- Add text_gap option to allow adjustment of vertical gap between

barcode and text
- EMF/EPS/SVG/GUI: ignore BOLD_TEXT for EAN/UPC
- DAFT: up max to 250 chars
- EMF/EPS/SVG: fix addon bars placement/length when text hidden
- Qt backend: use `QFontMetrics::horizontalAdvance()` rather than
  `boundingRect()` to calc text width (seems to be more accurate)
- library: make printf/sprintf() format arg always literal string
- output: fix errtxt nos clash;
  use array for `out_upcean_split_text()` text parts
- raster/vector: smallify addon text printing logic
- frontend: warn if output file and direct options both given;
  add TODO note about `CommandLineToArgvW()` loading shell32.dll
- manual: put HRT options in own section

backend/tests/data/eps/code128_egrave_bold.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 224 119
@@ -84,7 +84,7 @@ end
 matrix currentmatrix
 /Helvetica-ISOLatin1 findfont
 14.00 scalefont setfont
- 0 0 moveto 112.00 3.50 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 112.00 4.90 translate 0.00 rotate 0 0 moveto
  (Égjpqy) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/code128_egrave_bold_rotate_90.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 119 224
@@ -84,7 +84,7 @@ end
 matrix currentmatrix
 /Helvetica-ISOLatin1 findfont
 14.00 scalefont setfont
- 0 0 moveto 3.50 112.00 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 4.90 112.00 translate 0.00 rotate 0 0 moveto
  (Égjpqy) stringwidth
 gsave
 270 rotate

backend/tests/data/eps/code128_escape_latin1.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 246 119
@@ -90,7 +90,7 @@ end
 matrix currentmatrix
 /Helvetica-ISOLatin1 findfont
 14.00 scalefont setfont
- 0 0 moveto 123.00 3.50 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 123.00 4.90 translate 0.00 rotate 0 0 moveto
  (A\\B\)ç\(D) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/code39_fg_bg.eps

@@ -65,7 +65,7 @@ TE
 matrix currentmatrix
 /Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 64.00 3.50 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 64.00 4.90 translate 0.00 rotate 0 0 moveto
  (*123*) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/code39_fgalpha_bg_cmyk.eps

@@ -65,7 +65,7 @@ TE
 matrix currentmatrix
 /Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 64.00 3.50 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 64.00 4.90 translate 0.00 rotate 0 0 moveto
  (*123*) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/code39_nobg_cmyk.eps

@@ -62,7 +62,7 @@ TE
 matrix currentmatrix
 /Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 64.00 3.50 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 64.00 4.90 translate 0.00 rotate 0 0 moveto
  (*123*) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/dbar_ltd_24724_fig7_bold.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 158 119
@@ -61,7 +61,7 @@ TE
 matrix currentmatrix
 /Helvetica-Bold findfont
 14.00 scalefont setfont
- 0 0 moveto 79.00 3.50 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 79.00 4.90 translate 0.00 rotate 0 0 moveto
  (\(01\)15012345678907) stringwidth
 pop
 -2 div 0 rmoveto

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 276 117
@@ -9,87 +9,87 @@
 /TE { pop pop } bind def
 newpath
 1.00 1.00 1.00 setrgbcolor
-116.40 0.00 TB 0.00 276.00 TR
+116.90 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
+110.00 6.90 TB 22.00 2.00 TR
 TE
-110.00 6.40 TB 26.00 2.00 TR
+110.00 6.90 TB 26.00 2.00 TR
 TE
-100.00 16.40 TB 30.00 6.00 TR
+100.00 16.90 TB 30.00 6.00 TR
 TE
-100.00 16.40 TB 38.00 4.00 TR
+100.00 16.90 TB 38.00 4.00 TR
 TE
-100.00 16.40 TB 46.00 2.00 TR
+100.00 16.90 TB 46.00 2.00 TR
 TE
-100.00 16.40 TB 54.00 2.00 TR
+100.00 16.90 TB 54.00 2.00 TR
 TE
-100.00 16.40 TB 58.00 4.00 TR
+100.00 16.90 TB 58.00 4.00 TR
 TE
-100.00 16.40 TB 66.00 4.00 TR
+100.00 16.90 TB 66.00 4.00 TR
 TE
-100.00 16.40 TB 72.00 8.00 TR
+100.00 16.90 TB 72.00 8.00 TR
 TE
-100.00 16.40 TB 82.00 2.00 TR
+100.00 16.90 TB 82.00 2.00 TR
 TE
-100.00 16.40 TB 90.00 2.00 TR
+100.00 16.90 TB 90.00 2.00 TR
 TE
-100.00 16.40 TB 96.00 2.00 TR
+100.00 16.90 TB 96.00 2.00 TR
 TE
-100.00 16.40 TB 100.00 2.00 TR
+100.00 16.90 TB 100.00 2.00 TR
 TE
-100.00 16.40 TB 108.00 4.00 TR
+100.00 16.90 TB 108.00 4.00 TR
 TE
-110.00 6.40 TB 114.00 2.00 TR
+110.00 6.90 TB 114.00 2.00 TR
 TE
-110.00 6.40 TB 118.00 2.00 TR
+110.00 6.90 TB 118.00 2.00 TR
 TE
-100.00 16.40 TB 122.00 2.00 TR
+100.00 16.90 TB 122.00 2.00 TR
 TE
-100.00 16.40 TB 128.00 6.00 TR
+100.00 16.90 TB 128.00 6.00 TR
 TE
-100.00 16.40 TB 136.00 4.00 TR
+100.00 16.90 TB 136.00 4.00 TR
 TE
-100.00 16.40 TB 142.00 4.00 TR
+100.00 16.90 TB 142.00 4.00 TR
 TE
-100.00 16.40 TB 150.00 2.00 TR
+100.00 16.90 TB 150.00 2.00 TR
 TE
-100.00 16.40 TB 154.00 6.00 TR
+100.00 16.90 TB 154.00 6.00 TR
 TE
-100.00 16.40 TB 164.00 6.00 TR
+100.00 16.90 TB 164.00 6.00 TR
 TE
-100.00 16.40 TB 174.00 2.00 TR
+100.00 16.90 TB 174.00 2.00 TR
 TE
-100.00 16.40 TB 178.00 4.00 TR
+100.00 16.90 TB 178.00 4.00 TR
 TE
-100.00 16.40 TB 186.00 4.00 TR
+100.00 16.90 TB 186.00 4.00 TR
 TE
-100.00 16.40 TB 192.00 2.00 TR
+100.00 16.90 TB 192.00 2.00 TR
 TE
-100.00 16.40 TB 200.00 2.00 TR
+100.00 16.90 TB 200.00 2.00 TR
 TE
-110.00 6.40 TB 206.00 2.00 TR
+110.00 6.90 TB 206.00 2.00 TR
 TE
-110.00 6.40 TB 210.00 2.00 TR
+110.00 6.90 TB 210.00 2.00 TR
 TE
-91.00 6.40 TB 226.00 2.00 TR
+93.10 6.90 TB 226.00 2.00 TR
 TE
-91.00 6.40 TB 230.00 4.00 TR
+93.10 6.90 TB 230.00 4.00 TR
 TE
-91.00 6.40 TB 238.00 4.00 TR
+93.10 6.90 TB 238.00 4.00 TR
 TE
-91.00 6.40 TB 246.00 2.00 TR
+93.10 6.90 TB 246.00 2.00 TR
 TE
-91.00 6.40 TB 250.00 2.00 TR
+93.10 6.90 TB 250.00 2.00 TR
 TE
-91.00 6.40 TB 256.00 2.00 TR
+93.10 6.90 TB 256.00 2.00 TR
 TE
-91.00 6.40 TB 262.00 4.00 TR
+93.10 6.90 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
+ 0 0 moveto 12.20 0.80 translate 0.00 rotate 0 0 moveto
  (9) stringwidth
 pop
 neg 0 rmoveto
@@ -98,7 +98,7 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 20.00 scalefont setfont
- 0 0 moveto 70.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 71.00 0.80 translate 0.00 rotate 0 0 moveto
  (771384) stringwidth
 pop
 -2 div 0 rmoveto
@@ -107,7 +107,7 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 20.00 scalefont setfont
- 0 0 moveto 164.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 163.00 0.80 translate 0.00 rotate 0 0 moveto
  (524017) stringwidth
 pop
 -2 div 0 rmoveto
@@ -116,7 +116,7 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 20.00 scalefont setfont
- 0 0 moveto 246.00 101.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 246.00 101.90 translate 0.00 rotate 0 0 moveto
  (12) stringwidth
 pop
 -2 div 0 rmoveto

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 276 117
@@ -9,87 +9,87 @@
 /TE { pop pop } bind def
 newpath
 1.00 1.00 1.00 setrgbcolor
-116.40 0.00 TB 0.00 276.00 TR
+116.90 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
+110.00 6.90 TB 18.00 2.00 TR
 TE
-110.00 6.40 TB 22.00 2.00 TR
+110.00 6.90 TB 22.00 2.00 TR
 TE
-110.00 6.40 TB 30.00 4.00 TR
+110.00 6.90 TB 30.00 4.00 TR
 TE
-110.00 6.40 TB 36.00 2.00 TR
+110.00 6.90 TB 36.00 2.00 TR
 TE
-100.00 16.40 TB 42.00 4.00 TR
+100.00 16.90 TB 42.00 4.00 TR
 TE
-100.00 16.40 TB 50.00 2.00 TR
+100.00 16.90 TB 50.00 2.00 TR
 TE
-100.00 16.40 TB 56.00 2.00 TR
+100.00 16.90 TB 56.00 2.00 TR
 TE
-100.00 16.40 TB 62.00 4.00 TR
+100.00 16.90 TB 62.00 4.00 TR
 TE
-100.00 16.40 TB 68.00 8.00 TR
+100.00 16.90 TB 68.00 8.00 TR
 TE
-100.00 16.40 TB 78.00 2.00 TR
+100.00 16.90 TB 78.00 2.00 TR
 TE
-100.00 16.40 TB 82.00 2.00 TR
+100.00 16.90 TB 82.00 2.00 TR
 TE
-100.00 16.40 TB 90.00 4.00 TR
+100.00 16.90 TB 90.00 4.00 TR
 TE
-100.00 16.40 TB 96.00 4.00 TR
+100.00 16.90 TB 96.00 4.00 TR
 TE
-100.00 16.40 TB 106.00 2.00 TR
+100.00 16.90 TB 106.00 2.00 TR
 TE
-110.00 6.40 TB 110.00 2.00 TR
+110.00 6.90 TB 110.00 2.00 TR
 TE
-110.00 6.40 TB 114.00 2.00 TR
+110.00 6.90 TB 114.00 2.00 TR
 TE
-100.00 16.40 TB 118.00 2.00 TR
+100.00 16.90 TB 118.00 2.00 TR
 TE
-100.00 16.40 TB 122.00 2.00 TR
+100.00 16.90 TB 122.00 2.00 TR
 TE
-100.00 16.40 TB 132.00 2.00 TR
+100.00 16.90 TB 132.00 2.00 TR
 TE
-100.00 16.40 TB 140.00 2.00 TR
+100.00 16.90 TB 140.00 2.00 TR
 TE
-100.00 16.40 TB 146.00 2.00 TR
+100.00 16.90 TB 146.00 2.00 TR
 TE
-100.00 16.40 TB 152.00 2.00 TR
+100.00 16.90 TB 152.00 2.00 TR
 TE
-100.00 16.40 TB 160.00 6.00 TR
+100.00 16.90 TB 160.00 6.00 TR
 TE
-100.00 16.40 TB 168.00 2.00 TR
+100.00 16.90 TB 168.00 2.00 TR
 TE
-100.00 16.40 TB 174.00 6.00 TR
+100.00 16.90 TB 174.00 6.00 TR
 TE
-100.00 16.40 TB 184.00 2.00 TR
+100.00 16.90 TB 184.00 2.00 TR
 TE
-110.00 6.40 TB 188.00 2.00 TR
+110.00 6.90 TB 188.00 2.00 TR
 TE
-110.00 6.40 TB 194.00 6.00 TR
+110.00 6.90 TB 194.00 6.00 TR
 TE
-110.00 6.40 TB 202.00 2.00 TR
+110.00 6.90 TB 202.00 2.00 TR
 TE
-110.00 6.40 TB 206.00 2.00 TR
+110.00 6.90 TB 206.00 2.00 TR
 TE
-81.00 16.40 TB 226.00 2.00 TR
+83.10 16.90 TB 226.00 2.00 TR
 TE
-81.00 16.40 TB 230.00 4.00 TR
+83.10 16.90 TB 230.00 4.00 TR
 TE
-81.00 16.40 TB 238.00 2.00 TR
+83.10 16.90 TB 238.00 2.00 TR
 TE
-81.00 16.40 TB 244.00 4.00 TR
+83.10 16.90 TB 244.00 4.00 TR
 TE
-81.00 16.40 TB 250.00 2.00 TR
+83.10 16.90 TB 250.00 2.00 TR
 TE
-81.00 16.40 TB 254.00 2.00 TR
+83.10 16.90 TB 254.00 2.00 TR
 TE
-81.00 16.40 TB 262.00 4.00 TR
+83.10 16.90 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 0 moveto 8.70 0.80 translate 0.00 rotate 0 0 moveto
  (0) stringwidth
 pop
 neg 0 rmoveto
@@ -98,7 +98,7 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 20.00 scalefont setfont
- 0 0 moveto 72.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 74.00 0.80 translate 0.00 rotate 0 0 moveto
  (12345) stringwidth
 pop
 -2 div 0 rmoveto
@@ -107,7 +107,7 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 20.00 scalefont setfont
- 0 0 moveto 152.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 152.00 0.80 translate 0.00 rotate 0 0 moveto
  (67890) stringwidth
 pop
 -2 div 0 rmoveto
@@ -116,13 +116,13 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 218.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 217.30 0.80 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
+ 0 0 moveto 246.00 101.90 translate 0.00 rotate 0 0 moveto
  (24) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/upce_5addon.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 238 117
@@ -9,79 +9,79 @@
 /TE { pop pop } bind def
 newpath
 1.00 1.00 1.00 setrgbcolor
-116.40 0.00 TB 0.00 238.00 TR
+116.90 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
+110.00 6.90 TB 18.00 2.00 TR
 TE
-110.00 6.40 TB 22.00 2.00 TR
+110.00 6.90 TB 22.00 2.00 TR
 TE
-100.00 16.40 TB 26.00 4.00 TR
+100.00 16.90 TB 26.00 4.00 TR
 TE
-100.00 16.40 TB 34.00 4.00 TR
+100.00 16.90 TB 34.00 4.00 TR
 TE
-100.00 16.40 TB 42.00 2.00 TR
+100.00 16.90 TB 42.00 2.00 TR
 TE
-100.00 16.40 TB 48.00 4.00 TR
+100.00 16.90 TB 48.00 4.00 TR
 TE
-100.00 16.40 TB 54.00 8.00 TR
+100.00 16.90 TB 54.00 8.00 TR
 TE
-100.00 16.40 TB 64.00 2.00 TR
+100.00 16.90 TB 64.00 2.00 TR
 TE
-100.00 16.40 TB 70.00 6.00 TR
+100.00 16.90 TB 70.00 6.00 TR
 TE
-100.00 16.40 TB 78.00 2.00 TR
+100.00 16.90 TB 78.00 2.00 TR
 TE
-100.00 16.40 TB 82.00 6.00 TR
+100.00 16.90 TB 82.00 6.00 TR
 TE
-100.00 16.40 TB 92.00 2.00 TR
+100.00 16.90 TB 92.00 2.00 TR
 TE
-100.00 16.40 TB 96.00 2.00 TR
+100.00 16.90 TB 96.00 2.00 TR
 TE
-100.00 16.40 TB 100.00 8.00 TR
+100.00 16.90 TB 100.00 8.00 TR
 TE
-110.00 6.40 TB 110.00 2.00 TR
+110.00 6.90 TB 110.00 2.00 TR
 TE
-110.00 6.40 TB 114.00 2.00 TR
+110.00 6.90 TB 114.00 2.00 TR
 TE
-110.00 6.40 TB 118.00 2.00 TR
+110.00 6.90 TB 118.00 2.00 TR
 TE
-81.00 16.40 TB 134.00 2.00 TR
+83.10 16.90 TB 134.00 2.00 TR
 TE
-81.00 16.40 TB 138.00 4.00 TR
+83.10 16.90 TB 138.00 4.00 TR
 TE
-81.00 16.40 TB 144.00 4.00 TR
+83.10 16.90 TB 144.00 4.00 TR
 TE
-81.00 16.40 TB 152.00 4.00 TR
+83.10 16.90 TB 152.00 4.00 TR
 TE
-81.00 16.40 TB 158.00 2.00 TR
+83.10 16.90 TB 158.00 2.00 TR
 TE
-81.00 16.40 TB 164.00 2.00 TR
+83.10 16.90 TB 164.00 2.00 TR
 TE
-81.00 16.40 TB 170.00 4.00 TR
+83.10 16.90 TB 170.00 4.00 TR
 TE
-81.00 16.40 TB 176.00 2.00 TR
+83.10 16.90 TB 176.00 2.00 TR
 TE
-81.00 16.40 TB 180.00 2.00 TR
+83.10 16.90 TB 180.00 2.00 TR
 TE
-81.00 16.40 TB 190.00 2.00 TR
+83.10 16.90 TB 190.00 2.00 TR
 TE
-81.00 16.40 TB 194.00 2.00 TR
+83.10 16.90 TB 194.00 2.00 TR
 TE
-81.00 16.40 TB 198.00 2.00 TR
+83.10 16.90 TB 198.00 2.00 TR
 TE
-81.00 16.40 TB 206.00 4.00 TR
+83.10 16.90 TB 206.00 4.00 TR
 TE
-81.00 16.40 TB 212.00 2.00 TR
+83.10 16.90 TB 212.00 2.00 TR
 TE
-81.00 16.40 TB 216.00 4.00 TR
+83.10 16.90 TB 216.00 4.00 TR
 TE
-81.00 16.40 TB 226.00 2.00 TR
+83.10 16.90 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 0 moveto 8.70 0.80 translate 0.00 rotate 0 0 moveto
  (0) stringwidth
 pop
 neg 0 rmoveto
@@ -90,7 +90,7 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 20.00 scalefont setfont
- 0 0 moveto 66.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 67.00 0.80 translate 0.00 rotate 0 0 moveto
  (123456) stringwidth
 pop
 -2 div 0 rmoveto
