vector.c: string halign; POSTNET/PLANET: 1 module space; ZBarcode_Cap(); GUI settings

backend/aztec.c

@@ -980,7 +980,7 @@ INTERNAL int aztec(struct zint_symbol *symbol, unsigned char source[], const siz
     char binary_string[AZTEC_BIN_CAPACITY + 1], bit_pattern[20045], descriptor[42];
     char adjusted_string[AZTEC_MAX_CAPACITY + 1];
     unsigned char desc_data[4], desc_ecc[6];
-    int err_code, ecc_level, compact, data_length, data_maxsize, codeword_size, adjusted_length;
+    int error_number, ecc_level, compact, data_length, data_maxsize, codeword_size, adjusted_length;
     int remainder, padbits, count, gs1, adjustment_size;
     int debug = (symbol->debug & ZINT_DEBUG_PRINT), reader = 0;
     int comp_loop = 4;
@@ -1009,11 +1009,11 @@ INTERNAL int aztec(struct zint_symbol *symbol, unsigned char source[], const siz
 
     populate_map();
 
-    err_code = aztec_text_process(source, length, binary_string, gs1, symbol->eci, symbol->debug);
+    error_number = aztec_text_process(source, length, binary_string, gs1, symbol->eci, debug);
 
-    if (err_code != 0) {
+    if (error_number != 0) {
         strcpy(symbol->errtxt, "502: Input too long or too many extended ASCII characters");
-        return err_code;
+        return error_number;
     }
 
     if (!((symbol->option_1 >= -1) && (symbol->option_1 <= 4))) {
@@ -1021,7 +1021,7 @@ INTERNAL int aztec(struct zint_symbol *symbol, unsigned char source[], const siz
         if (symbol->warn_level == WARN_FAIL_ALL) {
             return ZINT_ERROR_INVALID_OPTION;
         } else {
-            err_code = ZINT_WARN_INVALID_OPTION;
+            error_number = ZINT_WARN_INVALID_OPTION;
         }
         symbol->option_1 = -1;
     }
@@ -1573,7 +1573,7 @@ INTERNAL int aztec(struct zint_symbol *symbol, unsigned char source[], const siz
         symbol->width = 151 - (2 * AztecOffset[layers - 1]);
     }
 
-    return err_code;
+    return error_number;
 }
 
 /* Encodes Aztec runes as specified in ISO/IEC 24778:2008 Annex A */

backend/codablock.c

@@ -629,7 +629,7 @@ static void SumASCII(uchar **ppOutPos, int Sum, int CharacterSet)
  */
 INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[], const size_t length) {
     int charCur, dataLength;
-    int Error;
+    int error_number;
     int rows, columns, useColumns;
     int fillings;
     int Sum1,Sum2;
@@ -652,14 +652,15 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
     /* option1: rows <= 0: automatic, 1..44 */
     rows = symbol->option_1;
     if (rows == 1) {
-        Error = code_128(symbol, source, length);
+        error_number = code_128(symbol, source, length); /* Only returns errors, not warnings */
-        if (Error < 5) {
+        if (error_number < ZINT_ERROR) {
             symbol->output_options |= BARCODE_BIND;
             if (symbol->border_width == 0) { /* Allow override if non-zero */
                 symbol->border_width = 1; /* AIM ISS-X-24 Section 4.6.1 b) (note change from previous default 2) */
             }
+            symbol->text[0] = '\0'; /* Disable HRT for compatibility with CODABLOCKF */
         }
-        return Error;
+        return error_number;
     }
     if (rows > 44) {
         strcpy(symbol->errtxt, "410: Rows parameter not in 0..44");
@@ -723,14 +724,14 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
     useColumns = columns - 5;
     if ( rows > 0 ) {
         /* row count given */
-        Error = Rows2Columns(symbol, T, dataLength, &rows, &useColumns, pSet, &fillings);
+        error_number = Rows2Columns(symbol, T, dataLength, &rows, &useColumns, pSet, &fillings);
     } else {
         /* column count given */
-        Error = Columns2Rows(symbol, T, dataLength, &rows, &useColumns, pSet, &fillings);
+        error_number = Columns2Rows(symbol, T, dataLength, &rows, &useColumns, pSet, &fillings);
     }
-    if (Error != 0) {
+    if (error_number != 0) {
         strcpy(symbol->errtxt, "413: Data string too long");
-        return Error;
+        return error_number;
     }
     /* Suppresses clang-analyzer-core.VLASize warning */
     assert(rows >= 2 && useColumns >= 4);
@@ -984,5 +985,5 @@ INTERNAL int codablock(struct zint_symbol *symbol,const unsigned char source[],
         symbol->border_width = 1; /* AIM ISS-X-24 Section 4.6.1 b) (note change from previous default 2) */
     }
 
-    return 0;
+    return error_number;
 }

backend/code16k.c

@@ -109,7 +109,7 @@ static void c16k_set_c(const unsigned char source_a, unsigned char source_b, int
 
 INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const size_t length) {
     char width_pattern[100];
-    int current_row, rows_needed, looper, first_check, second_check;
+    int current_row, rows, looper, first_check, second_check;
     int indexchaine;
     int list[2][C128_MAX] = {{0}};
     char set[C128_MAX] = {0}, fset[C128_MAX], mode, last_set, current_set;
@@ -117,14 +117,14 @@ INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const s
     int values[C128_MAX] = {0};
     int bar_characters;
     float glyph_count;
-    int errornum, first_sum, second_sum;
+    int error_number, first_sum, second_sum;
     int input_length;
     int gs1, c_count;
 
     /* Suppresses clang-analyzer-core.UndefinedBinaryOperatorResult warning on fset which is fully set */
     assert(length > 0);
 
-    errornum = 0;
+    error_number = 0;
     strcpy(width_pattern, "");
     input_length = length;
 
@@ -287,13 +287,13 @@ INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const s
     /* Calculate how tall the symbol will be */
     glyph_count = glyph_count + 2.0;
     i = (int)glyph_count;
-    rows_needed = (i / 5);
+    rows = (i / 5);
     if (i % 5 > 0) {
-        rows_needed++;
+        rows++;
     }
 
-    if (rows_needed == 1) {
+    if (rows == 1) {
-        rows_needed = 2;
+        rows = 2;
     }
 
     /* start with the mode character - Table 2 */
@@ -319,7 +319,7 @@ INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const s
                 m = 6;
             }
         }
-        values[bar_characters] = (7 * (rows_needed - 2)) + m; /* see 4.3.4.2 */
+        values[bar_characters] = (7 * (rows - 2)) + m; /* see 4.3.4.2 */
         values[bar_characters + 1] = 96; /* FNC3 */
         bar_characters += 2;
     } else {
@@ -339,7 +339,7 @@ INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const s
                 m = 6;
             }
         }
-        values[bar_characters] = (7 * (rows_needed - 2)) + m; /* see 4.3.4.2 */
+        values[bar_characters] = (7 * (rows - 2)) + m; /* see 4.3.4.2 */
         bar_characters++;
     }
 
@@ -457,7 +457,7 @@ INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const s
     }
 #endif
 
-    for (current_row = 0; current_row < rows_needed; current_row++) {
+    for (current_row = 0; current_row < rows; current_row++) {
         int writer;
         int flip_flop;
         int len;
@@ -491,7 +491,7 @@ INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const s
         symbol->row_height[current_row] = 10;
     }
 
-    symbol->rows = rows_needed;
+    symbol->rows = rows;
     symbol->width = 70;
 
     symbol->output_options |= BARCODE_BIND;
@@ -500,5 +500,5 @@ INTERNAL int code16k(struct zint_symbol *symbol, unsigned char source[], const s
         symbol->border_width = 1; /* BS EN 12323:2005 Section 4.3.7 minimum (note change from previous default 2) */
     }
 
-    return errornum;
+    return error_number;
 }

backend/common.c

@@ -135,7 +135,7 @@ INTERNAL int posn(const char set_string[], const char data) {
     return -1;
 }
 
-/* Return true (1) if a module is dark/black/colour, otherwise false (0) */
+/* Return true (1-8) if a module is dark/black/colour, otherwise false (0) */
 INTERNAL int module_is_set(const struct zint_symbol *symbol, const int y_coord, const int x_coord) {
     if (symbol->symbology == BARCODE_ULTRA) {
         return symbol->encoded_data[y_coord][x_coord];
@@ -154,7 +154,7 @@ INTERNAL void set_module_colour(struct zint_symbol *symbol, const int y_coord, c
     symbol->encoded_data[y_coord][x_coord] = colour;
 }
 
-/* Set (or unset) a module to white */
+/* Set a dark/black module to white (i.e. unset) */
 INTERNAL void unset_module(struct zint_symbol *symbol, const int y_coord, const int x_coord) {
     symbol->encoded_data[y_coord][x_coord / 8] &= ~(1 << (x_coord % 8));
 }
@@ -193,10 +193,9 @@ INTERNAL void expand(struct zint_symbol *symbol, const char data[]) {
     symbol->rows = symbol->rows + 1;
 }
 
-/* Indicates which symbologies can have row binding
+/* Indicates which symbologies can have row binding */
- * Note: if change this must also change version in frontend/main.c */
 INTERNAL int is_stackable(const int symbology) {
-    if (symbology < BARCODE_PDF417) {
+    if (symbology < BARCODE_PHARMA_TWO && symbology != BARCODE_POSTNET) {
         return 1;
     }
 
@@ -218,8 +217,7 @@ INTERNAL int is_stackable(const int symbology) {
     return 0;
 }
 
-/* Indicates which symbols can have addon (EAN-2 and EAN-5)
+/* Indicates which symbols can have addon (EAN-2 and EAN-5) */
- * Note: if change this must also change version in frontend/main.c */
 INTERNAL int is_extendable(const int symbology) {
 
     switch (symbology) {

backend/common.h

@@ -89,7 +89,8 @@ extern "C" {
     INTERNAL int is_composite(const int symbology);
     INTERNAL int istwodigits(const unsigned char source[], const int length, const int position);
     INTERNAL unsigned int decode_utf8(unsigned int *state, unsigned int *codep, const unsigned char byte);
-    INTERNAL int utf8_to_unicode(struct zint_symbol *symbol, const unsigned char source[], unsigned int vals[], size_t *length, int disallow_4byte);
+    INTERNAL int utf8_to_unicode(struct zint_symbol *symbol, const unsigned char source[], unsigned int vals[],
+                    size_t *length, int disallow_4byte);
     INTERNAL void set_minimum_height(struct zint_symbol *symbol, const int min_height);
 
     typedef unsigned int *(*pn_head_costs)(unsigned int state[]);

backend/composite.c

@@ -1349,7 +1349,7 @@ static int cc_binary_string(struct zint_symbol *symbol, const char source[], cha
     return 0;
 }
 
-static int linear_dummy_run(unsigned char *source, int length) {
+static int linear_dummy_run(unsigned char *source, int length, char *errtxt) {
     struct zint_symbol *dummy;
     int error_number;
     int linear_width;
@@ -1359,6 +1359,9 @@ static int linear_dummy_run(unsigned char *source, int length) {
     dummy->option_1 = 3;
     error_number = ean_128(dummy, source, length);
     linear_width = dummy->width;
+    if (error_number != 0) {
+        strcpy(errtxt, dummy->errtxt);
+    }
     ZBarcode_Delete(dummy);
 
     if (error_number == 0) {
@@ -1404,9 +1407,9 @@ INTERNAL int composite(struct zint_symbol *symbol, unsigned char source[], int l
 
     if (symbol->symbology == BARCODE_GS1_128_CC) {
         /* Do a test run of encoding the linear component to establish its width */
-        linear_width = linear_dummy_run((unsigned char *) symbol->primary, pri_len);
+        linear_width = linear_dummy_run((unsigned char *) symbol->primary, pri_len, symbol->errtxt);
         if (linear_width == 0) {
-            strcpy(symbol->errtxt, "448: Invalid data");
+            strcat(symbol->errtxt, " in linear component");
             return ZINT_ERROR_INVALID_DATA;
         }
         if (symbol->debug & ZINT_DEBUG_PRINT) {
@@ -1557,7 +1560,7 @@ INTERNAL int composite(struct zint_symbol *symbol, unsigned char source[], int l
 
     if (error_number != 0) {
         strcpy(symbol->errtxt, linear->errtxt);
-        strcat(symbol->errtxt, " in linear component ");
+        strcat(symbol->errtxt, " in linear component");
         ZBarcode_Delete(linear);
         return error_number;
     }

backend/dmatrix.c

@@ -55,7 +55,7 @@
 #include "reedsol.h"
 #include "dmatrix.h"
 
-/* Annex M placement alorithm low level */
+/* Annex M placement algorithm low level */
 static void ecc200placementbit(int *array, const int NR, const int NC, int r, int c, const int p, const char b) {
     if (r < 0) {
         r += NR;

backend/eci.c

@@ -45,8 +45,8 @@ INTERNAL int utf_to_eci(const int eci, const unsigned char source[], unsigned ch
     int ext;
     int done;
     
-    if (eci == 26) {
+    if (eci == 26 || eci == 899) {
-        /* Unicode mode, do not process - just copy data across */
+        /* Unicode or 8-bit binary data, do not process - just copy data across */
         memcpy(dest, source, *length);
         dest[*length] = '\0';
         return 0;

backend/emf.c

@@ -81,12 +81,28 @@ static int count_hexagons(struct zint_symbol *symbol) {
     return hexagons;
 }
 
-static int count_strings(struct zint_symbol *symbol) {
+static int count_strings(struct zint_symbol *symbol, int *fsize, int *fsize2, int *halign, int *halign1, int *halign2) {
     int strings = 0;
     struct zint_vector_string *str;
 
+    *fsize = *fsize2 = *halign = *halign1 = *halign2 = 0;
+
     str = symbol->vector->strings;
     while (str) {
+        /* Allow 2 font sizes */
+        if (*fsize == 0) {
+            *fsize = (int) str->fsize;
+        } else if (str->fsize != *fsize && *fsize2 == 0) {
+            *fsize2 = (int) str->fsize;
+        }
+        /* Only 3 haligns possible */
+        if (str->halign) {
+            if (str->halign == 1) {
+                *halign1 = str->halign;
+            } else {
+                *halign2 = str->halign;
+            }
+        }
         strings++;
         str = str->next;
     }
@@ -126,8 +142,22 @@ static int bump_up(int input) {
     return input;
 }
 
-INTERNAL int emf_plot(struct zint_symbol *symbol) {
+static int utfle_length(unsigned char *input, int length) {
-    int i,j;
+    int result = 0;
+    int i;
+
+    for (i = 0; i < length; i++) {
+        result++;
+        if (input[i] >= 0x80) { /* 2 byte UTF-8 counts as one UTF-16LE character */
+            i++;
+        }
+    }
+
+    return result;
+}
+
+INTERNAL int emf_plot(struct zint_symbol *symbol, int rotate_angle) {
+    int i;
     FILE *emf_file;
     int fgred, fggrn, fgblu, bgred, bggrn, bgblu;
     int error_number = 0;
@@ -140,8 +170,11 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
     int colours_used = 0;
     int rectangle_count_bycolour[9];
     unsigned char *this_string[6];
-    uint32_t spacing;
+    int width, height;
+    int utfle_len;
+    int bumped_len;
     int draw_background = 1;
+    int bold;
 
     float ax, ay, bx, by, cx, cy, dx, dy, ex, ey, fx, fy;
 
@@ -152,6 +185,8 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
 
     emr_header_t emr_header;
     emr_eof_t emr_eof;
+    emr_mapmode_t emr_mapmode;
+    emr_setworldtransform_t emr_setworldtransform;
     emr_createbrushindirect_t emr_createbrushindirect_fg;
     emr_createbrushindirect_t emr_createbrushindirect_bg;
     emr_createbrushindirect_t emr_createbrushindirect_colour[8]; // Used for colour symbols only
@@ -161,17 +196,31 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
     emr_createpen_t emr_createpen;
     emr_selectobject_t emr_selectobject_pen;
     emr_rectangle_t background;
-    emr_extcreatefontindirectw_t emr_extcreatefontindirectw;
     emr_settextcolor_t emr_settextcolor;
+
+    int fsize;
+    emr_extcreatefontindirectw_t emr_extcreatefontindirectw;
     emr_selectobject_t emr_selectobject_font;
-    //emr_extcreatefontindirectw_t emr_extcreatefontindirectw_big;
+    int fsize2;
-    //emr_selectobject_t emr_selectobject_font_big;
+    emr_extcreatefontindirectw_t emr_extcreatefontindirectw2;
+    emr_selectobject_t emr_selectobject_font2;
+    int halign;
+    emr_settextalign_t emr_settextalign;
+    int halign1;
+    emr_settextalign_t emr_settextalign1;
+    int halign2;
+    emr_settextalign_t emr_settextalign2;
+
+    int current_fsize;
+    int current_halign;
 
 #ifdef _MSC_VER
     emr_rectangle_t *rectangle;
     emr_ellipse_t *circle;
     emr_polygon_t *hexagon;
     emr_exttextoutw_t *text;
+    int *text_fsizes;
+    int *text_haligns;
 #endif
 
     fgred = (16 * ctoi(symbol->fgcolour[0])) + ctoi(symbol->fgcolour[1]);
@@ -190,18 +239,22 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
     rectangle_count = count_rectangles(symbol);
     circle_count = count_circles(symbol);
     hexagon_count = count_hexagons(symbol);
-    string_count = count_strings(symbol);
+    string_count = count_strings(symbol, &fsize, &fsize2, &halign, &halign1, &halign2);
 
 #ifndef _MSC_VER
     emr_rectangle_t rectangle[rectangle_count ? rectangle_count : 1]; // Avoid sanitize runtime error by making always non-zero
     emr_ellipse_t circle[circle_count ? circle_count : 1];
     emr_polygon_t hexagon[hexagon_count ? hexagon_count : 1];
     emr_exttextoutw_t text[string_count ? string_count: 1];
+    int text_fsizes[string_count ? string_count: 1];
+    int text_haligns[string_count ? string_count: 1];
 #else
     rectangle = (emr_rectangle_t*) _alloca(rectangle_count * sizeof (emr_rectangle_t));
     circle = (emr_ellipse_t*) _alloca(circle_count * sizeof (emr_ellipse_t));
     hexagon = (emr_polygon_t*) _alloca(hexagon_count * sizeof (emr_polygon_t));
     text = (emr_exttextoutw_t*) _alloca(string_count * sizeof (emr_exttextoutw_t));
+    text_fsizes = (int *) _alloca(string_count * sizeof (int));
+    text_haligns = (int *) _alloca(string_count * sizeof (int));
 #endif
 
     //Calculate how many coloured rectangles
@@ -220,12 +273,15 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
         }
     }
 
+    width = ceil(symbol->vector->width);
+    height = ceil(symbol->vector->height);
+
     /* Header */
     emr_header.type = 0x00000001; // EMR_HEADER
     emr_header.size = 108; // Including extensions
     emr_header.emf_header.bounds.left = 0;
-    emr_header.emf_header.bounds.right = ceil(symbol->vector->width);
+    emr_header.emf_header.bounds.right = rotate_angle == 90 || rotate_angle == 270 ? height : width;
-    emr_header.emf_header.bounds.bottom = ceil(symbol->vector->height);
+    emr_header.emf_header.bounds.bottom = rotate_angle == 90 || rotate_angle == 270 ? width : height;
     emr_header.emf_header.bounds.top = 0;
     emr_header.emf_header.frame.left = 0;
     emr_header.emf_header.frame.right = emr_header.emf_header.bounds.right * 30;
@@ -236,7 +292,7 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
     if (symbol->symbology == BARCODE_ULTRA) {
         emr_header.emf_header.handles = 11; // Number of graphics objects
     } else {
-        emr_header.emf_header.handles = 4;
+        emr_header.emf_header.handles = fsize2 ? 5 : 4;
     }
     emr_header.emf_header.reserved = 0x0000;
     emr_header.emf_header.n_description = 0;
@@ -256,6 +312,25 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
     bytecount = 108;
     recordcount = 1;
 
+    emr_mapmode.type = 0x00000011; // EMR_SETMAPMODE
+    emr_mapmode.size = 12;
+    emr_mapmode.mapmode = 0x01; // MM_TEXT
+    bytecount += 12;
+    recordcount++;
+
+    if (rotate_angle) {
+        emr_setworldtransform.type = 0x00000023; // EMR_SETWORLDTRANSFORM
+        emr_setworldtransform.size = 32;
+        emr_setworldtransform.m11 = rotate_angle == 90 ? 0.0f : rotate_angle == 180 ? -1.0f : 0.0f;
+        emr_setworldtransform.m12 = rotate_angle == 90 ? 1.0f : rotate_angle == 180 ? 0.0f : -1.0f;
+        emr_setworldtransform.m21 = rotate_angle == 90 ? -1.0f : rotate_angle == 180 ? 0.0f : 1.0f;
+        emr_setworldtransform.m22 = rotate_angle == 90 ? 0.0f : rotate_angle == 180 ? -1.0f : 0.0f;
+        emr_setworldtransform.dx = rotate_angle == 90 ? height : rotate_angle == 180 ? width : 0.0f;
+        emr_setworldtransform.dy = rotate_angle == 90 ? 0.0f : rotate_angle == 180 ? height : width;
+        bytecount += 32;
+        recordcount++;
+    }
+
     /* Create Brushes */
     emr_createbrushindirect_bg.type = 0x00000027; // EMR_CREATEBRUSHINDIRECT
     emr_createbrushindirect_bg.size = 24;
@@ -444,37 +519,60 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
         hex = hex->next;
     }
 
-    /* Create font records */
+    /* Create font records, alignment records and text color */
     if (symbol->vector->strings) {
+        bold = (symbol->output_options & BOLD_TEXT) && (!is_extendable(symbol->symbology) || (symbol->output_options & SMALL_TEXT));
+        memset(&emr_extcreatefontindirectw, 0, sizeof(emr_extcreatefontindirectw));
         emr_extcreatefontindirectw.type = 0x00000052; // EMR_EXTCREATEFONTINDIRECTW
         emr_extcreatefontindirectw.size = 104;
-        emr_extcreatefontindirectw.ih_fonts = 4;
+        emr_extcreatefontindirectw.ih_fonts = 11;
-        emr_extcreatefontindirectw.elw.height = 16 * symbol->scale;
+        emr_extcreatefontindirectw.elw.height = fsize;
         emr_extcreatefontindirectw.elw.width = 0; // automatic
-        emr_extcreatefontindirectw.elw.escapement = 0;
+        emr_extcreatefontindirectw.elw.weight = bold ? 700 : 400;
-        emr_extcreatefontindirectw.elw.orientation = 0;
+        emr_extcreatefontindirectw.elw.char_set = 0x00; // ANSI_CHARSET
-        emr_extcreatefontindirectw.elw.weight = 400;
-        emr_extcreatefontindirectw.elw.italic = 0x00;
-        emr_extcreatefontindirectw.elw.underline = 0x00;
-        emr_extcreatefontindirectw.elw.strike_out = 0x00;
-        emr_extcreatefontindirectw.elw.char_set = 0x01;
         emr_extcreatefontindirectw.elw.out_precision = 0x00; // OUT_DEFAULT_PRECIS
         emr_extcreatefontindirectw.elw.clip_precision = 0x00; // CLIP_DEFAULT_PRECIS
-        emr_extcreatefontindirectw.elw.quality = 0x00;
+        emr_extcreatefontindirectw.elw.pitch_and_family = 0x02 | (0x02 << 6); // FF_SWISS | VARIABLE_PITCH
-        emr_extcreatefontindirectw.elw.pitch_and_family = 0x00;
-        for (i = 0; i < 64; i++) {
-            emr_extcreatefontindirectw.elw.facename[i] = '\0';
-        }
         utfle_copy(emr_extcreatefontindirectw.elw.facename, (unsigned char*) "sans-serif", 10);
         bytecount += 104;
         recordcount++;
 
         emr_selectobject_font.type = 0x00000025; // EMR_SELECTOBJECT
         emr_selectobject_font.size = 12;
-        emr_selectobject_font.ih_object = 4;
+        emr_selectobject_font.ih_object = 11;
         bytecount += 12;
         recordcount++;
 
+        if (fsize2) {
+            memcpy(&emr_extcreatefontindirectw2, &emr_extcreatefontindirectw, sizeof(emr_extcreatefontindirectw));
+            emr_extcreatefontindirectw2.ih_fonts = 12;
+            emr_extcreatefontindirectw2.elw.height = fsize2;
+            bytecount += 104;
+            recordcount++;
+
+            emr_selectobject_font2.type = 0x00000025; // EMR_SELECTOBJECT
+            emr_selectobject_font2.size = 12;
+            emr_selectobject_font2.ih_object = 12;
+            bytecount += 12;
+            recordcount++;
+        }
+
+        /* Note select aligns counted below in strings loop */
+
+        emr_settextalign.type = 0x00000016; // EMR_SETTEXTALIGN
+        emr_settextalign.size = 12;
+        emr_settextalign.text_alignment_mode = 0x0006 | 0x0018; // TA_CENTER | TA_BASELINE
+        if (halign1) {
+            emr_settextalign1.type = 0x00000016; // EMR_SETTEXTALIGN
+            emr_settextalign1.size = 12;
+            emr_settextalign1.text_alignment_mode = 0x0000 | 0x0018; // TA_LEFT | TA_BASELINE
+        }
+        if (halign2) {
+            emr_settextalign2.type = 0x00000016; // EMR_SETTEXTALIGN
+            emr_settextalign2.size = 12;
+            emr_settextalign2.text_alignment_mode = 0x0002 | 0x0018; // TA_RIGHT | TA_BASELINE
+        }
+
         emr_settextcolor.type = 0x0000018; // EMR_SETTEXTCOLOR
         emr_settextcolor.size = 12;
         emr_settextcolor.color.red = fgred;
@@ -486,39 +584,58 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
     }
 
     //Text
-    str = symbol->vector->strings;
     this_text = 0;
+    // Loop over font sizes so that they're grouped together, so only have to select font twice at most
+    for (current_fsize = fsize; current_fsize; current_fsize = fsize2) {
+        str = symbol->vector->strings;
+        current_halign = -1;
         while (str) {
-        this_string[this_text] = (unsigned char *) malloc(bump_up(str->length + 1) * 2);
+            if (str->fsize != current_fsize) {
+                str = str->next;
+                continue;
+            }
+            text_fsizes[this_text] = str->fsize;
+            text_haligns[this_text] = str->halign;
+            if (text_haligns[this_text] != current_halign) {
+                current_halign = text_haligns[this_text];
+                bytecount += 12;
+                recordcount++;
+            }
+            assert(str->length > 0);
+            utfle_len = utfle_length(str->text, str->length);
+            bumped_len = bump_up(utfle_len) * 2;
+            this_string[this_text] = (unsigned char *) malloc(bumped_len);
+            memset(this_string[this_text], 0, bumped_len);
             text[this_text].type = 0x00000054; // EMR_EXTTEXTOUTW
-        text[this_text].size = 76 + (6 * bump_up(str->length + 1));
+            text[this_text].size = 76 + bumped_len;
             text[this_text].bounds.top = 0; // ignored
             text[this_text].bounds.left = 0; // ignored
             text[this_text].bounds.right = 0xffffffff; // ignored
             text[this_text].bounds.bottom = 0xffffffff; // ignored
-        text[this_text].i_graphics_mode = 0x00000001; // GM_COMPATIBLE
+            text[this_text].i_graphics_mode = 0x00000002; // GM_ADVANCED
-        text[this_text].ex_scale = 1.0;
+            text[this_text].ex_scale = 1.0f;
-        text[this_text].ey_scale = 1.0;
+            text[this_text].ey_scale = 1.0f;
-        text[this_text].w_emr_text.reference.x = str->x - (4 * str->length * symbol->scale); // text left
+            text[this_text].w_emr_text.reference.x = str->x;
-        text[this_text].w_emr_text.reference.y = str->y - (16 * symbol->scale); // text top
+            text[this_text].w_emr_text.reference.y = str->y;
-        text[this_text].w_emr_text.chars = str->length;
+            text[this_text].w_emr_text.chars = utfle_len;
             text[this_text].w_emr_text.off_string = 76;
             text[this_text].w_emr_text.options = 0;
             text[this_text].w_emr_text.rectangle.top = 0;
             text[this_text].w_emr_text.rectangle.left = 0;
             text[this_text].w_emr_text.rectangle.right = 0xffffffff;
             text[this_text].w_emr_text.rectangle.bottom = 0xffffffff;
-        text[this_text].w_emr_text.off_dx = 76 + (2 * bump_up(str->length + 1));
+            text[this_text].w_emr_text.off_dx = 0;
-        for (i = 0; i < bump_up(str->length + 1) * 2; i++) {
-            this_string[this_text][i] = '\0';
-        }
             utfle_copy(this_string[this_text], str->text, str->length);
-        bytecount += 76 + (6 * bump_up(str->length + 1));
+            bytecount += 76 + bumped_len;
             recordcount++;
 
             this_text++;
             str = str->next;
         }
+        if (current_fsize == fsize2) {
+            break;
+        }
+    }
 
     /* Create EOF record */
     emr_eof.type = 0x0000000e; // EMR_EOF
@@ -551,6 +668,12 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
 
     fwrite(&emr_header, sizeof (emr_header_t), 1, emf_file);
 
+    fwrite(&emr_mapmode, sizeof (emr_mapmode_t), 1, emf_file);
+
+    if (rotate_angle) {
+        fwrite(&emr_setworldtransform, sizeof (emr_setworldtransform_t), 1, emf_file);
+    }
+
     fwrite(&emr_createbrushindirect_bg, sizeof (emr_createbrushindirect_t), 1, emf_file);
 
     if (symbol->symbology == BARCODE_ULTRA) {
@@ -567,6 +690,9 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
 
     if (symbol->vector->strings) {
         fwrite(&emr_extcreatefontindirectw, sizeof (emr_extcreatefontindirectw_t), 1, emf_file);
+        if (fsize2) {
+            fwrite(&emr_extcreatefontindirectw2, sizeof (emr_extcreatefontindirectw_t), 1, emf_file);
+        }
     }
 
     fwrite(&emr_selectobject_bgbrush, sizeof (emr_selectobject_t), 1, emf_file);
@@ -633,14 +759,26 @@ INTERNAL int emf_plot(struct zint_symbol *symbol) {
     /* Suppresses clang-tidy clang-analyzer-core.UndefinedBinaryOperatorResult warning */
     assert((symbol->vector->strings == NULL && string_count == 0) || (symbol->vector->strings != NULL && string_count > 0));
 
+    current_fsize = fsize;
+    current_halign = -1;
     for (i = 0; i < string_count; i++) {
-        spacing = 8 * symbol->scale;
+        if (text_fsizes[i] != current_fsize) {
-        fwrite(&text[i], sizeof (emr_exttextoutw_t), 1, emf_file);
+            current_fsize = text_fsizes[i];
-        fwrite(this_string[i], bump_up(text[i].w_emr_text.chars + 1) * 2, 1, emf_file);
+            fwrite(&emr_selectobject_font2, sizeof (emr_selectobject_t), 1, emf_file);
-        free(this_string[i]);
-        for (j = 0; j < bump_up(text[i].w_emr_text.chars + 1); j++) {
-            fwrite(&spacing, 4, 1, emf_file);
         }
+        if (text_haligns[i] != current_halign) {
+            current_halign = text_haligns[i];
+            if (current_halign == 0) {
+                fwrite(&emr_settextalign, sizeof (emr_settextalign_t), 1, emf_file);
+            } else if (current_halign == 1) {
+                fwrite(&emr_settextalign1, sizeof (emr_settextalign_t), 1, emf_file);
+            } else {
+                fwrite(&emr_settextalign2, sizeof (emr_settextalign_t), 1, emf_file);
+            }
+        }
+        fwrite(&text[i], sizeof (emr_exttextoutw_t), 1, emf_file);
+        fwrite(this_string[i], bump_up(text[i].w_emr_text.chars) * 2, 1, emf_file);
+        free(this_string[i]);
     }
 
     fwrite(&emr_eof, sizeof (emr_eof_t), 1, emf_file);

backend/emf.h

@@ -135,6 +135,23 @@ extern "C" {
         emf_header_t emf_header;
     } emr_header_t;
 
+    typedef struct emr_mapmode {
+        uint32_t type;
+        uint32_t size;
+        uint32_t mapmode;
+    } emr_mapmode_t;
+
+    typedef struct emr_setworldtransform {
+        uint32_t type;
+        uint32_t size;
+        float m11;
+        float m12;
+        float m21;
+        float m22;
+        float dx;
+        float dy;
+    } emr_setworldtransform_t;
+
     typedef struct emr_createbrushindirect {
         uint32_t type;
         uint32_t size;
@@ -187,6 +204,12 @@ extern "C" {
         log_font_t elw;
     } emr_extcreatefontindirectw_t;
 
+    typedef struct emr_settextalign {
+        uint32_t type;
+        uint32_t size;
+        uint32_t text_alignment_mode;
+    } emr_settextalign_t;
+
     typedef struct emr_settextcolor {
         uint32_t type;
         uint32_t size;

backend/font.h

@@ -132,7 +132,6 @@ static font_item ascii_font[] = {
     0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, /* | */
     0, 48, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 48, /* } */
     0, 32, 82, 74, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ~ */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*  */
     0, 0, 8, 8, 0, 8, 8, 8, 8, 8, 8, 8, 0, 0, /* ¡ */
     0, 0, 0, 0, 16, 60, 82, 80, 80, 80, 82, 60, 16, 0, /* ¢ */
     0, 0, 0, 12, 18, 16, 16, 60, 16, 16, 60, 18, 0, 0, /* £ */
@@ -329,7 +328,6 @@ static font_item small_font[] = {
     0, 2, 2, 2, 2, 2, 2, 0, 0, /* | */
     0, 4, 2, 3, 2, 2, 4, 0, 0, /* } */
     0, 5, 10, 0, 0, 0, 0, 0, 0, /* ~ */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, /*  */
     0, 2, 0, 2, 2, 2, 2, 0, 0, /* ¡ */
     0, 0, 2, 7, 10, 10, 7, 2, 0, /* ¢ */
     0, 0, 3, 4, 14, 4, 11, 0, 0, /* £ */

backend/gridmtx.c

@@ -221,7 +221,7 @@ static void gm_cur_cost(unsigned int state[], const unsigned int gbdata[], const
 
 /* Calculate optimized encoding modes */
 static void define_mode(char* mode, const unsigned int gbdata[], const size_t length, const int debug) {
-    static const char mode_types[] = { GM_CHINESE, GM_NUMBER, GM_LOWER, GM_UPPER, GM_MIXED, GM_BYTE }; /* Must be in same order as GM_H etc */
+    static const char mode_types[] = { GM_CHINESE, GM_NUMBER, GM_LOWER, GM_UPPER, GM_MIXED, GM_BYTE, '\0' }; /* Must be in same order as GM_H etc */
     unsigned int state[3] = { 0 /*numeral_end*/, 0 /*numeral_cost*/, 0 /*byte_count*/ };
 
     pn_define_mode(mode, gbdata, length, debug, state, mode_types, GM_NUM_MODES, gm_head_costs, gm_switch_cost, gm_eod_cost, gm_cur_cost);

backend/hanxin.c

@@ -438,7 +438,7 @@ static void hx_cur_cost(unsigned int state[], const unsigned int gbdata[], const
 
 /* Calculate optimized encoding modes */
 static void hx_define_mode(char* mode, const unsigned int gbdata[], const size_t length, const int debug) {
-    static const char mode_types[] = { 'n', 't', 'b', '1', '2', 'd', 'f' }; /* Must be in same order as HX_N etc */
+    static const char mode_types[] = { 'n', 't', 'b', '1', '2', 'd', 'f', '\0' }; /* Must be in same order as HX_N etc */
     unsigned int state[5] = { 0 /*numeric_end*/, 0 /*numeric_cost*/, 1 /*text_submode*/, 0 /*fourbyte_end*/, 0 /*fourbyte_cost*/ };
 
     pn_define_mode(mode, gbdata, length, debug, state, mode_types, HX_NUM_MODES, hx_head_costs, hx_switch_cost, hx_eod_cost, hx_cur_cost);

backend/library.c

@@ -59,7 +59,7 @@ struct zint_symbol *ZBarcode_Create() {
     strcpy(symbol->bgcolour, "ffffff");
     symbol->bgcolor = &symbol->bgcolour[0];
     strcpy(symbol->outfile, "out.png");
-    symbol->scale = 1.0;
+    symbol->scale = 1.0f;
     symbol->option_1 = -1;
     symbol->option_2 = 0;
     symbol->option_3 = 0;
@@ -71,7 +71,7 @@ struct zint_symbol *ZBarcode_Create() {
     symbol->bitmap_height = 0;
     symbol->alphamap = NULL;
     symbol->eci = 0; // Default 0 uses ECI 3
-    symbol->dot_size = 4.0 / 5.0;
+    symbol->dot_size = 4.0f / 5.0f;
     symbol->vector = NULL;
     symbol->debug = 0;
     symbol->warn_level = WARN_DEFAULT;
@@ -83,6 +83,8 @@ INTERNAL void vector_free(struct zint_symbol *symbol); /* Free vector structures
 void ZBarcode_Clear(struct zint_symbol *symbol) {
     int i, j;
 
+    if (!symbol) return;
+
     for (i = 0; i < symbol->rows; i++) {
         for (j = 0; j < symbol->width; j++) {
             unset_module(symbol, i, j);
@@ -108,6 +110,8 @@ void ZBarcode_Clear(struct zint_symbol *symbol) {
 }
 
 void ZBarcode_Delete(struct zint_symbol *symbol) {
+    if (!symbol) return;
+
     if (symbol->bitmap != NULL)
         free(symbol->bitmap);
     if (symbol->alphamap != NULL)
@@ -196,7 +200,7 @@ static void error_tag(char error_string[], int error_number) {
         char error_buffer[100];
         strcpy(error_buffer, error_string);
 
-        if (error_number > 4) {
+        if (error_number >= ZINT_ERROR) {
             strcpy(error_string, "Error ");
         } else {
             strcpy(error_string, "Warning ");
@@ -426,12 +430,13 @@ static int gs1_compliant(const int symbology) {
     return result;
 }
 
-static int is_matrix(const int symbology) {
+static int is_dotty(const int symbology) {
-    /* Returns 1 if symbology is a matrix design */
+    /* Returns 1 if symbology is a matrix design renderable as dots */
 
     int result = 0;
 
     switch (symbology) {
+        /* Note MAXICODE and ULTRA absent */
         case BARCODE_QRCODE:
         case BARCODE_DATAMATRIX:
         case BARCODE_MICROQR:
@@ -453,6 +458,25 @@ static int is_matrix(const int symbology) {
     return result;
 }
 
+static int is_fixed_ratio(const int symbology) {
+    /* Returns 1 if symbology has fixed aspect ratio (matrix design) */
+
+    int result = 0;
+
+    if (is_dotty(symbology)) {
+        return 1;
+    }
+
+    switch (symbology) {
+        case BARCODE_MAXICODE:
+        case BARCODE_ULTRA:
+            result = 1;
+            break;
+    }
+
+    return result;
+}
+
 static int is_linear(const int symbology) {
     /* Returns 1 if symbology is linear (1 dimensional) */
 
@@ -541,6 +565,119 @@ static int supports_eci(const int symbology) {
     return result;
 }
 
+static int has_hrt(const int symbology) {
+    /* Returns 1 if symbology supports HRT */
+
+    if (is_fixed_ratio(symbology)) {
+        return 0;
+    }
+
+    switch (symbology) { /* These don't support HRT */
+        case BARCODE_CODE16K:
+        case BARCODE_CODE49:
+        case BARCODE_FLAT:
+        case BARCODE_POSTNET:
+        case BARCODE_FIM:
+        case BARCODE_PHARMA:
+        case BARCODE_PHARMA_TWO:
+        case BARCODE_PDF417:
+        case BARCODE_PDF417COMP:
+        case BARCODE_AUSPOST:
+        case BARCODE_AUSREPLY:
+        case BARCODE_AUSROUTE:
+        case BARCODE_AUSREDIRECT:
+        case BARCODE_RM4SCC:
+        case BARCODE_CODABLOCKF:
+        case BARCODE_JAPANPOST:
+        case BARCODE_DBAR_STK:
+        case BARCODE_DBAR_OMNSTK:
+        case BARCODE_DBAR_EXPSTK:
+        case BARCODE_PLANET:
+        case BARCODE_MICROPDF417:
+        case BARCODE_USPS_IMAIL:
+        case BARCODE_KIX:
+        case BARCODE_DAFT:
+        case BARCODE_HIBC_PDF:
+        case BARCODE_HIBC_MICPDF:
+        case BARCODE_HIBC_BLOCKF:
+        case BARCODE_MAILMARK:
+        case BARCODE_DBAR_STK_CC:
+        case BARCODE_DBAR_OMNSTK_CC:
+        case BARCODE_DBAR_EXPSTK_CC:
+            return 0;
+            break;
+    }
+
+    return 1;
+}
+
+unsigned int ZBarcode_Cap(int symbol_id, unsigned int cap_flag) {
+    unsigned int result = 0;
+
+    if (!ZBarcode_ValidID(symbol_id)) {
+        return 0;
+    }
+
+    if ((cap_flag & ZINT_CAP_HRT) && has_hrt(symbol_id)) {
+        result |= ZINT_CAP_HRT;
+    }
+    if ((cap_flag & ZINT_CAP_STACKABLE) && is_stackable(symbol_id)) {
+        result |= ZINT_CAP_STACKABLE;
+    }
+    if ((cap_flag & ZINT_CAP_EXTENDABLE) && is_extendable(symbol_id)) {
+        result |= ZINT_CAP_EXTENDABLE;
+    }
+    if ((cap_flag & ZINT_CAP_COMPOSITE) && is_composite(symbol_id)) {
+        result |= ZINT_CAP_COMPOSITE;
+    }
+    if ((cap_flag & ZINT_CAP_ECI) && supports_eci(symbol_id)) {
+        result |= ZINT_CAP_ECI;
+    }
+    if ((cap_flag & ZINT_CAP_GS1) && gs1_compliant(symbol_id)) {
+        result |= ZINT_CAP_GS1;
+    }
+    if ((cap_flag & ZINT_CAP_DOTTY) && is_dotty(symbol_id)) {
+        result |= ZINT_CAP_DOTTY;
+    }
+    if ((cap_flag & ZINT_CAP_FIXED_RATIO) && is_fixed_ratio(symbol_id)) {
+        result |= ZINT_CAP_FIXED_RATIO;
+    }
+    if (cap_flag & ZINT_CAP_READER_INIT) {
+        /* Note does not include HIBC versions */
+        switch (symbol_id) {
+            case BARCODE_CODE128: /* Note does not include GS1_128 or NVE18 */
+            case BARCODE_CODE128B:
+            case BARCODE_CODE16K:
+            case BARCODE_CODABLOCKF:
+            case BARCODE_PDF417:
+            case BARCODE_PDF417COMP:
+            case BARCODE_DATAMATRIX:
+            case BARCODE_MICROPDF417:
+            case BARCODE_AZTEC:
+            case BARCODE_DOTCODE:
+            case BARCODE_GRIDMATRIX:
+            case BARCODE_ULTRA:
+                result |= ZINT_CAP_READER_INIT;
+                break;
+        }
+    }
+    if (cap_flag & ZINT_CAP_FULL_MULTIBYTE) {
+        switch (symbol_id) {
+            case BARCODE_QRCODE:
+            case BARCODE_MICROQR:
+            //case BARCODE_HIBC_QR: Note character set restricted to ASCII subset
+            //case BARCODE_UPNQR: Note does not use Kanji mode
+            case BARCODE_RMQR:
+            case BARCODE_HANXIN:
+            case BARCODE_GRIDMATRIX:
+                result |= ZINT_CAP_FULL_MULTIBYTE;
+                break;
+        }
+    }
+
+    return result;
+}
+
 int ZBarcode_ValidID(int symbol_id) {
     /* Checks whether a symbology is supported */
 
@@ -1019,8 +1156,16 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int
 #ifdef _MSC_VER
     unsigned char* local_source;
 #endif
+
+    if (!symbol) return ZINT_ERROR_INVALID_DATA;
+
     error_number = 0;
 
+    if (source == NULL) {
+        strcpy(symbol->errtxt, "200: Input data NULL");
+        error_tag(symbol->errtxt, ZINT_ERROR_INVALID_DATA);
+        return ZINT_ERROR_INVALID_DATA;
+    }
     if (in_length <= 0) {
         in_length = (int)ustrlen(source);
     }
@@ -1208,7 +1353,7 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int
         error_number = ZINT_ERROR_INVALID_OPTION;
     }
 
-    if ((symbol->dot_size < 0.01) || (symbol->dot_size > 20.0)) {
+    if ((symbol->dot_size < 0.01f) || (symbol->dot_size > 20.0f)) {
         strcpy(symbol->errtxt, "221: Invalid dot size");
         error_number = ZINT_ERROR_INVALID_OPTION;
     }
@@ -1217,7 +1362,7 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int
         symbol->input_mode = DATA_MODE; /* Reset completely */
     }
 
-    if (error_number > 4) {
+    if (error_number >= ZINT_ERROR) {
         error_tag(symbol->errtxt, error_number);
         return error_number;
     } else {
@@ -1251,6 +1396,9 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int
 #endif
                 error_number = gs1_verify(symbol, local_source, in_length, reduced);
                 if (error_number != 0) {
+                    if (is_composite(symbol->symbology)) {
+                        strcat(symbol->errtxt, " in 2D component");
+                    }
                     error_tag(symbol->errtxt, error_number);
                     return error_number;
                 }
@@ -1287,7 +1435,7 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int
     }
     error_tag(symbol->errtxt, error_number);
 
-    if (error_number < 5) {
+    if (error_number < ZINT_ERROR) {
         check_row_heights(symbol);
     }
 
@@ -1297,6 +1445,8 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int
 int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle) {
     int error_number;
 
+    if (!symbol) return ZINT_ERROR_INVALID_DATA;
+
     switch (rotate_angle) {
         case 0:
         case 90:
@@ -1310,7 +1460,7 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle) {
     }
 
     if (symbol->output_options & BARCODE_DOTTY_MODE) {
-        if (!(is_matrix(symbol->symbology))) {
+        if (!(is_dotty(symbol->symbology))) {
             strcpy(symbol->errtxt, "224: Selected symbology cannot be rendered as dots");
             error_tag(symbol->errtxt, ZINT_ERROR_INVALID_OPTION);
             return ZINT_ERROR_INVALID_OPTION;
@@ -1326,31 +1476,31 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle) {
         to_upper((unsigned char*) output);
 
         if (!(strcmp(output, "PNG"))) {
-            if (symbol->scale < 1.0) {
+            if (symbol->scale < 1.0f) {
                 symbol->text[0] = '\0';
             }
             error_number = plot_raster(symbol, rotate_angle, OUT_PNG_FILE);
         } else
             if (!(strcmp(output, "BMP"))) {
-            if (symbol->scale < 1.0) {
+            if (symbol->scale < 1.0f) {
                 symbol->text[0] = '\0';
             }
             error_number = plot_raster(symbol, rotate_angle, OUT_BMP_FILE);
         } else
             if (!(strcmp(output, "PCX"))) {
-            if (symbol->scale < 1.0) {
+            if (symbol->scale < 1.0f) {
                 symbol->text[0] = '\0';
             }
             error_number = plot_raster(symbol, rotate_angle, OUT_PCX_FILE);
         } else
             if (!(strcmp(output, "GIF"))) {
-            if (symbol->scale < 1.0) {
+            if (symbol->scale < 1.0f) {
                 symbol->text[0] = '\0';
             }
             error_number = plot_raster(symbol, rotate_angle, OUT_GIF_FILE);
         } else
             if (!(strcmp(output, "TIF"))) {
-            if (symbol->scale < 1.0) {
+            if (symbol->scale < 1.0f) {
                 symbol->text[0] = '\0';
             }
             error_number = plot_raster(symbol, rotate_angle, OUT_TIF_FILE);
@@ -1384,6 +1534,8 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle) {
 int ZBarcode_Buffer(struct zint_symbol *symbol, int rotate_angle) {
     int error_number;
 
+    if (!symbol) return ZINT_ERROR_INVALID_DATA;
+
     switch (rotate_angle) {
         case 0:
         case 90:
@@ -1397,7 +1549,7 @@ int ZBarcode_Buffer(struct zint_symbol *symbol, int rotate_angle) {
     }
 
     if (symbol->output_options & BARCODE_DOTTY_MODE) {
-        if (!(is_matrix(symbol->symbology))) {
+        if (!(is_dotty(symbol->symbology))) {
             strcpy(symbol->errtxt, "237: Selected symbology cannot be rendered as dots");
             error_tag(symbol->errtxt, ZINT_ERROR_INVALID_OPTION);
             return ZINT_ERROR_INVALID_OPTION;
@@ -1412,6 +1564,8 @@ int ZBarcode_Buffer(struct zint_symbol *symbol, int rotate_angle) {
 int ZBarcode_Buffer_Vector(struct zint_symbol *symbol, int rotate_angle) {
     int error_number;
 
+    if (!symbol) return ZINT_ERROR_INVALID_DATA;
+
     switch (rotate_angle) {
         case 0:
         case 90:
@@ -1425,7 +1579,7 @@ int ZBarcode_Buffer_Vector(struct zint_symbol *symbol, int rotate_angle) {
     }
 
     if (symbol->output_options & BARCODE_DOTTY_MODE) {
-        if (!(is_matrix(symbol->symbology))) {
+        if (!(is_dotty(symbol->symbology))) {
             strcpy(symbol->errtxt, "238: Selected symbology cannot be rendered as dots");
             error_tag(symbol->errtxt, ZINT_ERROR_INVALID_OPTION);
             return ZINT_ERROR_INVALID_OPTION;
@@ -1442,7 +1596,7 @@ int ZBarcode_Encode_and_Print(struct zint_symbol *symbol, unsigned char *input,
     int first_err;
 
     error_number = ZBarcode_Encode(symbol, input, length);
-    if (error_number >= 5) {
+    if (error_number >= ZINT_ERROR) {
         return error_number;
     }
 
@@ -1459,7 +1613,7 @@ int ZBarcode_Encode_and_Buffer(struct zint_symbol *symbol, unsigned char *input,
     int first_err;
 
     error_number = ZBarcode_Encode(symbol, input, length);
-    if (error_number >= 5) {
+    if (error_number >= ZINT_ERROR) {
         return error_number;
     }
 
@@ -1477,7 +1631,7 @@ int ZBarcode_Encode_and_Buffer_Vector(struct zint_symbol *symbol, unsigned char
     int first_err;
 
     error_number = ZBarcode_Encode(symbol, input, length);
-    if (error_number >= 5) {
+    if (error_number >= ZINT_ERROR) {
         return error_number;
     }
 
@@ -1498,6 +1652,14 @@ int ZBarcode_Encode_File(struct zint_symbol *symbol, char *filename) {
     int nRead = 0;
     int ret;
 
+    if (!symbol) return ZINT_ERROR_INVALID_DATA;
+
+    if (!filename) {
+        strcpy(symbol->errtxt, "239: Filename NULL");
+        error_tag(symbol->errtxt, ZINT_ERROR_INVALID_OPTION);
+        return ZINT_ERROR_INVALID_DATA;
+    }
+
     if (!strcmp(filename, "-")) {
         file = stdin;
         fileLen = 7900;
@@ -1568,7 +1730,7 @@ int ZBarcode_Encode_File_and_Print(struct zint_symbol *symbol, char *filename, i
     int first_err;
 
     error_number = ZBarcode_Encode_File(symbol, filename);
-    if (error_number >= 5) {
+    if (error_number >= ZINT_ERROR) {
         return error_number;
     }
 
@@ -1586,7 +1748,7 @@ int ZBarcode_Encode_File_and_Buffer(struct zint_symbol *symbol, char *filename,
     int first_err;
 
     error_number = ZBarcode_Encode_File(symbol, filename);
-    if (error_number >= 5) {
+    if (error_number >= ZINT_ERROR) {
         return error_number;
     }
 
@@ -1604,7 +1766,7 @@ int ZBarcode_Encode_File_and_Buffer_Vector(struct zint_symbol *symbol, char *fil
     int first_err;
 
     error_number = ZBarcode_Encode_File(symbol, filename);
-    if (error_number >= 5) {
+    if (error_number >= ZINT_ERROR) {
         return error_number;
     }
 

backend/maxicode.c

@@ -36,10 +36,8 @@
 #include "maxicode.h"
 #include "reedsol.h"
 
-static int maxi_codeword[144];
-
 /* Handles error correction of primary message */
-static void maxi_do_primary_check() {
+static void maxi_do_primary_check(int maxi_codeword[144]) {
     unsigned char data[15];
     unsigned char results[15];
     int j;
@@ -60,7 +58,7 @@ static void maxi_do_primary_check() {
 }
 
 /* Handles error correction of odd characters in secondary */
-static void maxi_do_secondary_chk_odd(int ecclen) {
+static void maxi_do_secondary_chk_odd(int maxi_codeword[144], int ecclen) {
     unsigned char data[100];
     unsigned char results[30];
     int j;
@@ -84,7 +82,7 @@ static void maxi_do_secondary_chk_odd(int ecclen) {
 }
 
 /* Handles error correction of even characters in secondary */
-static void maxi_do_secondary_chk_even(int ecclen) {
+static void maxi_do_secondary_chk_even(int maxi_codeword[144], int ecclen) {
     unsigned char data[100];
     unsigned char results[30];
     int j;
@@ -145,7 +143,7 @@ static int bestSurroundingSet(int index, int length, int set[], int setval[], in
 }
 
 /* Format text according to Appendix A */
-static int maxi_text_process(int mode, unsigned char source[], int length, int eci) {
+static int maxi_text_process(int maxi_codeword[144], int mode, unsigned char source[], int length, int eci) {
     /* This code doesn't make use of [Lock in C], [Lock in D]
     and [Lock in E] and so is not always the most efficient at
     compressing data, but should suffice for most applications */
@@ -532,7 +530,7 @@ static int maxi_text_process(int mode, unsigned char source[], int length, int e
 }
 
 /* Format structured primary for Mode 2 */
-static void maxi_do_primary_2(char postcode[], int country, int service) {
+static void maxi_do_primary_2(int maxi_codeword[144], char postcode[], int country, int service) {
     size_t postcode_length;
    int    postcode_num, i;
 
@@ -558,7 +556,7 @@ static void maxi_do_primary_2(char postcode[], int country, int service) {
 }
 
 /* Format structured primary for Mode 3 */
-static void maxi_do_primary_3(char postcode[], int country, int service) {
+static void maxi_do_primary_3(int maxi_codeword[144], char postcode[], int country, int service) {
     int i, h;
 
     h = strlen(postcode);
@@ -590,7 +588,8 @@ static void maxi_do_primary_3(char postcode[], int country, int service) {
 
 INTERNAL int maxicode(struct zint_symbol *symbol, unsigned char local_source[], const int length) {
     int i, j, block, bit, mode, lp = 0;
-    int bit_pattern[7], internal_error = 0, eclen;
+    int bit_pattern[7], error_number = 0, eclen;
+    int maxi_codeword[144] = {0};
     char postcode[12], countrystr[4], servicestr[4];
 
     mode = symbol->option_1;
@@ -598,8 +597,6 @@ INTERNAL int maxicode(struct zint_symbol *symbol, unsigned char local_source[],
     strcpy(countrystr, "");
     strcpy(servicestr, "");
 
-    memset(maxi_codeword, 0, sizeof (maxi_codeword));
-
     if (mode == -1) { /* If mode is unspecified */
         lp = strlen(symbol->primary);
         if (lp == 0) {
@@ -627,13 +624,13 @@ INTERNAL int maxicode(struct zint_symbol *symbol, unsigned char local_source[],
             lp = strlen(symbol->primary);
         }
         if (lp != 15) {
-            strcpy(symbol->errtxt, "551: Invalid Primary String");
+            strcpy(symbol->errtxt, "551: Invalid Primary Message");
             return ZINT_ERROR_INVALID_DATA;
         }
 
         for (i = 9; i < 15; i++) { /* check that country code and service are numeric */
             if ((symbol->primary[i] < '0') || (symbol->primary[i] > '9')) {
-                strcpy(symbol->errtxt, "552: Invalid Primary String");
+                strcpy(symbol->errtxt, "552: Invalid Primary Message");
                 return ZINT_ERROR_INVALID_DATA;
             }
         }
@@ -665,31 +662,31 @@ INTERNAL int maxicode(struct zint_symbol *symbol, unsigned char local_source[],
         service = atoi(servicestr);
 
         if (mode == 2) {
-            maxi_do_primary_2(postcode, countrycode, service);
+            maxi_do_primary_2(maxi_codeword, postcode, countrycode, service);
         }
         if (mode == 3) {
-            maxi_do_primary_3(postcode, countrycode, service);
+            maxi_do_primary_3(maxi_codeword, postcode, countrycode, service);
         }
     } else {
         maxi_codeword[0] = mode;
     }
 
-    i = maxi_text_process(mode, local_source, length, symbol->eci);
+    i = maxi_text_process(maxi_codeword, mode, local_source, length, symbol->eci);
     if (i == ZINT_ERROR_TOO_LONG) {
         strcpy(symbol->errtxt, "553: Input data too long");
         return i;
     }
 
     /* All the data is sorted - now do error correction */
-    maxi_do_primary_check(); /* always EEC */
+    maxi_do_primary_check(maxi_codeword); /* always EEC */
 
     if (mode == 5)
         eclen = 56; // 68 data codewords , 56 error corrections
     else
         eclen = 40; // 84 data codewords,  40 error corrections
 
-    maxi_do_secondary_chk_even(eclen / 2); // do error correction of even
+    maxi_do_secondary_chk_even(maxi_codeword, eclen / 2); // do error correction of even
-    maxi_do_secondary_chk_odd(eclen / 2); // do error correction of odd
+    maxi_do_secondary_chk_odd(maxi_codeword, eclen / 2); // do error correction of odd
 
     /* Copy data into symbol grid */
     for (i = 0; i < 33; i++) {
@@ -731,5 +728,5 @@ INTERNAL int maxicode(struct zint_symbol *symbol, unsigned char local_source[],
     symbol->width = 30;
     symbol->rows = 33;
 
-    return internal_error;
+    return error_number;
 }

backend/medical.c

@@ -58,7 +58,8 @@ INTERNAL int pharma_one(struct zint_symbol *symbol, unsigned char source[], int
        - http://en.wikipedia.org/wiki/Pharmacode */
 
     /* This code uses the One Track Pharamacode calculating algorithm as recommended by
-       the specification at http://www.laetus.com/laetus.php?request=file&id=69 */
+       the specification at http://www.laetus.com/laetus.php?request=file&id=69
+       (http://www.gomaro.ch/ftproot/Laetus_PHARMA-CODE.pdf) */
 
     unsigned long int tester;
     int counter, error_number, h;

backend/pdf417.c

@@ -537,6 +537,7 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size
     int total, chainemc[PDF417_MAX_LEN], mclength, c1, c2, c3, dummy[35], calcheight;
     int liste[2][PDF417_MAX_LEN] = {{0}};
     char pattern[580];
+    int error_number = 0;
     int debug = symbol->debug & ZINT_DEBUG_PRINT;
 
     if (length > PDF417_MAX_LEN) {
@@ -760,13 +761,15 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size
     }
 #endif
 
+    symbol->rows = mclength / symbol->option_2;
+
     /* 818 - The CW string is finished */
-    c1 = (mclength / symbol->option_2 - 1) / 3;
+    c1 = (symbol->rows - 1) / 3;
-    c2 = symbol->option_1 * 3 + (mclength / symbol->option_2 - 1) % 3;
+    c2 = symbol->option_1 * 3 + (symbol->rows - 1) % 3;
     c3 = symbol->option_2 - 1;
 
     /* we now encode each row */
-    for (i = 0; i <= (mclength / symbol->option_2) - 1; i++) {
+    for (i = 0; i < symbol->rows; i++) {
         for (j = 0; j < symbol->option_2; j++) {
             dummy[j + 1] = chainemc[i * symbol->option_2 + j];
         }
@@ -821,11 +824,10 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size
         symbol->row_height[j] = calcheight;
     }
     
-    symbol->rows = (mclength / symbol->option_2);
+    symbol->width = (int) strlen(pattern);
-    symbol->width =(int)strlen(pattern);
 
     /* 843 */
-    return 0;
+    return error_number;
 }
 
 /* 345 */

backend/postal.c

@@ -135,7 +135,7 @@ INTERNAL int post_plot(struct zint_symbol *symbol, unsigned char source[], int l
             set_module(symbol, 0, writer);
         }
         set_module(symbol, 1, writer);
-        writer += 3;
+        writer += 2;
     }
     symbol->row_height[0] = 6;
     symbol->row_height[1] = 6;
@@ -197,12 +197,13 @@ INTERNAL int planet_plot(struct zint_symbol *symbol, unsigned char source[], int
             set_module(symbol, 0, writer);
         }
         set_module(symbol, 1, writer);
-        writer += 3;
+        writer += 2;
     }
     symbol->row_height[0] = 6;
     symbol->row_height[1] = 6;
     symbol->rows = 2;
     symbol->width = writer - 1;
+
     return error_number;
 }
 
@@ -241,13 +242,13 @@ INTERNAL int korea_post(struct zint_symbol *symbol, unsigned char source[], int
     lookup(NEON, KoreaTable, localstr[6], dest);
     expand(symbol, dest);
     ustrcpy(symbol->text, (unsigned char*) localstr);
+
     return error_number;
 }
 
 /* The simplest barcode symbology ever! Supported by MS Word, so here it is!
     glyphs from http://en.wikipedia.org/wiki/Facing_Identification_Mark */
 INTERNAL int fim(struct zint_symbol *symbol, unsigned char source[], int length) {
-
     char dest[16] = {0};
 
     if (length > 1) {
@@ -279,11 +280,12 @@ INTERNAL int fim(struct zint_symbol *symbol, unsigned char source[], int length)
     }
 
     expand(symbol, dest);
+
     return 0;
 }
 
 /* Handles the 4 State barcodes used in the UK by Royal Mail */
-static char rm4scc(char source[], unsigned char dest[], int length) {
+static char rm4scc(unsigned char source[], char dest[], int length) {
     int i;
     int top, bottom, row, column, check_digit;
     char values[3], set_copy[] = KRSET;
@@ -292,10 +294,10 @@ static char rm4scc(char source[], unsigned char dest[], int length) {
     bottom = 0;
 
     /* start character */
-    strcpy((char*) dest, "1");
+    strcpy(dest, "1");
 
     for (i = 0; i < length; i++) {
-        lookup(KRSET, RoyalTable, source[i], (char*) dest);
+        lookup(KRSET, RoyalTable, source[i], dest);
         strcpy(values, RoyalValues[posn(KRSET, source[i])]);
         top += ctoi(values[0]);
         bottom += ctoi(values[1]);
@@ -311,10 +313,10 @@ static char rm4scc(char source[], unsigned char dest[], int length) {
         column = 5;
     }
     check_digit = (6 * row) + column;
-    strcat((char*) dest, RoyalTable[check_digit]);
+    strcat(dest, RoyalTable[check_digit]);
 
     /* stop character */
-    strcat((char*) dest, "0");
+    strcat(dest, "0");
 
     return set_copy[check_digit];
 }
@@ -337,7 +339,7 @@ INTERNAL int royal_plot(struct zint_symbol *symbol, unsigned char source[], int
         strcpy(symbol->errtxt, "489: Invalid characters in data");
         return error_number;
     }
-    /*check = */rm4scc((char*) source, (unsigned char*) height_pattern, length);
+    /*check = */rm4scc(source, height_pattern, length);
 
     writer = 0;
     h = strlen(height_pattern);
@@ -487,6 +489,7 @@ INTERNAL int flattermarken(struct zint_symbol *symbol, unsigned char source[], i
     }
 
     expand(symbol, dest);
+
     return error_number;
 }
 

backend/ps.c

@@ -32,13 +32,14 @@
 /* vim: set ts=4 sw=4 et : */
 
 #include <locale.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#ifdef _MSC_VER
+#include <malloc.h>
+#endif
 #include "common.h"
 
-void colour_to_pscolor(int option, int colour, char* output) {
+static void colour_to_pscolor(int option, int colour, char* output) {
     strcpy(output, "");
     if ((option & CMYK_COLOUR) == 0) {
         // Use RGB colour space
@@ -101,6 +102,35 @@ void colour_to_pscolor(int option, int colour, char* output) {
     }
 }
 
+STATIC_UNLESS_ZINT_TEST void ps_convert(const unsigned char *string, unsigned char *ps_string) {
+    const unsigned char *s;
+    unsigned char *p = ps_string;
+
+    for (s = string; *s; s++) {
+        switch (*s) {
+            case '(':
+            case ')':
+            case '\\':
+                *p++ = '\\';
+                *p++ = *s;
+                break;
+            case 0xC2: /* See `to_iso8859_1()` in raster.c */
+                *p++ = *++s;
+                break;
+            case 0xC3:
+                *p++ = *++s + 64;
+                break;
+            default:
+                if (*s < 0x80) {
+                    *p++ = *s;
+                }
+                break;
+
+        }
+    }
+    *p = '\0';
+}
+
 INTERNAL int ps_plot(struct zint_symbol *symbol) {
     FILE *feps;
     int fgred, fggrn, fgblu, bgred, bggrn, bgblu;
@@ -118,6 +148,13 @@ INTERNAL int ps_plot(struct zint_symbol *symbol) {
     struct zint_vector_circle *circle;
     struct zint_vector_string *string;
     const char *locale = NULL;
+    const char *font;
+    int i, len;
+    int ps_len = 0;
+    int iso_latin1 = 0;
+#ifdef _MSC_VER
+    unsigned char *ps_string;
+#endif
 
     if (strlen(symbol->bgcolour) > 6) {
         if ((ctoi(symbol->bgcolour[6]) == 0) && (ctoi(symbol->bgcolour[7]) == 0)) {
@@ -197,6 +234,28 @@ INTERNAL int ps_plot(struct zint_symbol *symbol) {
         yellow_paper = 0.0;
     }
 
+    for (i = 0, len = (int) ustrlen(symbol->text); i < len; i++) {
+        switch (symbol->text[i]) {
+            case '(':
+            case ')':
+            case '\\':
+                ps_len += 2;
+                break;
+            default:
+                if (!iso_latin1 && symbol->text[i] >= 0x80) {
+                    iso_latin1 = 1;
+                }
+                ps_len++; /* Will overcount 2 byte UTF-8 chars */
+                break;
+        }
+    }
+
+#ifndef _MSC_VER
+    unsigned char ps_string[ps_len + 1];
+#else
+    ps_string = (unsigned char *) _alloca(ps_len + 1);
+#endif
+
     /* Start writing the header */
     fprintf(feps, "%%!PS-Adobe-3.0 EPSF-3.0\n");
     if (ZINT_VERSION_BUILD) {
@@ -330,21 +389,44 @@ INTERNAL int ps_plot(struct zint_symbol *symbol) {
     }
 
     // Text
+
     string = symbol->vector->strings;
 
+    if (string) {
+        if ((symbol->output_options & BOLD_TEXT) && (!is_extendable(symbol->symbology) || (symbol->output_options & SMALL_TEXT))) {
+            font = "Helvetica-Bold";
+        } else {
+            font = "Helvetica";
+        }
+        if (iso_latin1) { /* Change encoding to ISO 8859-1, see Postscript Language Reference Manual 2nd Edition Example 5.6 */
+            fprintf(feps, "/%s findfont\n", font);
+            fprintf(feps, "dup length dict begin\n");
+            fprintf(feps, "{1 index /FID ne {def} {pop pop} ifelse} forall\n");
+            fprintf(feps, "/Encoding ISOLatin1Encoding def\n");
+            fprintf(feps, "currentdict\n");
+            fprintf(feps, "end\n");
+            fprintf(feps, "/Helvetica-ISOLatin1 exch definefont pop\n");
+            font = "Helvetica-ISOLatin1";
+        }
+    }
     while (string) {
+        ps_convert(string->text, ps_string);
         fprintf(feps, "matrix currentmatrix\n");
-        fprintf(feps, "/Helvetica findfont\n");
+        fprintf(feps, "/%s findfont\n", font);
         fprintf(feps, "%.2f scalefont setfont\n", string->fsize);
         fprintf(feps, " 0 0 moveto %.2f %.2f translate 0.00 rotate 0 0 moveto\n", string->x, (symbol->vector->height - string->y));
-        fprintf(feps, " (%s) stringwidth\n", string->text);
+        if (string->halign == 0 || string->halign == 2) { /* Need width for middle or right align */
+            fprintf(feps, " (%s) stringwidth\n", ps_string);
+        }
         if (string->rotation != 0) {
             fprintf(feps, "gsave\n");
             fprintf(feps, "%d rotate\n", 360 - string->rotation);
         }
+        if (string->halign == 0 || string->halign == 2) {
             fprintf(feps, "pop\n");
-        fprintf(feps, "-2 div 0 rmoveto\n");
+            fprintf(feps, "%s 0 rmoveto\n", string->halign == 2 ? "neg" : "-2 div");
-        fprintf(feps, " (%s) show\n", string->text);
+        }
+        fprintf(feps, " (%s) show\n", ps_string);
         if (string->rotation != 0) {
             fprintf(feps, "grestore\n");
         }

backend/qr.c

@@ -138,7 +138,7 @@ static int in_alpha(const unsigned int jisdata[], const size_t length, const uns
 #define QR_B   2 /* Byte */
 #define QR_K   3 /* Kanji */
 
-static const char mode_types[] = { 'N', 'A', 'B', 'K', }; /* Must be in same order as QR_N etc */
+static const char mode_types[] = { 'N', 'A', 'B', 'K', '\0' }; /* Must be in same order as QR_N etc */
 
 #define QR_NUM_MODES 4
 

backend/raster.c

@@ -359,7 +359,7 @@ static void draw_letter(char *pixelbuf, unsigned char letter, int xposn, int ypo
         skip = 1;
     }
 
-    if ((letter > 127) && (letter < 161)) {
+    if ((letter >= 127) && (letter < 161)) {
         skip = 1;
     }
 
@@ -384,8 +384,8 @@ static void draw_letter(char *pixelbuf, unsigned char letter, int xposn, int ypo
         char *linePtr, *maxPtr;
         int x_start = 0;
 
-        if (letter > 128) {
+        if (letter > 127) {
-            glyph_no = letter - 66;
+            glyph_no = letter - 67; /* 161 - (127 - 33) */
         } else {
             glyph_no = letter - 33;
         }
@@ -432,7 +432,7 @@ static void draw_letter(char *pixelbuf, unsigned char letter, int xposn, int ypo
         linePtr = pixelbuf + (yposn * image_width) + xposn;
         for (y = 0; y < max_y; y++) {
             int x_si, y_si;
-            char *pixelPtr;
+            char *pixelPtr = linePtr; /* Avoid warning */
             for (y_si = 0; y_si < half_si; y_si++) {
                 int extra_dot = 0;
                 pixelPtr = linePtr;
@@ -586,8 +586,7 @@ static int plot_raster_maxicode(struct zint_symbol *symbol, int rotate_angle, in
     int image_height, image_width;
     char *pixelbuf;
     int error_number;
-    int xoffset, yoffset;
+    int xoffset, yoffset, roffset, boffset;
-    int roffset, boffset;
     float scaler = symbol->scale;
     char *scaled_hexagon;
     int hexagon_size;
@@ -664,26 +663,32 @@ static int plot_raster_maxicode(struct zint_symbol *symbol, int rotate_angle, in
 
 static int plot_raster_dotty(struct zint_symbol *symbol, int rotate_angle, int file_type) {
     float scaler = 2 * symbol->scale;
-    float half_scaler, dot_size_scaled;
     char *scaled_pixelbuf;
     int r, i;
     int scale_width, scale_height;
     int error_number = 0;
-    int xoffset, yoffset, image_width, image_height;
+    int image_width, image_height;
-    int roffset, boffset;
+    int xoffset, yoffset, roffset, boffset;
+    int dot_overspill = 0;
+    float dotradius_scaled;
 
     symbol->height = symbol->rows; // This is true because only 2d matrix symbols are processed here
 
     output_set_whitespace_offsets(symbol, &xoffset, &yoffset, &roffset, &boffset);
 
-    image_width = symbol->width + xoffset + roffset;
+    dot_overspill = (int) ceil(symbol->dot_size - 1); /* Allow for exceeding 1X */
-    image_height = symbol->height + yoffset + boffset;
+    if (dot_overspill < 0) {
+        dot_overspill = 0;
+    }
+
+    image_width = symbol->width + dot_overspill + xoffset + roffset;
+    image_height = symbol->height + dot_overspill + yoffset + boffset;
 
     if (scaler < 2.0f) {
         scaler = 2.0f;
     }
-    scale_width = (image_width * scaler) + 1;
+    scale_width = image_width * scaler;
-    scale_height = (image_height * scaler) + 1;
+    scale_height = image_height * scaler;
 
     /* Apply scale options by creating another pixel buffer */
     if (!(scaled_pixelbuf = (char *) malloc(scale_width * scale_height))) {
@@ -693,21 +698,22 @@ static int plot_raster_dotty(struct zint_symbol *symbol, int rotate_angle, int f
     memset(scaled_pixelbuf, DEFAULT_PAPER, scale_width * scale_height);
 
     /* Plot the body of the symbol to the pixel buffer */
-    half_scaler = scaler / 2.0f;
+    dotradius_scaled = (symbol->dot_size * scaler) / 2.0f;
-    dot_size_scaled = (symbol->dot_size * scaler) / 2.0f;
     for (r = 0; r < symbol->rows; r++) {
-        float row_scaled = (r + yoffset) * scaler + half_scaler;
+        float row_scaled = (r + yoffset) * scaler + dotradius_scaled;
         for (i = 0; i < symbol->width; i++) {
             if (module_is_set(symbol, r, i)) {
                 draw_circle(scaled_pixelbuf, scale_width, scale_height,
-                        (i + xoffset) * scaler + half_scaler,
+                        (i + xoffset) * scaler + dotradius_scaled,
                         row_scaled,
-                        dot_size_scaled,
+                        dotradius_scaled,
                         DEFAULT_INK);
             }
         }
     }
 
+    // TODO: bind/box
+
     error_number = save_raster_image_to_file(symbol, scale_height, scale_width, scaled_pixelbuf, rotate_angle, file_type);
     if (rotate_angle || file_type != OUT_BUFFER || !(symbol->output_options & OUT_BUFFER_INTERMEDIATE)) {
         free(scaled_pixelbuf);
@@ -759,12 +765,14 @@ static void to_iso8859_1(const unsigned char source[], unsigned char preprocesse
 
 static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int file_type) {
     int error_number;
-    float large_bar_height;
+    int large_bar_height;
-    int textdone;
+    int textdone = 0;
-    int main_width, comp_offset, addon_gap;
+    int main_width;
+    int comp_offset = 0;
     unsigned char addon[6];
+    int addon_gap;
+    float addon_text_posn = 0.0f;
     int xoffset, yoffset, roffset, boffset;
-    float addon_text_posn;
     int textoffset;
     int default_text_posn;
     float row_height, row_posn;
@@ -772,12 +780,13 @@ static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int
     int addon_latch = 0;
     unsigned char textpart1[5], textpart2[7], textpart3[7], textpart4[2];
     int textpos;
-    int hide_text = 0;
+    int hide_text;
     int i, r;
-    int text_height; /* Font size */
+    int text_height; /* Font pixel size (so whole integers) */
     int text_gap; /* Gap between barcode and text */
 
     int textflags = 0;
+    int guardoffset = 0;
     int image_width, image_height;
     char *pixelbuf;
     int next_yposn;
@@ -789,7 +798,6 @@ static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int
     int scale_width, scale_height;
     char *scaled_pixelbuf;
     int horiz, vert;
-    int guardoffset = 0;
 
     /* Ignore scaling < 0.5 for raster as would drop modules */
     if (scaler < 0.5f) {
@@ -804,10 +812,8 @@ static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int
     }
 
     large_bar_height = output_large_bar_height(symbol);
-    textdone = 0;
 
     main_width = symbol->width;
-    comp_offset = 0;
 
     if (is_extendable(symbol->symbology)) {
         upceanflag = output_process_upcean(symbol, &main_width, &comp_offset, addon, &addon_gap);
@@ -815,36 +821,32 @@ static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int
 
     output_set_whitespace_offsets(symbol, &xoffset, &yoffset, &roffset, &boffset);
 
-    addon_text_posn = 0.0f;
     hide_text = ((!symbol->show_hrt) || (ustrlen(symbol->text) == 0));
 
+    /* Note font sizes halved as in pixels */
     if (upceanflag) {
         textflags = UPCEAN_TEXT; /* Small and bold not available for UPC/EAN */
+        text_height = (UPCEAN_FONT_HEIGHT + 1) / 2;
+        text_gap = 1;
     } else {
         textflags = symbol->output_options & (SMALL_TEXT | BOLD_TEXT);
+        text_height = textflags & SMALL_TEXT ? (SMALL_FONT_HEIGHT + 1) / 2 : (NORMAL_FONT_HEIGHT + 1) / 2;
+        text_gap = 1;
     }
 
     if (hide_text) {
-        text_gap = 0;
         textoffset = upceanflag && upceanflag != 2 && upceanflag != 5 ? 5 : 0; /* Need 5X from bottom for guard bars */
     } else {
-        /* Note font sizes halved as in pixels */
         if (upceanflag) {
-            text_height = (UPCEAN_FONT_HEIGHT + 1) / 2;
-        } else if (textflags & SMALL_TEXT) {
-            text_height = (SMALL_FONT_HEIGHT + 1) / 2;
-        } else {
-            text_height = (NORMAL_FONT_HEIGHT + 1) / 2;
-        }
-        if (upceanflag) {
-            text_gap = 1;
             textoffset = (text_height > 5 ? text_height : 5) + text_gap; /* Need at least 5X for guard bars */
-            guardoffset = textoffset - 5 + yoffset;
         } else {
-            text_gap = 1;
             textoffset = text_height + text_gap;
         }
     }
+    if (upceanflag) {
+        guardoffset = textoffset - 5 + boffset;
+    }
+
     image_width = (symbol->width + xoffset + roffset) * si;
     image_height = (symbol->height + textoffset + yoffset + boffset) * si;
 
@@ -857,22 +859,18 @@ static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int
     default_text_posn = image_height - (textoffset - text_gap) * si;
 
     row_height = 0.0f;
-    row_posn = textoffset + yoffset;
+    row_posn = textoffset + boffset; /* Bottom up */
-    next_yposn = textoffset + yoffset;
+    next_yposn = textoffset + boffset;
 
     /* Plot the body of the symbol to the pixel buffer */
     for (r = 0; r < symbol->rows; r++) {
         int plot_yposn;
-        int plot_height;
+        float plot_height;
         int this_row = symbol->rows - r - 1; /* invert r otherwise plots upside down */
         int module_fill;
         row_posn += row_height;
         plot_yposn = next_yposn;
-        if (symbol->row_height[this_row] == 0) {
+        row_height = symbol->row_height[this_row] ? symbol->row_height[this_row] : large_bar_height;
-            row_height = large_bar_height;
-        } else {
-            row_height = symbol->row_height[this_row];
-        }
         next_yposn = (int) (row_posn + row_height);
         plot_height = next_yposn - plot_yposn;
 
@@ -886,13 +884,20 @@ static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int
             } while ((i + block_width < symbol->width) && module_is_set(symbol, this_row, i + block_width) == module_is_set(symbol, this_row, i));
 
             if ((addon_latch == 0) && (r == 0) && (i > main_width)) {
-                if (upceanflag == 12 || upceanflag == 6) { /* UPC-A/E add-ons don't descend */
+                plot_height = row_height - (text_height + text_gap) + 5.0f;
-                    plot_height = row_height > 8.0f ? row_height - 8.0f : 1;
-                    plot_yposn = row_posn;
-                } else {
-                    plot_height = row_height > 3.0f ? row_height - 3.0f : 1;
                 plot_yposn = row_posn - 5.0f;
+                if (plot_yposn < 0.0f) {
+                    plot_yposn = 0.0f;
                 }
+                if (upceanflag == 12 || upceanflag == 6) { /* UPC-A/E add-ons don't descend */
+                    plot_height -= 5.0f;
+                    plot_yposn += 5.0f;
+                }
+                if (plot_height < 0.5f) {
+                    plot_height = 0.5f;
+                }
+                /* Need to invert composite position */
+                addon_text_posn = is_composite(symbol->symbology) ? image_height - (plot_yposn + plot_height + text_height + text_gap) * si : yoffset * si;
                 addon_latch = 1;
             }
             if (module_fill) {
@@ -1086,12 +1091,14 @@ static int plot_raster_default(struct zint_symbol *symbol, int rotate_angle, int
             /* row binding */
             if (symbol->symbology != BARCODE_CODABLOCKF && symbol->symbology != BARCODE_HIBC_BLOCKF) {
                 for (r = 1; r < symbol->rows; r++) {
+                    row_height = symbol->row_height[r - 1] ? symbol->row_height[r - 1] : large_bar_height;
                     draw_bar(pixelbuf, xoffset * si, symbol->width * si,
                             ((r * row_height) + textoffset + yoffset - sep_height / 2) * si, sep_height * si, image_width, image_height, DEFAULT_INK);
                 }
             } else {
                 for (r = 1; r < symbol->rows; r++) {
                     /* Avoid 11-module start and 13-module stop chars */
+                    row_height = symbol->row_height[r - 1] ? symbol->row_height[r - 1] : large_bar_height;
                     draw_bar(pixelbuf, (xoffset + 11) * si, (symbol->width - 24) * si,
                             ((r * row_height) + textoffset + yoffset - sep_height / 2) * si, sep_height * si, image_width, image_height, DEFAULT_INK);
                 }

backend/svg.c

@@ -125,6 +125,8 @@ INTERNAL int svg_plot(struct zint_symbol *symbol) {
     char bgcolour_string[7];
     int bg_alpha = 0xff;
     int fg_alpha = 0xff;
+    const char *font_family = "Helvetica, sans-serif";
+    int bold;
 
     struct zint_vector_rect *rect;
     struct zint_vector_hexagon *hex;
@@ -278,10 +280,15 @@ INTERNAL int svg_plot(struct zint_symbol *symbol) {
         circle = circle->next;
     }
 
+    bold = (symbol->output_options & BOLD_TEXT) && (!is_extendable(symbol->symbology) || (symbol->output_options & SMALL_TEXT));
     string = symbol->vector->strings;
     while (string) {
-        fprintf(fsvg, "      <text x=\"%.2f\" y=\"%.2f\" text-anchor=\"middle\"\n", string->x, string->y);
+        const char *halign = string->halign == 2 ? "end" : string->halign == 1 ? "start" : "middle";
-        fprintf(fsvg, "         font-family=\"Helvetica\" font-size=\"%.1f\"", string->fsize);
+        fprintf(fsvg, "      <text x=\"%.2f\" y=\"%.2f\" text-anchor=\"%s\"\n", string->x, string->y, halign);
+        fprintf(fsvg, "         font-family=\"%s\" font-size=\"%.1f\"", font_family, string->fsize);
+        if (bold) {
+            fprintf(fsvg, " font-weight=\"bold\"");
+        }
         if (fg_alpha != 0xff) {
             fprintf(fsvg, " opacity=\"%.3f\"", (float) fg_alpha / 255.0);
         }

backend/tests/data/eps/code128_egrave_bold.eps

@@ -0,0 +1,95 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Zint 2.9.1.9
+%%Title: Zint Generated Symbol
+%%Pages: 0
+%%BoundingBox: 0 0 224 119
+%%EndComments
+/TL { setlinewidth moveto lineto stroke } bind def
+/TD { newpath 0 360 arc fill } bind def
+/TH { 0 setlinewidth moveto lineto lineto lineto lineto lineto closepath fill } bind def
+/TB { 2 copy } bind def
+/TR { newpath 4 1 roll exch moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath fill } bind def
+/TE { pop pop } bind def
+newpath
+1.00 1.00 1.00 setrgbcolor
+118.90 0.00 TB 0.00 224.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+100.00 18.90 TB 0.00 4.00 TR
+TE
+100.00 18.90 TB 6.00 2.00 TR
+TE
+100.00 18.90 TB 12.00 2.00 TR
+TE
+100.00 18.90 TB 22.00 2.00 TR
+TE
+100.00 18.90 TB 26.00 8.00 TR
+TE
+100.00 18.90 TB 36.00 6.00 TR
+TE
+100.00 18.90 TB 44.00 4.00 TR
+TE
+100.00 18.90 TB 54.00 2.00 TR
+TE
+100.00 18.90 TB 62.00 2.00 TR
+TE
+100.00 18.90 TB 66.00 2.00 TR
+TE
+100.00 18.90 TB 72.00 4.00 TR
+TE
+100.00 18.90 TB 78.00 2.00 TR
+TE
+100.00 18.90 TB 88.00 2.00 TR
+TE
+100.00 18.90 TB 98.00 4.00 TR
+TE
+100.00 18.90 TB 106.00 2.00 TR
+TE
+100.00 18.90 TB 110.00 2.00 TR
+TE
+100.00 18.90 TB 114.00 2.00 TR
+TE
+100.00 18.90 TB 120.00 8.00 TR
+TE
+100.00 18.90 TB 132.00 2.00 TR
+TE
+100.00 18.90 TB 138.00 2.00 TR
+TE
+100.00 18.90 TB 142.00 8.00 TR
+TE
+100.00 18.90 TB 154.00 4.00 TR
+TE
+100.00 18.90 TB 160.00 4.00 TR
+TE
+100.00 18.90 TB 166.00 8.00 TR
+TE
+100.00 18.90 TB 176.00 2.00 TR
+TE
+100.00 18.90 TB 184.00 4.00 TR
+TE
+100.00 18.90 TB 194.00 2.00 TR
+TE
+100.00 18.90 TB 198.00 4.00 TR
+TE
+100.00 18.90 TB 208.00 6.00 TR
+TE
+100.00 18.90 TB 216.00 2.00 TR
+TE
+100.00 18.90 TB 220.00 4.00 TR
+TE
+/Helvetica-Bold findfont
+dup length dict begin
+{1 index /FID ne {def} {pop pop} ifelse} forall
+/Encoding ISOLatin1Encoding def
+currentdict
+end
+/Helvetica-ISOLatin1 exch definefont pop
+matrix currentmatrix
+/Helvetica-ISOLatin1 findfont
+14.00 scalefont setfont
+ 0 0 moveto 112.00 3.50 translate 0.00 rotate 0 0 moveto
+ (Égjpqy) stringwidth
+pop
+-2 div 0 rmoveto
+ (Égjpqy) show
+setmatrix

backend/tests/data/eps/code128_escape_latin1.eps

@@ -0,0 +1,101 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Zint 2.9.1.9
+%%Title: Zint Generated Symbol
+%%Pages: 0
+%%BoundingBox: 0 0 246 119
+%%EndComments
+/TL { setlinewidth moveto lineto stroke } bind def
+/TD { newpath 0 360 arc fill } bind def
+/TH { 0 setlinewidth moveto lineto lineto lineto lineto lineto closepath fill } bind def
+/TB { 2 copy } bind def
+/TR { newpath 4 1 roll exch moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath fill } bind def
+/TE { pop pop } bind def
+newpath
+1.00 1.00 1.00 setrgbcolor
+118.90 0.00 TB 0.00 246.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+100.00 18.90 TB 0.00 4.00 TR
+TE
+100.00 18.90 TB 6.00 2.00 TR
+TE
+100.00 18.90 TB 12.00 2.00 TR
+TE
+100.00 18.90 TB 22.00 2.00 TR
+TE
+100.00 18.90 TB 26.00 2.00 TR
+TE
+100.00 18.90 TB 34.00 4.00 TR
+TE
+100.00 18.90 TB 44.00 6.00 TR
+TE
+100.00 18.90 TB 52.00 8.00 TR
+TE
+100.00 18.90 TB 62.00 2.00 TR
+TE
+100.00 18.90 TB 66.00 2.00 TR
+TE
+100.00 18.90 TB 74.00 2.00 TR
+TE
+100.00 18.90 TB 78.00 4.00 TR
+TE
+100.00 18.90 TB 88.00 4.00 TR
+TE
+100.00 18.90 TB 96.00 2.00 TR
+TE
+100.00 18.90 TB 102.00 2.00 TR
+TE
+100.00 18.90 TB 110.00 2.00 TR
+TE
+100.00 18.90 TB 114.00 8.00 TR
+TE
+100.00 18.90 TB 124.00 6.00 TR
+TE
+100.00 18.90 TB 132.00 2.00 TR
+TE
+100.00 18.90 TB 138.00 4.00 TR
+TE
+100.00 18.90 TB 144.00 2.00 TR
+TE
+100.00 18.90 TB 154.00 2.00 TR
+TE
+100.00 18.90 TB 162.00 4.00 TR
+TE
+100.00 18.90 TB 170.00 2.00 TR
+TE
+100.00 18.90 TB 176.00 2.00 TR
+TE
+100.00 18.90 TB 180.00 4.00 TR
+TE
+100.00 18.90 TB 190.00 2.00 TR
+TE
+100.00 18.90 TB 198.00 2.00 TR
+TE
+100.00 18.90 TB 204.00 6.00 TR
+TE
+100.00 18.90 TB 214.00 4.00 TR
+TE
+100.00 18.90 TB 220.00 4.00 TR
+TE
+100.00 18.90 TB 230.00 6.00 TR
+TE
+100.00 18.90 TB 238.00 2.00 TR
+TE
+100.00 18.90 TB 242.00 4.00 TR
+TE
+/Helvetica findfont
+dup length dict begin
+{1 index /FID ne {def} {pop pop} ifelse} forall
+/Encoding ISOLatin1Encoding def
+currentdict
+end
+/Helvetica-ISOLatin1 exch definefont pop
+matrix currentmatrix
+/Helvetica-ISOLatin1 findfont
+14.00 scalefont setfont
+ 0 0 moveto 123.00 3.50 translate 0.00 rotate 0 0 moveto
+ (A\\B\)ç\(D) stringwidth
+pop
+-2 div 0 rmoveto
+ (A\\B\)ç\(D) show
+setmatrix

backend/tests/data/eps/code39_fg_bg.eps

@@ -1,8 +1,8 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.9.0
+%%Creator: Zint 2.9.1.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
-%%BoundingBox: 0 0 128 118
+%%BoundingBox: 0 0 128 119
 %%EndComments
 /TL { setlinewidth moveto lineto stroke } bind def
 /TD { newpath 0 360 arc fill } bind def
@@ -12,63 +12,63 @@
 /TE { pop pop } bind def
 newpath
 0.98 0.59 0.19 setrgbcolor
-118.00 0.00 TB 0.00 128.00 TR
+118.90 0.00 TB 0.00 128.00 TR
 TE
 0.08 0.48 0.81 setrgbcolor
-100.00 18.00 TB 0.00 2.00 TR
+100.00 18.90 TB 0.00 2.00 TR
 TE
-100.00 18.00 TB 6.00 2.00 TR
+100.00 18.90 TB 6.00 2.00 TR
 TE
-100.00 18.00 TB 10.00 4.00 TR
+100.00 18.90 TB 10.00 4.00 TR
 TE
-100.00 18.00 TB 16.00 4.00 TR
+100.00 18.90 TB 16.00 4.00 TR
 TE
-100.00 18.00 TB 22.00 2.00 TR
+100.00 18.90 TB 22.00 2.00 TR
 TE
-100.00 18.00 TB 26.00 4.00 TR
+100.00 18.90 TB 26.00 4.00 TR
 TE
-100.00 18.00 TB 32.00 2.00 TR
+100.00 18.90 TB 32.00 2.00 TR
 TE
-100.00 18.00 TB 38.00 2.00 TR
+100.00 18.90 TB 38.00 2.00 TR
 TE
-100.00 18.00 TB 42.00 2.00 TR
+100.00 18.90 TB 42.00 2.00 TR
 TE
-100.00 18.00 TB 46.00 4.00 TR
+100.00 18.90 TB 46.00 4.00 TR
 TE
-100.00 18.00 TB 52.00 2.00 TR
+100.00 18.90 TB 52.00 2.00 TR
 TE
-100.00 18.00 TB 56.00 4.00 TR
+100.00 18.90 TB 56.00 4.00 TR
 TE
-100.00 18.00 TB 64.00 2.00 TR
+100.00 18.90 TB 64.00 2.00 TR
 TE
-100.00 18.00 TB 68.00 2.00 TR
+100.00 18.90 TB 68.00 2.00 TR
 TE
-100.00 18.00 TB 72.00 4.00 TR
+100.00 18.90 TB 72.00 4.00 TR
 TE
-100.00 18.00 TB 78.00 4.00 TR
+100.00 18.90 TB 78.00 4.00 TR
 TE
-100.00 18.00 TB 84.00 4.00 TR
+100.00 18.90 TB 84.00 4.00 TR
 TE
-100.00 18.00 TB 92.00 2.00 TR
+100.00 18.90 TB 92.00 2.00 TR
 TE
-100.00 18.00 TB 96.00 2.00 TR
+100.00 18.90 TB 96.00 2.00 TR
 TE
-100.00 18.00 TB 100.00 2.00 TR
+100.00 18.90 TB 100.00 2.00 TR
 TE
-100.00 18.00 TB 104.00 2.00 TR
+100.00 18.90 TB 104.00 2.00 TR
 TE
-100.00 18.00 TB 110.00 2.00 TR
+100.00 18.90 TB 110.00 2.00 TR
 TE
-100.00 18.00 TB 114.00 4.00 TR
+100.00 18.90 TB 114.00 4.00 TR
 TE
-100.00 18.00 TB 120.00 4.00 TR
+100.00 18.90 TB 120.00 4.00 TR
 TE
-100.00 18.00 TB 126.00 2.00 TR
+100.00 18.90 TB 126.00 2.00 TR
 TE
 matrix currentmatrix
 /Helvetica findfont
-18.00 scalefont setfont
+14.00 scalefont setfont
- 0 0 moveto 64.00 0.00 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 64.00 3.50 translate 0.00 rotate 0 0 moveto
  (*123*) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/dbar_ltd_24724_fig7_bold.eps

@@ -0,0 +1,72 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Zint 2.9.1.9
+%%Title: Zint Generated Symbol
+%%Pages: 0
+%%BoundingBox: 0 0 158 119
+%%EndComments
+/TL { setlinewidth moveto lineto stroke } bind def
+/TD { newpath 0 360 arc fill } bind def
+/TH { 0 setlinewidth moveto lineto lineto lineto lineto lineto closepath fill } bind def
+/TB { 2 copy } bind def
+/TR { newpath 4 1 roll exch moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath fill } bind def
+/TE { pop pop } bind def
+newpath
+1.00 1.00 1.00 setrgbcolor
+118.90 0.00 TB 0.00 158.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+100.00 18.90 TB 2.00 2.00 TR
+TE
+100.00 18.90 TB 10.00 4.00 TR
+TE
+100.00 18.90 TB 18.00 4.00 TR
+TE
+100.00 18.90 TB 28.00 4.00 TR
+TE
+100.00 18.90 TB 34.00 4.00 TR
+TE
+100.00 18.90 TB 40.00 2.00 TR
+TE
+100.00 18.90 TB 44.00 2.00 TR
+TE
+100.00 18.90 TB 50.00 6.00 TR
+TE
+100.00 18.90 TB 58.00 2.00 TR
+TE
+100.00 18.90 TB 64.00 2.00 TR
+TE
+100.00 18.90 TB 68.00 2.00 TR
+TE
+100.00 18.90 TB 72.00 4.00 TR
+TE
+100.00 18.90 TB 78.00 2.00 TR
+TE
+100.00 18.90 TB 84.00 4.00 TR
+TE
+100.00 18.90 TB 90.00 2.00 TR
+TE
+100.00 18.90 TB 96.00 2.00 TR
+TE
+100.00 18.90 TB 102.00 2.00 TR
+TE
+100.00 18.90 TB 106.00 4.00 TR
+TE
+100.00 18.90 TB 116.00 4.00 TR
+TE
+100.00 18.90 TB 122.00 6.00 TR
+TE
+100.00 18.90 TB 132.00 4.00 TR
+TE
+100.00 18.90 TB 140.00 4.00 TR
+TE
+100.00 18.90 TB 146.00 2.00 TR
+TE
+matrix currentmatrix
+/Helvetica-Bold findfont
+14.00 scalefont setfont
+ 0 0 moveto 79.00 3.50 translate 0.00 rotate 0 0 moveto
+ (\(01\)15012345678907) stringwidth
+pop
+-2 div 0 rmoveto
+ (\(01\)15012345678907) show
+setmatrix

backend/tests/data/eps/ean13_2addon_ggs_5.2.2.5.1-2.eps

@@ -0,0 +1,127 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Zint 2.9.1.9
+%%Title: Zint Generated Symbol
+%%Pages: 0
+%%BoundingBox: 0 0 276 117
+%%EndComments
+/TL { setlinewidth moveto lineto stroke } bind def
+/TD { newpath 0 360 arc fill } bind def
+/TH { 0 setlinewidth moveto lineto lineto lineto lineto lineto closepath fill } bind def
+/TB { 2 copy } bind def
+/TR { newpath 4 1 roll exch moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath fill } bind def
+/TE { pop pop } bind def
+newpath
+1.00 1.00 1.00 setrgbcolor
+116.40 0.00 TB 0.00 276.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+110.00 6.40 TB 22.00 2.00 TR
+TE
+110.00 6.40 TB 26.00 2.00 TR
+TE
+100.00 16.40 TB 30.00 6.00 TR
+TE
+100.00 16.40 TB 38.00 4.00 TR
+TE
+100.00 16.40 TB 46.00 2.00 TR
+TE
+100.00 16.40 TB 54.00 2.00 TR
+TE
+100.00 16.40 TB 58.00 4.00 TR
+TE
+100.00 16.40 TB 66.00 4.00 TR
+TE
+100.00 16.40 TB 72.00 8.00 TR
+TE
+100.00 16.40 TB 82.00 2.00 TR
+TE
+100.00 16.40 TB 90.00 2.00 TR
+TE
+100.00 16.40 TB 96.00 2.00 TR
+TE
+100.00 16.40 TB 100.00 2.00 TR
+TE
+100.00 16.40 TB 108.00 4.00 TR
+TE
+110.00 6.40 TB 114.00 2.00 TR
+TE
+110.00 6.40 TB 118.00 2.00 TR
+TE
+100.00 16.40 TB 122.00 2.00 TR
+TE
+100.00 16.40 TB 128.00 6.00 TR
+TE
+100.00 16.40 TB 136.00 4.00 TR
+TE
+100.00 16.40 TB 142.00 4.00 TR
+TE
+100.00 16.40 TB 150.00 2.00 TR
+TE
+100.00 16.40 TB 154.00 6.00 TR
+TE
+100.00 16.40 TB 164.00 6.00 TR
+TE
+100.00 16.40 TB 174.00 2.00 TR
+TE
+100.00 16.40 TB 178.00 4.00 TR
+TE
+100.00 16.40 TB 186.00 4.00 TR
+TE
+100.00 16.40 TB 192.00 2.00 TR
+TE
+100.00 16.40 TB 200.00 2.00 TR
+TE
+110.00 6.40 TB 206.00 2.00 TR
+TE
+110.00 6.40 TB 210.00 2.00 TR
+TE
+91.00 6.40 TB 226.00 2.00 TR
+TE
+91.00 6.40 TB 230.00 4.00 TR
+TE
+91.00 6.40 TB 238.00 4.00 TR
+TE
+91.00 6.40 TB 246.00 2.00 TR
+TE
+91.00 6.40 TB 250.00 2.00 TR
+TE
+91.00 6.40 TB 256.00 2.00 TR
+TE
+91.00 6.40 TB 262.00 4.00 TR
+TE
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 12.00 0.40 translate 0.00 rotate 0 0 moveto
+ (9) stringwidth
+pop
+neg 0 rmoveto
+ (9) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 70.00 0.40 translate 0.00 rotate 0 0 moveto
+ (771384) stringwidth
+pop
+-2 div 0 rmoveto
+ (771384) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 164.00 0.40 translate 0.00 rotate 0 0 moveto
+ (524017) stringwidth
+pop
+-2 div 0 rmoveto
+ (524017) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 246.00 101.40 translate 0.00 rotate 0 0 moveto
+ (12) stringwidth
+pop
+-2 div 0 rmoveto
+ (12) show
+setmatrix

backend/tests/data/eps/ultra_fg_bg.eps

@@ -1,8 +1,8 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.9.0
+%%Creator: Zint 2.9.1.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
-%%BoundingBox: 0 0 32 26
+%%BoundingBox: 0 0 28 26
 %%EndComments
 /TL { setlinewidth moveto lineto stroke } bind def
 /TD { newpath 0 360 arc fill } bind def
@@ -12,164 +12,195 @@
 /TE { pop pop } bind def
 newpath
 0.98 0.59 0.19 setrgbcolor
-26.00 0.00 TB 0.00 32.00 TR
+26.00 0.00 TB 0.00 28.00 TR
 TE
 0.00 1.00 1.00 setrgbcolor
-2.00 22.00 TB 18.00 4.00 TR
+2.00 22.00 TB 16.00 4.00 TR
 TE
-2.00 22.00 TB 24.00 4.00 TR
+2.00 22.00 TB 22.00 4.00 TR
-TE
-2.00 20.00 TB 14.00 2.00 TR
-TE
-2.00 18.00 TB 6.00 2.00 TR
-TE
-2.00 18.00 TB 18.00 2.00 TR
-TE
-2.00 18.00 TB 24.00 4.00 TR
-TE
-2.00 14.00 TB 12.00 2.00 TR
-TE
-2.00 10.00 TB 12.00 2.00 TR
-TE
-2.00 10.00 TB 16.00 2.00 TR
-TE
-2.00 10.00 TB 20.00 8.00 TR
-TE
-2.00 8.00 TB 6.00 2.00 TR
-TE
-2.00 8.00 TB 18.00 2.00 TR
-TE
-2.00 6.00 TB 22.00 4.00 TR
-TE
-2.00 4.00 TB 12.00 6.00 TR
-TE
-2.00 4.00 TB 26.00 2.00 TR
-TE
-2.00 2.00 TB 6.00 2.00 TR
-TE
-1.00 0.00 1.00 setrgbcolor
-2.00 22.00 TB 16.00 2.00 TR
-TE
-2.00 20.00 TB 6.00 2.00 TR
 TE
 2.00 20.00 TB 12.00 2.00 TR
 TE
-2.00 20.00 TB 18.00 4.00 TR
+2.00 18.00 TB 4.00 2.00 TR
-TE
-2.00 18.00 TB 14.00 2.00 TR
-TE
-2.00 16.00 TB 16.00 2.00 TR
-TE
-2.00 16.00 TB 20.00 2.00 TR
-TE
-2.00 14.00 TB 6.00 2.00 TR
-TE
-2.00 14.00 TB 18.00 2.00 TR
-TE
-2.00 14.00 TB 24.00 2.00 TR
-TE
-2.00 8.00 TB 12.00 2.00 TR
-TE
-2.00 8.00 TB 20.00 4.00 TR
-TE
-2.00 8.00 TB 26.00 2.00 TR
-TE
-2.00 6.00 TB 16.00 2.00 TR
-TE
-2.00 2.00 TB 12.00 12.00 TR
-TE
-1.00 1.00 0.00 setrgbcolor
-2.00 22.00 TB 6.00 2.00 TR
-TE
-2.00 22.00 TB 14.00 2.00 TR
-TE
-2.00 22.00 TB 22.00 2.00 TR
 TE
 2.00 18.00 TB 16.00 2.00 TR
 TE
-2.00 18.00 TB 22.00 2.00 TR
+2.00 18.00 TB 22.00 4.00 TR
 TE
-2.00 16.00 TB 6.00 2.00 TR
+2.00 14.00 TB 10.00 2.00 TR
 TE
-2.00 16.00 TB 12.00 2.00 TR
+2.00 10.00 TB 10.00 2.00 TR
 TE
-2.00 16.00 TB 18.00 2.00 TR
+2.00 10.00 TB 14.00 2.00 TR
 TE
-2.00 16.00 TB 24.00 2.00 TR
+2.00 10.00 TB 18.00 8.00 TR
 TE
-2.00 14.00 TB 14.00 4.00 TR
+2.00 8.00 TB 4.00 2.00 TR
 TE
-2.00 14.00 TB 22.00 2.00 TR
+2.00 8.00 TB 16.00 2.00 TR
 TE
-2.00 14.00 TB 26.00 2.00 TR
+2.00 6.00 TB 20.00 4.00 TR
 TE
-2.00 10.00 TB 18.00 2.00 TR
+2.00 4.00 TB 10.00 6.00 TR
-TE
-2.00 8.00 TB 14.00 4.00 TR
-TE
-2.00 6.00 TB 6.00 2.00 TR
-TE
-2.00 6.00 TB 12.00 2.00 TR
-TE
-2.00 6.00 TB 18.00 4.00 TR
-TE
-2.00 6.00 TB 26.00 2.00 TR
 TE
 2.00 4.00 TB 24.00 2.00 TR
 TE
-2.00 2.00 TB 26.00 2.00 TR
+2.00 2.00 TB 4.00 2.00 TR
 TE
-0.00 1.00 0.00 setrgbcolor
+1.00 0.00 1.00 setrgbcolor
-2.00 22.00 TB 12.00 2.00 TR
+2.00 22.00 TB 14.00 2.00 TR
 TE
-2.00 20.00 TB 16.00 2.00 TR
+2.00 20.00 TB 4.00 2.00 TR
 TE
-2.00 20.00 TB 22.00 6.00 TR
+2.00 20.00 TB 10.00 2.00 TR
+TE
+2.00 20.00 TB 16.00 4.00 TR
 TE
 2.00 18.00 TB 12.00 2.00 TR
 TE
-2.00 18.00 TB 20.00 2.00 TR
-TE
 2.00 16.00 TB 14.00 2.00 TR
 TE
-2.00 16.00 TB 22.00 2.00 TR
+2.00 16.00 TB 18.00 2.00 TR
 TE
-2.00 16.00 TB 26.00 2.00 TR
+2.00 14.00 TB 4.00 2.00 TR
 TE
-2.00 14.00 TB 20.00 2.00 TR
+2.00 14.00 TB 16.00 2.00 TR
 TE
-2.00 10.00 TB 6.00 2.00 TR
+2.00 14.00 TB 22.00 2.00 TR
 TE
-2.00 10.00 TB 14.00 2.00 TR
+2.00 8.00 TB 10.00 2.00 TR
+TE
+2.00 8.00 TB 18.00 4.00 TR
 TE
 2.00 8.00 TB 24.00 2.00 TR
 TE
 2.00 6.00 TB 14.00 2.00 TR
 TE
-2.00 4.00 TB 6.00 2.00 TR
+2.00 2.00 TB 10.00 12.00 TR
 TE
-2.00 4.00 TB 18.00 6.00 TR
+1.00 1.00 0.00 setrgbcolor
+2.00 22.00 TB 4.00 2.00 TR
+TE
+2.00 22.00 TB 12.00 2.00 TR
+TE
+2.00 22.00 TB 20.00 2.00 TR
+TE
+2.00 18.00 TB 14.00 2.00 TR
+TE
+2.00 18.00 TB 20.00 2.00 TR
+TE
+2.00 16.00 TB 4.00 2.00 TR
+TE
+2.00 16.00 TB 10.00 2.00 TR
+TE
+2.00 16.00 TB 16.00 2.00 TR
+TE
+2.00 16.00 TB 22.00 2.00 TR
+TE
+2.00 14.00 TB 12.00 4.00 TR
+TE
+2.00 14.00 TB 20.00 2.00 TR
+TE
+2.00 14.00 TB 24.00 2.00 TR
+TE
+2.00 10.00 TB 16.00 2.00 TR
+TE
+2.00 8.00 TB 12.00 4.00 TR
+TE
+2.00 6.00 TB 4.00 2.00 TR
+TE
+2.00 6.00 TB 10.00 2.00 TR
+TE
+2.00 6.00 TB 16.00 4.00 TR
+TE
+2.00 6.00 TB 24.00 2.00 TR
+TE
+2.00 4.00 TB 22.00 2.00 TR
 TE
 2.00 2.00 TB 24.00 2.00 TR
 TE
-0.00 0.00 0.00 setrgbcolor
+0.00 1.00 0.00 setrgbcolor
-2.00 24.00 TB 2.00 28.00 TR
+2.00 22.00 TB 10.00 2.00 TR
 TE
+2.00 20.00 TB 14.00 2.00 TR
+TE
+2.00 20.00 TB 20.00 6.00 TR
+TE
+2.00 18.00 TB 10.00 2.00 TR
+TE
+2.00 18.00 TB 18.00 2.00 TR
+TE
+2.00 16.00 TB 12.00 2.00 TR
+TE
+2.00 16.00 TB 20.00 2.00 TR
+TE
+2.00 16.00 TB 24.00 2.00 TR
+TE
+2.00 14.00 TB 18.00 2.00 TR
+TE
+2.00 10.00 TB 4.00 2.00 TR
+TE
+2.00 10.00 TB 12.00 2.00 TR
+TE
+2.00 8.00 TB 22.00 2.00 TR
+TE
+2.00 6.00 TB 12.00 2.00 TR
+TE
+2.00 4.00 TB 4.00 2.00 TR
+TE
+2.00 4.00 TB 16.00 6.00 TR
+TE
+2.00 2.00 TB 22.00 2.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+2.00 24.00 TB 0.00 28.00 TR
+TE
+2.00 22.00 TB 0.00 2.00 TR
+TE
+22.00 2.00 TB 6.00 2.00 TR
+TE
+22.00 2.00 TB 26.00 2.00 TR
+TE
+2.00 20.00 TB 0.00 4.00 TR
+TE
+2.00 18.00 TB 0.00 2.00 TR
+TE
+2.00 16.00 TB 0.00 4.00 TR
+TE
+2.00 14.00 TB 0.00 2.00 TR
+TE
+2.00 12.00 TB 0.00 4.00 TR
+TE
+2.00 12.00 TB 10.00 2.00 TR
+TE
+2.00 12.00 TB 14.00 2.00 TR
+TE
+2.00 12.00 TB 18.00 2.00 TR
+TE
+2.00 12.00 TB 22.00 2.00 TR
+TE
+2.00 10.00 TB 0.00 2.00 TR
+TE
+2.00 8.00 TB 0.00 4.00 TR
+TE
+2.00 6.00 TB 0.00 2.00 TR
+TE
+2.00 4.00 TB 0.00 4.00 TR
+TE
+2.00 2.00 TB 0.00 2.00 TR
+TE
+2.00 0.00 TB 0.00 28.00 TR
+TE
+1.00 1.00 1.00 setrgbcolor
 2.00 22.00 TB 2.00 2.00 TR
 TE
 22.00 2.00 TB 8.00 2.00 TR
 TE
-22.00 2.00 TB 28.00 2.00 TR
-TE
-2.00 20.00 TB 2.00 4.00 TR
-TE
 2.00 18.00 TB 2.00 2.00 TR
 TE
-2.00 16.00 TB 2.00 4.00 TR
-TE
 2.00 14.00 TB 2.00 2.00 TR
 TE
-2.00 12.00 TB 2.00 4.00 TR
+2.00 12.00 TB 4.00 2.00 TR
 TE
 2.00 12.00 TB 12.00 2.00 TR
 TE
@@ -181,38 +212,7 @@ TE
 TE
 2.00 10.00 TB 2.00 2.00 TR
 TE
-2.00 8.00 TB 2.00 4.00 TR
-TE
 2.00 6.00 TB 2.00 2.00 TR
 TE
-2.00 4.00 TB 2.00 4.00 TR
-TE
 2.00 2.00 TB 2.00 2.00 TR
 TE
-2.00 0.00 TB 2.00 28.00 TR
-TE
-1.00 1.00 1.00 setrgbcolor
-2.00 22.00 TB 4.00 2.00 TR
-TE
-22.00 2.00 TB 10.00 2.00 TR
-TE
-2.00 18.00 TB 4.00 2.00 TR
-TE
-2.00 14.00 TB 4.00 2.00 TR
-TE
-2.00 12.00 TB 6.00 2.00 TR
-TE
-2.00 12.00 TB 14.00 2.00 TR
-TE
-2.00 12.00 TB 18.00 2.00 TR
-TE
-2.00 12.00 TB 22.00 2.00 TR
-TE
-2.00 12.00 TB 26.00 2.00 TR
-TE
-2.00 10.00 TB 4.00 2.00 TR
-TE
-2.00 6.00 TB 4.00 2.00 TR
-TE
-2.00 2.00 TB 4.00 2.00 TR
-TE

backend/tests/data/eps/upca_2addon_ggs_5.2.6.6-5.eps

@@ -0,0 +1,133 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Zint 2.9.1.9
+%%Title: Zint Generated Symbol
+%%Pages: 0
+%%BoundingBox: 0 0 276 117
+%%EndComments
+/TL { setlinewidth moveto lineto stroke } bind def
+/TD { newpath 0 360 arc fill } bind def
+/TH { 0 setlinewidth moveto lineto lineto lineto lineto lineto closepath fill } bind def
+/TB { 2 copy } bind def
+/TR { newpath 4 1 roll exch moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath fill } bind def
+/TE { pop pop } bind def
+newpath
+1.00 1.00 1.00 setrgbcolor
+116.40 0.00 TB 0.00 276.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+110.00 6.40 TB 18.00 2.00 TR
+TE
+110.00 6.40 TB 22.00 2.00 TR
+TE
+110.00 6.40 TB 30.00 4.00 TR
+TE
+110.00 6.40 TB 36.00 2.00 TR
+TE
+100.00 16.40 TB 42.00 4.00 TR
+TE
+100.00 16.40 TB 50.00 2.00 TR
+TE
+100.00 16.40 TB 56.00 2.00 TR
+TE
+100.00 16.40 TB 62.00 4.00 TR
+TE
+100.00 16.40 TB 68.00 8.00 TR
+TE
+100.00 16.40 TB 78.00 2.00 TR
+TE
+100.00 16.40 TB 82.00 2.00 TR
+TE
+100.00 16.40 TB 90.00 4.00 TR
+TE
+100.00 16.40 TB 96.00 4.00 TR
+TE
+100.00 16.40 TB 106.00 2.00 TR
+TE
+110.00 6.40 TB 110.00 2.00 TR
+TE
+110.00 6.40 TB 114.00 2.00 TR
+TE
+100.00 16.40 TB 118.00 2.00 TR
+TE
+100.00 16.40 TB 122.00 2.00 TR
+TE
+100.00 16.40 TB 132.00 2.00 TR
+TE
+100.00 16.40 TB 140.00 2.00 TR
+TE
+100.00 16.40 TB 146.00 2.00 TR
+TE
+100.00 16.40 TB 152.00 2.00 TR
+TE
+100.00 16.40 TB 160.00 6.00 TR
+TE
+100.00 16.40 TB 168.00 2.00 TR
+TE
+100.00 16.40 TB 174.00 6.00 TR
+TE
+100.00 16.40 TB 184.00 2.00 TR
+TE
+110.00 6.40 TB 188.00 2.00 TR
+TE
+110.00 6.40 TB 194.00 6.00 TR
+TE
+110.00 6.40 TB 202.00 2.00 TR
+TE
+110.00 6.40 TB 206.00 2.00 TR
+TE
+81.00 16.40 TB 226.00 2.00 TR
+TE
+81.00 16.40 TB 230.00 4.00 TR
+TE
+81.00 16.40 TB 238.00 2.00 TR
+TE
+81.00 16.40 TB 244.00 4.00 TR
+TE
+81.00 16.40 TB 250.00 2.00 TR
+TE
+81.00 16.40 TB 254.00 2.00 TR
+TE
+81.00 16.40 TB 262.00 4.00 TR
+TE
+matrix currentmatrix
+/Helvetica findfont
+14.00 scalefont setfont
+ 0 0 moveto 8.00 0.40 translate 0.00 rotate 0 0 moveto
+ (0) stringwidth
+pop
+neg 0 rmoveto
+ (0) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 72.00 0.40 translate 0.00 rotate 0 0 moveto
+ (12345) stringwidth
+pop
+-2 div 0 rmoveto
+ (12345) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 152.00 0.40 translate 0.00 rotate 0 0 moveto
+ (67890) stringwidth
+pop
+-2 div 0 rmoveto
+ (67890) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+14.00 scalefont setfont
+ 0 0 moveto 218.00 0.40 translate 0.00 rotate 0 0 moveto
+ (5) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 246.00 101.40 translate 0.00 rotate 0 0 moveto
+ (24) stringwidth
+pop
+-2 div 0 rmoveto
+ (24) show
+setmatrix

backend/tests/data/eps/upce_5addon.eps

@@ -0,0 +1,116 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Zint 2.9.1.9
+%%Title: Zint Generated Symbol
+%%Pages: 0
+%%BoundingBox: 0 0 238 117
+%%EndComments
+/TL { setlinewidth moveto lineto stroke } bind def
+/TD { newpath 0 360 arc fill } bind def
+/TH { 0 setlinewidth moveto lineto lineto lineto lineto lineto closepath fill } bind def
+/TB { 2 copy } bind def
+/TR { newpath 4 1 roll exch moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath fill } bind def
+/TE { pop pop } bind def
+newpath
+1.00 1.00 1.00 setrgbcolor
+116.40 0.00 TB 0.00 238.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+110.00 6.40 TB 18.00 2.00 TR
+TE
+110.00 6.40 TB 22.00 2.00 TR
+TE
+100.00 16.40 TB 26.00 4.00 TR
+TE
+100.00 16.40 TB 34.00 4.00 TR
+TE
+100.00 16.40 TB 42.00 2.00 TR
+TE
+100.00 16.40 TB 48.00 4.00 TR
+TE
+100.00 16.40 TB 54.00 8.00 TR
+TE
+100.00 16.40 TB 64.00 2.00 TR
+TE
+100.00 16.40 TB 70.00 6.00 TR
+TE
+100.00 16.40 TB 78.00 2.00 TR
+TE
+100.00 16.40 TB 82.00 6.00 TR
+TE
+100.00 16.40 TB 92.00 2.00 TR
+TE
+100.00 16.40 TB 96.00 2.00 TR
+TE
+100.00 16.40 TB 100.00 8.00 TR
+TE
+110.00 6.40 TB 110.00 2.00 TR
+TE
+110.00 6.40 TB 114.00 2.00 TR
+TE
+110.00 6.40 TB 118.00 2.00 TR
+TE
+81.00 16.40 TB 134.00 2.00 TR
+TE
+81.00 16.40 TB 138.00 4.00 TR
+TE
+81.00 16.40 TB 144.00 4.00 TR
+TE
+81.00 16.40 TB 152.00 4.00 TR
+TE
+81.00 16.40 TB 158.00 2.00 TR
+TE
+81.00 16.40 TB 164.00 2.00 TR
+TE
+81.00 16.40 TB 170.00 4.00 TR
+TE
+81.00 16.40 TB 176.00 2.00 TR
+TE
+81.00 16.40 TB 180.00 2.00 TR
+TE
+81.00 16.40 TB 190.00 2.00 TR
+TE
+81.00 16.40 TB 194.00 2.00 TR
+TE
+81.00 16.40 TB 198.00 2.00 TR
+TE
+81.00 16.40 TB 206.00 4.00 TR
+TE
+81.00 16.40 TB 212.00 2.00 TR
+TE
+81.00 16.40 TB 216.00 4.00 TR
+TE
+81.00 16.40 TB 226.00 2.00 TR
+TE
+matrix currentmatrix
+/Helvetica findfont
+14.00 scalefont setfont
+ 0 0 moveto 8.00 0.40 translate 0.00 rotate 0 0 moveto
+ (0) stringwidth
+pop
+neg 0 rmoveto
+ (0) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 66.00 0.40 translate 0.00 rotate 0 0 moveto
+ (123456) stringwidth
+pop
+-2 div 0 rmoveto
+ (123456) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+14.00 scalefont setfont
+ 0 0 moveto 126.00 0.40 translate 0.00 rotate 0 0 moveto
+ (5) show
+setmatrix
+matrix currentmatrix
+/Helvetica findfont
+20.00 scalefont setfont
+ 0 0 moveto 182.00 101.40 translate 0.00 rotate 0 0 moveto
+ (12345) stringwidth
+pop
+-2 div 0 rmoveto
+ (12345) show
+setmatrix

backend/tests/data/eps/upce_5addon_small_bold.eps

@@ -0,0 +1,116 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: Zint 2.9.1.9
+%%Title: Zint Generated Symbol
+%%Pages: 0
+%%BoundingBox: 0 0 238 112
+%%EndComments
+/TL { setlinewidth moveto lineto stroke } bind def
+/TD { newpath 0 360 arc fill } bind def
+/TH { 0 setlinewidth moveto lineto lineto lineto lineto lineto closepath fill } bind def
+/TB { 2 copy } bind def
+/TR { newpath 4 1 roll exch moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto closepath fill } bind def
+/TE { pop pop } bind def
+newpath
+1.00 1.00 1.00 setrgbcolor
+111.90 0.00 TB 0.00 238.00 TR
+TE
+0.00 0.00 0.00 setrgbcolor
+110.00 1.90 TB 18.00 2.00 TR
+TE
+110.00 1.90 TB 22.00 2.00 TR
+TE
+100.00 11.90 TB 26.00 4.00 TR
+TE
+100.00 11.90 TB 34.00 4.00 TR
+TE
+100.00 11.90 TB 42.00 2.00 TR
+TE
+100.00 11.90 TB 48.00 4.00 TR
+TE
+100.00 11.90 TB 54.00 8.00 TR
+TE
+100.00 11.90 TB 64.00 2.00 TR
+TE
+100.00 11.90 TB 70.00 6.00 TR
+TE
+100.00 11.90 TB 78.00 2.00 TR
+TE
+100.00 11.90 TB 82.00 6.00 TR
+TE
+100.00 11.90 TB 92.00 2.00 TR
+TE
+100.00 11.90 TB 96.00 2.00 TR
+TE
+100.00 11.90 TB 100.00 8.00 TR
+TE
+110.00 1.90 TB 110.00 2.00 TR
+TE
+110.00 1.90 TB 114.00 2.00 TR
+TE
+110.00 1.90 TB 118.00 2.00 TR
+TE
+87.00 11.90 TB 134.00 2.00 TR
+TE
+87.00 11.90 TB 138.00 4.00 TR
+TE
+87.00 11.90 TB 144.00 4.00 TR
+TE
+87.00 11.90 TB 152.00 4.00 TR
+TE
+87.00 11.90 TB 158.00 2.00 TR
+TE
+87.00 11.90 TB 164.00 2.00 TR
+TE
+87.00 11.90 TB 170.00 4.00 TR
+TE
+87.00 11.90 TB 176.00 2.00 TR
+TE
+87.00 11.90 TB 180.00 2.00 TR
+TE
+87.00 11.90 TB 190.00 2.00 TR
+TE
+87.00 11.90 TB 194.00 2.00 TR
+TE
+87.00 11.90 TB 198.00 2.00 TR
+TE
+87.00 11.90 TB 206.00 4.00 TR
+TE
+87.00 11.90 TB 212.00 2.00 TR
+TE
+87.00 11.90 TB 216.00 4.00 TR
+TE
+87.00 11.90 TB 226.00 2.00 TR
+TE
+matrix currentmatrix
+/Helvetica-Bold findfont
+12.00 scalefont setfont
+ 0 0 moveto 8.00 0.40 translate 0.00 rotate 0 0 moveto
+ (0) stringwidth
+pop
+neg 0 rmoveto
+ (0) show
+setmatrix
+matrix currentmatrix
+/Helvetica-Bold findfont
+14.00 scalefont setfont
+ 0 0 moveto 66.00 0.40 translate 0.00 rotate 0 0 moveto
+ (123456) stringwidth
+pop
+-2 div 0 rmoveto
+ (123456) show
+setmatrix
+matrix currentmatrix
+/Helvetica-Bold findfont
+12.00 scalefont setfont
+ 0 0 moveto 126.00 0.40 translate 0.00 rotate 0 0 moveto
+ (5) show
+setmatrix
+matrix currentmatrix
+/Helvetica-Bold findfont
+14.00 scalefont setfont
+ 0 0 moveto 182.00 101.40 translate 0.00 rotate 0 0 moveto
+ (12345) stringwidth
+pop
+-2 div 0 rmoveto
+ (12345) show
+setmatrix

backend/tests/data/print/eps/code128_aim.eps

@@ -1,8 +1,8 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.9.0
+%%Creator: Zint 2.9.1.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
-%%BoundingBox: 0 0 136 118
+%%BoundingBox: 0 0 136 119
 %%EndComments
 /TL { setlinewidth moveto lineto stroke } bind def
 /TD { newpath 0 360 arc fill } bind def
@@ -12,51 +12,51 @@
 /TE { pop pop } bind def
 newpath
 1.00 1.00 1.00 setrgbcolor
-118.00 0.00 TB 0.00 136.00 TR
+118.90 0.00 TB 0.00 136.00 TR
 TE
 0.00 0.00 0.00 setrgbcolor
-100.00 18.00 TB 0.00 4.00 TR
+100.00 18.90 TB 0.00 4.00 TR
 TE
-100.00 18.00 TB 6.00 2.00 TR
+100.00 18.90 TB 6.00 2.00 TR
 TE
-100.00 18.00 TB 12.00 2.00 TR
+100.00 18.90 TB 12.00 2.00 TR
 TE
-100.00 18.00 TB 22.00 2.00 TR
+100.00 18.90 TB 22.00 2.00 TR
 TE
-100.00 18.00 TB 26.00 2.00 TR
+100.00 18.90 TB 26.00 2.00 TR
 TE
-100.00 18.00 TB 34.00 4.00 TR
+100.00 18.90 TB 34.00 4.00 TR
 TE
-100.00 18.00 TB 44.00 4.00 TR
+100.00 18.90 TB 44.00 4.00 TR
 TE
-100.00 18.00 TB 54.00 2.00 TR
+100.00 18.90 TB 54.00 2.00 TR
 TE
-100.00 18.00 TB 62.00 2.00 TR
+100.00 18.90 TB 62.00 2.00 TR
 TE
-100.00 18.00 TB 66.00 2.00 TR
+100.00 18.90 TB 66.00 2.00 TR
 TE
-100.00 18.00 TB 70.00 6.00 TR
+100.00 18.90 TB 70.00 6.00 TR
 TE
-100.00 18.00 TB 78.00 4.00 TR
+100.00 18.90 TB 78.00 4.00 TR
 TE
-100.00 18.00 TB 88.00 2.00 TR
+100.00 18.90 TB 88.00 2.00 TR
 TE
-100.00 18.00 TB 92.00 6.00 TR
+100.00 18.90 TB 92.00 6.00 TR
 TE
-100.00 18.00 TB 100.00 4.00 TR
+100.00 18.90 TB 100.00 4.00 TR
 TE
-100.00 18.00 TB 110.00 4.00 TR
+100.00 18.90 TB 110.00 4.00 TR
 TE
-100.00 18.00 TB 120.00 6.00 TR
+100.00 18.90 TB 120.00 6.00 TR
 TE
-100.00 18.00 TB 128.00 2.00 TR
+100.00 18.90 TB 128.00 2.00 TR
 TE
-100.00 18.00 TB 132.00 4.00 TR
+100.00 18.90 TB 132.00 4.00 TR
 TE
 matrix currentmatrix
 /Helvetica findfont
-18.00 scalefont setfont
+14.00 scalefont setfont
- 0 0 moveto 68.00 0.00 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 68.00 3.50 translate 0.00 rotate 0 0 moveto
  (AIM) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/print/eps/dotcode_aim_fig7.eps

@@ -1,8 +1,8 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.9.0
+%%Creator: Zint 2.9.1.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
-%%BoundingBox: 0 0 26 20
+%%BoundingBox: 0 0 130 100
 %%EndComments
 /TL { setlinewidth moveto lineto stroke } bind def
 /TD { newpath 0 360 arc fill } bind def
@@ -12,45 +12,45 @@
 /TE { pop pop } bind def
 newpath
 1.00 1.00 1.00 setrgbcolor
-20.00 0.00 TB 0.00 26.00 TR
+100.00 0.00 TB 0.00 130.00 TR
 TE
 0.00 0.00 0.00 setrgbcolor
-1.00 19.00 1.00 TD
+4.00 96.00 4.00 TD
-5.00 19.00 1.00 TD
+24.00 96.00 4.00 TD
-13.00 19.00 1.00 TD
+64.00 96.00 4.00 TD
-17.00 19.00 1.00 TD
+84.00 96.00 4.00 TD
-21.00 19.00 1.00 TD
+104.00 96.00 4.00 TD
-25.00 19.00 1.00 TD
+124.00 96.00 4.00 TD
-7.00 17.00 1.00 TD
+34.00 86.00 4.00 TD
-1.00 15.00 1.00 TD
+4.00 76.00 4.00 TD
-9.00 15.00 1.00 TD
+44.00 76.00 4.00 TD
-17.00 15.00 1.00 TD
+84.00 76.00 4.00 TD
-21.00 15.00 1.00 TD
+104.00 76.00 4.00 TD
-25.00 15.00 1.00 TD
+124.00 76.00 4.00 TD
-3.00 13.00 1.00 TD
+14.00 66.00 4.00 TD
-15.00 13.00 1.00 TD
+74.00 66.00 4.00 TD
-19.00 13.00 1.00 TD
+94.00 66.00 4.00 TD
-9.00 11.00 1.00 TD
+44.00 56.00 4.00 TD
-13.00 11.00 1.00 TD
+64.00 56.00 4.00 TD
-21.00 11.00 1.00 TD
+104.00 56.00 4.00 TD
-3.00 9.00 1.00 TD
+14.00 46.00 4.00 TD
-11.00 9.00 1.00 TD
+54.00 46.00 4.00 TD
-23.00 9.00 1.00 TD
+114.00 46.00 4.00 TD
-1.00 7.00 1.00 TD
+4.00 36.00 4.00 TD
-9.00 7.00 1.00 TD
+44.00 36.00 4.00 TD
-13.00 7.00 1.00 TD
+64.00 36.00 4.00 TD
-17.00 7.00 1.00 TD
+84.00 36.00 4.00 TD
-25.00 7.00 1.00 TD
+124.00 36.00 4.00 TD
-3.00 5.00 1.00 TD
+14.00 26.00 4.00 TD
-7.00 5.00 1.00 TD
+34.00 26.00 4.00 TD
-11.00 5.00 1.00 TD
+54.00 26.00 4.00 TD
-19.00 5.00 1.00 TD
+94.00 26.00 4.00 TD
-1.00 3.00 1.00 TD
+4.00 16.00 4.00 TD
-9.00 3.00 1.00 TD
+44.00 16.00 4.00 TD
-17.00 3.00 1.00 TD
+84.00 16.00 4.00 TD
-21.00 3.00 1.00 TD
+104.00 16.00 4.00 TD
-25.00 3.00 1.00 TD
+124.00 16.00 4.00 TD
-3.00 1.00 1.00 TD
+14.00 6.00 4.00 TD
-7.00 1.00 1.00 TD
+34.00 6.00 4.00 TD
-15.00 1.00 1.00 TD
+74.00 6.00 4.00 TD
-23.00 1.00 1.00 TD
+114.00 6.00 4.00 TD

backend/tests/data/print/eps/qr_v1_m.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.9.0
+%%Creator: Zint 2.9.1.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 42 42

backend/tests/data/print/eps/ultracode_a.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.9.0
+%%Creator: Zint 2.9.1.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 26 26

backend/tests/data/print/svg/code128_aim.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="136" height="118" version="1.1"
+<svg width="136" height="119" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="136" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="136" height="119" fill="#FFFFFF" />
       <rect x="0.00" y="0.00" width="4.00" height="100.00" />
       <rect x="6.00" y="0.00" width="2.00" height="100.00" />
       <rect x="12.00" y="0.00" width="2.00" height="100.00" />
@@ -27,8 +27,8 @@
       <rect x="120.00" y="0.00" width="6.00" height="100.00" />
       <rect x="128.00" y="0.00" width="2.00" height="100.00" />
       <rect x="132.00" y="0.00" width="4.00" height="100.00" />
-      <text x="68.00" y="118.00" text-anchor="middle"
+      <text x="68.00" y="115.40" text-anchor="middle"
-         font-family="Helvetica" font-size="18.0" >
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          AIM
       </text>
    </g>

backend/tests/data/print/svg/dotcode_aim_fig7.svg

@@ -1,51 +1,51 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="26" height="20" version="1.1"
+<svg width="130" height="100" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="26" height="20" fill="#FFFFFF" />
+      <rect x="0" y="0" width="130" height="100" fill="#FFFFFF" />
-      <circle cx="1.00" cy="1.00" r="1.00" />
+      <circle cx="4.00" cy="4.00" r="4.00" />
-      <circle cx="5.00" cy="1.00" r="1.00" />
+      <circle cx="24.00" cy="4.00" r="4.00" />
-      <circle cx="13.00" cy="1.00" r="1.00" />
+      <circle cx="64.00" cy="4.00" r="4.00" />
-      <circle cx="17.00" cy="1.00" r="1.00" />
+      <circle cx="84.00" cy="4.00" r="4.00" />
-      <circle cx="21.00" cy="1.00" r="1.00" />
+      <circle cx="104.00" cy="4.00" r="4.00" />
-      <circle cx="25.00" cy="1.00" r="1.00" />
+      <circle cx="124.00" cy="4.00" r="4.00" />
-      <circle cx="7.00" cy="3.00" r="1.00" />
+      <circle cx="34.00" cy="14.00" r="4.00" />
-      <circle cx="1.00" cy="5.00" r="1.00" />
+      <circle cx="4.00" cy="24.00" r="4.00" />
-      <circle cx="9.00" cy="5.00" r="1.00" />
+      <circle cx="44.00" cy="24.00" r="4.00" />
-      <circle cx="17.00" cy="5.00" r="1.00" />
+      <circle cx="84.00" cy="24.00" r="4.00" />
-      <circle cx="21.00" cy="5.00" r="1.00" />
+      <circle cx="104.00" cy="24.00" r="4.00" />
-      <circle cx="25.00" cy="5.00" r="1.00" />
+      <circle cx="124.00" cy="24.00" r="4.00" />
-      <circle cx="3.00" cy="7.00" r="1.00" />
+      <circle cx="14.00" cy="34.00" r="4.00" />
-      <circle cx="15.00" cy="7.00" r="1.00" />
+      <circle cx="74.00" cy="34.00" r="4.00" />
-      <circle cx="19.00" cy="7.00" r="1.00" />
+      <circle cx="94.00" cy="34.00" r="4.00" />
-      <circle cx="9.00" cy="9.00" r="1.00" />
+      <circle cx="44.00" cy="44.00" r="4.00" />
-      <circle cx="13.00" cy="9.00" r="1.00" />
+      <circle cx="64.00" cy="44.00" r="4.00" />
-      <circle cx="21.00" cy="9.00" r="1.00" />
+      <circle cx="104.00" cy="44.00" r="4.00" />
-      <circle cx="3.00" cy="11.00" r="1.00" />
+      <circle cx="14.00" cy="54.00" r="4.00" />
-      <circle cx="11.00" cy="11.00" r="1.00" />
+      <circle cx="54.00" cy="54.00" r="4.00" />
-      <circle cx="23.00" cy="11.00" r="1.00" />
+      <circle cx="114.00" cy="54.00" r="4.00" />
-      <circle cx="1.00" cy="13.00" r="1.00" />
+      <circle cx="4.00" cy="64.00" r="4.00" />
-      <circle cx="9.00" cy="13.00" r="1.00" />
+      <circle cx="44.00" cy="64.00" r="4.00" />
-      <circle cx="13.00" cy="13.00" r="1.00" />
+      <circle cx="64.00" cy="64.00" r="4.00" />
-      <circle cx="17.00" cy="13.00" r="1.00" />
+      <circle cx="84.00" cy="64.00" r="4.00" />
-      <circle cx="25.00" cy="13.00" r="1.00" />
+      <circle cx="124.00" cy="64.00" r="4.00" />
-      <circle cx="3.00" cy="15.00" r="1.00" />
+      <circle cx="14.00" cy="74.00" r="4.00" />
-      <circle cx="7.00" cy="15.00" r="1.00" />
+      <circle cx="34.00" cy="74.00" r="4.00" />
-      <circle cx="11.00" cy="15.00" r="1.00" />
+      <circle cx="54.00" cy="74.00" r="4.00" />
-      <circle cx="19.00" cy="15.00" r="1.00" />
+      <circle cx="94.00" cy="74.00" r="4.00" />
-      <circle cx="1.00" cy="17.00" r="1.00" />
+      <circle cx="4.00" cy="84.00" r="4.00" />
-      <circle cx="9.00" cy="17.00" r="1.00" />
+      <circle cx="44.00" cy="84.00" r="4.00" />
-      <circle cx="17.00" cy="17.00" r="1.00" />
+      <circle cx="84.00" cy="84.00" r="4.00" />
-      <circle cx="21.00" cy="17.00" r="1.00" />
+      <circle cx="104.00" cy="84.00" r="4.00" />
-      <circle cx="25.00" cy="17.00" r="1.00" />
+      <circle cx="124.00" cy="84.00" r="4.00" />
-      <circle cx="3.00" cy="19.00" r="1.00" />
+      <circle cx="14.00" cy="94.00" r="4.00" />
-      <circle cx="7.00" cy="19.00" r="1.00" />
+      <circle cx="34.00" cy="94.00" r="4.00" />
-      <circle cx="15.00" cy="19.00" r="1.00" />
+      <circle cx="74.00" cy="94.00" r="4.00" />
-      <circle cx="23.00" cy="19.00" r="1.00" />
+      <circle cx="114.00" cy="94.00" r="4.00" />
    </g>
 </svg>

backend/tests/data/svg/codablockf_3rows.svg

@@ -1,63 +1,63 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="242" height="64" version="1.1"
+<svg width="242" height="72" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="242" height="64" fill="#FFFFFF" />
+      <rect x="0" y="0" width="242" height="72" fill="#FFFFFF" />
-      <rect x="20.00" y="2.00" width="4.00" height="60.00" />
+      <rect x="20.00" y="6.00" width="4.00" height="60.00" />
-      <rect x="26.00" y="2.00" width="2.00" height="60.00" />
+      <rect x="26.00" y="6.00" width="2.00" height="60.00" />
-      <rect x="36.00" y="2.00" width="2.00" height="60.00" />
+      <rect x="36.00" y="6.00" width="2.00" height="60.00" />
-      <rect x="42.00" y="2.00" width="2.00" height="60.00" />
+      <rect x="42.00" y="6.00" width="2.00" height="60.00" />
-      <rect x="46.00" y="2.00" width="8.00" height="60.00" />
+      <rect x="46.00" y="6.00" width="8.00" height="60.00" />
-      <rect x="56.00" y="2.00" width="6.00" height="60.00" />
+      <rect x="56.00" y="6.00" width="6.00" height="60.00" />
-      <rect x="64.00" y="2.00" width="2.00" height="20.00" />
+      <rect x="64.00" y="6.00" width="2.00" height="20.00" />
-      <rect x="70.00" y="2.00" width="2.00" height="20.00" />
+      <rect x="70.00" y="6.00" width="2.00" height="20.00" />
-      <rect x="74.00" y="2.00" width="4.00" height="20.00" />
+      <rect x="74.00" y="6.00" width="4.00" height="20.00" />
-      <rect x="86.00" y="2.00" width="2.00" height="60.00" />
+      <rect x="86.00" y="6.00" width="2.00" height="60.00" />
-      <rect x="90.00" y="2.00" width="2.00" height="60.00" />
+      <rect x="90.00" y="6.00" width="2.00" height="60.00" />
-      <rect x="98.00" y="2.00" width="4.00" height="60.00" />
+      <rect x="98.00" y="6.00" width="4.00" height="60.00" />
-      <rect x="108.00" y="2.00" width="2.00" height="60.00" />
+      <rect x="108.00" y="6.00" width="2.00" height="60.00" />
-      <rect x="112.00" y="2.00" width="2.00" height="40.00" />
+      <rect x="112.00" y="6.00" width="2.00" height="40.00" />
-      <rect x="120.00" y="2.00" width="4.00" height="40.00" />
+      <rect x="120.00" y="6.00" width="4.00" height="40.00" />
-      <rect x="130.00" y="2.00" width="2.00" height="40.00" />
+      <rect x="130.00" y="6.00" width="2.00" height="40.00" />
-      <rect x="134.00" y="2.00" width="2.00" height="40.00" />
+      <rect x="134.00" y="6.00" width="2.00" height="40.00" />
-      <rect x="142.00" y="2.00" width="4.00" height="40.00" />
+      <rect x="142.00" y="6.00" width="4.00" height="40.00" />
-      <rect x="152.00" y="2.00" width="2.00" height="40.00" />
+      <rect x="152.00" y="6.00" width="2.00" height="40.00" />
-      <rect x="156.00" y="2.00" width="2.00" height="40.00" />
+      <rect x="156.00" y="6.00" width="2.00" height="40.00" />
-      <rect x="164.00" y="2.00" width="4.00" height="40.00" />
+      <rect x="164.00" y="6.00" width="4.00" height="40.00" />
-      <rect x="174.00" y="2.00" width="4.00" height="20.00" />
+      <rect x="174.00" y="6.00" width="4.00" height="20.00" />
-      <rect x="180.00" y="2.00" width="4.00" height="20.00" />
+      <rect x="180.00" y="6.00" width="4.00" height="20.00" />
-      <rect x="188.00" y="2.00" width="4.00" height="20.00" />
+      <rect x="188.00" y="6.00" width="4.00" height="20.00" />
-      <rect x="196.00" y="2.00" width="4.00" height="60.00" />
+      <rect x="196.00" y="6.00" width="4.00" height="60.00" />
-      <rect x="206.00" y="2.00" width="6.00" height="60.00" />
+      <rect x="206.00" y="6.00" width="6.00" height="60.00" />
-      <rect x="214.00" y="2.00" width="2.00" height="60.00" />
+      <rect x="214.00" y="6.00" width="2.00" height="60.00" />
-      <rect x="218.00" y="2.00" width="4.00" height="60.00" />
+      <rect x="218.00" y="6.00" width="4.00" height="60.00" />
-      <rect x="64.00" y="22.00" width="4.00" height="20.00" />
+      <rect x="64.00" y="26.00" width="4.00" height="20.00" />
-      <rect x="74.00" y="22.00" width="2.00" height="20.00" />
+      <rect x="74.00" y="26.00" width="2.00" height="20.00" />
-      <rect x="80.00" y="22.00" width="2.00" height="20.00" />
+      <rect x="80.00" y="26.00" width="2.00" height="20.00" />
-      <rect x="174.00" y="22.00" width="8.00" height="20.00" />
+      <rect x="174.00" y="26.00" width="8.00" height="20.00" />
-      <rect x="184.00" y="22.00" width="2.00" height="40.00" />
+      <rect x="184.00" y="26.00" width="2.00" height="40.00" />
-      <rect x="192.00" y="22.00" width="2.00" height="20.00" />
+      <rect x="192.00" y="26.00" width="2.00" height="20.00" />
-      <rect x="64.00" y="42.00" width="2.00" height="20.00" />
+      <rect x="64.00" y="46.00" width="2.00" height="20.00" />
-      <rect x="68.00" y="42.00" width="4.00" height="20.00" />
+      <rect x="68.00" y="46.00" width="4.00" height="20.00" />
-      <rect x="76.00" y="42.00" width="6.00" height="20.00" />
+      <rect x="76.00" y="46.00" width="6.00" height="20.00" />
-      <rect x="112.00" y="42.00" width="6.00" height="20.00" />
+      <rect x="112.00" y="46.00" width="6.00" height="20.00" />
-      <rect x="120.00" y="42.00" width="8.00" height="20.00" />
+      <rect x="120.00" y="46.00" width="8.00" height="20.00" />
-      <rect x="130.00" y="42.00" width="4.00" height="20.00" />
+      <rect x="130.00" y="46.00" width="4.00" height="20.00" />
-      <rect x="138.00" y="42.00" width="4.00" height="20.00" />
+      <rect x="138.00" y="46.00" width="4.00" height="20.00" />
-      <rect x="144.00" y="42.00" width="4.00" height="20.00" />
+      <rect x="144.00" y="46.00" width="4.00" height="20.00" />
-      <rect x="152.00" y="42.00" width="4.00" height="20.00" />
+      <rect x="152.00" y="46.00" width="4.00" height="20.00" />
-      <rect x="160.00" y="42.00" width="6.00" height="20.00" />
+      <rect x="160.00" y="46.00" width="6.00" height="20.00" />
-      <rect x="170.00" y="42.00" width="2.00" height="20.00" />
+      <rect x="170.00" y="46.00" width="2.00" height="20.00" />
-      <rect x="174.00" y="42.00" width="4.00" height="20.00" />
+      <rect x="174.00" y="46.00" width="4.00" height="20.00" />
-      <rect x="190.00" y="42.00" width="2.00" height="20.00" />
+      <rect x="190.00" y="46.00" width="2.00" height="20.00" />
-      <rect x="42.00" y="21.00" width="154.00" height="2.00" />
+      <rect x="42.00" y="25.00" width="154.00" height="2.00" />
-      <rect x="42.00" y="41.00" width="154.00" height="2.00" />
+      <rect x="42.00" y="45.00" width="154.00" height="2.00" />
-      <rect x="20.00" y="0.00" width="202.00" height="2.00" />
+      <rect x="20.00" y="0.00" width="202.00" height="6.00" />
-      <rect x="20.00" y="62.00" width="202.00" height="2.00" />
+      <rect x="20.00" y="66.00" width="202.00" height="6.00" />
    </g>
 </svg>

backend/tests/data/svg/code128_amperands.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="180" height="118" version="1.1"
+<svg width="180" height="119" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="180" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="180" height="119" fill="#FFFFFF" />
       <rect x="0.00" y="0.00" width="4.00" height="100.00" />
       <rect x="6.00" y="0.00" width="2.00" height="100.00" />
       <rect x="12.00" y="0.00" width="2.00" height="100.00" />
@@ -33,8 +33,8 @@
       <rect x="164.00" y="0.00" width="6.00" height="100.00" />
       <rect x="172.00" y="0.00" width="2.00" height="100.00" />
       <rect x="176.00" y="0.00" width="4.00" height="100.00" />
-      <text x="90.00" y="118.00" text-anchor="middle"
+      <text x="90.00" y="115.40" text-anchor="middle"
-         font-family="Helvetica" font-size="18.0" >
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          &lt;&gt;&quot;&amp;&apos;
       </text>
    </g>

backend/tests/data/svg/code128_egrave_bold.svg

@@ -0,0 +1,47 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="224" height="119" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="224" height="119" fill="#FFFFFF" />
+      <rect x="0.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="6.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="12.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="22.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="26.00" y="0.00" width="8.00" height="100.00" />
+      <rect x="36.00" y="0.00" width="6.00" height="100.00" />
+      <rect x="44.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="54.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="62.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="66.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="72.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="78.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="88.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="98.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="106.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="110.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="114.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="120.00" y="0.00" width="8.00" height="100.00" />
+      <rect x="132.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="138.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="142.00" y="0.00" width="8.00" height="100.00" />
+      <rect x="154.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="160.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="166.00" y="0.00" width="8.00" height="100.00" />
+      <rect x="176.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="184.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="194.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="198.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="208.00" y="0.00" width="6.00" height="100.00" />
+      <rect x="216.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="220.00" y="0.00" width="4.00" height="100.00" />
+      <text x="112.00" y="115.40" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+         Égjpqy
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/code128_egrave_bold_box3.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="236" height="131" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="236" height="131" fill="#FFFFFF" />
+      <rect x="6.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="12.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="18.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="28.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="32.00" y="6.00" width="8.00" height="100.00" />
+      <rect x="42.00" y="6.00" width="6.00" height="100.00" />
+      <rect x="50.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="60.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="68.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="72.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="78.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="84.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="94.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="104.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="112.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="116.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="120.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="126.00" y="6.00" width="8.00" height="100.00" />
+      <rect x="138.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="144.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="148.00" y="6.00" width="8.00" height="100.00" />
+      <rect x="160.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="166.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="172.00" y="6.00" width="8.00" height="100.00" />
+      <rect x="182.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="190.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="200.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="204.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="214.00" y="6.00" width="6.00" height="100.00" />
+      <rect x="222.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="226.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="0.00" y="0.00" width="236.00" height="6.00" />
+      <rect x="0.00" y="106.00" width="236.00" height="6.00" />
+      <rect x="0.00" y="0.00" width="6.00" height="112.00" />
+      <rect x="230.00" y="0.00" width="6.00" height="112.00" />
+      <text x="118.00" y="127.40" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+         Égjpqy
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/code39_small.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="128" height="117" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="128" height="117" fill="#FFFFFF" />
+      <rect x="0.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="6.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="10.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="16.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="22.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="26.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="32.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="38.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="42.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="46.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="52.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="56.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="64.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="68.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="72.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="78.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="84.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="92.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="96.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="100.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="104.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="110.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="114.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="120.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="126.00" y="0.00" width="2.00" height="100.00" />
+      <text x="64.00" y="113.20" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="12.0" >
+         *123*
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/ean13_2addon_ggs_5.2.2.5.1-2.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="276" height="118" version="1.1"
+<svg width="276" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="276" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="276" height="117" fill="#FFFFFF" />
       <rect x="22.00" y="0.00" width="2.00" height="110.00" />
       <rect x="26.00" y="0.00" width="2.00" height="110.00" />
       <rect x="30.00" y="0.00" width="6.00" height="100.00" />
@@ -38,27 +38,27 @@
       <rect x="200.00" y="0.00" width="2.00" height="100.00" />
       <rect x="206.00" y="0.00" width="2.00" height="110.00" />
       <rect x="210.00" y="0.00" width="2.00" height="110.00" />
-      <rect x="226.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="226.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="230.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="230.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="238.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="238.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="246.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="246.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="250.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="250.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="256.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="256.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="262.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="262.00" y="19.00" width="4.00" height="91.00" />
-      <text x="8.00" y="118.00" text-anchor="middle"
+      <text x="12.00" y="116.00" text-anchor="end"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          9
       </text>
-      <text x="70.00" y="118.00" text-anchor="middle"
+      <text x="70.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          771384
       </text>
-      <text x="164.00" y="118.00" text-anchor="middle"
+      <text x="164.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          524017
       </text>
-      <text x="246.00" y="16.00" text-anchor="middle"
+      <text x="246.00" y="15.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          12
       </text>
    </g>

backend/tests/data/svg/ean13_5addon_ggs_5.2.2.5.2-2.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="330" height="118" version="1.1"
+<svg width="330" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="330" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="330" height="117" fill="#FFFFFF" />
       <rect x="22.00" y="0.00" width="2.00" height="110.00" />
       <rect x="26.00" y="0.00" width="2.00" height="110.00" />
       <rect x="30.00" y="0.00" width="6.00" height="100.00" />
@@ -38,36 +38,36 @@
       <rect x="196.00" y="0.00" width="2.00" height="100.00" />
       <rect x="206.00" y="0.00" width="2.00" height="110.00" />
       <rect x="210.00" y="0.00" width="2.00" height="110.00" />
-      <rect x="226.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="226.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="230.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="230.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="236.00" y="20.00" width="6.00" height="90.00" />
+      <rect x="236.00" y="19.00" width="6.00" height="91.00" />
-      <rect x="246.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="246.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="250.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="250.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="254.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="254.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="262.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="262.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="268.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="268.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="272.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="272.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="282.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="282.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="286.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="286.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="292.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="292.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="298.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="298.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="304.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="304.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="310.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="310.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="318.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="318.00" y="19.00" width="2.00" height="91.00" />
-      <text x="8.00" y="118.00" text-anchor="middle"
+      <text x="12.00" y="116.00" text-anchor="end"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          9
       </text>
-      <text x="70.00" y="118.00" text-anchor="middle"
+      <text x="70.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          780877
       </text>
-      <text x="164.00" y="118.00" text-anchor="middle"
+      <text x="164.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          799306
       </text>
-      <text x="274.00" y="16.00" text-anchor="middle"
+      <text x="274.00" y="15.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          54321
       </text>
    </g>

backend/tests/data/svg/ean13_cc_2addon_cca_4x4.svg

@@ -0,0 +1,147 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="284" height="117" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="284" height="117" fill="#FFFFFF" />
+      <rect x="22.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="28.00" y="0.00" width="2.00" height="20.00" />
+      <rect x="34.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="42.00" y="0.00" width="8.00" height="4.00" />
+      <rect x="54.00" y="0.00" width="4.00" height="8.00" />
+      <rect x="60.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="66.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="76.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="80.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="88.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="100.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="110.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="116.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="124.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="130.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="134.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="142.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="152.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="164.00" y="0.00" width="4.00" height="8.00" />
+      <rect x="178.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="184.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="190.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="198.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="206.00" y="0.00" width="4.00" height="8.00" />
+      <rect x="214.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="218.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="32.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="4.00" width="6.00" height="8.00" />
+      <rect x="50.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="62.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="84.00" y="4.00" width="8.00" height="4.00" />
+      <rect x="94.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="98.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="126.00" y="4.00" width="2.00" height="12.00" />
+      <rect x="130.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="138.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="142.00" y="4.00" width="8.00" height="4.00" />
+      <rect x="152.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="172.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="178.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="194.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="198.00" y="4.00" width="4.00" height="12.00" />
+      <rect x="32.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="54.00" y="8.00" width="10.00" height="4.00" />
+      <rect x="66.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="8.00" width="12.00" height="4.00" />
+      <rect x="92.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="98.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="106.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="114.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="130.00" y="8.00" width="10.00" height="4.00" />
+      <rect x="142.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="146.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="158.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="164.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="170.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="176.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="182.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="204.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="32.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="42.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="50.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="58.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="70.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="86.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="90.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="102.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="114.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="130.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="138.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="148.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="160.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="164.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="170.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="178.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="186.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="204.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="216.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="26.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="218.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="28.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="216.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="32.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="38.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="44.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="50.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="60.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="66.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="74.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="78.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="88.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="98.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="102.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="108.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="116.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="120.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="124.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="128.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="134.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="142.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="150.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="156.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="166.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="170.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="178.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="184.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="190.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="198.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="204.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="212.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="232.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="236.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="244.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="252.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="256.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="262.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="268.00" y="47.00" width="4.00" height="63.00" />
+      <text x="18.00" y="116.00" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         1
+      </text>
+      <text x="76.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         234567
+      </text>
+      <text x="170.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         890128
+      </text>
+      <text x="252.00" y="43.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         12
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/ean13_cc_5addon_ccb_3x4.svg

@@ -0,0 +1,154 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="338" height="117" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="338" height="117" fill="#FFFFFF" />
+      <rect x="22.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="28.00" y="0.00" width="2.00" height="20.00" />
+      <rect x="34.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="42.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="50.00" y="0.00" width="10.00" height="4.00" />
+      <rect x="62.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="68.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="76.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="82.00" y="0.00" width="12.00" height="4.00" />
+      <rect x="96.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="100.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="110.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="116.00" y="0.00" width="6.00" height="8.00" />
+      <rect x="124.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="130.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="136.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="146.00" y="0.00" width="8.00" height="4.00" />
+      <rect x="156.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="164.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="172.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="176.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="190.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="198.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="204.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="210.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="218.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="34.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="46.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="54.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="60.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="76.00" y="4.00" width="2.00" height="12.00" />
+      <rect x="80.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="92.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="106.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="124.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="130.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="136.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="150.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="158.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="164.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="168.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="174.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="184.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="208.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="36.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="48.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="56.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="64.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="82.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="88.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="98.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="116.00" y="8.00" width="4.00" height="8.00" />
+      <rect x="140.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="144.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="156.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="164.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="170.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="184.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="194.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="208.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="36.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="46.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="56.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="70.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="80.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="90.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="104.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="124.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="130.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="140.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="150.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="160.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="164.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="170.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="178.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="190.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="208.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="216.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="26.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="218.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="28.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="216.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="32.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="38.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="44.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="50.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="60.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="66.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="74.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="78.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="88.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="98.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="102.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="108.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="116.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="120.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="124.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="128.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="134.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="142.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="150.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="156.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="166.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="170.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="178.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="184.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="190.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="198.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="204.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="212.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="232.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="236.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="242.00" y="47.00" width="6.00" height="63.00" />
+      <rect x="252.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="256.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="260.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="268.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="274.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="278.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="288.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="292.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="298.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="304.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="310.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="316.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="324.00" y="47.00" width="2.00" height="63.00" />
+      <text x="18.00" y="116.00" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         1
+      </text>
+      <text x="76.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         234567
+      </text>
+      <text x="170.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         890128
+      </text>
+      <text x="280.00" y="43.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         54321
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/ean13_cc_5addon_ccb_3x4_notext.svg

@@ -0,0 +1,138 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="338" height="110" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="338" height="110" fill="#FFFFFF" />
+      <rect x="22.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="28.00" y="0.00" width="2.00" height="20.00" />
+      <rect x="34.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="42.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="50.00" y="0.00" width="10.00" height="4.00" />
+      <rect x="62.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="68.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="76.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="82.00" y="0.00" width="12.00" height="4.00" />
+      <rect x="96.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="100.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="110.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="116.00" y="0.00" width="6.00" height="8.00" />
+      <rect x="124.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="130.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="136.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="146.00" y="0.00" width="8.00" height="4.00" />
+      <rect x="156.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="164.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="172.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="176.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="190.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="198.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="204.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="210.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="218.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="34.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="46.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="54.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="60.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="76.00" y="4.00" width="2.00" height="12.00" />
+      <rect x="80.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="92.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="106.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="124.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="130.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="136.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="150.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="158.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="164.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="168.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="174.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="184.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="208.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="36.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="48.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="56.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="64.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="82.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="88.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="98.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="116.00" y="8.00" width="4.00" height="8.00" />
+      <rect x="140.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="144.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="156.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="164.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="170.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="184.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="194.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="208.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="36.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="46.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="56.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="70.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="80.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="90.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="104.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="124.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="130.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="140.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="150.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="160.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="164.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="170.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="178.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="190.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="208.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="216.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="26.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="218.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="28.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="216.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="32.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="38.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="44.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="50.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="60.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="66.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="74.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="78.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="88.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="98.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="102.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="108.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="116.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="120.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="124.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="128.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="134.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="142.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="150.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="156.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="166.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="170.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="178.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="184.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="190.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="198.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="204.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="212.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="232.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="236.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="242.00" y="47.00" width="6.00" height="63.00" />
+      <rect x="252.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="256.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="260.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="268.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="274.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="278.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="288.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="292.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="298.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="304.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="310.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="316.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="324.00" y="47.00" width="2.00" height="63.00" />
+   </g>
+</svg>

backend/tests/data/svg/ean2.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="64" height="118" version="1.1"
+<svg width="64" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="64" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="64" height="117" fill="#FFFFFF" />
       <rect x="14.00" y="0.00" width="2.00" height="100.00" />
       <rect x="18.00" y="0.00" width="4.00" height="100.00" />
       <rect x="26.00" y="0.00" width="4.00" height="100.00" />
@@ -15,8 +15,8 @@
       <rect x="38.00" y="0.00" width="2.00" height="100.00" />
       <rect x="44.00" y="0.00" width="2.00" height="100.00" />
       <rect x="50.00" y="0.00" width="4.00" height="100.00" />
-      <text x="34.00" y="118.00" text-anchor="middle"
+      <text x="34.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          12
       </text>
    </g>

backend/tests/data/svg/ean5.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="118" height="118" version="1.1"
+<svg width="118" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="118" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="118" height="117" fill="#FFFFFF" />
       <rect x="14.00" y="0.00" width="2.00" height="100.00" />
       <rect x="18.00" y="0.00" width="4.00" height="100.00" />
       <rect x="24.00" y="0.00" width="4.00" height="100.00" />
@@ -24,8 +24,8 @@
       <rect x="92.00" y="0.00" width="2.00" height="100.00" />
       <rect x="96.00" y="0.00" width="4.00" height="100.00" />
       <rect x="106.00" y="0.00" width="2.00" height="100.00" />
-      <text x="61.00" y="118.00" text-anchor="middle"
+      <text x="61.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          12345
       </text>
    </g>

backend/tests/data/svg/ean8_2addon.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="216" height="118" version="1.1"
+<svg width="216" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="216" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="216" height="117" fill="#FFFFFF" />
       <rect x="14.00" y="0.00" width="2.00" height="110.00" />
       <rect x="18.00" y="0.00" width="2.00" height="110.00" />
       <rect x="24.00" y="0.00" width="4.00" height="100.00" />
@@ -30,23 +30,23 @@
       <rect x="138.00" y="0.00" width="2.00" height="100.00" />
       <rect x="142.00" y="0.00" width="2.00" height="110.00" />
       <rect x="146.00" y="0.00" width="2.00" height="110.00" />
-      <rect x="162.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="162.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="166.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="166.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="174.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="174.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="182.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="182.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="186.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="186.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="192.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="192.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="198.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="198.00" y="19.00" width="4.00" height="91.00" />
-      <text x="48.00" y="118.00" text-anchor="middle"
+      <text x="48.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          1234
       </text>
-      <text x="114.00" y="118.00" text-anchor="middle"
+      <text x="114.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          5670
       </text>
-      <text x="182.00" y="16.00" text-anchor="middle"
+      <text x="182.00" y="15.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          12
       </text>
    </g>

backend/tests/data/svg/ean8_5addon.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="270" height="118" version="1.1"
+<svg width="270" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="270" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="270" height="117" fill="#FFFFFF" />
       <rect x="14.00" y="0.00" width="2.00" height="110.00" />
       <rect x="18.00" y="0.00" width="2.00" height="110.00" />
       <rect x="24.00" y="0.00" width="4.00" height="100.00" />
@@ -30,32 +30,32 @@
       <rect x="138.00" y="0.00" width="2.00" height="100.00" />
       <rect x="142.00" y="0.00" width="2.00" height="110.00" />
       <rect x="146.00" y="0.00" width="2.00" height="110.00" />
-      <rect x="162.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="162.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="166.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="166.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="172.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="172.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="180.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="180.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="186.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="186.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="192.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="192.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="198.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="198.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="204.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="204.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="208.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="208.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="218.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="218.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="222.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="222.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="226.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="226.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="234.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="234.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="240.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="240.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="244.00" y="20.00" width="4.00" height="90.00" />
+      <rect x="244.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="254.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="254.00" y="19.00" width="2.00" height="91.00" />
-      <text x="48.00" y="118.00" text-anchor="middle"
+      <text x="48.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          1234
       </text>
-      <text x="114.00" y="118.00" text-anchor="middle"
+      <text x="114.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          5670
       </text>
-      <text x="210.00" y="16.00" text-anchor="middle"
+      <text x="210.00" y="15.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          12345
       </text>
    </g>

backend/tests/data/svg/ean8_cc_2addon_cca_4x3.svg

@@ -0,0 +1,116 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="226" height="117" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="226" height="117" fill="#FFFFFF" />
+      <rect x="14.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="20.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="28.00" y="0.00" width="10.00" height="4.00" />
+      <rect x="42.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="48.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="52.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="58.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="68.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="80.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="84.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="94.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="102.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="112.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="116.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="124.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="136.00" y="0.00" width="6.00" height="16.00" />
+      <rect x="144.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="150.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="156.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="14.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="20.00" y="4.00" width="12.00" height="4.00" />
+      <rect x="36.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="56.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="68.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="74.00" y="4.00" width="8.00" height="4.00" />
+      <rect x="86.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="90.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="102.00" y="4.00" width="8.00" height="4.00" />
+      <rect x="116.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="122.00" y="4.00" width="8.00" height="4.00" />
+      <rect x="132.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="148.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="14.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="24.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="28.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="8.00" width="4.00" height="8.00" />
+      <rect x="56.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="68.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="72.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="8.00" width="10.00" height="4.00" />
+      <rect x="88.00" y="8.00" width="10.00" height="4.00" />
+      <rect x="102.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="110.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="126.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="148.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="14.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="26.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="34.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="58.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="68.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="76.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="82.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="94.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="102.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="106.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="112.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="128.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="148.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="22.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="154.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="20.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="156.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="22.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="154.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="26.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="34.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="38.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="44.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="50.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="58.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="66.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="72.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="76.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="86.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="90.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="94.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="100.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="108.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="112.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="122.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="132.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="136.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="146.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="150.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="170.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="174.00" y="47.00" width="4.00" height="63.00" />
+      <rect x="180.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="184.00" y="47.00" width="8.00" height="63.00" />
+      <rect x="194.00" y="47.00" width="2.00" height="63.00" />
+      <rect x="198.00" y="47.00" width="6.00" height="63.00" />
+      <rect x="208.00" y="47.00" width="2.00" height="63.00" />
+      <text x="56.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         9876
+      </text>
+      <text x="122.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         5430
+      </text>
+      <text x="190.00" y="43.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         65
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/ean8_cc_5addon_ccb_8x3.svg

@@ -0,0 +1,182 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="300" height="117" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="300" height="117" fill="#FFFFFF" />
+      <rect x="14.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="22.00" y="0.00" width="6.00" height="8.00" />
+      <rect x="30.00" y="0.00" width="2.00" height="32.00" />
+      <rect x="34.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="42.00" y="0.00" width="10.00" height="4.00" />
+      <rect x="54.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="62.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="68.00" y="0.00" width="2.00" height="32.00" />
+      <rect x="78.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="82.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="88.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="100.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="110.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="118.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="122.00" y="0.00" width="10.00" height="4.00" />
+      <rect x="134.00" y="0.00" width="4.00" height="8.00" />
+      <rect x="140.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="146.00" y="0.00" width="8.00" height="4.00" />
+      <rect x="156.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="164.00" y="0.00" width="6.00" height="8.00" />
+      <rect x="172.00" y="0.00" width="2.00" height="32.00" />
+      <rect x="176.00" y="0.00" width="2.00" height="32.00" />
+      <rect x="14.00" y="4.00" width="6.00" height="8.00" />
+      <rect x="34.00" y="4.00" width="4.00" height="8.00" />
+      <rect x="42.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="46.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="60.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="84.00" y="4.00" width="2.00" height="28.00" />
+      <rect x="88.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="98.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="102.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="122.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="140.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="148.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="156.00" y="4.00" width="6.00" height="8.00" />
+      <rect x="24.00" y="8.00" width="4.00" height="8.00" />
+      <rect x="40.00" y="8.00" width="12.00" height="4.00" />
+      <rect x="56.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="62.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="78.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="88.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="92.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="100.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="104.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="122.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="130.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="136.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="142.00" y="8.00" width="12.00" height="4.00" />
+      <rect x="166.00" y="8.00" width="4.00" height="8.00" />
+      <rect x="14.00" y="12.00" width="8.00" height="8.00" />
+      <rect x="34.00" y="12.00" width="6.00" height="8.00" />
+      <rect x="42.00" y="12.00" width="4.00" height="8.00" />
+      <rect x="48.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="58.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="76.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="88.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="100.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="106.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="114.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="122.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="132.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="138.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="144.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="156.00" y="12.00" width="8.00" height="8.00" />
+      <rect x="26.00" y="16.00" width="2.00" height="12.00" />
+      <rect x="48.00" y="16.00" width="6.00" height="4.00" />
+      <rect x="58.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="16.00" width="4.00" height="4.00" />
+      <rect x="88.00" y="16.00" width="6.00" height="12.00" />
+      <rect x="96.00" y="16.00" width="6.00" height="4.00" />
+      <rect x="104.00" y="16.00" width="8.00" height="4.00" />
+      <rect x="116.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="122.00" y="16.00" width="2.00" height="16.00" />
+      <rect x="126.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="132.00" y="16.00" width="8.00" height="4.00" />
+      <rect x="148.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="168.00" y="16.00" width="2.00" height="12.00" />
+      <rect x="14.00" y="20.00" width="6.00" height="4.00" />
+      <rect x="34.00" y="20.00" width="12.00" height="4.00" />
+      <rect x="48.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="52.00" y="20.00" width="4.00" height="4.00" />
+      <rect x="62.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="98.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="102.00" y="20.00" width="12.00" height="4.00" />
+      <rect x="116.00" y="20.00" width="4.00" height="4.00" />
+      <rect x="128.00" y="20.00" width="8.00" height="4.00" />
+      <rect x="144.00" y="20.00" width="4.00" height="4.00" />
+      <rect x="150.00" y="20.00" width="4.00" height="4.00" />
+      <rect x="156.00" y="20.00" width="6.00" height="4.00" />
+      <rect x="14.00" y="24.00" width="4.00" height="8.00" />
+      <rect x="34.00" y="24.00" width="8.00" height="4.00" />
+      <rect x="46.00" y="24.00" width="2.00" height="4.00" />
+      <rect x="54.00" y="24.00" width="2.00" height="4.00" />
+      <rect x="58.00" y="24.00" width="8.00" height="4.00" />
+      <rect x="74.00" y="24.00" width="4.00" height="4.00" />
+      <rect x="98.00" y="24.00" width="8.00" height="4.00" />
+      <rect x="110.00" y="24.00" width="4.00" height="4.00" />
+      <rect x="118.00" y="24.00" width="2.00" height="8.00" />
+      <rect x="128.00" y="24.00" width="6.00" height="4.00" />
+      <rect x="140.00" y="24.00" width="6.00" height="4.00" />
+      <rect x="150.00" y="24.00" width="2.00" height="4.00" />
+      <rect x="156.00" y="24.00" width="4.00" height="8.00" />
+      <rect x="24.00" y="28.00" width="4.00" height="4.00" />
+      <rect x="34.00" y="28.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="28.00" width="4.00" height="4.00" />
+      <rect x="50.00" y="28.00" width="8.00" height="4.00" />
+      <rect x="60.00" y="28.00" width="2.00" height="4.00" />
+      <rect x="74.00" y="28.00" width="6.00" height="4.00" />
+      <rect x="88.00" y="28.00" width="10.00" height="4.00" />
+      <rect x="100.00" y="28.00" width="8.00" height="4.00" />
+      <rect x="110.00" y="28.00" width="6.00" height="4.00" />
+      <rect x="126.00" y="28.00" width="6.00" height="4.00" />
+      <rect x="136.00" y="28.00" width="12.00" height="4.00" />
+      <rect x="152.00" y="28.00" width="2.00" height="4.00" />
+      <rect x="166.00" y="28.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="32.00" width="2.00" height="4.00" />
+      <rect x="174.00" y="32.00" width="2.00" height="4.00" />
+      <rect x="40.00" y="36.00" width="2.00" height="4.00" />
+      <rect x="176.00" y="36.00" width="2.00" height="4.00" />
+      <rect x="42.00" y="40.00" width="2.00" height="70.00" />
+      <rect x="174.00" y="40.00" width="2.00" height="70.00" />
+      <rect x="46.00" y="44.00" width="2.00" height="66.00" />
+      <rect x="54.00" y="44.00" width="2.00" height="56.00" />
+      <rect x="58.00" y="44.00" width="4.00" height="56.00" />
+      <rect x="64.00" y="44.00" width="4.00" height="56.00" />
+      <rect x="70.00" y="44.00" width="6.00" height="56.00" />
+      <rect x="78.00" y="44.00" width="6.00" height="56.00" />
+      <rect x="86.00" y="44.00" width="4.00" height="56.00" />
+      <rect x="92.00" y="44.00" width="2.00" height="56.00" />
+      <rect x="96.00" y="44.00" width="8.00" height="56.00" />
+      <rect x="106.00" y="44.00" width="2.00" height="66.00" />
+      <rect x="110.00" y="44.00" width="2.00" height="66.00" />
+      <rect x="114.00" y="44.00" width="2.00" height="56.00" />
+      <rect x="120.00" y="44.00" width="6.00" height="56.00" />
+      <rect x="128.00" y="44.00" width="2.00" height="56.00" />
+      <rect x="132.00" y="44.00" width="6.00" height="56.00" />
+      <rect x="142.00" y="44.00" width="2.00" height="56.00" />
+      <rect x="152.00" y="44.00" width="2.00" height="56.00" />
+      <rect x="156.00" y="44.00" width="6.00" height="56.00" />
+      <rect x="166.00" y="44.00" width="2.00" height="56.00" />
+      <rect x="170.00" y="44.00" width="2.00" height="66.00" />
+      <rect x="190.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="194.00" y="63.00" width="4.00" height="47.00" />
+      <rect x="200.00" y="63.00" width="6.00" height="47.00" />
+      <rect x="208.00" y="63.00" width="4.00" height="47.00" />
+      <rect x="214.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="220.00" y="63.00" width="6.00" height="47.00" />
+      <rect x="228.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="232.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="240.00" y="63.00" width="4.00" height="47.00" />
+      <rect x="246.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="250.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="254.00" y="63.00" width="4.00" height="47.00" />
+      <rect x="260.00" y="63.00" width="6.00" height="47.00" />
+      <rect x="268.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="272.00" y="63.00" width="2.00" height="47.00" />
+      <rect x="282.00" y="63.00" width="2.00" height="47.00" />
+      <text x="76.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         9876
+      </text>
+      <text x="142.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         5430
+      </text>
+      <text x="238.00" y="59.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         74083
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/gs1_128_cc_fig12.svg

@@ -0,0 +1,252 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="348" height="119" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="348" height="119" fill="#FFFFFF" />
+      <rect x="0.00" y="0.00" width="16.00" height="30.00" />
+      <rect x="18.00" y="0.00" width="2.00" height="32.00" />
+      <rect x="22.00" y="0.00" width="2.00" height="30.00" />
+      <rect x="26.00" y="0.00" width="2.00" height="30.00" />
+      <rect x="34.00" y="0.00" width="8.00" height="6.00" />
+      <rect x="44.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="48.00" y="0.00" width="2.00" height="12.00" />
+      <rect x="52.00" y="0.00" width="8.00" height="6.00" />
+      <rect x="68.00" y="0.00" width="4.00" height="6.00" />
+      <rect x="74.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="78.00" y="0.00" width="6.00" height="6.00" />
+      <rect x="86.00" y="0.00" width="8.00" height="6.00" />
+      <rect x="102.00" y="0.00" width="6.00" height="6.00" />
+      <rect x="110.00" y="0.00" width="10.00" height="6.00" />
+      <rect x="122.00" y="0.00" width="6.00" height="6.00" />
+      <rect x="130.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="136.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="148.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="158.00" y="0.00" width="2.00" height="12.00" />
+      <rect x="166.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="170.00" y="0.00" width="8.00" height="6.00" />
+      <rect x="180.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="184.00" y="0.00" width="4.00" height="6.00" />
+      <rect x="192.00" y="0.00" width="10.00" height="6.00" />
+      <rect x="204.00" y="0.00" width="6.00" height="12.00" />
+      <rect x="212.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="218.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="226.00" y="0.00" width="6.00" height="6.00" />
+      <rect x="238.00" y="0.00" width="2.00" height="12.00" />
+      <rect x="246.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="254.00" y="0.00" width="4.00" height="6.00" />
+      <rect x="266.00" y="0.00" width="4.00" height="6.00" />
+      <rect x="272.00" y="0.00" width="10.00" height="6.00" />
+      <rect x="284.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="288.00" y="0.00" width="2.00" height="6.00" />
+      <rect x="294.00" y="0.00" width="10.00" height="6.00" />
+      <rect x="306.00" y="0.00" width="14.00" height="30.00" />
+      <rect x="322.00" y="0.00" width="2.00" height="30.00" />
+      <rect x="330.00" y="0.00" width="2.00" height="30.00" />
+      <rect x="334.00" y="0.00" width="2.00" height="30.00" />
+      <rect x="340.00" y="0.00" width="2.00" height="30.00" />
+      <rect x="34.00" y="6.00" width="12.00" height="6.00" />
+      <rect x="52.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="60.00" y="6.00" width="6.00" height="6.00" />
+      <rect x="68.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="78.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="84.00" y="6.00" width="8.00" height="6.00" />
+      <rect x="94.00" y="6.00" width="2.00" height="12.00" />
+      <rect x="102.00" y="6.00" width="4.00" height="12.00" />
+      <rect x="110.00" y="6.00" width="8.00" height="6.00" />
+      <rect x="120.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="124.00" y="6.00" width="10.00" height="6.00" />
+      <rect x="136.00" y="6.00" width="8.00" height="6.00" />
+      <rect x="146.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="154.00" y="6.00" width="2.00" height="12.00" />
+      <rect x="170.00" y="6.00" width="10.00" height="6.00" />
+      <rect x="186.00" y="6.00" width="4.00" height="6.00" />
+      <rect x="194.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="198.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="214.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="218.00" y="6.00" width="6.00" height="6.00" />
+      <rect x="230.00" y="6.00" width="4.00" height="6.00" />
+      <rect x="244.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="250.00" y="6.00" width="10.00" height="6.00" />
+      <rect x="262.00" y="6.00" width="4.00" height="6.00" />
+      <rect x="272.00" y="6.00" width="12.00" height="6.00" />
+      <rect x="286.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="290.00" y="6.00" width="2.00" height="6.00" />
+      <rect x="294.00" y="6.00" width="6.00" height="6.00" />
+      <rect x="34.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="38.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="42.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="50.00" y="12.00" width="8.00" height="6.00" />
+      <rect x="68.00" y="12.00" width="4.00" height="6.00" />
+      <rect x="76.00" y="12.00" width="10.00" height="6.00" />
+      <rect x="98.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="108.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="116.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="120.00" y="12.00" width="10.00" height="6.00" />
+      <rect x="136.00" y="12.00" width="6.00" height="6.00" />
+      <rect x="144.00" y="12.00" width="8.00" height="6.00" />
+      <rect x="158.00" y="12.00" width="6.00" height="6.00" />
+      <rect x="170.00" y="12.00" width="4.00" height="12.00" />
+      <rect x="184.00" y="12.00" width="4.00" height="6.00" />
+      <rect x="190.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="194.00" y="12.00" width="8.00" height="12.00" />
+      <rect x="204.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="208.00" y="12.00" width="8.00" height="12.00" />
+      <rect x="220.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="234.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="238.00" y="12.00" width="4.00" height="12.00" />
+      <rect x="250.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="254.00" y="12.00" width="12.00" height="6.00" />
+      <rect x="268.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="272.00" y="12.00" width="6.00" height="20.00" />
+      <rect x="280.00" y="12.00" width="2.00" height="20.00" />
+      <rect x="284.00" y="12.00" width="2.00" height="6.00" />
+      <rect x="292.00" y="12.00" width="12.00" height="6.00" />
+      <rect x="42.00" y="18.00" width="8.00" height="6.00" />
+      <rect x="54.00" y="18.00" width="8.00" height="6.00" />
+      <rect x="68.00" y="18.00" width="8.00" height="6.00" />
+      <rect x="78.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="88.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="92.00" y="18.00" width="8.00" height="6.00" />
+      <rect x="102.00" y="18.00" width="2.00" height="12.00" />
+      <rect x="106.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="110.00" y="18.00" width="10.00" height="6.00" />
+      <rect x="122.00" y="18.00" width="10.00" height="6.00" />
+      <rect x="136.00" y="18.00" width="4.00" height="6.00" />
+      <rect x="142.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="146.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="156.00" y="18.00" width="4.00" height="6.00" />
+      <rect x="176.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="182.00" y="18.00" width="6.00" height="6.00" />
+      <rect x="220.00" y="18.00" width="8.00" height="6.00" />
+      <rect x="230.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="248.00" y="18.00" width="6.00" height="6.00" />
+      <rect x="256.00" y="18.00" width="4.00" height="6.00" />
+      <rect x="262.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="286.00" y="18.00" width="2.00" height="6.00" />
+      <rect x="290.00" y="18.00" width="6.00" height="6.00" />
+      <rect x="34.00" y="24.00" width="6.00" height="6.00" />
+      <rect x="42.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="46.00" y="24.00" width="6.00" height="6.00" />
+      <rect x="60.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="68.00" y="24.00" width="10.00" height="6.00" />
+      <rect x="80.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="84.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="92.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="108.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="118.00" y="24.00" width="8.00" height="6.00" />
+      <rect x="132.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="136.00" y="24.00" width="6.00" height="6.00" />
+      <rect x="154.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="158.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="166.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="170.00" y="24.00" width="8.00" height="8.00" />
+      <rect x="182.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="186.00" y="24.00" width="4.00" height="8.00" />
+      <rect x="196.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="204.00" y="24.00" width="8.00" height="6.00" />
+      <rect x="216.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="220.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="226.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="238.00" y="24.00" width="8.00" height="6.00" />
+      <rect x="248.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="258.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="264.00" y="24.00" width="2.00" height="6.00" />
+      <rect x="284.00" y="24.00" width="6.00" height="6.00" />
+      <rect x="294.00" y="24.00" width="4.00" height="6.00" />
+      <rect x="22.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="32.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="44.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="48.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="56.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="62.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="68.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="76.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="82.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="88.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="96.00" y="30.00" width="6.00" height="2.00" />
+      <rect x="106.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="114.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="120.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="130.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="136.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="144.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="148.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="156.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="162.00" y="30.00" width="6.00" height="2.00" />
+      <rect x="180.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="194.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="200.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="210.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="216.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="224.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="230.00" y="30.00" width="4.00" height="2.00" />
+      <rect x="240.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="246.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="254.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="260.00" y="30.00" width="6.00" height="2.00" />
+      <rect x="268.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="290.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="298.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="306.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="316.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="320.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="326.00" y="30.00" width="6.00" height="2.00" />
+      <rect x="338.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="342.00" y="30.00" width="2.00" height="2.00" />
+      <rect x="14.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="20.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="26.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="36.00" y="32.00" width="8.00" height="68.00" />
+      <rect x="46.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="50.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="58.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="64.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="72.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="80.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="86.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="92.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="102.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="110.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="116.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="124.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="132.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="138.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="146.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="150.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="158.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="168.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="178.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="182.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="190.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="196.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="202.00" y="32.00" width="8.00" height="68.00" />
+      <rect x="212.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="220.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="226.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="234.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="242.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="248.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="256.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="266.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="270.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="278.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="282.00" y="32.00" width="8.00" height="68.00" />
+      <rect x="292.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="300.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="308.00" y="32.00" width="8.00" height="68.00" />
+      <rect x="318.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="322.00" y="32.00" width="4.00" height="68.00" />
+      <rect x="332.00" y="32.00" width="6.00" height="68.00" />
+      <rect x="340.00" y="32.00" width="2.00" height="68.00" />
+      <rect x="344.00" y="32.00" width="4.00" height="68.00" />
+      <text x="174.00" y="115.40" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         (00)030123456789012340
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/postnet_zip.svg

@@ -0,0 +1,44 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="126" height="24" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="126" height="24" fill="#FFFFFF" />
+      <rect x="0.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="16.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="20.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="32.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="40.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="52.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="56.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="68.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="80.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="88.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="96.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="108.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="116.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="124.00" y="0.00" width="2.00" height="24.00" />
+      <rect x="4.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="8.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="12.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="24.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="28.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="36.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="44.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="48.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="60.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="64.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="72.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="76.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="84.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="92.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="100.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="104.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="112.00" y="12.00" width="2.00" height="12.00" />
+      <rect x="120.00" y="12.00" width="2.00" height="12.00" />
+   </g>
+</svg>

backend/tests/data/svg/upca_2addon_ggs_5.2.6.6-5.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="276" height="118" version="1.1"
+<svg width="276" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="276" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="276" height="117" fill="#FFFFFF" />
       <rect x="18.00" y="0.00" width="2.00" height="110.00" />
       <rect x="22.00" y="0.00" width="2.00" height="110.00" />
       <rect x="30.00" y="0.00" width="4.00" height="110.00" />
@@ -38,31 +38,31 @@
       <rect x="194.00" y="0.00" width="6.00" height="110.00" />
       <rect x="202.00" y="0.00" width="2.00" height="110.00" />
       <rect x="206.00" y="0.00" width="2.00" height="110.00" />
-      <rect x="226.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="226.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="230.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="230.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="238.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="238.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="244.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="244.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="250.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="250.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="254.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="254.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="262.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="262.00" y="19.00" width="4.00" height="81.00" />
-      <text x="8.00" y="114.00" text-anchor="middle"
+      <text x="8.00" y="116.00" text-anchor="end"
-         font-family="Helvetica" font-size="16.0" >
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          0
       </text>
-      <text x="72.00" y="118.00" text-anchor="middle"
+      <text x="72.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          12345
       </text>
-      <text x="154.00" y="118.00" text-anchor="middle"
+      <text x="152.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          67890
       </text>
-      <text x="218.00" y="114.00" text-anchor="middle"
+      <text x="218.00" y="116.00" text-anchor="start"
-         font-family="Helvetica" font-size="16.0" >
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          5
       </text>
-      <text x="250.00" y="16.00" text-anchor="middle"
+      <text x="246.00" y="15.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          24
       </text>
    </g>

backend/tests/data/svg/upca_5addon.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="330" height="118" version="1.1"
+<svg width="330" height="117" version="1.1"
    xmlns="http://www.w3.org/2000/svg">
    <desc>Zint Generated Symbol
    </desc>
 
    <g id="barcode" fill="#000000">
-      <rect x="0" y="0" width="330" height="118" fill="#FFFFFF" />
+      <rect x="0" y="0" width="330" height="117" fill="#FFFFFF" />
       <rect x="18.00" y="0.00" width="2.00" height="110.00" />
       <rect x="22.00" y="0.00" width="2.00" height="110.00" />
       <rect x="26.00" y="0.00" width="2.00" height="110.00" />
@@ -38,40 +38,40 @@
       <rect x="196.00" y="0.00" width="2.00" height="110.00" />
       <rect x="202.00" y="0.00" width="2.00" height="110.00" />
       <rect x="206.00" y="0.00" width="2.00" height="110.00" />
-      <rect x="226.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="226.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="230.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="230.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="236.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="236.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="244.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="244.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="250.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="250.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="256.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="256.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="262.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="262.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="268.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="268.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="272.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="272.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="282.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="282.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="286.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="286.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="290.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="290.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="298.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="298.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="304.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="304.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="308.00" y="20.00" width="4.00" height="80.00" />
+      <rect x="308.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="318.00" y="20.00" width="2.00" height="80.00" />
+      <rect x="318.00" y="19.00" width="2.00" height="81.00" />
-      <text x="8.00" y="114.00" text-anchor="middle"
+      <text x="8.00" y="116.00" text-anchor="end"
-         font-family="Helvetica" font-size="16.0" >
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          6
       </text>
-      <text x="72.00" y="118.00" text-anchor="middle"
+      <text x="72.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          14141
       </text>
-      <text x="154.00" y="118.00" text-anchor="middle"
+      <text x="152.00" y="116.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          23441
       </text>
-      <text x="218.00" y="114.00" text-anchor="middle"
+      <text x="218.00" y="116.00" text-anchor="start"
-         font-family="Helvetica" font-size="16.0" >
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          7
       </text>
-      <text x="278.00" y="16.00" text-anchor="middle"
+      <text x="274.00" y="15.00" text-anchor="middle"
-         font-family="Helvetica" font-size="22.0" >
+         font-family="Helvetica, sans-serif" font-size="20.0" >
          12345
       </text>
    </g>

backend/tests/data/svg/upca_5addon_bind3.svg

@@ -0,0 +1,80 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="129" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="330" height="129" fill="#FFFFFF" />
+      <rect x="18.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="22.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="26.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="30.00" y="6.00" width="8.00" height="110.00" />
+      <rect x="42.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="50.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="54.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="62.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="70.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="78.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="82.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="90.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="98.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="106.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="110.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="114.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="118.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="124.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="132.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="142.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="146.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="150.00" y="6.00" width="6.00" height="100.00" />
+      <rect x="160.00" y="6.00" width="2.00" height="100.00" />
+      <rect x="164.00" y="6.00" width="6.00" height="100.00" />
+      <rect x="174.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="182.00" y="6.00" width="4.00" height="100.00" />
+      <rect x="188.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="196.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="202.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="206.00" y="6.00" width="2.00" height="110.00" />
+      <rect x="226.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="230.00" y="25.00" width="4.00" height="81.00" />
+      <rect x="236.00" y="25.00" width="4.00" height="81.00" />
+      <rect x="244.00" y="25.00" width="4.00" height="81.00" />
+      <rect x="250.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="256.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="262.00" y="25.00" width="4.00" height="81.00" />
+      <rect x="268.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="272.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="282.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="286.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="290.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="298.00" y="25.00" width="4.00" height="81.00" />
+      <rect x="304.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="308.00" y="25.00" width="4.00" height="81.00" />
+      <rect x="318.00" y="25.00" width="2.00" height="81.00" />
+      <rect x="0.00" y="0.00" width="330.00" height="6.00" />
+      <rect x="0.00" y="106.00" width="330.00" height="6.00" />
+      <text x="8.00" y="128.00" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         6
+      </text>
+      <text x="72.00" y="128.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         14141
+      </text>
+      <text x="152.00" y="128.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         23441
+      </text>
+      <text x="218.00" y="128.00" text-anchor="start"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         7
+      </text>
+      <text x="274.00" y="21.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         12345
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/upca_5addon_small_bold.svg

@@ -0,0 +1,78 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="330" height="112" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="330" height="112" fill="#FFFFFF" />
+      <rect x="18.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="22.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="26.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="30.00" y="0.00" width="8.00" height="110.00" />
+      <rect x="42.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="50.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="54.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="62.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="70.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="78.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="82.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="90.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="98.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="106.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="110.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="114.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="118.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="124.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="132.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="142.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="146.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="150.00" y="0.00" width="6.00" height="100.00" />
+      <rect x="160.00" y="0.00" width="2.00" height="100.00" />
+      <rect x="164.00" y="0.00" width="6.00" height="100.00" />
+      <rect x="174.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="182.00" y="0.00" width="4.00" height="100.00" />
+      <rect x="188.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="196.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="202.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="206.00" y="0.00" width="2.00" height="110.00" />
+      <rect x="226.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="230.00" y="13.00" width="4.00" height="87.00" />
+      <rect x="236.00" y="13.00" width="4.00" height="87.00" />
+      <rect x="244.00" y="13.00" width="4.00" height="87.00" />
+      <rect x="250.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="256.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="262.00" y="13.00" width="4.00" height="87.00" />
+      <rect x="268.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="272.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="282.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="286.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="290.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="298.00" y="13.00" width="4.00" height="87.00" />
+      <rect x="304.00" y="13.00" width="2.00" height="87.00" />
+      <rect x="308.00" y="13.00" width="4.00" height="87.00" />
+      <rect x="318.00" y="13.00" width="2.00" height="87.00" />
+      <text x="8.00" y="111.50" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="12.0" font-weight="bold" >
+         6
+      </text>
+      <text x="72.00" y="111.50" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+         14141
+      </text>
+      <text x="152.00" y="111.50" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+         23441
+      </text>
+      <text x="218.00" y="111.50" text-anchor="start"
+         font-family="Helvetica, sans-serif" font-size="12.0" font-weight="bold" >
+         7
+      </text>
+      <text x="274.00" y="10.50" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+         12345
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/upca_cc_2addon_cca_3x4.svg

@@ -0,0 +1,134 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="284" height="117" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="284" height="117" fill="#FFFFFF" />
+      <rect x="18.00" y="0.00" width="4.00" height="12.00" />
+      <rect x="24.00" y="0.00" width="4.00" height="12.00" />
+      <rect x="30.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="38.00" y="0.00" width="8.00" height="4.00" />
+      <rect x="50.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="56.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="62.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="72.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="84.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="96.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="106.00" y="0.00" width="2.00" height="12.00" />
+      <rect x="112.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="120.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="126.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="130.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="138.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="148.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="160.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="174.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="180.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="186.00" y="0.00" width="6.00" height="12.00" />
+      <rect x="194.00" y="0.00" width="4.00" height="8.00" />
+      <rect x="200.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="210.00" y="0.00" width="2.00" height="12.00" />
+      <rect x="214.00" y="0.00" width="2.00" height="12.00" />
+      <rect x="30.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="38.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="48.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="58.00" y="4.00" width="8.00" height="4.00" />
+      <rect x="68.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="72.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="84.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="92.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="102.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="112.00" y="4.00" width="4.00" height="8.00" />
+      <rect x="126.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="134.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="138.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="146.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="160.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="166.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="170.00" y="4.00" width="12.00" height="4.00" />
+      <rect x="202.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="30.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="38.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="48.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="60.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="72.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="86.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="100.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="120.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="126.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="134.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="148.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="152.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="160.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="166.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="178.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="194.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="24.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="212.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="22.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="214.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="24.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="212.00" y="20.00" width="2.00" height="90.00" />
+      <rect x="28.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="34.00" y="24.00" width="4.00" height="86.00" />
+      <rect x="42.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="48.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="54.00" y="24.00" width="4.00" height="76.00" />
+      <rect x="60.00" y="24.00" width="8.00" height="76.00" />
+      <rect x="70.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="74.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="82.00" y="24.00" width="4.00" height="76.00" />
+      <rect x="88.00" y="24.00" width="4.00" height="76.00" />
+      <rect x="98.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="102.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="106.00" y="24.00" width="8.00" height="76.00" />
+      <rect x="116.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="120.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="124.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="132.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="138.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="144.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="152.00" y="24.00" width="6.00" height="76.00" />
+      <rect x="160.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="166.00" y="24.00" width="6.00" height="76.00" />
+      <rect x="176.00" y="24.00" width="2.00" height="76.00" />
+      <rect x="180.00" y="24.00" width="4.00" height="76.00" />
+      <rect x="188.00" y="24.00" width="4.00" height="76.00" />
+      <rect x="194.00" y="24.00" width="4.00" height="86.00" />
+      <rect x="200.00" y="24.00" width="4.00" height="86.00" />
+      <rect x="208.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="232.00" y="43.00" width="2.00" height="57.00" />
+      <rect x="236.00" y="43.00" width="4.00" height="57.00" />
+      <rect x="244.00" y="43.00" width="4.00" height="57.00" />
+      <rect x="252.00" y="43.00" width="2.00" height="57.00" />
+      <rect x="256.00" y="43.00" width="2.00" height="57.00" />
+      <rect x="262.00" y="43.00" width="2.00" height="57.00" />
+      <rect x="268.00" y="43.00" width="4.00" height="57.00" />
+      <text x="14.00" y="116.00" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         1
+      </text>
+      <text x="78.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         23456
+      </text>
+      <text x="158.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         78901
+      </text>
+      <text x="224.00" y="116.00" text-anchor="start"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         2
+      </text>
+      <text x="252.00" y="39.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         12
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/upca_cc_5addon_ccb_4x4.svg

@@ -0,0 +1,158 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="338" height="117" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="338" height="117" fill="#FFFFFF" />
+      <rect x="18.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="24.00" y="0.00" width="2.00" height="20.00" />
+      <rect x="30.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="38.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="46.00" y="0.00" width="10.00" height="4.00" />
+      <rect x="58.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="64.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="72.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="78.00" y="0.00" width="12.00" height="4.00" />
+      <rect x="92.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="96.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="106.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="112.00" y="0.00" width="6.00" height="8.00" />
+      <rect x="120.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="126.00" y="0.00" width="4.00" height="8.00" />
+      <rect x="132.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="142.00" y="0.00" width="8.00" height="4.00" />
+      <rect x="152.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="160.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="168.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="172.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="186.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="194.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="200.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="206.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="214.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="30.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="50.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="56.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="72.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="88.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="102.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="120.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="132.00" y="4.00" width="12.00" height="4.00" />
+      <rect x="148.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="154.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="160.00" y="4.00" width="6.00" height="8.00" />
+      <rect x="174.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="188.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="204.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="32.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="38.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="48.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="54.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="64.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="72.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="80.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="92.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="96.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="112.00" y="8.00" width="4.00" height="8.00" />
+      <rect x="126.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="132.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="142.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="152.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="172.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="180.00" y="8.00" width="2.00" height="8.00" />
+      <rect x="204.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="32.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="38.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="48.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="52.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="68.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="72.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="80.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="86.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="96.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="120.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="126.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="142.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="146.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="150.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="160.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="174.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="184.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="204.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="212.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="22.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="214.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="24.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="212.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="28.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="34.00" y="28.00" width="4.00" height="82.00" />
+      <rect x="42.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="48.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="54.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="60.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="70.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="74.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="82.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="88.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="98.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="102.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="106.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="116.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="120.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="124.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="132.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="138.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="144.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="152.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="160.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="166.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="176.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="180.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="188.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="194.00" y="28.00" width="4.00" height="82.00" />
+      <rect x="200.00" y="28.00" width="4.00" height="82.00" />
+      <rect x="208.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="232.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="236.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="244.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="252.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="256.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="262.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="268.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="274.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="278.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="286.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="292.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="298.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="304.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="310.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="316.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="324.00" y="47.00" width="2.00" height="53.00" />
+      <text x="14.00" y="116.00" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         1
+      </text>
+      <text x="78.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         23456
+      </text>
+      <text x="158.00" y="116.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         78901
+      </text>
+      <text x="224.00" y="116.00" text-anchor="start"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         2
+      </text>
+      <text x="280.00" y="43.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         12121
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/upca_cc_5addon_ccb_4x4_bind3.svg

@@ -0,0 +1,160 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="338" height="129" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="338" height="129" fill="#FFFFFF" />
+      <rect x="18.00" y="6.00" width="4.00" height="16.00" />
+      <rect x="24.00" y="6.00" width="2.00" height="20.00" />
+      <rect x="30.00" y="6.00" width="6.00" height="4.00" />
+      <rect x="38.00" y="6.00" width="2.00" height="8.00" />
+      <rect x="46.00" y="6.00" width="10.00" height="4.00" />
+      <rect x="58.00" y="6.00" width="2.00" height="4.00" />
+      <rect x="64.00" y="6.00" width="6.00" height="4.00" />
+      <rect x="72.00" y="6.00" width="4.00" height="4.00" />
+      <rect x="78.00" y="6.00" width="12.00" height="4.00" />
+      <rect x="92.00" y="6.00" width="2.00" height="4.00" />
+      <rect x="96.00" y="6.00" width="6.00" height="4.00" />
+      <rect x="106.00" y="6.00" width="2.00" height="16.00" />
+      <rect x="112.00" y="6.00" width="6.00" height="8.00" />
+      <rect x="120.00" y="6.00" width="4.00" height="4.00" />
+      <rect x="126.00" y="6.00" width="4.00" height="8.00" />
+      <rect x="132.00" y="6.00" width="2.00" height="4.00" />
+      <rect x="142.00" y="6.00" width="8.00" height="4.00" />
+      <rect x="152.00" y="6.00" width="4.00" height="4.00" />
+      <rect x="160.00" y="6.00" width="4.00" height="4.00" />
+      <rect x="168.00" y="6.00" width="2.00" height="8.00" />
+      <rect x="172.00" y="6.00" width="6.00" height="4.00" />
+      <rect x="186.00" y="6.00" width="2.00" height="4.00" />
+      <rect x="194.00" y="6.00" width="4.00" height="16.00" />
+      <rect x="200.00" y="6.00" width="2.00" height="16.00" />
+      <rect x="206.00" y="6.00" width="2.00" height="4.00" />
+      <rect x="214.00" y="6.00" width="2.00" height="16.00" />
+      <rect x="30.00" y="10.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="10.00" width="4.00" height="4.00" />
+      <rect x="50.00" y="10.00" width="2.00" height="4.00" />
+      <rect x="56.00" y="10.00" width="6.00" height="4.00" />
+      <rect x="72.00" y="10.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="10.00" width="10.00" height="4.00" />
+      <rect x="88.00" y="10.00" width="4.00" height="4.00" />
+      <rect x="102.00" y="10.00" width="2.00" height="4.00" />
+      <rect x="120.00" y="10.00" width="2.00" height="8.00" />
+      <rect x="132.00" y="10.00" width="12.00" height="4.00" />
+      <rect x="148.00" y="10.00" width="4.00" height="4.00" />
+      <rect x="154.00" y="10.00" width="2.00" height="4.00" />
+      <rect x="160.00" y="10.00" width="6.00" height="8.00" />
+      <rect x="174.00" y="10.00" width="10.00" height="4.00" />
+      <rect x="188.00" y="10.00" width="2.00" height="8.00" />
+      <rect x="204.00" y="10.00" width="4.00" height="4.00" />
+      <rect x="32.00" y="14.00" width="2.00" height="4.00" />
+      <rect x="38.00" y="14.00" width="6.00" height="4.00" />
+      <rect x="48.00" y="14.00" width="4.00" height="4.00" />
+      <rect x="54.00" y="14.00" width="2.00" height="4.00" />
+      <rect x="64.00" y="14.00" width="4.00" height="4.00" />
+      <rect x="72.00" y="14.00" width="4.00" height="4.00" />
+      <rect x="80.00" y="14.00" width="2.00" height="4.00" />
+      <rect x="92.00" y="14.00" width="2.00" height="4.00" />
+      <rect x="96.00" y="14.00" width="4.00" height="4.00" />
+      <rect x="112.00" y="14.00" width="4.00" height="8.00" />
+      <rect x="126.00" y="14.00" width="2.00" height="4.00" />
+      <rect x="132.00" y="14.00" width="8.00" height="4.00" />
+      <rect x="142.00" y="14.00" width="8.00" height="4.00" />
+      <rect x="152.00" y="14.00" width="2.00" height="4.00" />
+      <rect x="172.00" y="14.00" width="6.00" height="4.00" />
+      <rect x="180.00" y="14.00" width="2.00" height="8.00" />
+      <rect x="204.00" y="14.00" width="6.00" height="4.00" />
+      <rect x="32.00" y="18.00" width="4.00" height="4.00" />
+      <rect x="38.00" y="18.00" width="4.00" height="4.00" />
+      <rect x="48.00" y="18.00" width="2.00" height="4.00" />
+      <rect x="52.00" y="18.00" width="6.00" height="4.00" />
+      <rect x="68.00" y="18.00" width="2.00" height="4.00" />
+      <rect x="72.00" y="18.00" width="6.00" height="4.00" />
+      <rect x="80.00" y="18.00" width="4.00" height="4.00" />
+      <rect x="86.00" y="18.00" width="6.00" height="4.00" />
+      <rect x="96.00" y="18.00" width="2.00" height="4.00" />
+      <rect x="120.00" y="18.00" width="4.00" height="4.00" />
+      <rect x="126.00" y="18.00" width="10.00" height="4.00" />
+      <rect x="142.00" y="18.00" width="2.00" height="4.00" />
+      <rect x="146.00" y="18.00" width="2.00" height="4.00" />
+      <rect x="150.00" y="18.00" width="4.00" height="4.00" />
+      <rect x="160.00" y="18.00" width="8.00" height="4.00" />
+      <rect x="174.00" y="18.00" width="2.00" height="4.00" />
+      <rect x="184.00" y="18.00" width="2.00" height="4.00" />
+      <rect x="204.00" y="18.00" width="8.00" height="4.00" />
+      <rect x="212.00" y="22.00" width="2.00" height="4.00" />
+      <rect x="22.00" y="26.00" width="2.00" height="4.00" />
+      <rect x="214.00" y="26.00" width="2.00" height="4.00" />
+      <rect x="24.00" y="30.00" width="2.00" height="86.00" />
+      <rect x="212.00" y="30.00" width="2.00" height="86.00" />
+      <rect x="28.00" y="34.00" width="2.00" height="82.00" />
+      <rect x="34.00" y="34.00" width="4.00" height="82.00" />
+      <rect x="42.00" y="34.00" width="2.00" height="82.00" />
+      <rect x="48.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="54.00" y="34.00" width="4.00" height="72.00" />
+      <rect x="60.00" y="34.00" width="8.00" height="72.00" />
+      <rect x="70.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="74.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="82.00" y="34.00" width="4.00" height="72.00" />
+      <rect x="88.00" y="34.00" width="4.00" height="72.00" />
+      <rect x="98.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="102.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="106.00" y="34.00" width="8.00" height="72.00" />
+      <rect x="116.00" y="34.00" width="2.00" height="82.00" />
+      <rect x="120.00" y="34.00" width="2.00" height="82.00" />
+      <rect x="124.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="132.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="138.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="144.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="152.00" y="34.00" width="6.00" height="72.00" />
+      <rect x="160.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="166.00" y="34.00" width="6.00" height="72.00" />
+      <rect x="176.00" y="34.00" width="2.00" height="72.00" />
+      <rect x="180.00" y="34.00" width="4.00" height="72.00" />
+      <rect x="188.00" y="34.00" width="4.00" height="72.00" />
+      <rect x="194.00" y="34.00" width="4.00" height="82.00" />
+      <rect x="200.00" y="34.00" width="4.00" height="82.00" />
+      <rect x="208.00" y="34.00" width="2.00" height="82.00" />
+      <rect x="232.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="236.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="244.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="252.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="256.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="262.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="268.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="274.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="278.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="286.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="292.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="298.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="304.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="310.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="316.00" y="53.00" width="4.00" height="53.00" />
+      <rect x="324.00" y="53.00" width="2.00" height="53.00" />
+      <rect x="0.00" y="0.00" width="338.00" height="6.00" />
+      <rect x="0.00" y="106.00" width="338.00" height="6.00" />
+      <text x="14.00" y="128.00" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         1
+      </text>
+      <text x="78.00" y="128.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         23456
+      </text>
+      <text x="158.00" y="128.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         78901
+      </text>
+      <text x="224.00" y="128.00" text-anchor="start"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
+         2
+      </text>
+      <text x="280.00" y="49.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" >
+         12121
+      </text>
+   </g>
+</svg>

backend/tests/data/svg/upca_cc_5addon_ccb_4x4_notext.svg

@@ -0,0 +1,138 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="338" height="110" version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+   <desc>Zint Generated Symbol
+   </desc>
+
+   <g id="barcode" fill="#000000">
+      <rect x="0" y="0" width="338" height="110" fill="#FFFFFF" />
+      <rect x="18.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="24.00" y="0.00" width="2.00" height="20.00" />
+      <rect x="30.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="38.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="46.00" y="0.00" width="10.00" height="4.00" />
+      <rect x="58.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="64.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="72.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="78.00" y="0.00" width="12.00" height="4.00" />
+      <rect x="92.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="96.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="106.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="112.00" y="0.00" width="6.00" height="8.00" />
+      <rect x="120.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="126.00" y="0.00" width="4.00" height="8.00" />
+      <rect x="132.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="142.00" y="0.00" width="8.00" height="4.00" />
+      <rect x="152.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="160.00" y="0.00" width="4.00" height="4.00" />
+      <rect x="168.00" y="0.00" width="2.00" height="8.00" />
+      <rect x="172.00" y="0.00" width="6.00" height="4.00" />
+      <rect x="186.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="194.00" y="0.00" width="4.00" height="16.00" />
+      <rect x="200.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="206.00" y="0.00" width="2.00" height="4.00" />
+      <rect x="214.00" y="0.00" width="2.00" height="16.00" />
+      <rect x="30.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="42.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="50.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="56.00" y="4.00" width="6.00" height="4.00" />
+      <rect x="72.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="76.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="88.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="102.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="120.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="132.00" y="4.00" width="12.00" height="4.00" />
+      <rect x="148.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="154.00" y="4.00" width="2.00" height="4.00" />
+      <rect x="160.00" y="4.00" width="6.00" height="8.00" />
+      <rect x="174.00" y="4.00" width="10.00" height="4.00" />
+      <rect x="188.00" y="4.00" width="2.00" height="8.00" />
+      <rect x="204.00" y="4.00" width="4.00" height="4.00" />
+      <rect x="32.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="38.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="48.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="54.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="64.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="72.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="80.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="92.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="96.00" y="8.00" width="4.00" height="4.00" />
+      <rect x="112.00" y="8.00" width="4.00" height="8.00" />
+      <rect x="126.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="132.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="142.00" y="8.00" width="8.00" height="4.00" />
+      <rect x="152.00" y="8.00" width="2.00" height="4.00" />
+      <rect x="172.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="180.00" y="8.00" width="2.00" height="8.00" />
+      <rect x="204.00" y="8.00" width="6.00" height="4.00" />
+      <rect x="32.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="38.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="48.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="52.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="68.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="72.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="80.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="86.00" y="12.00" width="6.00" height="4.00" />
+      <rect x="96.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="120.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="126.00" y="12.00" width="10.00" height="4.00" />
+      <rect x="142.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="146.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="150.00" y="12.00" width="4.00" height="4.00" />
+      <rect x="160.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="174.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="184.00" y="12.00" width="2.00" height="4.00" />
+      <rect x="204.00" y="12.00" width="8.00" height="4.00" />
+      <rect x="212.00" y="16.00" width="2.00" height="4.00" />
+      <rect x="22.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="214.00" y="20.00" width="2.00" height="4.00" />
+      <rect x="24.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="212.00" y="24.00" width="2.00" height="86.00" />
+      <rect x="28.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="34.00" y="28.00" width="4.00" height="82.00" />
+      <rect x="42.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="48.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="54.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="60.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="70.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="74.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="82.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="88.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="98.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="102.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="106.00" y="28.00" width="8.00" height="72.00" />
+      <rect x="116.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="120.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="124.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="132.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="138.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="144.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="152.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="160.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="166.00" y="28.00" width="6.00" height="72.00" />
+      <rect x="176.00" y="28.00" width="2.00" height="72.00" />
+      <rect x="180.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="188.00" y="28.00" width="4.00" height="72.00" />
+      <rect x="194.00" y="28.00" width="4.00" height="82.00" />
+      <rect x="200.00" y="28.00" width="4.00" height="82.00" />
+      <rect x="208.00" y="28.00" width="2.00" height="82.00" />
+      <rect x="232.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="236.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="244.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="252.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="256.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="262.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="268.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="274.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="278.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="286.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="292.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="298.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="304.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="310.00" y="47.00" width="2.00" height="53.00" />
+      <rect x="316.00" y="47.00" width="4.00" height="53.00" />
+      <rect x="324.00" y="47.00" width="2.00" height="53.00" />
+   </g>
+</svg>