@@ -99,13 +99,13 @@ setmatrix
 matrix currentmatrix
 /Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 126.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 125.30 0.80 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
+ 0 0 moveto 182.00 101.90 translate 0.00 rotate 0 0 moveto
  (12345) stringwidth
 pop
 -2 div 0 rmoveto

backend/tests/data/eps/upce_5addon_small_bold.eps

@@ -1,111 +1,111 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
-%%BoundingBox: 0 0 238 112
+%%BoundingBox: 0 0 238 113
 %%EndComments
 /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
+112.28 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
+110.00 2.28 TB 18.00 2.00 TR
 TE
-110.00 1.90 TB 22.00 2.00 TR
+110.00 2.28 TB 22.00 2.00 TR
 TE
-100.00 11.90 TB 26.00 4.00 TR
+100.00 12.28 TB 26.00 4.00 TR
 TE
-100.00 11.90 TB 34.00 4.00 TR
+100.00 12.28 TB 34.00 4.00 TR
 TE
-100.00 11.90 TB 42.00 2.00 TR
+100.00 12.28 TB 42.00 2.00 TR
 TE
-100.00 11.90 TB 48.00 4.00 TR
+100.00 12.28 TB 48.00 4.00 TR
 TE
-100.00 11.90 TB 54.00 8.00 TR
+100.00 12.28 TB 54.00 8.00 TR
 TE
-100.00 11.90 TB 64.00 2.00 TR
+100.00 12.28 TB 64.00 2.00 TR
 TE
-100.00 11.90 TB 70.00 6.00 TR
+100.00 12.28 TB 70.00 6.00 TR
 TE
-100.00 11.90 TB 78.00 2.00 TR
+100.00 12.28 TB 78.00 2.00 TR
 TE
-100.00 11.90 TB 82.00 6.00 TR
+100.00 12.28 TB 82.00 6.00 TR
 TE
-100.00 11.90 TB 92.00 2.00 TR
+100.00 12.28 TB 92.00 2.00 TR
 TE
-100.00 11.90 TB 96.00 2.00 TR
+100.00 12.28 TB 96.00 2.00 TR
 TE
-100.00 11.90 TB 100.00 8.00 TR
+100.00 12.28 TB 100.00 8.00 TR
 TE
-110.00 1.90 TB 110.00 2.00 TR
+110.00 2.28 TB 110.00 2.00 TR
 TE
-110.00 1.90 TB 114.00 2.00 TR
+110.00 2.28 TB 114.00 2.00 TR
 TE
-110.00 1.90 TB 118.00 2.00 TR
+110.00 2.28 TB 118.00 2.00 TR
 TE
-87.00 11.90 TB 134.00 2.00 TR
+87.72 12.28 TB 134.00 2.00 TR
 TE
-87.00 11.90 TB 138.00 4.00 TR
+87.72 12.28 TB 138.00 4.00 TR
 TE
-87.00 11.90 TB 144.00 4.00 TR
+87.72 12.28 TB 144.00 4.00 TR
 TE
-87.00 11.90 TB 152.00 4.00 TR
+87.72 12.28 TB 152.00 4.00 TR
 TE
-87.00 11.90 TB 158.00 2.00 TR
+87.72 12.28 TB 158.00 2.00 TR
 TE
-87.00 11.90 TB 164.00 2.00 TR
+87.72 12.28 TB 164.00 2.00 TR
 TE
-87.00 11.90 TB 170.00 4.00 TR
+87.72 12.28 TB 170.00 4.00 TR
 TE
-87.00 11.90 TB 176.00 2.00 TR
+87.72 12.28 TB 176.00 2.00 TR
 TE
-87.00 11.90 TB 180.00 2.00 TR
+87.72 12.28 TB 180.00 2.00 TR
 TE
-87.00 11.90 TB 190.00 2.00 TR
+87.72 12.28 TB 190.00 2.00 TR
 TE
-87.00 11.90 TB 194.00 2.00 TR
+87.72 12.28 TB 194.00 2.00 TR
 TE
-87.00 11.90 TB 198.00 2.00 TR
+87.72 12.28 TB 198.00 2.00 TR
 TE
-87.00 11.90 TB 206.00 4.00 TR
+87.72 12.28 TB 206.00 4.00 TR
 TE
-87.00 11.90 TB 212.00 2.00 TR
+87.72 12.28 TB 212.00 2.00 TR
 TE
-87.00 11.90 TB 216.00 4.00 TR
+87.72 12.28 TB 216.00 4.00 TR
 TE
-87.00 11.90 TB 226.00 2.00 TR
+87.72 12.28 TB 226.00 2.00 TR
 TE
 matrix currentmatrix
-/Helvetica-Bold findfont
+/Helvetica findfont
 12.00 scalefont setfont
- 0 0 moveto 8.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 8.70 0.56 translate 0.00 rotate 0 0 moveto
  (0) stringwidth
 pop
 neg 0 rmoveto
  (0) show
 setmatrix
 matrix currentmatrix
-/Helvetica-Bold findfont
+/Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 66.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 67.00 0.56 translate 0.00 rotate 0 0 moveto
  (123456) stringwidth
 pop
 -2 div 0 rmoveto
  (123456) show
 setmatrix
 matrix currentmatrix
-/Helvetica-Bold findfont
+/Helvetica findfont
 12.00 scalefont setfont
- 0 0 moveto 126.00 0.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 125.30 0.56 translate 0.00 rotate 0 0 moveto
  (5) show
 setmatrix
 matrix currentmatrix
-/Helvetica-Bold findfont
+/Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 182.00 101.40 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 182.00 101.78 translate 0.00 rotate 0 0 moveto
  (12345) stringwidth
 pop
 -2 div 0 rmoveto

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.10.0.9
+%%Creator: Zint 2.12.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 136 119
@@ -53,7 +53,7 @@ TE
 matrix currentmatrix
 /Helvetica findfont
 14.00 scalefont setfont
- 0 0 moveto 68.00 3.50 translate 0.00 rotate 0 0 moveto
+ 0 0 moveto 68.00 4.90 translate 0.00 rotate 0 0 moveto
  (AIM) stringwidth
 pop
 -2 div 0 rmoveto

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

@@ -27,7 +27,7 @@
       <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="115.40" text-anchor="middle"
+      <text x="68.00" y="114.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          AIM
       </text>

backend/tests/data/svg/channel_cmyk_nobg.svg

@@ -16,7 +16,7 @@
       <rect x="26.00" y="0.00" width="6.00" height="40.00" />
       <rect x="38.00" y="0.00" width="2.00" height="40.00" />
       <rect x="42.00" y="0.00" width="4.00" height="40.00" />
-      <text x="23.00" y="55.40" text-anchor="middle"
+      <text x="23.00" y="54.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          123
       </text>

backend/tests/data/svg/code128_amperands.svg

@@ -33,7 +33,7 @@
       <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="115.40" text-anchor="middle"
+      <text x="90.00" y="114.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          &lt;&gt;&quot;&amp;&apos;
       </text>

backend/tests/data/svg/code128_egrave_bold.svg

@@ -39,7 +39,7 @@
       <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"
+      <text x="112.00" y="114.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
          Égjpqy
       </text>

backend/tests/data/svg/code128_egrave_bold_box3.svg

@@ -43,7 +43,7 @@
       <rect x="0.00" y="106.00" width="236.00" height="6.00" />
       <rect x="0.00" y="6.00" width="6.00" height="100.00" />
       <rect x="230.00" y="6.00" width="6.00" height="100.00" />
-      <text x="118.00" y="127.40" text-anchor="middle"
+      <text x="118.00" y="126.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
          Égjpqy
       </text>

backend/tests/data/svg/code128_egrave_bold_hvwsp2_box2.svg

@@ -43,7 +43,7 @@
       <rect x="0.00" y="108.00" width="240.00" height="4.00" />
       <rect x="0.00" y="8.00" width="4.00" height="100.00" />
       <rect x="236.00" y="8.00" width="4.00" height="100.00" />
-      <text x="120.00" y="127.40" text-anchor="middle"
+      <text x="120.00" y="126.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
          Égjpqy
       </text>

backend/tests/data/svg/code128_egrave_bold_hvwsp3.svg

@@ -39,7 +39,7 @@
       <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" />
-      <text x="118.00" y="121.40" text-anchor="middle"
+      <text x="118.00" y="120.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
          Égjpqy
       </text>

backend/tests/data/svg/code39_small.svg

@@ -33,7 +33,7 @@
       <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"
+      <text x="64.00" y="112.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="12.0" >
          *123*
       </text>

backend/tests/data/svg/dbar_ltd.svg

@@ -31,7 +31,7 @@
       <rect x="132.00" y="0.00" width="4.00" height="100.00" />
       <rect x="138.00" y="0.00" width="6.00" height="100.00" />
       <rect x="146.00" y="0.00" width="2.00" height="100.00" />
-      <text x="79.00" y="115.40" text-anchor="middle"
+      <text x="79.00" y="114.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          (01)00123456789098
       </text>

backend/tests/data/svg/dpd_compliant.svg

@@ -67,7 +67,7 @@
       <rect x="439.00" y="6.00" width="2.00" height="133.33" />
       <rect x="443.00" y="6.00" width="4.00" height="133.33" />
       <rect x="25.00" y="0.00" width="422.00" height="6.00" />
-      <text x="236.00" y="154.73" text-anchor="middle"
+      <text x="236.00" y="153.33" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          0081 827 0998 0000 0200 28 101 276 B
       </text>

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

@@ -38,22 +38,22 @@
       <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="19.00" width="2.00" height="91.00" />
-      <rect x="230.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="238.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="246.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="250.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="256.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="262.00" y="19.00" width="4.00" height="91.00" />
-      <text x="12.00" y="116.00" text-anchor="end"
+      <rect x="226.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="230.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="238.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="246.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="250.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="256.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="262.00" y="16.90" width="4.00" height="93.10" />
+      <text x="12.20" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          9
       </text>
-      <text x="70.00" y="116.00" text-anchor="middle"
+      <text x="71.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          771384
       </text>
-      <text x="164.00" y="116.00" text-anchor="middle"
+      <text x="163.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          524017
       </text>

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

@@ -38,31 +38,31 @@
       <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="19.00" width="2.00" height="91.00" />
-      <rect x="230.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="236.00" y="19.00" width="6.00" height="91.00" />
-      <rect x="246.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="250.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="254.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="262.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="268.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="272.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="282.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="286.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="292.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="298.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="304.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="310.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="318.00" y="19.00" width="2.00" height="91.00" />
-      <text x="12.00" y="116.00" text-anchor="end"
+      <rect x="226.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="230.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="236.00" y="16.90" width="6.00" height="93.10" />
+      <rect x="246.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="250.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="254.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="262.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="268.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="272.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="282.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="286.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="292.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="298.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="304.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="310.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="318.00" y="16.90" width="2.00" height="93.10" />
+      <text x="12.20" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          9
       </text>
-      <text x="70.00" y="116.00" text-anchor="middle"
+      <text x="71.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          780877
       </text>
-      <text x="164.00" y="116.00" text-anchor="middle"
+      <text x="163.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          799306
       </text>

backend/tests/data/svg/ean13_cc_2addon_cca_4x4.svg

@@ -120,22 +120,22 @@
       <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"
+      <rect x="232.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="236.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="244.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="252.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="256.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="262.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="268.00" y="44.90" width="4.00" height="65.10" />
+      <text x="18.20" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          1
       </text>
-      <text x="76.00" y="116.00" text-anchor="middle"
+      <text x="77.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          234567
       </text>
-      <text x="170.00" y="116.00" text-anchor="middle"
+      <text x="169.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          890128
       </text>

backend/tests/data/svg/ean13_cc_5addon_ccb_3x4.svg

@@ -118,31 +118,31 @@
       <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"
+      <rect x="232.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="236.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="242.00" y="44.90" width="6.00" height="65.10" />
+      <rect x="252.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="256.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="260.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="268.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="274.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="278.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="288.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="292.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="298.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="304.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="310.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="316.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="324.00" y="44.90" width="2.00" height="65.10" />
+      <text x="18.20" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          1
       </text>
-      <text x="76.00" y="116.00" text-anchor="middle"
+      <text x="77.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          234567
       </text>
-      <text x="170.00" y="116.00" text-anchor="middle"
+      <text x="169.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          890128
       </text>

backend/tests/data/svg/ean13_cc_5addon_ccb_3x4_notext.svg

@@ -118,21 +118,21 @@
       <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" />
+      <rect x="232.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="236.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="242.00" y="44.90" width="6.00" height="65.10" />
+      <rect x="252.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="256.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="260.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="268.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="274.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="278.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="288.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="292.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="298.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="304.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="310.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="316.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="324.00" y="44.90" width="2.00" height="65.10" />
    </g>
 </svg>

backend/tests/data/svg/ean2.svg

@@ -15,7 +15,7 @@
       <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="116.00" text-anchor="middle"
+      <text x="34.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          12
       </text>

backend/tests/data/svg/ean5.svg

@@ -24,7 +24,7 @@
       <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="116.00" text-anchor="middle"
+      <text x="61.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          12345
       </text>

backend/tests/data/svg/ean8_2addon.svg

@@ -30,18 +30,18 @@
       <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="19.00" width="2.00" height="91.00" />
-      <rect x="166.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="174.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="182.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="186.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="192.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="198.00" y="19.00" width="4.00" height="91.00" />
-      <text x="48.00" y="116.00" text-anchor="middle"
+      <rect x="162.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="166.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="174.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="182.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="186.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="192.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="198.00" y="16.90" width="4.00" height="93.10" />
+      <text x="49.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          1234
       </text>
-      <text x="114.00" y="116.00" text-anchor="middle"
+      <text x="113.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          5670
       </text>

backend/tests/data/svg/ean8_5addon.svg

@@ -30,27 +30,27 @@
       <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="19.00" width="2.00" height="91.00" />
-      <rect x="166.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="172.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="180.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="186.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="192.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="198.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="204.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="208.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="218.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="222.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="226.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="234.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="240.00" y="19.00" width="2.00" height="91.00" />
-      <rect x="244.00" y="19.00" width="4.00" height="91.00" />
-      <rect x="254.00" y="19.00" width="2.00" height="91.00" />
-      <text x="48.00" y="116.00" text-anchor="middle"
+      <rect x="162.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="166.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="172.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="180.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="186.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="192.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="198.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="204.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="208.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="218.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="222.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="226.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="234.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="240.00" y="16.90" width="2.00" height="93.10" />
+      <rect x="244.00" y="16.90" width="4.00" height="93.10" />
+      <rect x="254.00" y="16.90" width="2.00" height="93.10" />
+      <text x="49.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          1234
       </text>
-      <text x="114.00" y="116.00" text-anchor="middle"
+      <text x="113.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          5670
       </text>

backend/tests/data/svg/ean8_cc_2addon_cca_4x3.svg

@@ -93,18 +93,18 @@
       <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"
+      <rect x="170.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="174.00" y="44.90" width="4.00" height="65.10" />
+      <rect x="180.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="184.00" y="44.90" width="8.00" height="65.10" />
+      <rect x="194.00" y="44.90" width="2.00" height="65.10" />
+      <rect x="198.00" y="44.90" width="6.00" height="65.10" />
+      <rect x="208.00" y="44.90" width="2.00" height="65.10" />
+      <text x="57.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          9876
       </text>
-      <text x="122.00" y="116.00" text-anchor="middle"
+      <text x="121.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          5430
       </text>

backend/tests/data/svg/ean8_cc_5addon_ccb_8x3.svg

@@ -150,27 +150,27 @@
       <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"
+      <rect x="190.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="194.00" y="60.90" width="4.00" height="49.10" />
+      <rect x="200.00" y="60.90" width="6.00" height="49.10" />
+      <rect x="208.00" y="60.90" width="4.00" height="49.10" />
+      <rect x="214.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="220.00" y="60.90" width="6.00" height="49.10" />
+      <rect x="228.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="232.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="240.00" y="60.90" width="4.00" height="49.10" />
+      <rect x="246.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="250.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="254.00" y="60.90" width="4.00" height="49.10" />
+      <rect x="260.00" y="60.90" width="6.00" height="49.10" />
+      <rect x="268.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="272.00" y="60.90" width="2.00" height="49.10" />
+      <rect x="282.00" y="60.90" width="2.00" height="49.10" />
+      <text x="77.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          9876
       </text>
-      <text x="142.00" y="116.00" text-anchor="middle"
+      <text x="141.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          5430
       </text>

backend/tests/data/svg/gs1_128_cc_fig12.svg

@@ -244,7 +244,7 @@
       <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"
+      <text x="174.00" y="114.00" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          (00)030123456789012340
       </text>

backend/tests/data/svg/telepen_height0.4_rotate_180.svg

@@ -30,8 +30,8 @@
       <rect x="10.00" y="18.90" width="2.00" height="1.00" />
       <rect x="6.00" y="18.90" width="2.00" height="1.00" />
       <rect x="2.00" y="18.90" width="2.00" height="1.00" />
-      <text x="64.00" y="3.50" text-anchor="middle"
-         font-family="Helvetica, sans-serif" font-size="14.0" transform="rotate(180,64.00,3.50)" >
+      <text x="64.00" y="4.90" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" transform="rotate(180,64.00,4.90)" >
          A
       </text>
    </g>

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

@@ -38,26 +38,26 @@
       <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="19.00" width="2.00" height="81.00" />
-      <rect x="230.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="238.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="244.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="250.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="254.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="262.00" y="19.00" width="4.00" height="81.00" />
-      <text x="8.00" y="116.00" text-anchor="end"
+      <rect x="226.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="230.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="238.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="244.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="250.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="254.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="262.00" y="16.90" width="4.00" height="83.10" />
+      <text x="8.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          0
       </text>
-      <text x="72.00" y="116.00" text-anchor="middle"
+      <text x="74.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          12345
       </text>
-      <text x="152.00" y="116.00" text-anchor="middle"
+      <text x="152.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          67890
       </text>
-      <text x="218.00" y="116.00" text-anchor="start"
+      <text x="217.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          5
       </text>

backend/tests/data/svg/upca_5addon.svg

@@ -38,35 +38,35 @@
       <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="19.00" width="2.00" height="81.00" />
-      <rect x="230.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="236.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="244.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="250.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="256.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="262.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="268.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="272.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="282.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="286.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="290.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="298.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="304.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="308.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="318.00" y="19.00" width="2.00" height="81.00" />
-      <text x="8.00" y="116.00" text-anchor="end"
+      <rect x="226.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="230.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="236.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="244.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="250.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="256.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="262.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="268.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="272.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="282.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="286.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="290.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="298.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="304.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="308.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="318.00" y="16.90" width="2.00" height="83.10" />
+      <text x="8.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          6
       </text>
-      <text x="72.00" y="116.00" text-anchor="middle"
+      <text x="74.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          14141
       </text>
-      <text x="152.00" y="116.00" text-anchor="middle"
+      <text x="152.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          23441
       </text>
-      <text x="218.00" y="116.00" text-anchor="start"
+      <text x="217.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          7
       </text>

backend/tests/data/svg/upca_5addon_bind3.svg

@@ -38,37 +38,37 @@
       <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="226.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="230.00" y="22.90" width="4.00" height="83.10" />
+      <rect x="236.00" y="22.90" width="4.00" height="83.10" />
+      <rect x="244.00" y="22.90" width="4.00" height="83.10" />
+      <rect x="250.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="256.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="262.00" y="22.90" width="4.00" height="83.10" />
+      <rect x="268.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="272.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="282.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="286.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="290.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="298.00" y="22.90" width="4.00" height="83.10" />
+      <rect x="304.00" y="22.90" width="2.00" height="83.10" />
+      <rect x="308.00" y="22.90" width="4.00" height="83.10" />
+      <rect x="318.00" y="22.90" width="2.00" height="83.10" />
       <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"
+      <text x="8.70" y="128.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          6
       </text>
-      <text x="72.00" y="128.00" text-anchor="middle"
+      <text x="74.00" y="128.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          14141
       </text>
-      <text x="152.00" y="128.00" text-anchor="middle"
+      <text x="152.00" y="128.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          23441
       </text>
-      <text x="218.00" y="128.00" text-anchor="start"
+      <text x="217.30" y="128.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          7
       </text>

backend/tests/data/svg/upca_5addon_small_bold.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="112" version="1.1"
+<svg width="330" height="113" 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="0" y="0" width="330" height="113" 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="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" >
+      <rect x="226.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="230.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="236.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="244.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="250.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="256.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="262.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="268.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="272.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="282.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="286.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="290.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="298.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="304.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="308.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="318.00" y="12.28" width="2.00" height="87.72" />
+      <text x="8.70" y="111.72" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="12.0" >
          6
       </text>
-      <text x="72.00" y="111.50" text-anchor="middle"
-         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+      <text x="74.00" y="111.72" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          14141
       </text>
-      <text x="152.00" y="111.50" text-anchor="middle"
-         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+      <text x="152.00" y="111.72" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          23441
       </text>
-      <text x="218.00" y="111.50" text-anchor="start"
-         font-family="Helvetica, sans-serif" font-size="12.0" font-weight="bold" >
+      <text x="217.30" y="111.72" text-anchor="start"
+         font-family="Helvetica, sans-serif" font-size="12.0" >
          7
       </text>
       <text x="274.00" y="10.50" text-anchor="middle"
-         font-family="Helvetica, sans-serif" font-size="14.0" font-weight="bold" >
+         font-family="Helvetica, sans-serif" font-size="14.0" >
          12345
       </text>
    </g>

backend/tests/data/svg/upca_cc_2addon_cca_3x4.svg

@@ -103,26 +103,26 @@
       <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"
+      <rect x="232.00" y="40.90" width="2.00" height="59.10" />
+      <rect x="236.00" y="40.90" width="4.00" height="59.10" />
+      <rect x="244.00" y="40.90" width="4.00" height="59.10" />
+      <rect x="252.00" y="40.90" width="2.00" height="59.10" />
+      <rect x="256.00" y="40.90" width="2.00" height="59.10" />
+      <rect x="262.00" y="40.90" width="2.00" height="59.10" />
+      <rect x="268.00" y="40.90" width="4.00" height="59.10" />
+      <text x="14.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          1
       </text>
-      <text x="78.00" y="116.00" text-anchor="middle"
+      <text x="80.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          23456
       </text>
-      <text x="158.00" y="116.00" text-anchor="middle"
+      <text x="158.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          78901
       </text>
-      <text x="224.00" y="116.00" text-anchor="start"
+      <text x="223.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          2
       </text>

backend/tests/data/svg/upca_cc_5addon_ccb_4x4.svg

@@ -118,35 +118,35 @@
       <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"
+      <rect x="232.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="236.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="244.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="252.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="256.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="262.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="268.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="274.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="278.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="286.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="292.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="298.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="304.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="310.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="316.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="324.00" y="44.90" width="2.00" height="55.10" />
+      <text x="14.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          1
       </text>
-      <text x="78.00" y="116.00" text-anchor="middle"
+      <text x="80.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          23456
       </text>
-      <text x="158.00" y="116.00" text-anchor="middle"
+      <text x="158.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          78901
       </text>
-      <text x="224.00" y="116.00" text-anchor="start"
+      <text x="223.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          2
       </text>

backend/tests/data/svg/upca_cc_5addon_ccb_4x4_bind3.svg

@@ -118,37 +118,37 @@
       <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="232.00" y="50.90" width="2.00" height="55.10" />
+      <rect x="236.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="244.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="252.00" y="50.90" width="2.00" height="55.10" />
+      <rect x="256.00" y="50.90" width="2.00" height="55.10" />
+      <rect x="262.00" y="50.90" width="2.00" height="55.10" />
+      <rect x="268.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="274.00" y="50.90" width="2.00" height="55.10" />
+      <rect x="278.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="286.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="292.00" y="50.90" width="2.00" height="55.10" />
+      <rect x="298.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="304.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="310.00" y="50.90" width="2.00" height="55.10" />
+      <rect x="316.00" y="50.90" width="4.00" height="55.10" />
+      <rect x="324.00" y="50.90" width="2.00" height="55.10" />
       <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"
+      <text x="14.70" y="128.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          1
       </text>
-      <text x="78.00" y="128.00" text-anchor="middle"
+      <text x="80.00" y="128.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          23456
       </text>
-      <text x="158.00" y="128.00" text-anchor="middle"
+      <text x="158.00" y="128.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          78901
       </text>
-      <text x="224.00" y="128.00" text-anchor="start"
+      <text x="223.30" y="128.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          2
       </text>

backend/tests/data/svg/upca_cc_5addon_ccb_4x4_notext.svg

@@ -118,21 +118,21 @@
       <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" />
+      <rect x="232.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="236.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="244.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="252.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="256.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="262.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="268.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="274.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="278.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="286.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="292.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="298.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="304.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="310.00" y="44.90" width="2.00" height="55.10" />
+      <rect x="316.00" y="44.90" width="4.00" height="55.10" />
+      <rect x="324.00" y="44.90" width="2.00" height="55.10" />
    </g>
 </svg>

backend/tests/data/svg/upce_2addon.svg

@@ -25,22 +25,22 @@
       <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="2.00" height="110.00" />
-      <rect x="134.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="138.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="146.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="154.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="158.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="164.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="170.00" y="19.00" width="4.00" height="81.00" />
-      <text x="8.00" y="116.00" text-anchor="end"
+      <rect x="134.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="138.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="146.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="154.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="158.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="164.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="170.00" y="16.90" width="4.00" height="83.10" />
+      <text x="8.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          1
       </text>
-      <text x="66.00" y="116.00" text-anchor="middle"
+      <text x="67.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          234567
       </text>
-      <text x="126.00" y="116.00" text-anchor="start"
+      <text x="125.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          0
       </text>

backend/tests/data/svg/upce_5addon.svg

@@ -25,31 +25,31 @@
       <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="2.00" height="110.00" />
-      <rect x="134.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="138.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="144.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="152.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="158.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="164.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="170.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="176.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="180.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="190.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="194.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="198.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="206.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="212.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="216.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="226.00" y="19.00" width="2.00" height="81.00" />
-      <text x="8.00" y="116.00" text-anchor="end"
+      <rect x="134.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="138.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="144.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="152.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="158.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="164.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="170.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="176.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="180.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="190.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="194.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="198.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="206.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="212.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="216.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="226.00" y="16.90" width="2.00" height="83.10" />
+      <text x="8.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          1
       </text>
-      <text x="66.00" y="116.00" text-anchor="middle"
+      <text x="67.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          234567
       </text>
-      <text x="126.00" y="116.00" text-anchor="start"
+      <text x="125.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          0
       </text>

backend/tests/data/svg/upce_5addon_notext.svg

@@ -25,21 +25,21 @@
       <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="2.00" height="110.00" />
-      <rect x="134.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="138.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="144.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="152.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="158.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="164.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="170.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="176.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="180.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="190.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="194.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="198.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="206.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="212.00" y="19.00" width="2.00" height="81.00" />
-      <rect x="216.00" y="19.00" width="4.00" height="81.00" />
-      <rect x="226.00" y="19.00" width="2.00" height="81.00" />
+      <rect x="134.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="138.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="144.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="152.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="158.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="164.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="170.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="176.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="180.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="190.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="194.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="198.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="206.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="212.00" y="16.90" width="2.00" height="83.10" />
+      <rect x="216.00" y="16.90" width="4.00" height="83.10" />
+      <rect x="226.00" y="16.90" width="2.00" height="83.10" />
    </g>
 </svg>

backend/tests/data/svg/upce_5addon_small.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="238" height="112" version="1.1"
+<svg width="238" height="113" 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="238" height="112" fill="#FFFFFF" />
+      <rect x="0" y="0" width="238" height="113" 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="28.00" y="0.00" width="2.00" height="100.00" />
@@ -25,31 +25,31 @@
       <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="2.00" height="110.00" />
-      <rect x="134.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="138.00" y="13.00" width="4.00" height="87.00" />
-      <rect x="144.00" y="13.00" width="4.00" height="87.00" />
-      <rect x="152.00" y="13.00" width="4.00" height="87.00" />
-      <rect x="158.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="164.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="170.00" y="13.00" width="4.00" height="87.00" />
-      <rect x="176.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="180.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="190.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="194.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="198.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="206.00" y="13.00" width="4.00" height="87.00" />
-      <rect x="212.00" y="13.00" width="2.00" height="87.00" />
-      <rect x="216.00" y="13.00" width="4.00" height="87.00" />
-      <rect x="226.00" y="13.00" width="2.00" height="87.00" />
-      <text x="8.00" y="111.50" text-anchor="end"
+      <rect x="134.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="138.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="144.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="152.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="158.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="164.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="170.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="176.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="180.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="190.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="194.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="198.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="206.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="212.00" y="12.28" width="2.00" height="87.72" />
+      <rect x="216.00" y="12.28" width="4.00" height="87.72" />
+      <rect x="226.00" y="12.28" width="2.00" height="87.72" />
+      <text x="8.70" y="111.72" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="12.0" >
          1
       </text>
-      <text x="66.00" y="111.50" text-anchor="middle"
+      <text x="67.00" y="111.72" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          234567
       </text>
-      <text x="126.00" y="111.50" text-anchor="start"
+      <text x="125.30" y="111.72" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="12.0" >
          0
       </text>

backend/tests/data/svg/upce_cc_2addon_cca_5x2.svg

@@ -80,22 +80,22 @@
       <rect x="112.00" y="32.00" width="2.00" height="68.00" />
       <rect x="116.00" y="32.00" width="2.00" height="78.00" />
       <rect x="120.00" y="32.00" width="2.00" height="78.00" />
-      <rect x="140.00" y="51.00" width="2.00" height="49.00" />
-      <rect x="144.00" y="51.00" width="4.00" height="49.00" />
-      <rect x="150.00" y="51.00" width="4.00" height="49.00" />
-      <rect x="156.00" y="51.00" width="6.00" height="49.00" />
-      <rect x="164.00" y="51.00" width="2.00" height="49.00" />
-      <rect x="170.00" y="51.00" width="2.00" height="49.00" />
-      <rect x="174.00" y="51.00" width="6.00" height="49.00" />
-      <text x="14.00" y="116.00" text-anchor="end"
+      <rect x="140.00" y="48.90" width="2.00" height="51.10" />
+      <rect x="144.00" y="48.90" width="4.00" height="51.10" />
+      <rect x="150.00" y="48.90" width="4.00" height="51.10" />
+      <rect x="156.00" y="48.90" width="6.00" height="51.10" />
+      <rect x="164.00" y="48.90" width="2.00" height="51.10" />
+      <rect x="170.00" y="48.90" width="2.00" height="51.10" />
+      <rect x="174.00" y="48.90" width="6.00" height="51.10" />
+      <text x="14.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          0
       </text>
-      <text x="72.00" y="116.00" text-anchor="middle"
+      <text x="73.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          654321
       </text>
-      <text x="132.00" y="116.00" text-anchor="start"
+      <text x="131.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          7
       </text>

backend/tests/data/svg/upce_cc_2addon_cca_5x2_fgbgalpha.svg

@@ -80,22 +80,22 @@
       <rect x="112.00" y="32.00" width="2.00" height="68.00" opacity="0.933" />
       <rect x="116.00" y="32.00" width="2.00" height="78.00" opacity="0.933" />
       <rect x="120.00" y="32.00" width="2.00" height="78.00" opacity="0.933" />
-      <rect x="140.00" y="51.00" width="2.00" height="49.00" opacity="0.933" />
-      <rect x="144.00" y="51.00" width="4.00" height="49.00" opacity="0.933" />
-      <rect x="150.00" y="51.00" width="4.00" height="49.00" opacity="0.933" />
-      <rect x="156.00" y="51.00" width="6.00" height="49.00" opacity="0.933" />
-      <rect x="164.00" y="51.00" width="2.00" height="49.00" opacity="0.933" />
-      <rect x="170.00" y="51.00" width="2.00" height="49.00" opacity="0.933" />
-      <rect x="174.00" y="51.00" width="6.00" height="49.00" opacity="0.933" />
-      <text x="14.00" y="116.00" text-anchor="end"
+      <rect x="140.00" y="48.90" width="2.00" height="51.10" opacity="0.933" />
+      <rect x="144.00" y="48.90" width="4.00" height="51.10" opacity="0.933" />
+      <rect x="150.00" y="48.90" width="4.00" height="51.10" opacity="0.933" />
+      <rect x="156.00" y="48.90" width="6.00" height="51.10" opacity="0.933" />
+      <rect x="164.00" y="48.90" width="2.00" height="51.10" opacity="0.933" />
+      <rect x="170.00" y="48.90" width="2.00" height="51.10" opacity="0.933" />
+      <rect x="174.00" y="48.90" width="6.00" height="51.10" opacity="0.933" />
+      <text x="14.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" opacity="0.933" >
          0
       </text>
-      <text x="72.00" y="116.00" text-anchor="middle"
+      <text x="73.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" opacity="0.933" >
          654321
       </text>
-      <text x="132.00" y="116.00" text-anchor="start"
+      <text x="131.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" opacity="0.933" >
          7
       </text>

backend/tests/data/svg/upce_cc_2addon_cca_5x2_nobg.svg

@@ -79,22 +79,22 @@
       <rect x="112.00" y="32.00" width="2.00" height="68.00" />
       <rect x="116.00" y="32.00" width="2.00" height="78.00" />
       <rect x="120.00" y="32.00" width="2.00" height="78.00" />
-      <rect x="140.00" y="51.00" width="2.00" height="49.00" />
-      <rect x="144.00" y="51.00" width="4.00" height="49.00" />
-      <rect x="150.00" y="51.00" width="4.00" height="49.00" />
-      <rect x="156.00" y="51.00" width="6.00" height="49.00" />
-      <rect x="164.00" y="51.00" width="2.00" height="49.00" />
-      <rect x="170.00" y="51.00" width="2.00" height="49.00" />
-      <rect x="174.00" y="51.00" width="6.00" height="49.00" />
-      <text x="14.00" y="116.00" text-anchor="end"
+      <rect x="140.00" y="48.90" width="2.00" height="51.10" />
+      <rect x="144.00" y="48.90" width="4.00" height="51.10" />
+      <rect x="150.00" y="48.90" width="4.00" height="51.10" />
+      <rect x="156.00" y="48.90" width="6.00" height="51.10" />
+      <rect x="164.00" y="48.90" width="2.00" height="51.10" />
+      <rect x="170.00" y="48.90" width="2.00" height="51.10" />
+      <rect x="174.00" y="48.90" width="6.00" height="51.10" />
+      <text x="14.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          0
       </text>
-      <text x="72.00" y="116.00" text-anchor="middle"
+      <text x="73.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          654321
       </text>
-      <text x="132.00" y="116.00" text-anchor="start"
+      <text x="131.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          7
       </text>

backend/tests/data/svg/upce_cc_2addon_cca_5x2_rotate_270.svg

@@ -80,23 +80,23 @@
       <rect x="32.00" y="78.00" width="68.00" height="2.00" />
       <rect x="32.00" y="74.00" width="78.00" height="2.00" />
       <rect x="32.00" y="70.00" width="78.00" height="2.00" />
-      <rect x="51.00" y="50.00" width="49.00" height="2.00" />
-      <rect x="51.00" y="44.00" width="49.00" height="4.00" />
-      <rect x="51.00" y="38.00" width="49.00" height="4.00" />
-      <rect x="51.00" y="30.00" width="49.00" height="6.00" />
-      <rect x="51.00" y="26.00" width="49.00" height="2.00" />
-      <rect x="51.00" y="20.00" width="49.00" height="2.00" />
-      <rect x="51.00" y="12.00" width="49.00" height="6.00" />
-      <text x="116.00" y="178.00" text-anchor="end"
-         font-family="Helvetica, sans-serif" font-size="14.0" transform="rotate(270,116.00,178.00)" >
+      <rect x="48.90" y="50.00" width="51.10" height="2.00" />
+      <rect x="48.90" y="44.00" width="51.10" height="4.00" />
+      <rect x="48.90" y="38.00" width="51.10" height="4.00" />
+      <rect x="48.90" y="30.00" width="51.10" height="6.00" />
+      <rect x="48.90" y="26.00" width="51.10" height="2.00" />
+      <rect x="48.90" y="20.00" width="51.10" height="2.00" />
+      <rect x="48.90" y="12.00" width="51.10" height="6.00" />
+      <text x="116.10" y="177.30" text-anchor="end"
+         font-family="Helvetica, sans-serif" font-size="14.0" transform="rotate(270,116.10,177.30)" >
          0
       </text>
-      <text x="116.00" y="120.00" text-anchor="middle"
-         font-family="Helvetica, sans-serif" font-size="20.0" transform="rotate(270,116.00,120.00)" >
+      <text x="116.10" y="119.00" text-anchor="middle"
+         font-family="Helvetica, sans-serif" font-size="20.0" transform="rotate(270,116.10,119.00)" >
          654321
       </text>
-      <text x="116.00" y="60.00" text-anchor="start"
-         font-family="Helvetica, sans-serif" font-size="14.0" transform="rotate(270,116.00,60.00)" >
+      <text x="116.10" y="60.70" text-anchor="start"
+         font-family="Helvetica, sans-serif" font-size="14.0" transform="rotate(270,116.10,60.70)" >
          7
       </text>
       <text x="47.00" y="32.00" text-anchor="middle"

backend/tests/data/svg/upce_cc_5addon_ccb_8x2.svg

@@ -106,31 +106,31 @@
       <rect x="112.00" y="44.00" width="2.00" height="56.00" />
       <rect x="116.00" y="44.00" width="2.00" height="66.00" />
       <rect x="120.00" y="44.00" width="2.00" height="66.00" />
-      <rect x="140.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="144.00" y="63.00" width="4.00" height="37.00" />
-      <rect x="150.00" y="63.00" width="4.00" height="37.00" />
-      <rect x="160.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="164.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="168.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="172.00" y="63.00" width="8.00" height="37.00" />
-      <rect x="182.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="188.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="196.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="200.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="204.00" y="63.00" width="4.00" height="37.00" />
-      <rect x="210.00" y="63.00" width="6.00" height="37.00" />
-      <rect x="218.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="224.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="228.00" y="63.00" width="6.00" height="37.00" />
-      <text x="14.00" y="116.00" text-anchor="end"
+      <rect x="140.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="144.00" y="60.90" width="4.00" height="39.10" />
+      <rect x="150.00" y="60.90" width="4.00" height="39.10" />
+      <rect x="160.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="164.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="168.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="172.00" y="60.90" width="8.00" height="39.10" />
+      <rect x="182.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="188.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="196.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="200.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="204.00" y="60.90" width="4.00" height="39.10" />
+      <rect x="210.00" y="60.90" width="6.00" height="39.10" />
+      <rect x="218.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="224.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="228.00" y="60.90" width="6.00" height="39.10" />
+      <text x="14.70" y="116.10" text-anchor="end"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          1
       </text>
-      <text x="72.00" y="116.00" text-anchor="middle"
+      <text x="73.00" y="116.10" text-anchor="middle"
          font-family="Helvetica, sans-serif" font-size="20.0" >
          876543
       </text>
-      <text x="132.00" y="116.00" text-anchor="start"
+      <text x="131.30" y="116.10" text-anchor="start"
          font-family="Helvetica, sans-serif" font-size="14.0" >
          5
       </text>

backend/tests/data/svg/upce_cc_5addon_ccb_8x2_notext.svg

@@ -106,21 +106,21 @@
       <rect x="112.00" y="44.00" width="2.00" height="56.00" />
       <rect x="116.00" y="44.00" width="2.00" height="66.00" />
       <rect x="120.00" y="44.00" width="2.00" height="66.00" />
-      <rect x="140.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="144.00" y="63.00" width="4.00" height="37.00" />
-      <rect x="150.00" y="63.00" width="4.00" height="37.00" />
-      <rect x="160.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="164.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="168.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="172.00" y="63.00" width="8.00" height="37.00" />
-      <rect x="182.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="188.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="196.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="200.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="204.00" y="63.00" width="4.00" height="37.00" />
-      <rect x="210.00" y="63.00" width="6.00" height="37.00" />
-      <rect x="218.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="224.00" y="63.00" width="2.00" height="37.00" />
-      <rect x="228.00" y="63.00" width="6.00" height="37.00" />
+      <rect x="140.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="144.00" y="60.90" width="4.00" height="39.10" />
+      <rect x="150.00" y="60.90" width="4.00" height="39.10" />
+      <rect x="160.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="164.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="168.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="172.00" y="60.90" width="8.00" height="39.10" />
+      <rect x="182.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="188.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="196.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="200.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="204.00" y="60.90" width="4.00" height="39.10" />
+      <rect x="210.00" y="60.90" width="6.00" height="39.10" />
+      <rect x="218.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="224.00" y="60.90" width="2.00" height="39.10" />
+      <rect x="228.00" y="60.90" width="6.00" height="39.10" />
    </g>
 </svg>

backend/tests/test_emf.c

@@ -158,7 +158,8 @@ static void test_print(const testCtx *const p_ctx) {
                 /* Note this will fail (on Ubuntu anyway) if LibreOffice Base/Calc/Impress/Writer running (i.e. anything but LibreOffice Draw)
                    Doesn't seem to be a way to force Draw invocation through the command line */
                 ret = testUtilVerifyLibreOffice(expected_file, debug);
-                assert_zero(ret, "i:%d %s libreoffice %s ret %d != 0\n", i, testUtilBarcodeName(data[i].symbology), expected_file, ret);
+                assert_zero(ret, "i:%d %s libreoffice %s ret %d != 0 - check that LibreOffice is not running!\n",
+                            i, testUtilBarcodeName(data[i].symbology), expected_file, ret);
             }
         } else {
             assert_nonzero(testUtilExists(symbol->outfile), "i:%d testUtilExists(%s) == 0\n", i, symbol->outfile);

backend/tests/test_library.c

@@ -52,6 +52,7 @@ static void test_checks(const testCtx *const p_ctx) {
         int border_width;
         float scale;
         float dot_size;
+        float text_gap;
         float guard_descent;
         int warn_level;
         int ret;
@@ -61,155 +62,157 @@ static void test_checks(const testCtx *const p_ctx) {
     };
     /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */
     struct item data[] = {
-        /*  0*/ { BARCODE_CODE128, -1, "1234", -1, -1, 3, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 217: Symbology does not support ECI switching", -1 },
-        /*  1*/ { BARCODE_CODE128, -1, "1234", -1, -1, 0, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", -1 },
-        /*  2*/ { BARCODE_QRCODE, -1, "1234", -1, -1, 3, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", -1 },
-        /*  3*/ { BARCODE_QRCODE, -1, "1234", -1, -1, 999999 + 1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 218: Invalid ECI code 1000000", -1 },
-        /*  4*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, 0.009, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 227: Scale out of range (0.01 to 200)", -1 },
-        /*  5*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, 200.01, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 227: Scale out of range (0.01 to 200)", -1 },
-        /*  6*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, -1, 20.1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 221: Dot size out of range (0.01 to 20)", -1 },
-        /*  7*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, 0.01, 0.009, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 221: Dot size out of range (0.01 to 20)", -1 },
-        /*  8*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, -0.1, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 765: Height out of range (0 to 2000)", -1 },
-        /*  9*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 2000.01, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 765: Height out of range (0 to 2000)", -1 },
-        /* 10*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, -1, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 766: Whitespace width out of range (0 to 100)", -1 },
-        /* 11*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 101, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 766: Whitespace width out of range (0 to 100)", -1 },
-        /* 12*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, -1, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 767: Whitespace height out of range (0 to 100)", -1 },
-        /* 13*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 101, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 767: Whitespace height out of range (0 to 100)", -1 },
-        /* 14*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, -1, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 768: Border width out of range (0 to 100)", -1 },
-        /* 15*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 101, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 768: Border width out of range (0 to 100)", -1 },
-        /* 16*/ { BARCODE_CODE128, -1, "1234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 220: Selected symbology does not support GS1 mode", -1 },
-        /* 17*/ { BARCODE_EANX, -1, "123456789012", -1, -1, -1, 0, 0, 0, 101, -1, -1, -0.5, -1, ZINT_ERROR_INVALID_OPTION, "Error 769: Guard bar descent out of range (0 to 50)", -1 },
-        /* 18*/ { BARCODE_EANX, -1, "123456789012", -1, -1, -1, 0, 0, 0, 101, -1, -1, 50.1, -1, ZINT_ERROR_INVALID_OPTION, "Error 769: Guard bar descent out of range (0 to 50)", -1 },
-        /* 19*/ { BARCODE_GS1_128, -1, "[21]12\0004", 8, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 262: NUL characters not permitted in GS1 mode", -1 },
-        /* 20*/ { BARCODE_GS1_128, -1, "[21]12é4", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 250: Extended ASCII characters are not supported by GS1", -1 },
-        /* 21*/ { BARCODE_GS1_128, -1, "[21]12\0074", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 251: Control characters are not supported by GS1", -1 },
-        /* 22*/ { BARCODE_GS1_128, -1, "[21]1234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", -1 },
-        /* 23*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
-        /* 24*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
-        /* 25*/ { 0, -1, "1", -1, -1, 1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 217: Symbology does not support ECI switching", BARCODE_CODE128 }, /* Not supporting beats invalid ECI */
-        /* 26*/ { 0, -1, "1", -1, -1, 1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
-        /* 27*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, 0.009, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 221: Dot size out of range (0.01 to 20)", BARCODE_CODE128 },
-        /* 28*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, 0.009, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
-        /* 29*/ { 0, -1, "1", -1, -1, 1, 0, 0, 0, 0, -1, 0.009, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 217: Symbology does not support ECI switching", BARCODE_CODE128 }, /* Invalid dot size no longer beats invalid ECI */
-        /* 30*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, 0.009, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
-        /* 31*/ { 5, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_C25STANDARD },
-        /* 32*/ { 5, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_C25STANDARD },
-        /* 33*/ { 10, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_EANX },
-        /* 34*/ { 10, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
-        /* 35*/ { 11, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_EANX },
-        /* 36*/ { 11, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
-        /* 37*/ { 12, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_EANX },
-        /* 38*/ { 12, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
-        /* 39*/ { 15, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_EANX },
-        /* 40*/ { 15, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
-        /* 41*/ { 17, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_UPCA },
-        /* 42*/ { 17, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCA },
-        /* 43*/ { 19, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_TOO_LONG, "Error 362: Input too short (3 character minimum)", BARCODE_CODABAR },
-        /* 44*/ { 19, -1, "A1B", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 207: Codabar 18 not supported", BARCODE_CODABAR },
-        /* 45*/ { 19, -1, "A1B", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 207: Codabar 18 not supported", -1 },
-        /* 46*/ { 26, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_UPCA },
-        /* 47*/ { 26, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCA },
-        /* 48*/ { 27, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 208: UPCD1 not supported", 27 },
-        /* 49*/ { 33, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 252: Data does not start with an AI", BARCODE_GS1_128 },
-        /* 50*/ { 33, -1, "[10]23", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_GS1_128 },
-        /* 51*/ { 33, -1, "[10]23", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_GS1_128 },
-        /* 52*/ { 36, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_UPCA },
-        /* 53*/ { 36, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCA },
-        /* 54*/ { 39, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_UPCE },
-        /* 55*/ { 39, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCE },
-        /* 56*/ { 41, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_NONCOMPLIANT, "Warning 479: Input length is not standard (5, 9 or 11 characters)", BARCODE_POSTNET },
-        /* 57*/ { 41, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_POSTNET },
-        /* 58*/ { 41, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
-        /* 59*/ { 42, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_POSTNET },
-        /* 60*/ { 42, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
-        /* 61*/ { 43, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_POSTNET },
-        /* 62*/ { 43, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
-        /* 63*/ { 44, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_POSTNET },
-        /* 64*/ { 44, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
-        /* 65*/ { 45, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_POSTNET },
-        /* 66*/ { 45, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
-        /* 67*/ { 46, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_PLESSEY },
-        /* 68*/ { 46, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_PLESSEY },
-        /* 69*/ { 48, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_NVE18 },
-        /* 70*/ { 48, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_NVE18 },
-        /* 71*/ { 59, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_CODE128 },
-        /* 72*/ { 59, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_CODE128 },
-        /* 73*/ { 61, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_CODE128 },
-        /* 74*/ { 61, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_CODE128 },
-        /* 75*/ { 62, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_CODE93 },
-        /* 76*/ { 62, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_CODE93 },
-        /* 77*/ { 64, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_AUSPOST },
-        /* 78*/ { 64, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_AUSPOST },
-        /* 79*/ { 65, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_AUSPOST },
-        /* 80*/ { 65, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_AUSPOST },
-        /* 81*/ { 78, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_DBAR_OMN },
-        /* 82*/ { 78, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_DBAR_OMN },
-        /* 83*/ { 83, -1, "12345678901", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_PLANET },
-        /* 84*/ { 83, -1, "12345678901", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_PLANET },
-        /* 85*/ { 88, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 252: Data does not start with an AI", BARCODE_GS1_128 },
-        /* 86*/ { 88, -1, "[10]12", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_GS1_128 },
-        /* 87*/ { 88, -1, "[10]12", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_GS1_128 },
-        /* 88*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 212: Symbology out of range", BARCODE_CODE128 },
-        /* 89*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 212: Symbology out of range", -1 },
-        /* 90*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 213: Symbology out of range", BARCODE_CODE128 },
-        /* 91*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 213: Symbology out of range", -1 },
-        /* 92*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 213: Symbology out of range", BARCODE_CODE128 },
-        /* 93*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 213: Symbology out of range", -1 },
-        /* 94*/ { 100, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_HIBC_128 },
-        /* 95*/ { 100, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_128 },
-        /* 96*/ { 101, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_HIBC_39 },
-        /* 97*/ { 101, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_39 },
-        /* 98*/ { 103, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_HIBC_DM },
-        /* 99*/ { 103, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_DM },
-        /*100*/ { 105, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_HIBC_QR },
-        /*101*/ { 105, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_QR },
-        /*102*/ { 107, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_HIBC_PDF },
-        /*103*/ { 107, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_PDF },
-        /*104*/ { 109, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_HIBC_MICPDF },
-        /*105*/ { 109, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_MICPDF },
-        /*106*/ { 111, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", BARCODE_HIBC_BLOCKF },
-        /*107*/ { 111, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_BLOCKF },
-        /*108*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 214: Symbology out of range", BARCODE_CODE128 },
-        /*109*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 214: Symbology out of range", -1 },
-        /*110*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 214: Symbology out of range", BARCODE_CODE128 },
-        /*111*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 214: Symbology out of range", -1 },
-        /*112*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*113*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*114*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*115*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*116*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*117*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*118*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*119*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*120*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*121*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*122*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*123*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*124*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*125*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*126*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*127*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*128*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 216: Symbology out of range", BARCODE_CODE128 },
-        /*129*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 216: Symbology out of range", -1 },
-        /*130*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 216: Symbology out of range", BARCODE_CODE128 },
-        /*131*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 216: Symbology out of range", -1 },
-        /*132*/ { BARCODE_CODE128, -1, "\200", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input data", -1 },
-        /*133*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_NONCOMPLIANT, "Warning 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 },
-        /*134*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 },
-        /*135*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", -1 },
-        /*136*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 },
-        /*137*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 },
-        /*138*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 },
-        /*139*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 512: ECI ignored for GS1 mode", -1 },
-        /*140*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 }, /* Warning in encoder overrides library warnings */
-        /*141*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, /* But not errors */
-        /*142*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, -1, -1, 0, "", -1 },
-        /*143*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 },
-        /*144*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 },
-        /*145*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 503: Invalid error correction level - using default instead", -1 },
-        /*146*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Invalid error correction level - using default instead", -1 },
-        /*147*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, /* ECI warning trumps all other warnings */
-        /*148*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Invalid error correction level - using default instead", -1 }, /* But not errors */
+        /*  0*/ { BARCODE_CODE128, -1, "1234", -1, -1, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 217: Symbology does not support ECI switching", -1 },
+        /*  1*/ { BARCODE_CODE128, -1, "1234", -1, -1, 0, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 },
+        /*  2*/ { BARCODE_QRCODE, -1, "1234", -1, -1, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 },
+        /*  3*/ { BARCODE_QRCODE, -1, "1234", -1, -1, 999999 + 1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 218: Invalid ECI code 1000000", -1 },
+        /*  4*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, 0.009, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 227: Scale out of range (0.01 to 200)", -1 },
+        /*  5*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, 200.01, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 227: Scale out of range (0.01 to 200)", -1 },
+        /*  6*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, -1, 20.1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 221: Dot size out of range (0.01 to 20)", -1 },
+        /*  7*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 0, 0.01, 0.009, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 221: Dot size out of range (0.01 to 20)", -1 },
+        /*  8*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, -0.1, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 765: Height out of range (0 to 2000)", -1 },
+        /*  9*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 2000.01, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 765: Height out of range (0 to 2000)", -1 },
+        /* 10*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, -1, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 766: Whitespace width out of range (0 to 100)", -1 },
+        /* 11*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 101, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 766: Whitespace width out of range (0 to 100)", -1 },
+        /* 12*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, -1, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 767: Whitespace height out of range (0 to 100)", -1 },
+        /* 13*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 101, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 767: Whitespace height out of range (0 to 100)", -1 },
+        /* 14*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, -1, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 768: Border width out of range (0 to 100)", -1 },
+        /* 15*/ { BARCODE_CODE128, -1, "1234", -1, -1, -1, 0, 0, 0, 101, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 768: Border width out of range (0 to 100)", -1 },
+        /* 16*/ { BARCODE_CODE128, -1, "1234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 220: Selected symbology does not support GS1 mode", -1 },
+        /* 17*/ { BARCODE_EANX, -1, "123456789012", -1, -1, -1, 0, 0, 0, 101, -1, -1, -0.1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 219: Text gap out of range (0 to 5)", -1 },
+        /* 18*/ { BARCODE_EANX, -1, "123456789012", -1, -1, -1, 0, 0, 0, 101, -1, -1, 5.1, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 219: Text gap out of range (0 to 5)", -1 },
+        /* 19*/ { BARCODE_EANX, -1, "123456789012", -1, -1, -1, 0, 0, 0, 101, -1, -1, 0, -0.5, -1, ZINT_ERROR_INVALID_OPTION, "Error 769: Guard bar descent out of range (0 to 50)", -1 },
+        /* 20*/ { BARCODE_EANX, -1, "123456789012", -1, -1, -1, 0, 0, 0, 101, -1, -1, 0, 50.1, -1, ZINT_ERROR_INVALID_OPTION, "Error 769: Guard bar descent out of range (0 to 50)", -1 },
+        /* 21*/ { BARCODE_GS1_128, -1, "[21]12\0004", 8, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 262: NUL characters not permitted in GS1 mode", -1 },
+        /* 22*/ { BARCODE_GS1_128, -1, "[21]12é4", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 250: Extended ASCII characters are not supported by GS1", -1 },
+        /* 23*/ { BARCODE_GS1_128, -1, "[21]12\0074", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 251: Control characters are not supported by GS1", -1 },
+        /* 24*/ { BARCODE_GS1_128, -1, "[21]1234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 },
+        /* 25*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /* 26*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /* 27*/ { 0, -1, "1", -1, -1, 1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 217: Symbology does not support ECI switching", BARCODE_CODE128 }, /* Not supporting beats invalid ECI */
+        /* 28*/ { 0, -1, "1", -1, -1, 1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /* 29*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, 0.009, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 221: Dot size out of range (0.01 to 20)", BARCODE_CODE128 },
+        /* 30*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, 0.009, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /* 31*/ { 0, -1, "1", -1, -1, 1, 0, 0, 0, 0, -1, 0.009, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 217: Symbology does not support ECI switching", BARCODE_CODE128 }, /* Invalid dot size no longer beats invalid ECI */
+        /* 32*/ { 0, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, 0.009, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /* 33*/ { 5, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_C25STANDARD },
+        /* 34*/ { 5, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_C25STANDARD },
+        /* 35*/ { 10, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_EANX },
+        /* 36*/ { 10, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
+        /* 37*/ { 11, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_EANX },
+        /* 38*/ { 11, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
+        /* 39*/ { 12, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_EANX },
+        /* 40*/ { 12, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
+        /* 41*/ { 15, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_EANX },
+        /* 42*/ { 15, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_EANX },
+        /* 43*/ { 17, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_UPCA },
+        /* 44*/ { 17, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCA },
+        /* 45*/ { 19, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_TOO_LONG, "Error 362: Input too short (3 character minimum)", BARCODE_CODABAR },
+        /* 46*/ { 19, -1, "A1B", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 207: Codabar 18 not supported", BARCODE_CODABAR },
+        /* 47*/ { 19, -1, "A1B", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 207: Codabar 18 not supported", -1 },
+        /* 48*/ { 26, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_UPCA },
+        /* 49*/ { 26, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCA },
+        /* 50*/ { 27, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_OPTION, "Error 208: UPCD1 not supported", 27 },
+        /* 51*/ { 33, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 252: Data does not start with an AI", BARCODE_GS1_128 },
+        /* 52*/ { 33, -1, "[10]23", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_GS1_128 },
+        /* 53*/ { 33, -1, "[10]23", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_GS1_128 },
+        /* 54*/ { 36, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_UPCA },
+        /* 55*/ { 36, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCA },
+        /* 56*/ { 39, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_UPCE },
+        /* 57*/ { 39, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_UPCE },
+        /* 58*/ { 41, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_NONCOMPLIANT, "Warning 479: Input length is not standard (5, 9 or 11 characters)", BARCODE_POSTNET },
+        /* 59*/ { 41, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_POSTNET },
+        /* 60*/ { 41, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
+        /* 61*/ { 42, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_POSTNET },
+        /* 62*/ { 42, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
+        /* 63*/ { 43, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_POSTNET },
+        /* 64*/ { 43, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
+        /* 65*/ { 44, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_POSTNET },
+        /* 66*/ { 44, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
+        /* 67*/ { 45, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_POSTNET },
+        /* 68*/ { 45, -1, "12345", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_POSTNET },
+        /* 69*/ { 46, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_PLESSEY },
+        /* 70*/ { 46, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_PLESSEY },
+        /* 71*/ { 48, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_NVE18 },
+        /* 72*/ { 48, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_NVE18 },
+        /* 73*/ { 59, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_CODE128 },
+        /* 74*/ { 59, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_CODE128 },
+        /* 75*/ { 61, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_CODE128 },
+        /* 76*/ { 61, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_CODE128 },
+        /* 77*/ { 62, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_CODE93 },
+        /* 78*/ { 62, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_CODE93 },
+        /* 79*/ { 64, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_AUSPOST },
+        /* 80*/ { 64, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_AUSPOST },
+        /* 81*/ { 65, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_AUSPOST },
+        /* 82*/ { 65, -1, "12345678", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_AUSPOST },
+        /* 83*/ { 78, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_DBAR_OMN },
+        /* 84*/ { 78, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_DBAR_OMN },
+        /* 85*/ { 83, -1, "12345678901", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_PLANET },
+        /* 86*/ { 83, -1, "12345678901", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_PLANET },
+        /* 87*/ { 88, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 252: Data does not start with an AI", BARCODE_GS1_128 },
+        /* 88*/ { 88, -1, "[10]12", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_GS1_128 },
+        /* 89*/ { 88, -1, "[10]12", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_GS1_128 },
+        /* 90*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 212: Symbology out of range", BARCODE_CODE128 },
+        /* 91*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 212: Symbology out of range", -1 },
+        /* 92*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 213: Symbology out of range", BARCODE_CODE128 },
+        /* 93*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 213: Symbology out of range", -1 },
+        /* 94*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 213: Symbology out of range", BARCODE_CODE128 },
+        /* 95*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 213: Symbology out of range", -1 },
+        /* 96*/ { 100, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_128 },
+        /* 97*/ { 100, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_128 },
+        /* 98*/ { 101, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_39 },
+        /* 99*/ { 101, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_39 },
+        /*100*/ { 103, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_DM },
+        /*101*/ { 103, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_DM },
+        /*102*/ { 105, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_QR },
+        /*103*/ { 105, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_QR },
+        /*104*/ { 107, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_PDF },
+        /*105*/ { 107, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_PDF },
+        /*106*/ { 109, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_MICPDF },
+        /*107*/ { 109, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_MICPDF },
+        /*108*/ { 111, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_BLOCKF },
+        /*109*/ { 111, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_BLOCKF },
+        /*110*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 214: Symbology out of range", BARCODE_CODE128 },
+        /*111*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 214: Symbology out of range", -1 },
+        /*112*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 214: Symbology out of range", BARCODE_CODE128 },
+        /*113*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 214: Symbology out of range", -1 },
+        /*114*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*115*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*116*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*117*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*118*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*119*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*120*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*121*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*122*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*123*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*124*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*125*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*126*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*127*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*128*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
+        /*129*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
+        /*130*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 216: Symbology out of range", BARCODE_CODE128 },
+        /*131*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 216: Symbology out of range", -1 },
+        /*132*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 216: Symbology out of range", BARCODE_CODE128 },
+        /*133*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 216: Symbology out of range", -1 },
+        /*134*/ { BARCODE_CODE128, -1, "\200", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input data", -1 },
+        /*135*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_NONCOMPLIANT, "Warning 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 },
+        /*136*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 },
+        /*137*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 },
+        /*138*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 },
+        /*139*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 },
+        /*140*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 },
+        /*141*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 512: ECI ignored for GS1 mode", -1 },
+        /*142*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 }, /* Warning in encoder overrides library warnings */
+        /*143*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, /* But not errors */
+        /*144*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 },
+        /*145*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 },
+        /*146*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 },
+        /*147*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 503: Invalid error correction level - using default instead", -1 },
+        /*148*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Invalid error correction level - using default instead", -1 },
+        /*149*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, /* ECI warning trumps all other warnings */
+        /*150*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Invalid error correction level - using default instead", -1 }, /* But not errors */
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
@@ -243,6 +246,9 @@ static void test_checks(const testCtx *const p_ctx) {
         if (data[i].dot_size != -1) {
             symbol->dot_size = data[i].dot_size;
         }
+        if (data[i].text_gap) {
+            symbol->text_gap = data[i].text_gap;
+        }
         if (data[i].guard_descent != -1) {
             symbol->guard_descent = data[i].guard_descent;
         }

backend/tests/test_output.c

@@ -48,23 +48,23 @@ static void test_check_colour_options(const testCtx *const p_ctx) {
         /*  0*/ { "FFFFFF", "000000", 0, "" },
         /*  1*/ { "ffffff", "ffffff", 0, "" },
         /*  2*/ { "77777777", "33333333", 0, "" },
-        /*  3*/ { "FFFFF", "000000", ZINT_ERROR_INVALID_OPTION, "690: Malformed foreground RGB colour (6 or 8 characters only)" },
-        /*  4*/ { "FFFFFFF", "000000", ZINT_ERROR_INVALID_OPTION, "690: Malformed foreground RGB colour (6 or 8 characters only)" },
-        /*  5*/ { "FFFFFG", "000000", ZINT_ERROR_INVALID_OPTION, "691: Malformed foreground RGB colour 'FFFFFG' (hexadecimal only)" },
-        /*  6*/ { "FFFFFF", "000000000", ZINT_ERROR_INVALID_OPTION, "690: Malformed background RGB colour (6 or 8 characters only)" },
-        /*  7*/ { "FFFFFF", "0000000Z", ZINT_ERROR_INVALID_OPTION, "691: Malformed background RGB colour '0000000Z' (hexadecimal only)" },
+        /*  3*/ { "FFFFF", "000000", ZINT_ERROR_INVALID_OPTION, "880: Malformed foreground RGB colour (6 or 8 characters only)" },
+        /*  4*/ { "FFFFFFF", "000000", ZINT_ERROR_INVALID_OPTION, "880: Malformed foreground RGB colour (6 or 8 characters only)" },
+        /*  5*/ { "FFFFFG", "000000", ZINT_ERROR_INVALID_OPTION, "881: Malformed foreground RGB colour 'FFFFFG' (hexadecimal only)" },
+        /*  6*/ { "FFFFFF", "000000000", ZINT_ERROR_INVALID_OPTION, "880: Malformed background RGB colour (6 or 8 characters only)" },
+        /*  7*/ { "FFFFFF", "0000000Z", ZINT_ERROR_INVALID_OPTION, "881: Malformed background RGB colour '0000000Z' (hexadecimal only)" },
         /*  8*/ { "100,100,100,100", "0,1,2,3", 0, "" },
         /*  9*/ { "100,,100,100", ",1,2,", 0, "" },
-        /* 10*/ { "100,100,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "692: Malformed foreground CMYK colour (4 decimal numbers, comma-separated)" },
-        /* 11*/ { "100,100,99,1001", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "693: Malformed foreground CMYK colour (3 digit maximum per number)" },
-        /* 12*/ { "101,100,100,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "694: Malformed foreground CMYK colour C (decimal 0-100 only)" },
-        /* 13*/ { "100,101,100,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "695: Malformed foreground CMYK colour M (decimal 0-100 only)" },
-        /* 14*/ { "100,100,101,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "696: Malformed foreground CMYK colour Y (decimal 0-100 only)" },
-        /* 15*/ { "100,100,100,101", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "697: Malformed foreground CMYK colour K (decimal 0-100 only)" },
-        /* 16*/ { "100,100,100,100", "0,1,", ZINT_ERROR_INVALID_OPTION, "692: Malformed background CMYK colour (4 decimal numbers, comma-separated)" },
-        /* 17*/ { "100,100,100,100", "0,0123,3,4", ZINT_ERROR_INVALID_OPTION, "693: Malformed background CMYK colour (3 digit maximum per number)" },
-        /* 18*/ { "100,100,100,100", "0,1,2,101", ZINT_ERROR_INVALID_OPTION, "697: Malformed background CMYK colour K (decimal 0-100 only)" },
-        /* 19*/ { "100,100,100,100", "0,1,2,3,", ZINT_ERROR_INVALID_OPTION, "692: Malformed background CMYK colour (4 decimal numbers, comma-separated)" },
+        /* 10*/ { "100,100,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "882: Malformed foreground CMYK colour (4 decimal numbers, comma-separated)" },
+        /* 11*/ { "100,100,99,1001", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "883: Malformed foreground CMYK colour (3 digit maximum per number)" },
+        /* 12*/ { "101,100,100,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "884: Malformed foreground CMYK colour C (decimal 0-100 only)" },
+        /* 13*/ { "100,101,100,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "885: Malformed foreground CMYK colour M (decimal 0-100 only)" },
+        /* 14*/ { "100,100,101,100", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "886: Malformed foreground CMYK colour Y (decimal 0-100 only)" },
+        /* 15*/ { "100,100,100,101", "0,1,2,3", ZINT_ERROR_INVALID_OPTION, "887: Malformed foreground CMYK colour K (decimal 0-100 only)" },
+        /* 16*/ { "100,100,100,100", "0,1,", ZINT_ERROR_INVALID_OPTION, "882: Malformed background CMYK colour (4 decimal numbers, comma-separated)" },
+        /* 17*/ { "100,100,100,100", "0,0123,3,4", ZINT_ERROR_INVALID_OPTION, "883: Malformed background CMYK colour (3 digit maximum per number)" },
+        /* 18*/ { "100,100,100,100", "0,1,2,101", ZINT_ERROR_INVALID_OPTION, "887: Malformed background CMYK colour K (decimal 0-100 only)" },
+        /* 19*/ { "100,100,100,100", "0,1,2,3,", ZINT_ERROR_INVALID_OPTION, "882: Malformed background CMYK colour (4 decimal numbers, comma-separated)" },
     };
     int data_size = ARRAY_SIZE(data);
     int i, ret;

backend/tests/test_png.c

@@ -136,6 +136,7 @@ static void test_print(const testCtx *const p_ctx) {
         struct zint_structapp structapp;
         char *fgcolour;
         char *bgcolour;
+        float text_gap;
         char *data;
         char *composite;
         int ret;
@@ -143,66 +144,66 @@ static void test_print(const testCtx *const p_ctx) {
         char *comment;
     };
     struct item data[] = {
-        /*  0*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "Égjpqy", "", 0, "code128_egrave_bold.png", "" },
-        /*  1*/ { BARCODE_CODE128, UNICODE_MODE, 3, BOLD_TEXT | BARCODE_BOX, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "Égjpqy", "", 0, "code128_egrave_bold_box3.png", "" },
-        /*  2*/ { BARCODE_CODE128, UNICODE_MODE, 2, BOLD_TEXT | BARCODE_BOX, 2, 2, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "Égjpqy", "", 0, "code128_egrave_bold_hvwsp2_box2.png", "" },
-        /*  3*/ { BARCODE_GS1_128_CC, -1, -1, -1, -1, -1, -1, 3, -1, 0, 0, { 0, 0, "" }, "", "", "[00]030123456789012340", "[02]13012345678909[37]24[10]1234567ABCDEFG", 0, "gs1_128_cc_fig12.png", "" },
-        /*  4*/ { BARCODE_CODABLOCKF, -1, 3, -1, -1, -1, -1, 3, -1, 0, 0, { 0, 0, "" }, "", "", "AAAAAAAAA", "", 0, "codablockf_3rows.png", "" },
-        /*  5*/ { BARCODE_CODABLOCKF, -1, -1, -1, 2, 2, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "AAAAAAAAA", "", 0, "codablockf_hvwsp2.png", "" },
-        /*  6*/ { BARCODE_CODABLOCKF, -1, 2, BARCODE_BOX, 2, 2, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "AAAAAAAAA", "", 0, "codablockf_hvwsp2_box2.png", "" },
-        /*  7*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "9771384524017+12", "", 0, "ean13_2addon_ggs_5.2.2.5.1-2.png", "" },
-        /*  8*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "9780877799306+54321", "", 0, "ean13_5addon_ggs_5.2.2.5.2-2.png", "" },
-        /*  9*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, 0, { 0, 0, "" }, "", "", "123456789012+12", "[91]123456789012345678901", 0, "ean13_cc_2addon_cca_4x4.png", "" },
-        /* 10*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4.png", "" },
-        /* 11*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, 0, { 0, 0, "" }, "", "", "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4_notext.png", "" },
-        /* 12*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "012345678905+24", "", 0, "upca_2addon_ggs_5.2.6.6-5.png", "" },
-        /* 13*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "614141234417+12345", "", 0, "upca_5addon.png", "" },
-        /* 14*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, 0, -1, -1, 0, 0, { 0, 0, "" }, "", "", "614141234417+12345", "", 0, "upca_5addon_notext.png", "" },
-        /* 15*/ { BARCODE_UPCA, -1, 3, BARCODE_BIND, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "614141234417+12345", "", 0, "upca_5addon_bind3.png", "" },
-        /* 16*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, 0, { 0, 0, "" }, "", "", "12345678901+12", "[91]123456789", 0, "upca_cc_2addon_cca_3x4.png", "" },
-        /* 17*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4.png", "" },
-        /* 18*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, 0, { 0, 0, "" }, "", "", "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_notext.png", "" },
-        /* 19*/ { BARCODE_UPCA_CC, -1, 3, BARCODE_BIND, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_bind3.png", "" },
-        /* 20*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "1234567+12", "", 0, "upce_2addon.png", "" },
-        /* 21*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "1234567+12345", "", 0, "upce_5addon.png", "" },
-        /* 22*/ { BARCODE_UPCE, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "1234567+12345", "", 0, "upce_5addon_small.png", "" },
-        /* 23*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, 0, { 0, 0, "" }, "", "", "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2.png", "" },
-        /* 24*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2.png", "" },
-        /* 25*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, 0, { 0, 0, "" }, "", "", "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2_notext.png", "" },
-        /* 26*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "1234567+12", "", 0, "ean8_2addon.png", "" },
-        /* 27*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "1234567+12345", "", 0, "ean8_5addon.png", "" },
-        /* 28*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "9876543+65", "[91]1234567", 0, "ean8_cc_2addon_cca_4x3.png", "" },
-        /* 29*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "9876543+74083", "[91]123456789012345678", 0, "ean8_cc_5addon_ccb_8x3.png", "" },
-        /* 30*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "12345", "", 0, "ean5.png", "" },
-        /* 31*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "12", "", 0, "ean2.png", "" },
-        /* 32*/ { BARCODE_CODE39, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "123", "", 0, "code39_small.png", "" },
-        /* 33*/ { BARCODE_POSTNET, -1, -1, -1, -1, -1, -1, -1, -1, 0, 3.5, { 0, 0, "" }, "", "", "12345", "", 0, "postnet_zip.png", "300 dpi, using 1/43in X, 300 / 43 / 2 = ~3.5 scale" },
-        /* 34*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "CFCECDCC", "12345", "", 0, "pdf417_bgalpha.png", "" },
-        /* 35*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "30313233", "", "12345", "", 0, "pdf417_fgalpha.png", "" },
-        /* 36*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "20212244", "CFCECDCC", "12345", "", 0, "pdf417_bgfgalpha.png", "" },
-        /* 37*/ { BARCODE_ULTRA, -1, -1, -1, 2, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "0000007F", "FF000033", "12345", "", 0, "ultra_bgfgalpha.png", "" },
-        /* 38*/ { BARCODE_ULTRA, -1, -1, -1, 2, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "FF000033", "12345", "", 0, "ultra_bgalpha.png", "" },
-        /* 39*/ { BARCODE_ULTRA, -1, -1, -1, 2, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "0000007F", "FF0000", "12345", "", 0, "ultra_fgalpha.png", "" },
-        /* 40*/ { BARCODE_ULTRA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "0000007F", "", "12345", "", 0, "ultra_fgalpha_nobg.png", "" },
-        /* 41*/ { BARCODE_ULTRA, -1, 1, BARCODE_BOX, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "12345", "", 0, "ultra_hvwsp1_box1.png", "" },
-        /* 42*/ { BARCODE_ULTRA, -1, 1, BARCODE_BOX, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "00FF007F", "BABDB6", "12345", "", 0, "ultra_fgalpha_hvwsp1_box1.png", "" },
-        /* 43*/ { BARCODE_ULTRA, -1, 1, BARCODE_BIND_TOP, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "00FF007F", "BABDB6", "12345", "", 0, "ultra_fgalpha_hvwsp1_bindtop1.png", "" },
-        /* 44*/ { BARCODE_ULTRA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0.5, { 0, 0, "" }, "", "", "1", "", 0, "ultra_odd.png", "" },
-        /* 45*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0.5, { 0, 0, "" }, "", "", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_0.5.png", "6 dpmm, 150 dpi" },
-        /* 46*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BOX, 3, -1, -1, -1, -1, 0, 0.7, { 0, 0, "" }, "", "", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_0.7_wsp3_box1.png", "8 dpmm, 200 dpi" },
-        /* 47*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1.4, { 0, 0, "" }, "1111117F", "EEEEEEEE", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_1.4_bgfgalpha.png", "16 dpmm, 400 dpi" },
-        /* 48*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 2.1, { 0, 0, "" }, "", "", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_2.1.png", "24 dpmm, 600 dpi" },
-        /* 49*/ { BARCODE_MAXICODE, -1, 2, BARCODE_BOX, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_hvwsp1_box2.png", "" },
-        /* 50*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BIND, -1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_vwsp1_bind1.png", "" },
-        /* 51*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, -1, -1, -1, -1, -1, 0, 2.0f, { 0, 0, "" }, "", "", "1234", "", 0, "datamatrix_2.0_bind1_dotty.png", "" },
-        /* 52*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, 1, 1, -1, -1, -1, 0, 2.0f, { 0, 0, "" }, "", "", "1234", "", 0, "datamatrix_2.0_hvwsp1_bind1_dotty.png", "" },
-        /* 53*/ { BARCODE_DBAR_LTD, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "12345678909", "", 0, "dbar_ltd.png", "" },
-        /* 54*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 5.0, 0, { 0, 0, "" }, "", "", "Your Data Here!", "", ZINT_WARN_NONCOMPLIANT, "pdf417_height5.png", "" },
-        /* 55*/ { BARCODE_USPS_IMAIL, -1, -1, -1, -1, -1, -1, -1, -1, 7.75, 0, { 0, 0, "" }, "", "", "12345678901234567890", "", 0, "imail_height7.75.png", "" },
-        /* 56*/ { BARCODE_AZTEC, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 4, 7, "Z1.txt" }, "", "", "3456", "", 0, "aztec_z1_seq4of7.png", "" },
-        /* 57*/ { BARCODE_PDF417, -1, -1, BARCODE_NO_QUIET_ZONES, -1, -1, -1, 5, 8, 16, 1.5, { 0, 0, "" }, "", "", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "", ZINT_WARN_NONCOMPLIANT, "pdf417_#204.png", "Ticket #204 Blank line in PDF417" },
-        /* 58*/ { BARCODE_DPD, -1, -1, BARCODE_QUIET_ZONES | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", "008182709980000020028101276", "", 0, "dpd_compliant.png", "Now with bind top 3X default" },
-        /* 59*/ { BARCODE_CHANNEL, -1, -1, CMYK_COLOUR | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "100,85,0,20", "FFFFFF00", "123", "", 0, "channel_cmyk_nobg.png", "" },
+        /*  0*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold.png", "" },
+        /*  1*/ { BARCODE_CODE128, UNICODE_MODE, 3, BOLD_TEXT | BARCODE_BOX, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_box3.png", "" },
+        /*  2*/ { BARCODE_CODE128, UNICODE_MODE, 2, BOLD_TEXT | BARCODE_BOX, 2, 2, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp2_box2.png", "" },
+        /*  3*/ { BARCODE_GS1_128_CC, -1, -1, -1, -1, -1, -1, 3, -1, 0, 0, { 0, 0, "" }, "", "", 0, "[00]030123456789012340", "[02]13012345678909[37]24[10]1234567ABCDEFG", 0, "gs1_128_cc_fig12.png", "" },
+        /*  4*/ { BARCODE_CODABLOCKF, -1, 3, -1, -1, -1, -1, 3, -1, 0, 0, { 0, 0, "" }, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_3rows.png", "" },
+        /*  5*/ { BARCODE_CODABLOCKF, -1, -1, -1, 2, 2, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2.png", "" },
+        /*  6*/ { BARCODE_CODABLOCKF, -1, 2, BARCODE_BOX, 2, 2, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2_box2.png", "" },
+        /*  7*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "9771384524017+12", "", 0, "ean13_2addon_ggs_5.2.2.5.1-2.png", "" },
+        /*  8*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "9780877799306+54321", "", 0, "ean13_5addon_ggs_5.2.2.5.2-2.png", "" },
+        /*  9*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "123456789012+12", "[91]123456789012345678901", 0, "ean13_cc_2addon_cca_4x4.png", "" },
+        /* 10*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4.png", "" },
+        /* 11*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, 0, { 0, 0, "" }, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4_notext.png", "" },
+        /* 12*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "012345678905+24", "", 0, "upca_2addon_ggs_5.2.6.6-5.png", "" },
+        /* 13*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "614141234417+12345", "", 0, "upca_5addon.png", "" },
+        /* 14*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, 0, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_notext.png", "" },
+        /* 15*/ { BARCODE_UPCA, -1, 3, BARCODE_BIND, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_bind3.png", "" },
+        /* 16*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12345678901+12", "[91]123456789", 0, "upca_cc_2addon_cca_3x4.png", "" },
+        /* 17*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4.png", "" },
+        /* 18*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_notext.png", "" },
+        /* 19*/ { BARCODE_UPCA_CC, -1, 3, BARCODE_BIND, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_bind3.png", "" },
+        /* 20*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "1234567+12", "", 0, "upce_2addon.png", "" },
+        /* 21*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "1234567+12345", "", 0, "upce_5addon.png", "" },
+        /* 22*/ { BARCODE_UPCE, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "1234567+12345", "", 0, "upce_5addon_small.png", "" },
+        /* 23*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2.png", "" },
+        /* 24*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 2, -1, 0, 0, { 0, 0, "" }, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2.png", "" },
+        /* 25*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, 0, 2, -1, 0, 0, { 0, 0, "" }, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2_notext.png", "" },
+        /* 26*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "1234567+12", "", 0, "ean8_2addon.png", "" },
+        /* 27*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "1234567+12345", "", 0, "ean8_5addon.png", "" },
+        /* 28*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "9876543+65", "[91]1234567", 0, "ean8_cc_2addon_cca_4x3.png", "" },
+        /* 29*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "9876543+74083", "[91]123456789012345678", 0, "ean8_cc_5addon_ccb_8x3.png", "" },
+        /* 30*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12345", "", 0, "ean5.png", "" },
+        /* 31*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12", "", 0, "ean2.png", "" },
+        /* 32*/ { BARCODE_CODE39, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "123", "", 0, "code39_small.png", "" },
+        /* 33*/ { BARCODE_POSTNET, -1, -1, -1, -1, -1, -1, -1, -1, 0, 3.5, { 0, 0, "" }, "", "", 0, "12345", "", 0, "postnet_zip.png", "300 dpi, using 1/43in X, 300 / 43 / 2 = ~3.5 scale" },
+        /* 34*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "CFCECDCC", 0, "12345", "", 0, "pdf417_bgalpha.png", "" },
+        /* 35*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "30313233", "", 0, "12345", "", 0, "pdf417_fgalpha.png", "" },
+        /* 36*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "20212244", "CFCECDCC", 0, "12345", "", 0, "pdf417_bgfgalpha.png", "" },
+        /* 37*/ { BARCODE_ULTRA, -1, -1, -1, 2, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "0000007F", "FF000033", 0, "12345", "", 0, "ultra_bgfgalpha.png", "" },
+        /* 38*/ { BARCODE_ULTRA, -1, -1, -1, 2, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "FF000033", 0, "12345", "", 0, "ultra_bgalpha.png", "" },
+        /* 39*/ { BARCODE_ULTRA, -1, -1, -1, 2, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "0000007F", "FF0000", 0, "12345", "", 0, "ultra_fgalpha.png", "" },
+        /* 40*/ { BARCODE_ULTRA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "0000007F", "", 0, "12345", "", 0, "ultra_fgalpha_nobg.png", "" },
+        /* 41*/ { BARCODE_ULTRA, -1, 1, BARCODE_BOX, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12345", "", 0, "ultra_hvwsp1_box1.png", "" },
+        /* 42*/ { BARCODE_ULTRA, -1, 1, BARCODE_BOX, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "00FF007F", "BABDB6", 0, "12345", "", 0, "ultra_fgalpha_hvwsp1_box1.png", "" },
+        /* 43*/ { BARCODE_ULTRA, -1, 1, BARCODE_BIND_TOP, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "00FF007F", "BABDB6", 0, "12345", "", 0, "ultra_fgalpha_hvwsp1_bindtop1.png", "" },
+        /* 44*/ { BARCODE_ULTRA, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0.5, { 0, 0, "" }, "", "", 0, "1", "", 0, "ultra_odd.png", "" },
+        /* 45*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0.5, { 0, 0, "" }, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_0.5.png", "6 dpmm, 150 dpi" },
+        /* 46*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BOX, 3, -1, -1, -1, -1, 0, 0.7, { 0, 0, "" }, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_0.7_wsp3_box1.png", "8 dpmm, 200 dpi" },
+        /* 47*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1.4, { 0, 0, "" }, "1111117F", "EEEEEEEE", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_1.4_bgfgalpha.png", "16 dpmm, 400 dpi" },
+        /* 48*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, 0, 2.1, { 0, 0, "" }, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_2.1.png", "24 dpmm, 600 dpi" },
+        /* 49*/ { BARCODE_MAXICODE, -1, 2, BARCODE_BOX, 1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_hvwsp1_box2.png", "" },
+        /* 50*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BIND, -1, 1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_vwsp1_bind1.png", "" },
+        /* 51*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, -1, -1, -1, -1, -1, 0, 2.0f, { 0, 0, "" }, "", "", 0, "1234", "", 0, "datamatrix_2.0_bind1_dotty.png", "" },
+        /* 52*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, 1, 1, -1, -1, -1, 0, 2.0f, { 0, 0, "" }, "", "", 0, "1234", "", 0, "datamatrix_2.0_hvwsp1_bind1_dotty.png", "" },
+        /* 53*/ { BARCODE_DBAR_LTD, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "12345678909", "", 0, "dbar_ltd.png", "" },
+        /* 54*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, 5.0, 0, { 0, 0, "" }, "", "", 0, "Your Data Here!", "", ZINT_WARN_NONCOMPLIANT, "pdf417_height5.png", "" },
+        /* 55*/ { BARCODE_USPS_IMAIL, -1, -1, -1, -1, -1, -1, -1, -1, 7.75, 0, { 0, 0, "" }, "", "", 0, "12345678901234567890", "", 0, "imail_height7.75.png", "" },
+        /* 56*/ { BARCODE_AZTEC, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, { 4, 7, "Z1.txt" }, "", "", 0, "3456", "", 0, "aztec_z1_seq4of7.png", "" },
+        /* 57*/ { BARCODE_PDF417, -1, -1, BARCODE_NO_QUIET_ZONES, -1, -1, -1, 5, 8, 16, 1.5, { 0, 0, "" }, "", "", 0, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "", ZINT_WARN_NONCOMPLIANT, "pdf417_#204.png", "Ticket #204 Blank line in PDF417" },
+        /* 58*/ { BARCODE_DPD, -1, -1, BARCODE_QUIET_ZONES | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "", "", 0, "008182709980000020028101276", "", 0, "dpd_compliant.png", "Now with bind top 3X default" },
+        /* 59*/ { BARCODE_CHANNEL, -1, -1, CMYK_COLOUR | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, 0, 0, { 0, 0, "" }, "100,85,0,20", "FFFFFF00", 0, "123", "", 0, "channel_cmyk_nobg.png", "" },
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
@@ -264,6 +265,8 @@ static void test_print(const testCtx *const p_ctx) {
         if (*data[i].bgcolour) {
             strcpy(symbol->bgcolour, data[i].bgcolour);
         }
+        symbol->text_gap = data[i].text_gap;
+
         if (strlen(data[i].composite)) {
             text = data[i].composite;
             strcpy(symbol->primary, data[i].data);

backend/tests/test_postal.c

@@ -1,6 +1,6 @@
 /*
     libzint - the open source barcode library
-    Copyright (C) 2019-2022 Robin Stuart <rstuart114@gmail.com>
+    Copyright (C) 2019-2023 Robin Stuart <rstuart114@gmail.com>
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -74,8 +74,8 @@ static void test_large(const testCtx *const p_ctx) {
         /* 23*/ { BARCODE_PLANET, "1", 39, ZINT_ERROR_TOO_LONG, -1, -1 },
         /* 24*/ { BARCODE_KIX, "1", 18, 0, 3, 143 },
         /* 25*/ { BARCODE_KIX, "1", 19, ZINT_ERROR_TOO_LONG, -1, -1 },
-        /* 26*/ { BARCODE_DAFT, "D", 100, 0, 3, 199 },
-        /* 27*/ { BARCODE_DAFT, "D", 101, ZINT_ERROR_TOO_LONG, -1, -1 },
+        /* 26*/ { BARCODE_DAFT, "D", 250, 0, 3, 499 },
+        /* 27*/ { BARCODE_DAFT, "D", 251, ZINT_ERROR_TOO_LONG, -1, -1 },
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;

backend/tests/test_raster.c

@@ -1,6 +1,6 @@
 /*
     libzint - the open source barcode library
-    Copyright (C) 2019-2022 Robin Stuart <rstuart114@gmail.com>
+    Copyright (C) 2019-2023 Robin Stuart <rstuart114@gmail.com>
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -1237,7 +1237,6 @@ static void test_scale(const testCtx *const p_ctx) {
         symbol = ZBarcode_Create();
         assert_nonnull(symbol, "Symbol not created\n");
 
-        testUtilSetSymbol(symbol, data[i].symbology, UNICODE_MODE, -1 /*eci*/, -1 /*option_1*/, data[i].option_2, -1, data[i].output_options, data[i].data, -1, debug);
         if (data[i].border_width != -1) {
             symbol->border_width = data[i].border_width;
         }
@@ -1253,7 +1252,7 @@ static void test_scale(const testCtx *const p_ctx) {
         } else {
             text = data[i].data;
         }
-        length = (int) strlen(text);
+        length = testUtilSetSymbol(symbol, data[i].symbology, UNICODE_MODE, -1 /*eci*/, -1 /*option_1*/, data[i].option_2, -1, data[i].output_options, text, -1, debug);
 
         ret = ZBarcode_Encode(symbol, (unsigned char *) text, length);
         assert_nonzero(ret < ZINT_ERROR, "i:%d ZBarcode_Encode(%d) ret %d >= ZINT_ERROR (%s)\n", i, data[i].symbology, ret, symbol->errtxt);
@@ -1788,6 +1787,161 @@ static void test_quiet_zones(const testCtx *const p_ctx) {
     testFinish();
 }
 
+static void test_text_gap(const testCtx *const p_ctx) {
+    int debug = p_ctx->debug;
+
+    struct item {
+        int symbology;
+        int output_options;
+        int option_2;
+        int show_hrt;
+        float text_gap;
+        float scale;
+        char *data;
+        char *composite;
+
+        int ret;
+        float expected_height;
+        int expected_rows;
+        int expected_width;
+        int expected_bitmap_width;
+        int expected_bitmap_height;
+
+        int expected_set;
+        int expected_set_row;
+        int expected_set_rows; /* Last row no. + 1 */
+        int expected_set_col;
+        int expected_set_len;
+    };
+    /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */
+    struct item data[] = {
+        /*  0*/ { BARCODE_CODE11, -1, -1, -1, 0, 0, "1234", "", 0, 50, 1, 62, 124, 116, 1 /*set*/, 104, 105, 55, 6 }, /* Default */
+        /*  1*/ { BARCODE_CODE11, -1, -1, -1, 0, 0, "1234", "", 0, 50, 1, 62, 124, 116, 0 /*set*/, 103, 104, 0, 124 }, /* Default */
+        /*  2*/ { BARCODE_CODE11, -1, -1, -1, 0.1, 0, "1234", "", 0, 50, 1, 62, 124, 114, 1 /*set*/, 102, 103, 55, 6 },
+        /*  3*/ { BARCODE_CODE11, -1, -1, -1, 0.4, 0, "1234", "", 0, 50, 1, 62, 124, 114, 1 /*set*/, 102, 103, 55, 6 },
+        /*  4*/ { BARCODE_CODE11, -1, -1, -1, 0.5, 0, "1234", "", 0, 50, 1, 62, 124, 115, 1 /*set*/, 103, 104, 55, 6 },
+        /*  5*/ { BARCODE_CODE11, -1, -1, -1, 0.5, 0, "1234", "", 0, 50, 1, 62, 124, 115, 0 /*set*/, 102, 103, 0, 124 },
+        /*  6*/ { BARCODE_CODE11, -1, -1, -1, 0.6, 0, "1234", "", 0, 50, 1, 62, 124, 115, 1 /*set*/, 103, 104, 55, 6 },
+        /*  7*/ { BARCODE_CODE11, -1, -1, -1, 1.0, 0, "1234", "", 0, 50, 1, 62, 124, 116, 1 /*set*/, 104, 105, 55, 6 }, /* Same as default */
+        /*  8*/ { BARCODE_CODE11, -1, -1, -1, 1.0, 0, "1234", "", 0, 50, 1, 62, 124, 116, 0 /*set*/, 103, 104, 0, 124 }, /* Same as default */
+        /*  9*/ { BARCODE_CODE11, -1, -1, -1, 1.5, 0, "1234", "", 0, 50, 1, 62, 124, 117, 1 /*set*/, 105, 106, 55, 6 },
+        /* 10*/ { BARCODE_CODE11, -1, -1, -1, 1.5, 0, "1234", "", 0, 50, 1, 62, 124, 117, 0 /*set*/, 104, 105, 0, 124 },
+        /* 11*/ { BARCODE_CODE11, -1, -1, -1, 2.0, 0, "1234", "", 0, 50, 1, 62, 124, 118, 1 /*set*/, 106, 107, 55, 6 },
+        /* 12*/ { BARCODE_CODE11, -1, -1, -1, 2.0, 0, "1234", "", 0, 50, 1, 62, 124, 118, 0 /*set*/, 105, 106, 0, 124 },
+        /* 13*/ { BARCODE_CODE11, -1, -1, -1, 3.0, 0, "1234", "", 0, 50, 1, 62, 124, 120, 1 /*set*/, 108, 109, 55, 6 },
+        /* 14*/ { BARCODE_CODE11, -1, -1, -1, 3.0, 0, "1234", "", 0, 50, 1, 62, 124, 120, 0 /*set*/, 107, 108, 0, 124 },
+        /* 15*/ { BARCODE_CODE11, -1, -1, -1, 4.0, 0, "1234", "", 0, 50, 1, 62, 124, 122, 1 /*set*/, 110, 111, 55, 6 },
+        /* 16*/ { BARCODE_CODE11, -1, -1, -1, 4.0, 0, "1234", "", 0, 50, 1, 62, 124, 122, 0 /*set*/, 109, 110, 0, 124 },
+        /* 17*/ { BARCODE_CODE11, -1, -1, -1, 5.0, 0, "1234", "", 0, 50, 1, 62, 124, 124, 1 /*set*/, 112, 113, 55, 6 },
+        /* 18*/ { BARCODE_CODE11, -1, -1, -1, 5.0, 0, "1234", "", 0, 50, 1, 62, 124, 124, 0 /*set*/, 111, 112, 0, 124 },
+        /* 19*/ { BARCODE_CODE11, -1, -1, -1, 0, 3.0, "1234", "", 0, 50, 1, 62, 372, 348, 1 /*set*/, 312, 315, 165, 18 }, /* Scale default */
+        /* 20*/ { BARCODE_CODE11, -1, -1, -1, 0, 3.0, "1234", "", 0, 50, 1, 62, 372, 348, 0 /*set*/, 311, 312, 0, 372 }, /* Scale default */
+        /* 21*/ { BARCODE_CODE11, -1, -1, -1, 1.5, 3.0, "1234", "", 0, 50, 1, 62, 372, 351, 1 /*set*/, 315, 318, 165, 18 }, /* Scale */
+        /* 22*/ { BARCODE_CODE11, -1, -1, -1, 1.5, 3.0, "1234", "", 0, 50, 1, 62, 372, 351, 0 /*set*/, 314, 315, 0, 372 }, /* Scale */
+        /* 23*/ { BARCODE_UPCA, -1, -1, -1, 0, 0, "01457130763", "", 0, 50, 1, 95, 226, 116, 1 /*set*/, 102, 104, 81, 9 }, /* Default */
+        /* 24*/ { BARCODE_UPCA, -1, -1, -1, 0, 0, "01457130763", "", 0, 50, 1, 95, 226, 116, 0 /*set*/, 101, 102, 38, 72 }, /* Default */
+        /* 25*/ { BARCODE_UPCA, -1, -1, -1, 0.5, 0, "01457130763", "", 0, 50, 1, 95, 226, 115, 1 /*set*/, 101, 103, 81, 9 },
+        /* 26*/ { BARCODE_UPCA, -1, -1, -1, 0.75, 0, "01457130763", "", 0, 50, 1, 95, 226, 115, 1 /*set*/, 101, 103, 81, 9 },
+        /* 27*/ { BARCODE_UPCA, -1, -1, -1, 1.0, 0, "01457130763", "", 0, 50, 1, 95, 226, 116, 1 /*set*/, 102, 104, 81, 9 }, /* Same as default */
+        /* 28*/ { BARCODE_UPCA, -1, -1, -1, 1.0, 0, "01457130763", "", 0, 50, 1, 95, 226, 116, 0 /*set*/, 101, 102, 38, 72 }, /* Same as default */
+        /* 29*/ { BARCODE_UPCA, -1, -1, -1, 2.0, 0, "01457130763", "", 0, 50, 1, 95, 226, 118, 1 /*set*/, 104, 106, 81, 9 },
+        /* 30*/ { BARCODE_UPCA, -1, -1, -1, 2.0, 2.5, "01457130763", "", 0, 50, 1, 95, 565, 295, 1 /*set*/, 260, 265, 201, 22 }, /* Scale */
+        /* 31*/ { BARCODE_UPCA, -1, -1, -1, 2.0, 2.5, "01457130763", "", 0, 50, 1, 95, 565, 295, 0 /*set*/, 259, 260, 95, 180 }, /* Scale */
+        /* 32*/ { BARCODE_UPCA, -1, -1, -1, 0, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116, 0 /*set*/, 14, 16, 208, 68 }, /* Default */
+        /* 33*/ { BARCODE_UPCA, -1, -1, -1, 0, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116, 1 /*set*/, 16, 100, 244, 4 }, /* Default */
+        /* 34*/ { BARCODE_UPCA, -1, -1, -1, 0.5, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 115, 0 /*set*/, 14, 15, 208, 68 },
+        /* 35*/ { BARCODE_UPCA, -1, -1, -1, 0.5, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 115, 1 /*set*/, 16, 100, 244, 4 },
+        /* 36*/ { BARCODE_UPCA, -1, -1, -1, 1.0, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116, 0 /*set*/, 14, 16, 208, 68 }, /* Same as default */
+        /* 37*/ { BARCODE_UPCA, -1, -1, -1, 1.0, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116, 1 /*set*/, 16, 100, 244, 4 }, /* Same as default */
+        /* 38*/ { BARCODE_UPCA, -1, -1, -1, 1.5, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117, 0 /*set*/, 14, 17, 208, 68 },
+        /* 39*/ { BARCODE_UPCA, -1, -1, -1, 1.5, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117, 1 /*set*/, 17, 100, 244, 4 },
+        /* 40*/ { BARCODE_UPCA, -1, -1, -1, 2.5, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 119, 0 /*set*/, 14, 19, 208, 68 },
+        /* 41*/ { BARCODE_UPCA, -1, -1, -1, 2.5, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 119, 1 /*set*/, 19, 100, 244, 4 },
+        /* 42*/ { BARCODE_UPCA_CC, -1, -1, -1, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 116, 0 /*set*/, 38, 40, 214, 70 }, /* Default */
+        /* 43*/ { BARCODE_UPCA_CC, -1, -1, -1, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 116, 1 /*set*/, 40, 100, 250, 4 }, /* Default */
+        /* 44*/ { BARCODE_UPCA_CC, -1, -1, -1, 1.0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 116, 0 /*set*/, 38, 40, 214, 70 }, /* Same as default */
+        /* 45*/ { BARCODE_UPCA_CC, -1, -1, -1, 1.0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 116, 1 /*set*/, 40, 100, 250, 4 },
+        /* 46*/ { BARCODE_UPCA_CC, -1, -1, -1, 3.0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 120, 0 /*set*/, 38, 44, 214, 70 },
+        /* 47*/ { BARCODE_UPCA_CC, -1, -1, -1, 3.0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 120, 1 /*set*/, 44, 100, 250, 4 },
+        /* 48*/ { BARCODE_UPCA_CC, -1, -1, 0, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 110, 0 /*set*/, 38, 40, 214, 70 }, /* Hide text default */
+        /* 49*/ { BARCODE_UPCA_CC, -1, -1, 0, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 110, 1 /*set*/, 40, 100, 250, 4 }, /* Hide text default */
+        /* 50*/ { BARCODE_UPCA_CC, -1, -1, 0, 3.0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 110, 0 /*set*/, 38, 44, 214, 70 }, /* Hide text */
+        /* 51*/ { BARCODE_UPCA_CC, -1, -1, 0, 3.0, 0, "01457130763+10", "[91]12", 0, 50, 7, 128, 284, 110, 1 /*set*/, 44, 100, 250, 4 }, /* Hide text */
+    };
+    int data_size = ARRAY_SIZE(data);
+    int i, length, ret;
+    struct zint_symbol *symbol;
+
+    const char *text;
+
+    testStart("test_text_gap");
+
+    for (i = 0; i < data_size; i++) {
+        int row, column;
+
+        if (testContinue(p_ctx, i)) continue;
+
+        symbol = ZBarcode_Create();
+        assert_nonnull(symbol, "Symbol not created\n");
+
+        if (data[i].show_hrt != -1) {
+            symbol->show_hrt = data[i].show_hrt;
+        }
+        symbol->text_gap = data[i].text_gap;
+        if (data[i].scale != 0.0f) {
+            symbol->scale = data[i].scale;
+        }
+
+        if (strlen(data[i].composite)) {
+            text = data[i].composite;
+            strcpy(symbol->primary, data[i].data);
+        } else {
+            text = data[i].data;
+        }
+        length = testUtilSetSymbol(symbol, data[i].symbology, UNICODE_MODE, -1 /*eci*/, -1 /*option_1*/, data[i].option_2, -1, data[i].output_options, text, -1, debug);
+
+        ret = ZBarcode_Encode(symbol, (unsigned char *) text, length);
+        assert_zero(ret, "i:%d ZBarcode_Encode(%d) ret %d != 0 (%s)\n", i, data[i].symbology, ret, symbol->errtxt);
+
+        ret = ZBarcode_Buffer(symbol, 0);
+        assert_equal(ret, data[i].ret, "i:%d ZBarcode_Buffer(%d) ret %d != %d (%s)\n", i, data[i].symbology, ret, data[i].ret, symbol->errtxt);
+        assert_nonnull(symbol->bitmap, "i:%d (%d) symbol->bitmap NULL\n", i, data[i].symbology);
+
+        if (p_ctx->index != -1 && (debug & ZINT_DEBUG_TEST_PRINT)) testUtilBitmapPrint(symbol, NULL, NULL); /* ZINT_DEBUG_TEST_PRINT 16 */
+
+        assert_equal(symbol->height, data[i].expected_height, "i:%d (%d) symbol->height %.8g != %.8g\n", i, data[i].symbology, symbol->height, data[i].expected_height);
+        assert_equal(symbol->rows, data[i].expected_rows, "i:%d (%d) symbol->rows %d != %d\n", i, data[i].symbology, symbol->rows, data[i].expected_rows);
+        assert_equal(symbol->width, data[i].expected_width, "i:%d (%d) symbol->width %d != %d\n", i, data[i].symbology, symbol->width, data[i].expected_width);
+        assert_equal(symbol->bitmap_width, data[i].expected_bitmap_width, "i:%d (%d) symbol->bitmap_width %d != %d\n", i, data[i].symbology, symbol->bitmap_width, data[i].expected_bitmap_width);
+        assert_equal(symbol->bitmap_height, data[i].expected_bitmap_height, "i:%d (%d) symbol->bitmap_height %d != %d\n", i, data[i].symbology, symbol->bitmap_height, data[i].expected_bitmap_height);
+
+        ret = ZBarcode_Print(symbol, 0);
+        assert_equal(ret, data[i].ret, "i:%d ZBarcode_Print(%d) ret %d != %d (%s)\n", i, data[i].symbology, ret, data[i].ret, symbol->errtxt);
+        assert_zero(remove(symbol->outfile), "i:%d remove(%s) != 0\n", i, symbol->outfile);
+
+        assert_nonzero(symbol->bitmap_height >= data[i].expected_set_rows, "i:%d (%d) symbol->bitmap_height %d < expected_set_rows %d\n",
+                i, data[i].symbology, symbol->bitmap_height, data[i].expected_set_rows);
+        assert_nonzero(data[i].expected_set_rows > data[i].expected_set_row, "i:%d (%d) expected_set_rows %d < expected_set_row %d\n",
+                i, data[i].symbology, data[i].expected_set_rows, data[i].expected_set_row);
+        for (row = data[i].expected_set_row; row < data[i].expected_set_rows; row++) {
+            int bits_set = 0;
+            for (column = data[i].expected_set_col; column < data[i].expected_set_col + data[i].expected_set_len; column++) {
+                if (is_row_column_black(symbol, row, column)) {
+                    bits_set++;
+                }
+            }
+            if (data[i].expected_set) {
+                assert_equal(bits_set, data[i].expected_set_len, "i:%d (%d) row %d bits_set %d != expected_set_len %d\n", i, data[i].symbology, row, bits_set, data[i].expected_set_len);
+            } else {
+                assert_zero(bits_set, "i:%d (%d) row %d bits_set %d != 0\n", i, data[i].symbology, row, bits_set);
+            }
+        }
+        ZBarcode_Delete(symbol);
+    }
+
+    testFinish();
+}
+
 static void test_buffer_plot(const testCtx *const p_ctx) {
     int debug = p_ctx->debug;
 
@@ -1812,96 +1966,96 @@ static void test_buffer_plot(const testCtx *const p_ctx) {
     };
     struct item data[] = {
         /*  0*/ { BARCODE_PDF417, 0, 1, -1, -1, 15, "", "", "1", 0, 16, 4, 86, 86, 16,
-                    "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
-                    "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
-                    "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
-                    "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
-                    "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
-                    "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
-                    "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
-                    "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
-                    "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
-                    "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
-                    "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
-                    "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
-                    "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
-                    "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
-                    "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
-                    "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
-                },
+            "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
+                "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
+                "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
+                "11111111010101000111101010111100001111101010111110011101010111000000111111101000101001"
+                "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
+                "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
+                "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
+                "11111111010101000111110101011000001111000001000101011111101010111000111111101000101001"
+                "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
+                "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
+                "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
+                "11111111010101000110101011111000001111011111101011011010101111100000111111101000101001"
+                "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
+                "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
+                "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
+                "11111111010101000101011110011110001010000010001000011010111101111100111111101000101001"
+        },
         /*  1*/ { BARCODE_PDF417, 0, 1, -1, -1, 15, "FF0000", "00FF0099", "1", 0, 16, 4, 86, 86, 16,
-                    "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
-                    "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
-                },
+            "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRRRGRGRGRRRRGGGGRRRRRGRGRGRRRRRGGRRRGRGRGRRRGGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRRRRGRGRGRRGGGGGRRRRGGGGGRGGGRGRGRRRRRRGRGRGRRRGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRRGRGRGRRRRRGGGGGRRRRGRRRRRRGRGRRGRRGRGRGRRRRRGGGGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
+                "RRRRRRRRGRGRGRGGGRGRGRRRRGGRRRRGGGRGRGGGGGRGGGRGGGGRRGRGRRRRGRRRRRGGRRRRRRRGRGGGRGRGGR"
+        },
         /*  2*/ { BARCODE_PDF417, 0, 1, 1, -1, 15, "FFFF0033", "00FF00", "1", 0, 16, 4, 86, 88, 16,
-                    "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
-                    "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
-                },
+            "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYYYGYGYGYYYYGGGGYYYYYGYGYGYYYYYGGYYYGYGYGYYYGGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYYYYGYGYGYYGGGGGYYYYGGGGGYGGGYGYGYYYYYYGYGYGYYYGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYYGYGYGYYYYYGGGGGYYYYGYYYYYYGYGYYGYYGYGYGYYYYYGGGGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
+                "GYYYYYYYYGYGYGYGGGYGYGYYYYGGYYYYGGGYGYGGGGGYGGGYGGGGYYGYGYYYYGYYYYYGGYYYYYYYGYGGGYGYGGYG"
+        },
         /*  3*/ { BARCODE_ULTRA, -1, -1, -1, -1, 13, "FF00007F", "00FF0000", "1", 0, 13, 13, 13, 13, 13,
-                    "1111111111111"
-                    "10Y10GYCGYYC1"
-                    "11C10MGYCGGG1"
-                    "10G10GYCMCYC1"
-                    "11Y10YMMGYGY1"
-                    "10M10CGGCMYM1"
-                    "1101010101011"
-                    "10G10CYMGCCC1"
-                    "11C10MCGCMMM1"
-                    "10Y10CGCGYCY1"
-                    "11M10GMMMMGC1"
-                    "10C10MYYYGMY1"
-                    "1111111111111"
-                },
+            "1111111111111"
+                "10Y10GYCGYYC1"
+                "11C10MGYCGGG1"
+                "10G10GYCMCYC1"
+                "11Y10YMMGYGY1"
+                "10M10CGGCMYM1"
+                "1101010101011"
+                "10G10CYMGCCC1"
+                "11C10MCGCMMM1"
+                "10Y10CGCGYCY1"
+                "11M10GMMMMGC1"
+                "10C10MYYYGMY1"
+                "1111111111111"
+        },
         /*  4*/ { BARCODE_ULTRA, -1, -1, 1, -1, 13, "", "00FF0000", "1", 0, 13, 13, 13, 15, 13,
-                    "G1111111111111G"
-                    "G10Y10GYCGYYC1G"
-                    "G11C10MGYCGGG1G"
-                    "G10G10GYCMCYC1G"
-                    "G11Y10YMMGYGY1G"
-                    "G10M10CGGCMYM1G"
-                    "G1101010101011G"
-                    "G10G10CYMGCCC1G"
-                    "G11C10MCGCMMM1G"
-                    "G10Y10CGCGYCY1G"
-                    "G11M10GMMMMGC1G"
-                    "G10C10MYYYGMY1G"
-                    "G1111111111111G"
-                },
+            "G1111111111111G"
+                "G10Y10GYCGYYC1G"
+                "G11C10MGYCGGG1G"
+                "G10G10GYCMCYC1G"
+                "G11Y10YMMGYGY1G"
+                "G10M10CGGCMYM1G"
+                "G1101010101011G"
+                "G10G10CYMGCCC1G"
+                "G11C10MCGCMMM1G"
+                "G10Y10CGCGYCY1G"
+                "G11M10GMMMMGC1G"
+                "G10C10MYYYGMY1G"
+                "G1111111111111G"
+        },
         /*  5*/ { BARCODE_CHANNEL, -1, -1, 1, -1, 5, "30313233", "CFCECDCC", "1", 0, 5, 1, 19, 21, 5,
-                    "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
-                    "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
-                    "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
-                    "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
-                    "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
-                },
+            "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
+                "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
+                "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
+                "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
+                "CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132CFCECD303132303132CFCECD303132303132CFCECDCFCECDCFCECD303132CFCECD"
+        },
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
@@ -1957,9 +2111,9 @@ static void test_buffer_plot(const testCtx *const p_ctx) {
             assert_equal(symbol->rows, data[i].expected_rows, "i:%d (%s) symbol->rows %d != %d\n", i, testUtilBarcodeName(data[i].symbology), symbol->rows, data[i].expected_rows);
             assert_equal(symbol->width, data[i].expected_width, "i:%d (%s) symbol->width %d != %d\n", i, testUtilBarcodeName(data[i].symbology), symbol->width, data[i].expected_width);
             assert_equal(symbol->bitmap_width, data[i].expected_bitmap_width, "i:%d (%s) symbol->bitmap_width %d != %d\n",
-                i, testUtilBarcodeName(data[i].symbology), symbol->bitmap_width, data[i].expected_bitmap_width);
+                    i, testUtilBarcodeName(data[i].symbology), symbol->bitmap_width, data[i].expected_bitmap_width);
             assert_equal(symbol->bitmap_height, data[i].expected_bitmap_height, "i:%d (%s) symbol->bitmap_height %d != %d\n",
-                i, testUtilBarcodeName(data[i].symbology), symbol->bitmap_height, data[i].expected_bitmap_height);
+                    i, testUtilBarcodeName(data[i].symbology), symbol->bitmap_height, data[i].expected_bitmap_height);
 
             ret = testUtilBitmapCmp(symbol, data[i].expected_bitmap, &row, &column);
             assert_zero(ret, "i:%d (%s) testUtilBitmapCmp ret %d != 0 column %d row %d (%s)\n", i, testUtilBarcodeName(data[i].symbology), ret, column, row, data[i].data);
@@ -2979,6 +3133,7 @@ int main(int argc, char *argv[]) {
         { "test_scale", test_scale, },
         { "test_guard_descent", test_guard_descent, },
         { "test_quiet_zones", test_quiet_zones, },
+        { "test_text_gap", test_text_gap, },
         { "test_buffer_plot", test_buffer_plot, },
         { "test_height", test_height, },
         { "test_height_per_row", test_height_per_row, },

backend/tests/test_svg.c

@@ -54,62 +54,63 @@ static void test_print(const testCtx *const p_ctx) {
         char *composite;
         int ret;
         char *expected_file;
+        char *comment;
     };
     struct item data[] = {
-        /*  0*/ { BARCODE_CODE128, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "<>\"&'", "", 0, "code128_amperands.svg" },
-        /*  1*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold.svg" },
-        /*  2*/ { BARCODE_CODE128, UNICODE_MODE, 3, BOLD_TEXT | BARCODE_BOX, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_box3.svg" },
-        /*  3*/ { BARCODE_CODE128, UNICODE_MODE, 2, BOLD_TEXT | BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp2_box2.svg" },
-        /*  4*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, 3, 3, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp3.svg" },
-        /*  5*/ { BARCODE_GS1_128_CC, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, "", "", 0, "[00]030123456789012340", "[02]13012345678909[37]24[10]1234567ABCDEFG", 0, "gs1_128_cc_fig12.svg" },
-        /*  6*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_3rows.svg" },
-        /*  7*/ { BARCODE_CODABLOCKF, -1, -1, -1, 2, 2, -1, 3, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2.svg" },
-        /*  8*/ { BARCODE_CODABLOCKF, -1, 2, BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2_box2.svg" },
-        /*  9*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9771384524017+12", "", 0, "ean13_2addon_ggs_5.2.2.5.1-2.svg" },
-        /* 10*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9780877799306+54321", "", 0, "ean13_5addon_ggs_5.2.2.5.2-2.svg" },
-        /* 11*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "123456789012+12", "[91]123456789012345678901", 0, "ean13_cc_2addon_cca_4x4.svg" },
-        /* 12*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4.svg" },
-        /* 13*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4_notext.svg" },
-        /* 14*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "012345678905+24", "", 0, "upca_2addon_ggs_5.2.6.6-5.svg" },
-        /* 15*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon.svg" },
-        /* 16*/ { BARCODE_UPCA, -1, 3, BARCODE_BIND, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_bind3.svg" },
-        /* 17*/ { BARCODE_UPCA, -1, -1, SMALL_TEXT | BOLD_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_small_bold.svg" },
-        /* 18*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "12345678901+12", "[91]123456789", 0, "upca_cc_2addon_cca_3x4.svg" },
-        /* 19*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4.svg" },
-        /* 20*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_notext.svg" },
-        /* 21*/ { BARCODE_UPCA_CC, -1, 3, BARCODE_BIND, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_bind3.svg" },
-        /* 22*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "upce_2addon.svg" },
-        /* 23*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon.svg" },
-        /* 24*/ { BARCODE_UPCE, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_small.svg" },
-        /* 25*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, 0, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_notext.svg" },
-        /* 26*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2.svg" },
-        /* 27*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "FF0000EE", "0000FF11", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_fgbgalpha.svg" },
-        /* 28*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "FFFFFF00", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_nobg.svg" },
-        /* 29*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 270, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_rotate_270.svg" },
-        /* 30*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2.svg" },
-        /* 31*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2_notext.svg" },
-        /* 32*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "ean8_2addon.svg" },
-        /* 33*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "ean8_5addon.svg" },
-        /* 34*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "9876543+65", "[91]1234567", 0, "ean8_cc_2addon_cca_4x3.svg" },
-        /* 35*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "9876543+74083", "[91]123456789012345678", 0, "ean8_cc_5addon_ccb_8x3.svg" },
-        /* 36*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "ean5.svg" },
-        /* 37*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12", "", 0, "ean2.svg" },
-        /* 38*/ { BARCODE_CODE39, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "123", "", 0, "code39_small.svg" },
-        /* 39*/ { BARCODE_POSTNET, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "postnet_zip.svg" },
-        /* 40*/ { BARCODE_MAXICODE, -1, 2, BARCODE_BOX, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_box2.svg" },
-        /* 41*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BIND, -1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_vwsp1_bind1.svg" },
-        /* 42*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "121212DD", "EEEEEE22", 90, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_fgbg_rotate_90.svg" },
-        /* 43*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, -1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_vwsp1_bind1_dotty.svg" },
-        /* 44*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, 1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_hvwsp1_bind1_dotty.svg" },
-        /* 45*/ { BARCODE_DBAR_LTD, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345678909", "", 0, "dbar_ltd.svg" },
-        /* 46*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5, "", "", 0, "Your Data Here!", "", ZINT_WARN_NONCOMPLIANT, "pdf417_height5.svg" },
-        /* 47*/ { BARCODE_USPS_IMAIL, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7.75, "", "", 0, "12345678901234567890", "", 0, "imail_height7.75.svg" },
-        /* 48*/ { BARCODE_ULTRA, -1, 3, BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "FF0000", "0000FF", 0, "12345678901234567890", "", 0, "ultra_fgbg_hvwsp2_box3.svg" },
-        /* 49*/ { BARCODE_TELEPEN, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0.4, "", "", 180, "A", "", 0, "telepen_height0.4_rotate_180.svg" },
-        /* 50*/ { BARCODE_CODE49, -1, -1, COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, -1, 0, "FF11157F", "", 0, "A", "", 0, "code49_comph_fgalpha.svg" },
-        /* 51*/ { BARCODE_CODABLOCKF, -1, -1, COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, 2, 0, "00000033", "FFFFFF66", 0, "1234567890123456789012345678901234", "", 0, "codablockf_comph_sep2_fgbgalpha.svg" },
-        /* 52*/ { BARCODE_DPD, -1, -1, BARCODE_QUIET_ZONES | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "008182709980000020028101276", "", 0, "dpd_compliant.svg" },
-        /* 53*/ { BARCODE_CHANNEL, -1, -1, CMYK_COLOUR | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, -1, 0, "100,85,0,20", "FFFFFF00", 0, "123", "", 0, "channel_cmyk_nobg.svg" },
+        /*  0*/ { BARCODE_CODE128, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "<>\"&'", "", 0, "code128_amperands.svg", "" },
+        /*  1*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold.svg", "" },
+        /*  2*/ { BARCODE_CODE128, UNICODE_MODE, 3, BOLD_TEXT | BARCODE_BOX, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_box3.svg", "" },
+        /*  3*/ { BARCODE_CODE128, UNICODE_MODE, 2, BOLD_TEXT | BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp2_box2.svg", "" },
+        /*  4*/ { BARCODE_CODE128, UNICODE_MODE, -1, BOLD_TEXT, 3, 3, -1, -1, -1, -1, 0, "", "", 0, "Égjpqy", "", 0, "code128_egrave_bold_hvwsp3.svg", "" },
+        /*  5*/ { BARCODE_GS1_128_CC, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, "", "", 0, "[00]030123456789012340", "[02]13012345678909[37]24[10]1234567ABCDEFG", 0, "gs1_128_cc_fig12.svg", "" },
+        /*  6*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_3rows.svg", "" },
+        /*  7*/ { BARCODE_CODABLOCKF, -1, -1, -1, 2, 2, -1, 3, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2.svg", "" },
+        /*  8*/ { BARCODE_CODABLOCKF, -1, 2, BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "", "", 0, "AAAAAAAAA", "", 0, "codablockf_hvwsp2_box2.svg", "" },
+        /*  9*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9771384524017+12", "", 0, "ean13_2addon_ggs_5.2.2.5.1-2.svg", "" },
+        /* 10*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "9780877799306+54321", "", 0, "ean13_5addon_ggs_5.2.2.5.2-2.svg", "" },
+        /* 11*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "123456789012+12", "[91]123456789012345678901", 0, "ean13_cc_2addon_cca_4x4.svg", "" },
+        /* 12*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4.svg", "" },
+        /* 13*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "123456789012+54321", "[91]1234567890", 0, "ean13_cc_5addon_ccb_3x4_notext.svg", "" },
+        /* 14*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "012345678905+24", "", 0, "upca_2addon_ggs_5.2.6.6-5.svg", "" },
+        /* 15*/ { BARCODE_UPCA, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon.svg", "" },
+        /* 16*/ { BARCODE_UPCA, -1, 3, BARCODE_BIND, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_bind3.svg", "" },
+        /* 17*/ { BARCODE_UPCA, -1, -1, SMALL_TEXT | BOLD_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "614141234417+12345", "", 0, "upca_5addon_small_bold.svg", "Note BOLD_TEXT ignored for UPC/EAN" },
+        /* 18*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "12345678901+12", "[91]123456789", 0, "upca_cc_2addon_cca_3x4.svg", "" },
+        /* 19*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4.svg", "" },
+        /* 20*/ { BARCODE_UPCA_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_notext.svg", "" },
+        /* 21*/ { BARCODE_UPCA_CC, -1, 3, BARCODE_BIND, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "12345678901+12121", "[91]1234567890123", 0, "upca_cc_5addon_ccb_4x4_bind3.svg", "" },
+        /* 22*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "upce_2addon.svg", "" },
+        /* 23*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon.svg", "" },
+        /* 24*/ { BARCODE_UPCE, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_small.svg", "" },
+        /* 25*/ { BARCODE_UPCE, -1, -1, -1, -1, -1, 0, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "upce_5addon_notext.svg", "" },
+        /* 26*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2.svg", "" },
+        /* 27*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "FF0000EE", "0000FF11", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_fgbgalpha.svg", "" },
+        /* 28*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "FFFFFF00", 0, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_nobg.svg", "" },
+        /* 29*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 270, "0654321+89", "[91]1", 0, "upce_cc_2addon_cca_5x2_rotate_270.svg", "" },
+        /* 30*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2.svg", "" },
+        /* 31*/ { BARCODE_UPCE_CC, -1, -1, -1, -1, -1, 0, 2, -1, -1, 0, "", "", 0, "1876543+56789", "[91]12345", 0, "upce_cc_5addon_ccb_8x2_notext.svg", "" },
+        /* 32*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12", "", 0, "ean8_2addon.svg", "" },
+        /* 33*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "1234567+12345", "", 0, "ean8_5addon.svg", "" },
+        /* 34*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, "", "", 0, "9876543+65", "[91]1234567", 0, "ean8_cc_2addon_cca_4x3.svg", "" },
+        /* 35*/ { BARCODE_EANX_CC, -1, -1, -1, -1, -1, -1, 2, -1, -1, 0, "", "", 0, "9876543+74083", "[91]123456789012345678", 0, "ean8_cc_5addon_ccb_8x3.svg", "" },
+        /* 36*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "ean5.svg", "" },
+        /* 37*/ { BARCODE_EANX, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12", "", 0, "ean2.svg", "" },
+        /* 38*/ { BARCODE_CODE39, -1, -1, SMALL_TEXT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "123", "", 0, "code39_small.svg", "" },
+        /* 39*/ { BARCODE_POSTNET, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345", "", 0, "postnet_zip.svg", "" },
+        /* 40*/ { BARCODE_MAXICODE, -1, 2, BARCODE_BOX, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_box2.svg", "" },
+        /* 41*/ { BARCODE_MAXICODE, -1, 1, BARCODE_BIND, -1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_vwsp1_bind1.svg", "" },
+        /* 42*/ { BARCODE_MAXICODE, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "121212DD", "EEEEEE22", 90, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "maxicode_fgbg_rotate_90.svg", "" },
+        /* 43*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, -1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_vwsp1_bind1_dotty.svg", "" },
+        /* 44*/ { BARCODE_DATAMATRIX, -1, 1, BARCODE_BIND | BARCODE_DOTTY_MODE, 1, 1, -1, -1, -1, -1, 0, "", "", 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "", 0, "datamatrix_hvwsp1_bind1_dotty.svg", "" },
+        /* 45*/ { BARCODE_DBAR_LTD, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "12345678909", "", 0, "dbar_ltd.svg", "" },
+        /* 46*/ { BARCODE_PDF417, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5, "", "", 0, "Your Data Here!", "", ZINT_WARN_NONCOMPLIANT, "pdf417_height5.svg", "" },
+        /* 47*/ { BARCODE_USPS_IMAIL, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7.75, "", "", 0, "12345678901234567890", "", 0, "imail_height7.75.svg", "" },
+        /* 48*/ { BARCODE_ULTRA, -1, 3, BARCODE_BOX, 2, 2, -1, -1, -1, -1, 0, "FF0000", "0000FF", 0, "12345678901234567890", "", 0, "ultra_fgbg_hvwsp2_box3.svg", "" },
+        /* 49*/ { BARCODE_TELEPEN, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0.4, "", "", 180, "A", "", 0, "telepen_height0.4_rotate_180.svg", "" },
+        /* 50*/ { BARCODE_CODE49, -1, -1, COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, -1, 0, "FF11157F", "", 0, "A", "", 0, "code49_comph_fgalpha.svg", "" },
+        /* 51*/ { BARCODE_CODABLOCKF, -1, -1, COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, 2, 0, "00000033", "FFFFFF66", 0, "1234567890123456789012345678901234", "", 0, "codablockf_comph_sep2_fgbgalpha.svg", "" },
+        /* 52*/ { BARCODE_DPD, -1, -1, BARCODE_QUIET_ZONES | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, -1, 0, "", "", 0, "008182709980000020028101276", "", 0, "dpd_compliant.svg", "" },
+        /* 53*/ { BARCODE_CHANNEL, -1, -1, CMYK_COLOUR | COMPLIANT_HEIGHT, -1, -1, -1, -1, -1, -1, 0, "100,85,0,20", "FFFFFF00", 0, "123", "", 0, "channel_cmyk_nobg.svg", "" },
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
@@ -189,11 +190,11 @@ static void test_print(const testCtx *const p_ctx) {
         assert_nonzero(testUtilDataPath(expected_file, sizeof(expected_file), data_dir, data[i].expected_file), "i:%d testUtilDataPath == 0\n", i);
 
         if (p_ctx->generate) {
-            printf("        /*%3d*/ { %s, %s, %d, %s, %d, %d, %d, %d, %d, %d, %.8g, \"%s\", \"%s\", %d, \"%s\", \"%s\", \"%s\" },\n",
+            printf("        /*%3d*/ { %s, %s, %d, %s, %d, %d, %d, %d, %d, %d, %.8g, \"%s\", \"%s\", %d, \"%s\", \"%s\", \"%s\", \"%s\" },\n",
                     i, testUtilBarcodeName(data[i].symbology), testUtilInputModeName(data[i].input_mode), data[i].border_width,
                     testUtilOutputOptionsName(data[i].output_options), data[i].whitespace_width, data[i].whitespace_height, data[i].show_hrt,
                     data[i].option_1, data[i].option_2, data[i].option_3, data[i].height, data[i].fgcolour, data[i].bgcolour, data[i].rotate_angle,
-                    testUtilEscape(data[i].data, length, escaped, escaped_size), data[i].composite, data[i].expected_file);
+                    testUtilEscape(data[i].data, length, escaped, escaped_size), data[i].composite, data[i].expected_file, data[i].comment);
             ret = testUtilRename(symbol->outfile, expected_file);
             assert_zero(ret, "i:%d testUtilRename(%s, %s) ret %d != 0\n", i, symbol->outfile, expected_file, ret);
             if (have_libreoffice) {

backend/tests/testcommon.c

@@ -364,7 +364,7 @@ int testContinue(const testCtx *const p_ctx, const int i) {
 
 /* Helper to set common symbol fields */
 int testUtilSetSymbol(struct zint_symbol *symbol, int symbology, int input_mode, int eci, int option_1, int option_2,
-            int option_3, int output_options, char *data, int length, int debug) {
+            int option_3, int output_options, const char *data, int length, int debug) {
     symbol->symbology = symbology;
     if (input_mode != -1) {
         symbol->input_mode = input_mode;

backend/tests/testcommon.h

@@ -1,6 +1,6 @@
 /*
     libzint - the open source barcode library
-    Copyright (C) 2019-2022 Robin Stuart <rstuart114@gmail.com>
+    Copyright (C) 2019-2023 Robin Stuart <rstuart114@gmail.com>
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -129,7 +129,7 @@ void assert_notequal(int e1, int e2, const char *fmt, ...);
 INTERNAL void vector_free(struct zint_symbol *symbol); /* Free vector structures */
 
 int testUtilSetSymbol(struct zint_symbol *symbol, int symbology, int input_mode, int eci,
-            int option_1, int option_2, int option_3, int output_options, char *data, int length, int debug);
+            int option_1, int option_2, int option_3, int output_options, const char *data, int length, int debug);
 
 const char *testUtilBarcodeName(int symbology);
 const char *testUtilErrorName(int error_number);