UPCA/UPCE: descend add-ons to same level as guards following

ISO/IEC 15420:2009 4.3.5 (and BWIPP) and adjust righthand outside
  digit to be 4X/2X instead of 5X/3X (ISO/IEC 15420:2009
  Annex A.2) away from main symbol so as not to touch add-on
  TODO: revisit when standard clarified

backend/library.c

@@ -668,6 +668,8 @@ static int reduced_charset(struct zint_symbol *symbol, struct zint_seg segs[], c
         if (barcode_src_funcs[symbol->symbology]) {
             error_number = barcode_src_funcs[symbol->symbology](symbol, local_segs[0].source, local_segs[0].length);
         } else {
+            assert(symbol->symbology >= LIB_SEG_FUNCS_START); /* Suppress clang-tidy-20 warning */
+            assert(barcode_seg_funcs[symbol->symbology - LIB_SEG_FUNCS_START]); /* Suppress clang-tidy-20 warning */
             error_number = barcode_seg_funcs[symbol->symbology - LIB_SEG_FUNCS_START](symbol, local_segs, seg_count);
         }
     } else {

backend/raster.c

@@ -1080,9 +1080,9 @@ static int plot_raster_default(struct zint_symbol *symbol, const int rotate_angl
                     addon_text_yposn = yposn_si;
                     yposn_si += addon_row_adj_si;
                     addon_row_height_si = row_height_si - addon_row_adj_si;
-                    if (upceanflag != 12 && upceanflag != 6) { /* UPC-A/E add-ons don't descend */
+                    /* Following ISO/IEC 15420:2009 Figure 5 — UPC-A bar code symbol with 2-digit add-on (contrary to
+                       GS1 General Specs v24.0 Figure 5.2.6.6-5) descends for all including UPC-A/E */
                     addon_row_height_si += guard_descent * si;
-                    }
                     if (addon_row_height_si == 0) {
                         addon_row_height_si = 1;
                     }
@@ -1210,7 +1210,9 @@ static int plot_raster_default(struct zint_symbol *symbol, const int rotate_angl
                 text_xposn = 24 * si + xoffset_comp_si;
                 draw_string(pixelbuf, symbol->text + 1, 6, text_xposn, text_yposn, textflags, image_width,
                             image_height, si);
-                text_xposn = (51 + 3) * si + xoffset_comp_si;
+                /* TODO: GS1 General Specs v24.0 5.2.5 Human readable interpretation says 3X but this could cause
+                   digit's righthand to touch any add-on, now that they descend, so use 2X, until clarified */
+                text_xposn = (51 + 2) * si + xoffset_comp_si;
                 draw_string(pixelbuf, symbol->text + 7, 1, text_xposn, text_yposn + upcea_height_adj,
                             textflags | SMALL_TEXT | ZFONT_HALIGN_LEFT, image_width, image_height, si);
                 if (addon_len) {
@@ -1262,7 +1264,9 @@ static int plot_raster_default(struct zint_symbol *symbol, const int rotate_angl
                 text_xposn = 67 * si + xoffset_comp_si;
                 draw_string(pixelbuf, symbol->text + 6, 5, text_xposn, text_yposn, textflags, image_width,
                             image_height, si);
-                text_xposn = (95 + 5) * si + xoffset_comp_si;
+                /* TODO: GS1 General Specs v24.0 5.2.5 Human readable interpretation says 5X but this could cause
+                   digit's righthand to touch any add-on, now that they descend, so use 4X, until clarified */
+                text_xposn = (95 + 4) * si + xoffset_comp_si;
                 draw_string(pixelbuf, symbol->text + 11, 1, text_xposn, text_yposn + upcea_height_adj,
                             textflags | SMALL_TEXT | ZFONT_HALIGN_LEFT, image_width, image_height, si);
                 if (addon_len) {

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.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 276 118
@@ -39,7 +39,7 @@ I 174 6 R
 I 194 6 R
 I 202 2 R
 206 2 R
-82 18 I 226 2 R
+92 8 I 226 2 R
 I 230 4 R
 I 238 2 R
 I 244 4 R
@@ -58,7 +58,7 @@ I 254 2 R
  (67890) stringwidth pop -2 div 0 rmoveto
  (67890) show
 /Helvetica findfont 14.98 scalefont setfont
- 217.3 0.8 moveto
+ 215.3 0.8 moveto
  (5) show
 /Helvetica findfont 21.4 scalefont setfont
  246 102.4 moveto

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 276 118
@@ -39,7 +39,7 @@ I 174 6 R
 I 194 6 R
 I 202 2 R
 206 2 R
-82 18 I 226 2 R
+92 8 I 226 2 R
 I 230 4 R
 I 238 2 R
 I 244 4 R
@@ -58,7 +58,7 @@ I 254 2 R
  (67890) stringwidth pop -2 div 0 rmoveto
  (67890) show
 /Helvetica findfont 14.98 scalefont setfont
- 217.3 0.8 moveto
+ 215.3 0.8 moveto
  (5) show
 /Helvetica findfont 21.4 scalefont setfont
  246 102.4 moveto

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 276 118
@@ -39,7 +39,7 @@ I 96 6 R
 I 76 6 R
 I 72 2 R
 68 2 R
-82 18 I 48 2 R
+92 18 I 48 2 R
 I 42 4 R
 I 36 2 R
 I 28 4 R
@@ -67,7 +67,7 @@ I 20 2 R
  (67890) show
  grestore
 /Helvetica findfont 14.98 scalefont setfont
- 58.7 117.2 moveto
+ 60.7 117.2 moveto
  gsave
  180 rotate
  (5) show

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 118 292
@@ -39,13 +39,13 @@
 6 202 0 110 R
 2 210 0 110 R
 2 214 0 110 R
-2 234 18 82 R
+2 234 18 92 R
-4 238 18 82 R
+4 238 18 92 R
-2 246 18 82 R
+2 246 18 92 R
-4 252 18 82 R
+4 252 18 92 R
-2 258 18 82 R
+2 258 18 92 R
-2 262 18 82 R
+2 262 18 92 R
-4 270 18 82 R
+4 270 18 92 R
 /Helvetica findfont 14.98 scalefont setfont
  117.2 16.7 moveto
  gsave
@@ -67,7 +67,7 @@
  (67890) show
  grestore
 /Helvetica findfont 14.98 scalefont setfont
- 117.2 225.3 moveto
+ 117.2 223.3 moveto
  gsave
  90 rotate
  (5) show

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 280 130
@@ -39,7 +39,7 @@ I 176 6 R
 I 196 6 R
 I 204 2 R
 208 2 R
-82 24 I 228 2 R
+92 14 I 228 2 R
 I 232 4 R
 I 240 2 R
 I 246 4 R
@@ -58,7 +58,7 @@ I 256 2 R
  (67890) stringwidth pop -2 div 0 rmoveto
  (67890) show
 /Helvetica findfont 14.98 scalefont setfont
- 219.3 6.8 moveto
+ 217.3 6.8 moveto
  (5) show
 /Helvetica findfont 21.4 scalefont setfont
  248 108.4 moveto

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

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 118 276
@@ -39,13 +39,13 @@
 6 76 8 110 R
 2 72 8 110 R
 2 68 8 110 R
-2 48 18 82 R
+2 48 8 92 R
-4 42 18 82 R
+4 42 8 92 R
-2 36 18 82 R
+2 36 8 92 R
-4 28 18 82 R
+4 28 8 92 R
-2 24 18 82 R
+2 24 8 92 R
-2 20 18 82 R
+2 20 8 92 R
-4 10 18 82 R
+4 10 8 92 R
 /Helvetica findfont 14.98 scalefont setfont
  0.8 267.3 moveto
  gsave
@@ -67,7 +67,7 @@
  (67890) show
  grestore
 /Helvetica findfont 14.98 scalefont setfont
- 0.8 58.7 moveto
+ 0.8 60.7 moveto
  gsave
  270 rotate
  (5) show

backend/tests/data/eps/upce_5addon.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 238 118
@@ -26,7 +26,7 @@ I 96 2 R
 110 8 I 110 2 R
 I 114 2 R
 118 2 R
-82 18 I 134 2 R
+92 8 I 134 2 R
 I 138 4 R
 I 144 4 R
 I 152 4 R
@@ -51,7 +51,7 @@ I 216 4 R
  (123456) stringwidth pop -2 div 0 rmoveto
  (123456) show
 /Helvetica findfont 14.98 scalefont setfont
- 125.3 0.8 moveto
+ 123.3 0.8 moveto
  (5) show
 /Helvetica findfont 21.4 scalefont setfont
  182 102.4 moveto

backend/tests/data/eps/upce_5addon_gws.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 238 118
@@ -26,7 +26,7 @@ I 96 2 R
 110 8 I 110 2 R
 I 114 2 R
 118 2 R
-82 18 I 134 2 R
+92 8 I 134 2 R
 I 138 4 R
 I 144 4 R
 I 152 4 R
@@ -51,7 +51,7 @@ I 216 4 R
  (123456) stringwidth pop -2 div 0 rmoveto
  (123456) show
 /Helvetica findfont 14.98 scalefont setfont
- 125.3 0.8 moveto
+ 123.3 0.8 moveto
  (5) show
 /Helvetica findfont 21.4 scalefont setfont
  182 102.4 moveto

backend/tests/data/eps/upce_5addon_rotate_270.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 118 238
@@ -26,22 +26,22 @@
 2 110 0 110 R
 2 114 0 110 R
 2 118 0 110 R
-2 134 18 82 R
+2 134 18 92 R
-4 138 18 82 R
+4 138 18 92 R
-4 144 18 82 R
+4 144 18 92 R
-4 152 18 82 R
+4 152 18 92 R
-2 158 18 82 R
+2 158 18 92 R
-2 164 18 82 R
+2 164 18 92 R
-4 170 18 82 R
+4 170 18 92 R
-2 176 18 82 R
+2 176 18 92 R
-2 180 18 82 R
+2 180 18 92 R
-2 190 18 82 R
+2 190 18 92 R
-2 194 18 82 R
+2 194 18 92 R
-2 198 18 82 R
+2 198 18 92 R
-4 206 18 82 R
+4 206 18 92 R
-2 212 18 82 R
+2 212 18 92 R
-4 216 18 82 R
+4 216 18 92 R
-2 226 18 82 R
+2 226 18 92 R
 /Helvetica findfont 14.98 scalefont setfont
  117.2 8.7 moveto
  gsave
@@ -57,7 +57,7 @@
  (123456) show
  grestore
 /Helvetica findfont 14.98 scalefont setfont
- 117.2 125.3 moveto
+ 117.2 123.3 moveto
  gsave
  90 rotate
  (5) show

backend/tests/data/eps/upce_5addon_small_bold.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 238 114
@@ -26,7 +26,7 @@ I 96 2 R
 110 3.2 I 110 2 R
 I 114 2 R
 118 2 R
-86.8 13.2 I 134 2 R
+96.8 3.2 I 134 2 R
 I 138 4 R
 I 144 4 R
 I 152 4 R
@@ -51,7 +51,7 @@ I 216 4 R
  (123456) stringwidth pop -2 div 0 rmoveto
  (123456) show
 /Helvetica findfont 12.84 scalefont setfont
- 125.3 0.56 moveto
+ 123.3 0.56 moveto
  (5) show
 /Helvetica findfont 14.98 scalefont setfont
  182 102.28 moveto

backend/tests/data/eps/upce_5addon_small_bold_gws.eps

@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Zint 2.12.0.9
+%%Creator: Zint 2.13.0.9
 %%Title: Zint Generated Symbol
 %%Pages: 0
 %%BoundingBox: 0 0 238 114
@@ -26,7 +26,7 @@ I 96 2 R
 110 3.2 I 110 2 R
 I 114 2 R
 118 2 R
-86.8 13.2 I 134 2 R
+96.8 3.2 I 134 2 R
 I 138 4 R
 I 144 4 R
 I 152 4 R
@@ -51,7 +51,7 @@ I 216 4 R
  (123456) stringwidth pop -2 div 0 rmoveto
  (123456) show
 /Helvetica findfont 12.84 scalefont setfont
- 125.3 0.56 moveto
+ 123.3 0.56 moveto
  (5) show
 /Helvetica findfont 14.98 scalefont setfont
  182 102.28 moveto

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

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="276" height="118" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM30 0h4v110h-4ZM36 0h2v110h-2ZM42 0h4v100h-4ZM50 0h2v100h-2ZM56 0h2v100h-2ZM62 0h4v100h-4ZM68 0h8v100h-8ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM96 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v100h-2ZM122 0h2v100h-2ZM132 0h2v100h-2ZM140 0h2v100h-2ZM146 0h2v100h-2ZM152 0h2v100h-2ZM160 0h6v100h-6ZM168 0h2v100h-2ZM174 0h6v100h-6ZM184 0h2v100h-2ZM188 0h2v110h-2ZM194 0h6v110h-6ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v82h-2ZM230 18h4v82h-4ZM238 18h2v82h-2ZM244 18h4v82h-4ZM250 18h2v82h-2ZM254 18h2v82h-2ZM262 18h4v82h-4Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM30 0h4v110h-4ZM36 0h2v110h-2ZM42 0h4v100h-4ZM50 0h2v100h-2ZM56 0h2v100h-2ZM62 0h4v100h-4ZM68 0h8v100h-8ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM96 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v100h-2ZM122 0h2v100h-2ZM132 0h2v100h-2ZM140 0h2v100h-2ZM146 0h2v100h-2ZM152 0h2v100h-2ZM160 0h6v100h-6ZM168 0h2v100h-2ZM174 0h6v100h-6ZM184 0h2v100h-2ZM188 0h2v110h-2ZM194 0h6v110h-6ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v92h-2ZM230 18h4v92h-4ZM238 18h2v92h-2ZM244 18h4v92h-4ZM250 18h2v92h-2ZM254 18h2v92h-2ZM262 18h4v92h-4Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    0
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    67890
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    5
   </text>
   <text x="246" y="15.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

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

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="276" height="118" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM30 0h4v110h-4ZM36 0h2v110h-2ZM42 0h4v100h-4ZM50 0h2v100h-2ZM56 0h2v100h-2ZM62 0h4v100h-4ZM68 0h8v100h-8ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM96 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v100h-2ZM122 0h2v100h-2ZM132 0h2v100h-2ZM140 0h2v100h-2ZM146 0h2v100h-2ZM152 0h2v100h-2ZM160 0h6v100h-6ZM168 0h2v100h-2ZM174 0h6v100h-6ZM184 0h2v100h-2ZM188 0h2v110h-2ZM194 0h6v110h-6ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v82h-2ZM230 18h4v82h-4ZM238 18h2v82h-2ZM244 18h4v82h-4ZM250 18h2v82h-2ZM254 18h2v82h-2ZM262 18h4v82h-4Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM30 0h4v110h-4ZM36 0h2v110h-2ZM42 0h4v100h-4ZM50 0h2v100h-2ZM56 0h2v100h-2ZM62 0h4v100h-4ZM68 0h8v100h-8ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM96 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v100h-2ZM122 0h2v100h-2ZM132 0h2v100h-2ZM140 0h2v100h-2ZM146 0h2v100h-2ZM152 0h2v100h-2ZM160 0h6v100h-6ZM168 0h2v100h-2ZM174 0h6v100h-6ZM184 0h2v100h-2ZM188 0h2v110h-2ZM194 0h6v110h-6ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v92h-2ZM230 18h4v92h-4ZM238 18h2v92h-2ZM244 18h4v92h-4ZM250 18h2v92h-2ZM254 18h2v92h-2ZM262 18h4v92h-4Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    0
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    67890
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    5
   </text>
   <text x="246" y="15.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_5addon.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="118" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM26 0h2v110h-2ZM30 0h8v110h-8ZM42 0h4v100h-4ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM70 0h4v100h-4ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM98 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h4v100h-4ZM124 0h4v100h-4ZM132 0h2v100h-2ZM142 0h2v100h-2ZM146 0h2v100h-2ZM150 0h6v100h-6ZM160 0h2v100h-2ZM164 0h6v100h-6ZM174 0h4v100h-4ZM182 0h4v100h-4ZM188 0h2v110h-2ZM196 0h2v110h-2ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v82h-2ZM230 18h4v82h-4ZM236 18h4v82h-4ZM244 18h4v82h-4ZM250 18h2v82h-2ZM256 18h2v82h-2ZM262 18h4v82h-4ZM268 18h2v82h-2ZM272 18h2v82h-2ZM282 18h2v82h-2ZM286 18h2v82h-2ZM290 18h2v82h-2ZM298 18h4v82h-4ZM304 18h2v82h-2ZM308 18h4v82h-4ZM318 18h2v82h-2Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM26 0h2v110h-2ZM30 0h8v110h-8ZM42 0h4v100h-4ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM70 0h4v100h-4ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM98 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h4v100h-4ZM124 0h4v100h-4ZM132 0h2v100h-2ZM142 0h2v100h-2ZM146 0h2v100h-2ZM150 0h6v100h-6ZM160 0h2v100h-2ZM164 0h6v100h-6ZM174 0h4v100h-4ZM182 0h4v100h-4ZM188 0h2v110h-2ZM196 0h2v110h-2ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v92h-2ZM230 18h4v92h-4ZM236 18h4v92h-4ZM244 18h4v92h-4ZM250 18h2v92h-2ZM256 18h2v92h-2ZM262 18h4v92h-4ZM268 18h2v92h-2ZM272 18h2v92h-2ZM282 18h2v92h-2ZM286 18h2v92h-2ZM290 18h2v92h-2ZM298 18h4v92h-4ZM304 18h2v92h-2ZM308 18h4v92h-4ZM318 18h2v92h-2Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    6
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    23441
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    7
   </text>
   <text x="274" y="15.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_5addon_bind3.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="130" fill="#FFFFFF"/>
-  <path d="M18 6h2v110h-2ZM22 6h2v110h-2ZM26 6h2v110h-2ZM30 6h8v110h-8ZM42 6h4v100h-4ZM50 6h2v100h-2ZM54 6h2v100h-2ZM62 6h4v100h-4ZM70 6h4v100h-4ZM78 6h2v100h-2ZM82 6h2v100h-2ZM90 6h4v100h-4ZM98 6h4v100h-4ZM106 6h2v100h-2ZM110 6h2v110h-2ZM114 6h2v110h-2ZM118 6h4v100h-4ZM124 6h4v100h-4ZM132 6h2v100h-2ZM142 6h2v100h-2ZM146 6h2v100h-2ZM150 6h6v100h-6ZM160 6h2v100h-2ZM164 6h6v100h-6ZM174 6h4v100h-4ZM182 6h4v100h-4ZM188 6h2v110h-2ZM196 6h2v110h-2ZM202 6h2v110h-2ZM206 6h2v110h-2ZM226 24h2v82h-2ZM230 24h4v82h-4ZM236 24h4v82h-4ZM244 24h4v82h-4ZM250 24h2v82h-2ZM256 24h2v82h-2ZM262 24h4v82h-4ZM268 24h2v82h-2ZM272 24h2v82h-2ZM282 24h2v82h-2ZM286 24h2v82h-2ZM290 24h2v82h-2ZM298 24h4v82h-4ZM304 24h2v82h-2ZM308 24h4v82h-4ZM318 24h2v82h-2ZM0 0h330v6h-330ZM0 106h330v6h-330Z"/>
+  <path d="M18 6h2v110h-2ZM22 6h2v110h-2ZM26 6h2v110h-2ZM30 6h8v110h-8ZM42 6h4v100h-4ZM50 6h2v100h-2ZM54 6h2v100h-2ZM62 6h4v100h-4ZM70 6h4v100h-4ZM78 6h2v100h-2ZM82 6h2v100h-2ZM90 6h4v100h-4ZM98 6h4v100h-4ZM106 6h2v100h-2ZM110 6h2v110h-2ZM114 6h2v110h-2ZM118 6h4v100h-4ZM124 6h4v100h-4ZM132 6h2v100h-2ZM142 6h2v100h-2ZM146 6h2v100h-2ZM150 6h6v100h-6ZM160 6h2v100h-2ZM164 6h6v100h-6ZM174 6h4v100h-4ZM182 6h4v100h-4ZM188 6h2v110h-2ZM196 6h2v110h-2ZM202 6h2v110h-2ZM206 6h2v110h-2ZM226 24h2v92h-2ZM230 24h4v92h-4ZM236 24h4v92h-4ZM244 24h4v92h-4ZM250 24h2v92h-2ZM256 24h2v92h-2ZM262 24h4v92h-4ZM268 24h2v92h-2ZM272 24h2v92h-2ZM282 24h2v92h-2ZM286 24h2v92h-2ZM290 24h2v92h-2ZM298 24h4v92h-4ZM304 24h2v92h-2ZM308 24h4v92h-4ZM318 24h2v92h-2ZM0 0h330v6h-330ZM0 106h330v6h-330Z"/>
   <text x="8.7" y="129.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    6
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="129.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    23441
   </text>
-  <text x="217.3" y="129.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="129.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    7
   </text>
   <text x="274" y="21.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_5addon_gws.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="118" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM26 0h2v110h-2ZM30 0h8v110h-8ZM42 0h4v100h-4ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM70 0h4v100h-4ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM98 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h4v100h-4ZM124 0h4v100h-4ZM132 0h2v100h-2ZM142 0h2v100h-2ZM146 0h2v100h-2ZM150 0h6v100h-6ZM160 0h2v100h-2ZM164 0h6v100h-6ZM174 0h4v100h-4ZM182 0h4v100h-4ZM188 0h2v110h-2ZM196 0h2v110h-2ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v82h-2ZM230 18h4v82h-4ZM236 18h4v82h-4ZM244 18h4v82h-4ZM250 18h2v82h-2ZM256 18h2v82h-2ZM262 18h4v82h-4ZM268 18h2v82h-2ZM272 18h2v82h-2ZM282 18h2v82h-2ZM286 18h2v82h-2ZM290 18h2v82h-2ZM298 18h4v82h-4ZM304 18h2v82h-2ZM308 18h4v82h-4ZM318 18h2v82h-2Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM26 0h2v110h-2ZM30 0h8v110h-8ZM42 0h4v100h-4ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM70 0h4v100h-4ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM98 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h4v100h-4ZM124 0h4v100h-4ZM132 0h2v100h-2ZM142 0h2v100h-2ZM146 0h2v100h-2ZM150 0h6v100h-6ZM160 0h2v100h-2ZM164 0h6v100h-6ZM174 0h4v100h-4ZM182 0h4v100h-4ZM188 0h2v110h-2ZM196 0h2v110h-2ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 18h2v92h-2ZM230 18h4v92h-4ZM236 18h4v92h-4ZM244 18h4v92h-4ZM250 18h2v92h-2ZM256 18h2v92h-2ZM262 18h4v92h-4ZM268 18h2v92h-2ZM272 18h2v92h-2ZM282 18h2v92h-2ZM286 18h2v92h-2ZM290 18h2v92h-2ZM298 18h4v92h-4ZM304 18h2v92h-2ZM308 18h4v92h-4ZM318 18h2v92h-2Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    6
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    23441
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    7
   </text>
   <text x="274" y="15.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_5addon_small_bold.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="114" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM26 0h2v110h-2ZM30 0h8v110h-8ZM42 0h4v100h-4ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM70 0h4v100h-4ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM98 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h4v100h-4ZM124 0h4v100h-4ZM132 0h2v100h-2ZM142 0h2v100h-2ZM146 0h2v100h-2ZM150 0h6v100h-6ZM160 0h2v100h-2ZM164 0h6v100h-6ZM174 0h4v100h-4ZM182 0h4v100h-4ZM188 0h2v110h-2ZM196 0h2v110h-2ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 13.2h2v86.8h-2ZM230 13.2h4v86.8h-4ZM236 13.2h4v86.8h-4ZM244 13.2h4v86.8h-4ZM250 13.2h2v86.8h-2ZM256 13.2h2v86.8h-2ZM262 13.2h4v86.8h-4ZM268 13.2h2v86.8h-2ZM272 13.2h2v86.8h-2ZM282 13.2h2v86.8h-2ZM286 13.2h2v86.8h-2ZM290 13.2h2v86.8h-2ZM298 13.2h4v86.8h-4ZM304 13.2h2v86.8h-2ZM308 13.2h4v86.8h-4ZM318 13.2h2v86.8h-2Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM26 0h2v110h-2ZM30 0h8v110h-8ZM42 0h4v100h-4ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM70 0h4v100h-4ZM78 0h2v100h-2ZM82 0h2v100h-2ZM90 0h4v100h-4ZM98 0h4v100h-4ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h4v100h-4ZM124 0h4v100h-4ZM132 0h2v100h-2ZM142 0h2v100h-2ZM146 0h2v100h-2ZM150 0h6v100h-6ZM160 0h2v100h-2ZM164 0h6v100h-6ZM174 0h4v100h-4ZM182 0h4v100h-4ZM188 0h2v110h-2ZM196 0h2v110h-2ZM202 0h2v110h-2ZM206 0h2v110h-2ZM226 13.2h2v96.8h-2ZM230 13.2h4v96.8h-4ZM236 13.2h4v96.8h-4ZM244 13.2h4v96.8h-4ZM250 13.2h2v96.8h-2ZM256 13.2h2v96.8h-2ZM262 13.2h4v96.8h-4ZM268 13.2h2v96.8h-2ZM272 13.2h2v96.8h-2ZM282 13.2h2v96.8h-2ZM286 13.2h2v96.8h-2ZM290 13.2h2v96.8h-2ZM298 13.2h4v96.8h-4ZM304 13.2h2v96.8h-2ZM308 13.2h4v96.8h-4ZM318 13.2h2v96.8h-2Z"/>
   <text x="8.7" y="112.64" text-anchor="end" font-family="OCRB, monospace" font-size="12">
    6
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="112.64" text-anchor="middle" font-family="OCRB, monospace" font-size="14">
    23441
   </text>
-  <text x="217.3" y="112.64" text-anchor="start" font-family="OCRB, monospace" font-size="12">
+  <text x="215.3" y="112.64" text-anchor="start" font-family="OCRB, monospace" font-size="12">
    7
   </text>
   <text x="274" y="10.92" text-anchor="middle" font-family="OCRB, monospace" font-size="14">

backend/tests/data/svg/upca_cc_2addon_cca_3x4.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="276" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v12h-4ZM18 0h4v12h-4ZM24 0h6v4h-6ZM32 0h8v4h-8ZM44 0h4v4h-4ZM50 0h2v4h-2ZM56 0h6v4h-6ZM66 0h2v4h-2ZM70 0h6v4h-6ZM78 0h6v4h-6ZM90 0h2v4h-2ZM100 0h2v12h-2ZM106 0h6v4h-6ZM114 0h2v8h-2ZM120 0h2v4h-2ZM124 0h6v4h-6ZM132 0h6v4h-6ZM142 0h2v4h-2ZM154 0h4v4h-4ZM168 0h2v4h-2ZM174 0h4v4h-4ZM180 0h6v12h-6ZM188 0h4v8h-4ZM194 0h4v4h-4ZM204 0h2v12h-2ZM208 0h2v12h-2ZM24 4h4v4h-4ZM32 4h6v4h-6ZM42 4h6v4h-6ZM52 4h8v4h-8ZM62 4h2v8h-2ZM66 4h4v4h-4ZM78 4h2v4h-2ZM86 4h6v4h-6ZM96 4h2v4h-2ZM106 4h4v8h-4ZM120 4h6v4h-6ZM128 4h2v4h-2ZM132 4h4v4h-4ZM140 4h2v4h-2ZM154 4h2v4h-2ZM160 4h2v4h-2ZM164 4h12v4h-12ZM196 4h2v8h-2ZM24 8h2v4h-2ZM32 8h2v4h-2ZM42 8h8v4h-8ZM54 8h2v4h-2ZM66 8h2v4h-2ZM70 8h8v4h-8ZM80 8h2v4h-2ZM94 8h2v4h-2ZM114 8h4v4h-4ZM120 8h2v4h-2ZM128 8h6v4h-6ZM142 8h2v4h-2ZM146 8h4v4h-4ZM154 8h4v4h-4ZM160 8h6v4h-6ZM172 8h2v4h-2ZM188 8h6v4h-6ZM18 12h2v4h-2ZM206 12h2v4h-2ZM16 16h2v4h-2ZM208 16h2v4h-2ZM18 20h2v90h-2ZM206 20h2v90h-2ZM22 24h2v86h-2ZM28 24h4v86h-4ZM36 24h2v86h-2ZM42 24h2v76h-2ZM48 24h4v76h-4ZM54 24h8v76h-8ZM64 24h2v76h-2ZM68 24h2v76h-2ZM76 24h4v76h-4ZM82 24h4v76h-4ZM92 24h2v76h-2ZM96 24h2v76h-2ZM100 24h8v76h-8ZM110 24h2v86h-2ZM114 24h2v86h-2ZM118 24h2v76h-2ZM126 24h2v76h-2ZM132 24h2v76h-2ZM138 24h2v76h-2ZM146 24h6v76h-6ZM154 24h2v76h-2ZM160 24h6v76h-6ZM170 24h2v76h-2ZM174 24h4v76h-4ZM182 24h4v76h-4ZM188 24h4v86h-4ZM194 24h4v86h-4ZM202 24h2v86h-2ZM226 42h2v58h-2ZM230 42h4v58h-4ZM238 42h4v58h-4ZM246 42h2v58h-2ZM250 42h2v58h-2ZM256 42h2v58h-2ZM262 42h4v58h-4Z"/>
+  <path d="M12 0h4v12h-4ZM18 0h4v12h-4ZM24 0h6v4h-6ZM32 0h8v4h-8ZM44 0h4v4h-4ZM50 0h2v4h-2ZM56 0h6v4h-6ZM66 0h2v4h-2ZM70 0h6v4h-6ZM78 0h6v4h-6ZM90 0h2v4h-2ZM100 0h2v12h-2ZM106 0h6v4h-6ZM114 0h2v8h-2ZM120 0h2v4h-2ZM124 0h6v4h-6ZM132 0h6v4h-6ZM142 0h2v4h-2ZM154 0h4v4h-4ZM168 0h2v4h-2ZM174 0h4v4h-4ZM180 0h6v12h-6ZM188 0h4v8h-4ZM194 0h4v4h-4ZM204 0h2v12h-2ZM208 0h2v12h-2ZM24 4h4v4h-4ZM32 4h6v4h-6ZM42 4h6v4h-6ZM52 4h8v4h-8ZM62 4h2v8h-2ZM66 4h4v4h-4ZM78 4h2v4h-2ZM86 4h6v4h-6ZM96 4h2v4h-2ZM106 4h4v8h-4ZM120 4h6v4h-6ZM128 4h2v4h-2ZM132 4h4v4h-4ZM140 4h2v4h-2ZM154 4h2v4h-2ZM160 4h2v4h-2ZM164 4h12v4h-12ZM196 4h2v8h-2ZM24 8h2v4h-2ZM32 8h2v4h-2ZM42 8h8v4h-8ZM54 8h2v4h-2ZM66 8h2v4h-2ZM70 8h8v4h-8ZM80 8h2v4h-2ZM94 8h2v4h-2ZM114 8h4v4h-4ZM120 8h2v4h-2ZM128 8h6v4h-6ZM142 8h2v4h-2ZM146 8h4v4h-4ZM154 8h4v4h-4ZM160 8h6v4h-6ZM172 8h2v4h-2ZM188 8h6v4h-6ZM18 12h2v4h-2ZM206 12h2v4h-2ZM16 16h2v4h-2ZM208 16h2v4h-2ZM18 20h2v90h-2ZM206 20h2v90h-2ZM22 24h2v86h-2ZM28 24h4v86h-4ZM36 24h2v86h-2ZM42 24h2v76h-2ZM48 24h4v76h-4ZM54 24h8v76h-8ZM64 24h2v76h-2ZM68 24h2v76h-2ZM76 24h4v76h-4ZM82 24h4v76h-4ZM92 24h2v76h-2ZM96 24h2v76h-2ZM100 24h8v76h-8ZM110 24h2v86h-2ZM114 24h2v86h-2ZM118 24h2v76h-2ZM126 24h2v76h-2ZM132 24h2v76h-2ZM138 24h2v76h-2ZM146 24h6v76h-6ZM154 24h2v76h-2ZM160 24h6v76h-6ZM170 24h2v76h-2ZM174 24h4v76h-4ZM182 24h4v76h-4ZM188 24h4v86h-4ZM194 24h4v86h-4ZM202 24h2v86h-2ZM226 42h2v68h-2ZM230 42h4v68h-4ZM238 42h4v68h-4ZM246 42h2v68h-2ZM250 42h2v68h-2ZM256 42h2v68h-2ZM262 42h4v68h-4Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    78901
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    2
   </text>
   <text x="246" y="39.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_cc_2addon_cca_3x4_gws.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="276" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v12h-4ZM18 0h4v12h-4ZM24 0h6v4h-6ZM32 0h8v4h-8ZM44 0h4v4h-4ZM50 0h2v4h-2ZM56 0h6v4h-6ZM66 0h2v4h-2ZM70 0h6v4h-6ZM78 0h6v4h-6ZM90 0h2v4h-2ZM100 0h2v12h-2ZM106 0h6v4h-6ZM114 0h2v8h-2ZM120 0h2v4h-2ZM124 0h6v4h-6ZM132 0h6v4h-6ZM142 0h2v4h-2ZM154 0h4v4h-4ZM168 0h2v4h-2ZM174 0h4v4h-4ZM180 0h6v12h-6ZM188 0h4v8h-4ZM194 0h4v4h-4ZM204 0h2v12h-2ZM208 0h2v12h-2ZM24 4h4v4h-4ZM32 4h6v4h-6ZM42 4h6v4h-6ZM52 4h8v4h-8ZM62 4h2v8h-2ZM66 4h4v4h-4ZM78 4h2v4h-2ZM86 4h6v4h-6ZM96 4h2v4h-2ZM106 4h4v8h-4ZM120 4h6v4h-6ZM128 4h2v4h-2ZM132 4h4v4h-4ZM140 4h2v4h-2ZM154 4h2v4h-2ZM160 4h2v4h-2ZM164 4h12v4h-12ZM196 4h2v8h-2ZM24 8h2v4h-2ZM32 8h2v4h-2ZM42 8h8v4h-8ZM54 8h2v4h-2ZM66 8h2v4h-2ZM70 8h8v4h-8ZM80 8h2v4h-2ZM94 8h2v4h-2ZM114 8h4v4h-4ZM120 8h2v4h-2ZM128 8h6v4h-6ZM142 8h2v4h-2ZM146 8h4v4h-4ZM154 8h4v4h-4ZM160 8h6v4h-6ZM172 8h2v4h-2ZM188 8h6v4h-6ZM18 12h2v4h-2ZM206 12h2v4h-2ZM16 16h2v4h-2ZM208 16h2v4h-2ZM18 20h2v90h-2ZM206 20h2v90h-2ZM22 24h2v86h-2ZM28 24h4v86h-4ZM36 24h2v86h-2ZM42 24h2v76h-2ZM48 24h4v76h-4ZM54 24h8v76h-8ZM64 24h2v76h-2ZM68 24h2v76h-2ZM76 24h4v76h-4ZM82 24h4v76h-4ZM92 24h2v76h-2ZM96 24h2v76h-2ZM100 24h8v76h-8ZM110 24h2v86h-2ZM114 24h2v86h-2ZM118 24h2v76h-2ZM126 24h2v76h-2ZM132 24h2v76h-2ZM138 24h2v76h-2ZM146 24h6v76h-6ZM154 24h2v76h-2ZM160 24h6v76h-6ZM170 24h2v76h-2ZM174 24h4v76h-4ZM182 24h4v76h-4ZM188 24h4v86h-4ZM194 24h4v86h-4ZM202 24h2v86h-2ZM226 42h2v58h-2ZM230 42h4v58h-4ZM238 42h4v58h-4ZM246 42h2v58h-2ZM250 42h2v58h-2ZM256 42h2v58h-2ZM262 42h4v58h-4Z"/>
+  <path d="M12 0h4v12h-4ZM18 0h4v12h-4ZM24 0h6v4h-6ZM32 0h8v4h-8ZM44 0h4v4h-4ZM50 0h2v4h-2ZM56 0h6v4h-6ZM66 0h2v4h-2ZM70 0h6v4h-6ZM78 0h6v4h-6ZM90 0h2v4h-2ZM100 0h2v12h-2ZM106 0h6v4h-6ZM114 0h2v8h-2ZM120 0h2v4h-2ZM124 0h6v4h-6ZM132 0h6v4h-6ZM142 0h2v4h-2ZM154 0h4v4h-4ZM168 0h2v4h-2ZM174 0h4v4h-4ZM180 0h6v12h-6ZM188 0h4v8h-4ZM194 0h4v4h-4ZM204 0h2v12h-2ZM208 0h2v12h-2ZM24 4h4v4h-4ZM32 4h6v4h-6ZM42 4h6v4h-6ZM52 4h8v4h-8ZM62 4h2v8h-2ZM66 4h4v4h-4ZM78 4h2v4h-2ZM86 4h6v4h-6ZM96 4h2v4h-2ZM106 4h4v8h-4ZM120 4h6v4h-6ZM128 4h2v4h-2ZM132 4h4v4h-4ZM140 4h2v4h-2ZM154 4h2v4h-2ZM160 4h2v4h-2ZM164 4h12v4h-12ZM196 4h2v8h-2ZM24 8h2v4h-2ZM32 8h2v4h-2ZM42 8h8v4h-8ZM54 8h2v4h-2ZM66 8h2v4h-2ZM70 8h8v4h-8ZM80 8h2v4h-2ZM94 8h2v4h-2ZM114 8h4v4h-4ZM120 8h2v4h-2ZM128 8h6v4h-6ZM142 8h2v4h-2ZM146 8h4v4h-4ZM154 8h4v4h-4ZM160 8h6v4h-6ZM172 8h2v4h-2ZM188 8h6v4h-6ZM18 12h2v4h-2ZM206 12h2v4h-2ZM16 16h2v4h-2ZM208 16h2v4h-2ZM18 20h2v90h-2ZM206 20h2v90h-2ZM22 24h2v86h-2ZM28 24h4v86h-4ZM36 24h2v86h-2ZM42 24h2v76h-2ZM48 24h4v76h-4ZM54 24h8v76h-8ZM64 24h2v76h-2ZM68 24h2v76h-2ZM76 24h4v76h-4ZM82 24h4v76h-4ZM92 24h2v76h-2ZM96 24h2v76h-2ZM100 24h8v76h-8ZM110 24h2v86h-2ZM114 24h2v86h-2ZM118 24h2v76h-2ZM126 24h2v76h-2ZM132 24h2v76h-2ZM138 24h2v76h-2ZM146 24h6v76h-6ZM154 24h2v76h-2ZM160 24h6v76h-6ZM170 24h2v76h-2ZM174 24h4v76h-4ZM182 24h4v76h-4ZM188 24h4v86h-4ZM194 24h4v86h-4ZM202 24h2v86h-2ZM226 42h2v68h-2ZM230 42h4v68h-4ZM238 42h4v68h-4ZM246 42h2v68h-2ZM250 42h2v68h-2ZM256 42h2v68h-2ZM262 42h4v68h-4Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    78901
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    2
   </text>
   <text x="246" y="39.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_cc_5addon_ccb_4x4.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v16h-4ZM18 0h2v20h-2ZM24 0h6v4h-6ZM32 0h2v8h-2ZM40 0h10v4h-10ZM52 0h2v4h-2ZM58 0h6v4h-6ZM66 0h4v4h-4ZM72 0h12v4h-12ZM86 0h2v4h-2ZM90 0h6v4h-6ZM100 0h2v16h-2ZM106 0h6v8h-6ZM114 0h4v4h-4ZM120 0h4v8h-4ZM126 0h2v4h-2ZM136 0h8v4h-8ZM146 0h4v4h-4ZM154 0h4v4h-4ZM162 0h2v8h-2ZM166 0h6v4h-6ZM180 0h2v4h-2ZM188 0h4v16h-4ZM194 0h2v16h-2ZM200 0h2v4h-2ZM208 0h2v16h-2ZM24 4h4v4h-4ZM36 4h4v4h-4ZM44 4h2v4h-2ZM50 4h6v4h-6ZM66 4h2v4h-2ZM70 4h10v4h-10ZM82 4h4v4h-4ZM96 4h2v4h-2ZM114 4h2v8h-2ZM126 4h12v4h-12ZM142 4h4v4h-4ZM148 4h2v4h-2ZM154 4h6v8h-6ZM168 4h10v4h-10ZM182 4h2v8h-2ZM198 4h4v4h-4ZM26 8h2v4h-2ZM32 8h6v4h-6ZM42 8h4v4h-4ZM48 8h2v4h-2ZM58 8h4v4h-4ZM66 8h4v4h-4ZM74 8h2v4h-2ZM86 8h2v4h-2ZM90 8h4v4h-4ZM106 8h4v8h-4ZM120 8h2v4h-2ZM126 8h8v4h-8ZM136 8h8v4h-8ZM146 8h2v4h-2ZM166 8h6v4h-6ZM174 8h2v8h-2ZM198 8h6v4h-6ZM26 12h4v4h-4ZM32 12h4v4h-4ZM42 12h2v4h-2ZM46 12h6v4h-6ZM62 12h2v4h-2ZM66 12h6v4h-6ZM74 12h4v4h-4ZM80 12h6v4h-6ZM90 12h2v4h-2ZM114 12h4v4h-4ZM120 12h10v4h-10ZM136 12h2v4h-2ZM140 12h2v4h-2ZM144 12h4v4h-4ZM154 12h8v4h-8ZM168 12h2v4h-2ZM178 12h2v4h-2ZM198 12h8v4h-8ZM206 16h2v4h-2ZM16 20h2v4h-2ZM208 20h2v4h-2ZM18 24h2v86h-2ZM206 24h2v86h-2ZM22 28h2v82h-2ZM28 28h4v82h-4ZM36 28h2v82h-2ZM42 28h2v72h-2ZM48 28h4v72h-4ZM54 28h8v72h-8ZM64 28h2v72h-2ZM68 28h2v72h-2ZM76 28h4v72h-4ZM82 28h4v72h-4ZM92 28h2v72h-2ZM96 28h2v72h-2ZM100 28h8v72h-8ZM110 28h2v82h-2ZM114 28h2v82h-2ZM118 28h2v72h-2ZM126 28h2v72h-2ZM132 28h2v72h-2ZM138 28h2v72h-2ZM146 28h6v72h-6ZM154 28h2v72h-2ZM160 28h6v72h-6ZM170 28h2v72h-2ZM174 28h4v72h-4ZM182 28h4v72h-4ZM188 28h4v82h-4ZM194 28h4v82h-4ZM202 28h2v82h-2ZM226 46h2v54h-2ZM230 46h4v54h-4ZM238 46h4v54h-4ZM246 46h2v54h-2ZM250 46h2v54h-2ZM256 46h2v54h-2ZM262 46h4v54h-4ZM268 46h2v54h-2ZM272 46h4v54h-4ZM280 46h4v54h-4ZM286 46h2v54h-2ZM292 46h4v54h-4ZM298 46h4v54h-4ZM304 46h2v54h-2ZM310 46h4v54h-4ZM318 46h2v54h-2Z"/>
+  <path d="M12 0h4v16h-4ZM18 0h2v20h-2ZM24 0h6v4h-6ZM32 0h2v8h-2ZM40 0h10v4h-10ZM52 0h2v4h-2ZM58 0h6v4h-6ZM66 0h4v4h-4ZM72 0h12v4h-12ZM86 0h2v4h-2ZM90 0h6v4h-6ZM100 0h2v16h-2ZM106 0h6v8h-6ZM114 0h4v4h-4ZM120 0h4v8h-4ZM126 0h2v4h-2ZM136 0h8v4h-8ZM146 0h4v4h-4ZM154 0h4v4h-4ZM162 0h2v8h-2ZM166 0h6v4h-6ZM180 0h2v4h-2ZM188 0h4v16h-4ZM194 0h2v16h-2ZM200 0h2v4h-2ZM208 0h2v16h-2ZM24 4h4v4h-4ZM36 4h4v4h-4ZM44 4h2v4h-2ZM50 4h6v4h-6ZM66 4h2v4h-2ZM70 4h10v4h-10ZM82 4h4v4h-4ZM96 4h2v4h-2ZM114 4h2v8h-2ZM126 4h12v4h-12ZM142 4h4v4h-4ZM148 4h2v4h-2ZM154 4h6v8h-6ZM168 4h10v4h-10ZM182 4h2v8h-2ZM198 4h4v4h-4ZM26 8h2v4h-2ZM32 8h6v4h-6ZM42 8h4v4h-4ZM48 8h2v4h-2ZM58 8h4v4h-4ZM66 8h4v4h-4ZM74 8h2v4h-2ZM86 8h2v4h-2ZM90 8h4v4h-4ZM106 8h4v8h-4ZM120 8h2v4h-2ZM126 8h8v4h-8ZM136 8h8v4h-8ZM146 8h2v4h-2ZM166 8h6v4h-6ZM174 8h2v8h-2ZM198 8h6v4h-6ZM26 12h4v4h-4ZM32 12h4v4h-4ZM42 12h2v4h-2ZM46 12h6v4h-6ZM62 12h2v4h-2ZM66 12h6v4h-6ZM74 12h4v4h-4ZM80 12h6v4h-6ZM90 12h2v4h-2ZM114 12h4v4h-4ZM120 12h10v4h-10ZM136 12h2v4h-2ZM140 12h2v4h-2ZM144 12h4v4h-4ZM154 12h8v4h-8ZM168 12h2v4h-2ZM178 12h2v4h-2ZM198 12h8v4h-8ZM206 16h2v4h-2ZM16 20h2v4h-2ZM208 20h2v4h-2ZM18 24h2v86h-2ZM206 24h2v86h-2ZM22 28h2v82h-2ZM28 28h4v82h-4ZM36 28h2v82h-2ZM42 28h2v72h-2ZM48 28h4v72h-4ZM54 28h8v72h-8ZM64 28h2v72h-2ZM68 28h2v72h-2ZM76 28h4v72h-4ZM82 28h4v72h-4ZM92 28h2v72h-2ZM96 28h2v72h-2ZM100 28h8v72h-8ZM110 28h2v82h-2ZM114 28h2v82h-2ZM118 28h2v72h-2ZM126 28h2v72h-2ZM132 28h2v72h-2ZM138 28h2v72h-2ZM146 28h6v72h-6ZM154 28h2v72h-2ZM160 28h6v72h-6ZM170 28h2v72h-2ZM174 28h4v72h-4ZM182 28h4v72h-4ZM188 28h4v82h-4ZM194 28h4v82h-4ZM202 28h2v82h-2ZM226 46h2v64h-2ZM230 46h4v64h-4ZM238 46h4v64h-4ZM246 46h2v64h-2ZM250 46h2v64h-2ZM256 46h2v64h-2ZM262 46h4v64h-4ZM268 46h2v64h-2ZM272 46h4v64h-4ZM280 46h4v64h-4ZM286 46h2v64h-2ZM292 46h4v64h-4ZM298 46h4v64h-4ZM304 46h2v64h-2ZM310 46h4v64h-4ZM318 46h2v64h-2Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    78901
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    2
   </text>
   <text x="274" y="43.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_cc_5addon_ccb_4x4_bind3.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="130" fill="#FFFFFF"/>
-  <path d="M12 6h4v16h-4ZM18 6h2v20h-2ZM24 6h6v4h-6ZM32 6h2v8h-2ZM40 6h10v4h-10ZM52 6h2v4h-2ZM58 6h6v4h-6ZM66 6h4v4h-4ZM72 6h12v4h-12ZM86 6h2v4h-2ZM90 6h6v4h-6ZM100 6h2v16h-2ZM106 6h6v8h-6ZM114 6h4v4h-4ZM120 6h4v8h-4ZM126 6h2v4h-2ZM136 6h8v4h-8ZM146 6h4v4h-4ZM154 6h4v4h-4ZM162 6h2v8h-2ZM166 6h6v4h-6ZM180 6h2v4h-2ZM188 6h4v16h-4ZM194 6h2v16h-2ZM200 6h2v4h-2ZM208 6h2v16h-2ZM24 10h4v4h-4ZM36 10h4v4h-4ZM44 10h2v4h-2ZM50 10h6v4h-6ZM66 10h2v4h-2ZM70 10h10v4h-10ZM82 10h4v4h-4ZM96 10h2v4h-2ZM114 10h2v8h-2ZM126 10h12v4h-12ZM142 10h4v4h-4ZM148 10h2v4h-2ZM154 10h6v8h-6ZM168 10h10v4h-10ZM182 10h2v8h-2ZM198 10h4v4h-4ZM26 14h2v4h-2ZM32 14h6v4h-6ZM42 14h4v4h-4ZM48 14h2v4h-2ZM58 14h4v4h-4ZM66 14h4v4h-4ZM74 14h2v4h-2ZM86 14h2v4h-2ZM90 14h4v4h-4ZM106 14h4v8h-4ZM120 14h2v4h-2ZM126 14h8v4h-8ZM136 14h8v4h-8ZM146 14h2v4h-2ZM166 14h6v4h-6ZM174 14h2v8h-2ZM198 14h6v4h-6ZM26 18h4v4h-4ZM32 18h4v4h-4ZM42 18h2v4h-2ZM46 18h6v4h-6ZM62 18h2v4h-2ZM66 18h6v4h-6ZM74 18h4v4h-4ZM80 18h6v4h-6ZM90 18h2v4h-2ZM114 18h4v4h-4ZM120 18h10v4h-10ZM136 18h2v4h-2ZM140 18h2v4h-2ZM144 18h4v4h-4ZM154 18h8v4h-8ZM168 18h2v4h-2ZM178 18h2v4h-2ZM198 18h8v4h-8ZM206 22h2v4h-2ZM16 26h2v4h-2ZM208 26h2v4h-2ZM18 30h2v86h-2ZM206 30h2v86h-2ZM22 34h2v82h-2ZM28 34h4v82h-4ZM36 34h2v82h-2ZM42 34h2v72h-2ZM48 34h4v72h-4ZM54 34h8v72h-8ZM64 34h2v72h-2ZM68 34h2v72h-2ZM76 34h4v72h-4ZM82 34h4v72h-4ZM92 34h2v72h-2ZM96 34h2v72h-2ZM100 34h8v72h-8ZM110 34h2v82h-2ZM114 34h2v82h-2ZM118 34h2v72h-2ZM126 34h2v72h-2ZM132 34h2v72h-2ZM138 34h2v72h-2ZM146 34h6v72h-6ZM154 34h2v72h-2ZM160 34h6v72h-6ZM170 34h2v72h-2ZM174 34h4v72h-4ZM182 34h4v72h-4ZM188 34h4v82h-4ZM194 34h4v82h-4ZM202 34h2v82h-2ZM226 52h2v54h-2ZM230 52h4v54h-4ZM238 52h4v54h-4ZM246 52h2v54h-2ZM250 52h2v54h-2ZM256 52h2v54h-2ZM262 52h4v54h-4ZM268 52h2v54h-2ZM272 52h4v54h-4ZM280 52h4v54h-4ZM286 52h2v54h-2ZM292 52h4v54h-4ZM298 52h4v54h-4ZM304 52h2v54h-2ZM310 52h4v54h-4ZM318 52h2v54h-2ZM0 0h330v6h-330ZM0 106h330v6h-330Z"/>
+  <path d="M12 6h4v16h-4ZM18 6h2v20h-2ZM24 6h6v4h-6ZM32 6h2v8h-2ZM40 6h10v4h-10ZM52 6h2v4h-2ZM58 6h6v4h-6ZM66 6h4v4h-4ZM72 6h12v4h-12ZM86 6h2v4h-2ZM90 6h6v4h-6ZM100 6h2v16h-2ZM106 6h6v8h-6ZM114 6h4v4h-4ZM120 6h4v8h-4ZM126 6h2v4h-2ZM136 6h8v4h-8ZM146 6h4v4h-4ZM154 6h4v4h-4ZM162 6h2v8h-2ZM166 6h6v4h-6ZM180 6h2v4h-2ZM188 6h4v16h-4ZM194 6h2v16h-2ZM200 6h2v4h-2ZM208 6h2v16h-2ZM24 10h4v4h-4ZM36 10h4v4h-4ZM44 10h2v4h-2ZM50 10h6v4h-6ZM66 10h2v4h-2ZM70 10h10v4h-10ZM82 10h4v4h-4ZM96 10h2v4h-2ZM114 10h2v8h-2ZM126 10h12v4h-12ZM142 10h4v4h-4ZM148 10h2v4h-2ZM154 10h6v8h-6ZM168 10h10v4h-10ZM182 10h2v8h-2ZM198 10h4v4h-4ZM26 14h2v4h-2ZM32 14h6v4h-6ZM42 14h4v4h-4ZM48 14h2v4h-2ZM58 14h4v4h-4ZM66 14h4v4h-4ZM74 14h2v4h-2ZM86 14h2v4h-2ZM90 14h4v4h-4ZM106 14h4v8h-4ZM120 14h2v4h-2ZM126 14h8v4h-8ZM136 14h8v4h-8ZM146 14h2v4h-2ZM166 14h6v4h-6ZM174 14h2v8h-2ZM198 14h6v4h-6ZM26 18h4v4h-4ZM32 18h4v4h-4ZM42 18h2v4h-2ZM46 18h6v4h-6ZM62 18h2v4h-2ZM66 18h6v4h-6ZM74 18h4v4h-4ZM80 18h6v4h-6ZM90 18h2v4h-2ZM114 18h4v4h-4ZM120 18h10v4h-10ZM136 18h2v4h-2ZM140 18h2v4h-2ZM144 18h4v4h-4ZM154 18h8v4h-8ZM168 18h2v4h-2ZM178 18h2v4h-2ZM198 18h8v4h-8ZM206 22h2v4h-2ZM16 26h2v4h-2ZM208 26h2v4h-2ZM18 30h2v86h-2ZM206 30h2v86h-2ZM22 34h2v82h-2ZM28 34h4v82h-4ZM36 34h2v82h-2ZM42 34h2v72h-2ZM48 34h4v72h-4ZM54 34h8v72h-8ZM64 34h2v72h-2ZM68 34h2v72h-2ZM76 34h4v72h-4ZM82 34h4v72h-4ZM92 34h2v72h-2ZM96 34h2v72h-2ZM100 34h8v72h-8ZM110 34h2v82h-2ZM114 34h2v82h-2ZM118 34h2v72h-2ZM126 34h2v72h-2ZM132 34h2v72h-2ZM138 34h2v72h-2ZM146 34h6v72h-6ZM154 34h2v72h-2ZM160 34h6v72h-6ZM170 34h2v72h-2ZM174 34h4v72h-4ZM182 34h4v72h-4ZM188 34h4v82h-4ZM194 34h4v82h-4ZM202 34h2v82h-2ZM226 52h2v64h-2ZM230 52h4v64h-4ZM238 52h4v64h-4ZM246 52h2v64h-2ZM250 52h2v64h-2ZM256 52h2v64h-2ZM262 52h4v64h-4ZM268 52h2v64h-2ZM272 52h4v64h-4ZM280 52h4v64h-4ZM286 52h2v64h-2ZM292 52h4v64h-4ZM298 52h4v64h-4ZM304 52h2v64h-2ZM310 52h4v64h-4ZM318 52h2v64h-2ZM0 0h330v6h-330ZM0 106h330v6h-330Z"/>
   <text x="8.7" y="129.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="129.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    78901
   </text>
-  <text x="217.3" y="129.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="129.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    2
   </text>
   <text x="274" y="49.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_cc_5addon_ccb_4x4_gws.svg

@@ -4,7 +4,7 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v16h-4ZM18 0h2v20h-2ZM24 0h6v4h-6ZM32 0h2v8h-2ZM40 0h10v4h-10ZM52 0h2v4h-2ZM58 0h6v4h-6ZM66 0h4v4h-4ZM72 0h12v4h-12ZM86 0h2v4h-2ZM90 0h6v4h-6ZM100 0h2v16h-2ZM106 0h6v8h-6ZM114 0h4v4h-4ZM120 0h4v8h-4ZM126 0h2v4h-2ZM136 0h8v4h-8ZM146 0h4v4h-4ZM154 0h4v4h-4ZM162 0h2v8h-2ZM166 0h6v4h-6ZM180 0h2v4h-2ZM188 0h4v16h-4ZM194 0h2v16h-2ZM200 0h2v4h-2ZM208 0h2v16h-2ZM24 4h4v4h-4ZM36 4h4v4h-4ZM44 4h2v4h-2ZM50 4h6v4h-6ZM66 4h2v4h-2ZM70 4h10v4h-10ZM82 4h4v4h-4ZM96 4h2v4h-2ZM114 4h2v8h-2ZM126 4h12v4h-12ZM142 4h4v4h-4ZM148 4h2v4h-2ZM154 4h6v8h-6ZM168 4h10v4h-10ZM182 4h2v8h-2ZM198 4h4v4h-4ZM26 8h2v4h-2ZM32 8h6v4h-6ZM42 8h4v4h-4ZM48 8h2v4h-2ZM58 8h4v4h-4ZM66 8h4v4h-4ZM74 8h2v4h-2ZM86 8h2v4h-2ZM90 8h4v4h-4ZM106 8h4v8h-4ZM120 8h2v4h-2ZM126 8h8v4h-8ZM136 8h8v4h-8ZM146 8h2v4h-2ZM166 8h6v4h-6ZM174 8h2v8h-2ZM198 8h6v4h-6ZM26 12h4v4h-4ZM32 12h4v4h-4ZM42 12h2v4h-2ZM46 12h6v4h-6ZM62 12h2v4h-2ZM66 12h6v4h-6ZM74 12h4v4h-4ZM80 12h6v4h-6ZM90 12h2v4h-2ZM114 12h4v4h-4ZM120 12h10v4h-10ZM136 12h2v4h-2ZM140 12h2v4h-2ZM144 12h4v4h-4ZM154 12h8v4h-8ZM168 12h2v4h-2ZM178 12h2v4h-2ZM198 12h8v4h-8ZM206 16h2v4h-2ZM16 20h2v4h-2ZM208 20h2v4h-2ZM18 24h2v86h-2ZM206 24h2v86h-2ZM22 28h2v82h-2ZM28 28h4v82h-4ZM36 28h2v82h-2ZM42 28h2v72h-2ZM48 28h4v72h-4ZM54 28h8v72h-8ZM64 28h2v72h-2ZM68 28h2v72h-2ZM76 28h4v72h-4ZM82 28h4v72h-4ZM92 28h2v72h-2ZM96 28h2v72h-2ZM100 28h8v72h-8ZM110 28h2v82h-2ZM114 28h2v82h-2ZM118 28h2v72h-2ZM126 28h2v72h-2ZM132 28h2v72h-2ZM138 28h2v72h-2ZM146 28h6v72h-6ZM154 28h2v72h-2ZM160 28h6v72h-6ZM170 28h2v72h-2ZM174 28h4v72h-4ZM182 28h4v72h-4ZM188 28h4v82h-4ZM194 28h4v82h-4ZM202 28h2v82h-2ZM226 46h2v54h-2ZM230 46h4v54h-4ZM238 46h4v54h-4ZM246 46h2v54h-2ZM250 46h2v54h-2ZM256 46h2v54h-2ZM262 46h4v54h-4ZM268 46h2v54h-2ZM272 46h4v54h-4ZM280 46h4v54h-4ZM286 46h2v54h-2ZM292 46h4v54h-4ZM298 46h4v54h-4ZM304 46h2v54h-2ZM310 46h4v54h-4ZM318 46h2v54h-2Z"/>
+  <path d="M12 0h4v16h-4ZM18 0h2v20h-2ZM24 0h6v4h-6ZM32 0h2v8h-2ZM40 0h10v4h-10ZM52 0h2v4h-2ZM58 0h6v4h-6ZM66 0h4v4h-4ZM72 0h12v4h-12ZM86 0h2v4h-2ZM90 0h6v4h-6ZM100 0h2v16h-2ZM106 0h6v8h-6ZM114 0h4v4h-4ZM120 0h4v8h-4ZM126 0h2v4h-2ZM136 0h8v4h-8ZM146 0h4v4h-4ZM154 0h4v4h-4ZM162 0h2v8h-2ZM166 0h6v4h-6ZM180 0h2v4h-2ZM188 0h4v16h-4ZM194 0h2v16h-2ZM200 0h2v4h-2ZM208 0h2v16h-2ZM24 4h4v4h-4ZM36 4h4v4h-4ZM44 4h2v4h-2ZM50 4h6v4h-6ZM66 4h2v4h-2ZM70 4h10v4h-10ZM82 4h4v4h-4ZM96 4h2v4h-2ZM114 4h2v8h-2ZM126 4h12v4h-12ZM142 4h4v4h-4ZM148 4h2v4h-2ZM154 4h6v8h-6ZM168 4h10v4h-10ZM182 4h2v8h-2ZM198 4h4v4h-4ZM26 8h2v4h-2ZM32 8h6v4h-6ZM42 8h4v4h-4ZM48 8h2v4h-2ZM58 8h4v4h-4ZM66 8h4v4h-4ZM74 8h2v4h-2ZM86 8h2v4h-2ZM90 8h4v4h-4ZM106 8h4v8h-4ZM120 8h2v4h-2ZM126 8h8v4h-8ZM136 8h8v4h-8ZM146 8h2v4h-2ZM166 8h6v4h-6ZM174 8h2v8h-2ZM198 8h6v4h-6ZM26 12h4v4h-4ZM32 12h4v4h-4ZM42 12h2v4h-2ZM46 12h6v4h-6ZM62 12h2v4h-2ZM66 12h6v4h-6ZM74 12h4v4h-4ZM80 12h6v4h-6ZM90 12h2v4h-2ZM114 12h4v4h-4ZM120 12h10v4h-10ZM136 12h2v4h-2ZM140 12h2v4h-2ZM144 12h4v4h-4ZM154 12h8v4h-8ZM168 12h2v4h-2ZM178 12h2v4h-2ZM198 12h8v4h-8ZM206 16h2v4h-2ZM16 20h2v4h-2ZM208 20h2v4h-2ZM18 24h2v86h-2ZM206 24h2v86h-2ZM22 28h2v82h-2ZM28 28h4v82h-4ZM36 28h2v82h-2ZM42 28h2v72h-2ZM48 28h4v72h-4ZM54 28h8v72h-8ZM64 28h2v72h-2ZM68 28h2v72h-2ZM76 28h4v72h-4ZM82 28h4v72h-4ZM92 28h2v72h-2ZM96 28h2v72h-2ZM100 28h8v72h-8ZM110 28h2v82h-2ZM114 28h2v82h-2ZM118 28h2v72h-2ZM126 28h2v72h-2ZM132 28h2v72h-2ZM138 28h2v72h-2ZM146 28h6v72h-6ZM154 28h2v72h-2ZM160 28h6v72h-6ZM170 28h2v72h-2ZM174 28h4v72h-4ZM182 28h4v72h-4ZM188 28h4v82h-4ZM194 28h4v82h-4ZM202 28h2v82h-2ZM226 46h2v64h-2ZM230 46h4v64h-4ZM238 46h4v64h-4ZM246 46h2v64h-2ZM250 46h2v64h-2ZM256 46h2v64h-2ZM262 46h4v64h-4ZM268 46h2v64h-2ZM272 46h4v64h-4ZM280 46h4v64h-4ZM286 46h2v64h-2ZM292 46h4v64h-4ZM298 46h4v64h-4ZM304 46h2v64h-2ZM310 46h4v64h-4ZM318 46h2v64h-2Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
@@ -14,7 +14,7 @@
   <text x="152" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    78901
   </text>
-  <text x="217.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="215.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    2
   </text>
   <text x="274" y="43.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upca_cc_5addon_ccb_4x4_notext.svg

@@ -4,6 +4,6 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="330" height="110" fill="#FFFFFF"/>
-  <path d="M12 0h4v16h-4ZM18 0h2v20h-2ZM24 0h6v4h-6ZM32 0h2v8h-2ZM40 0h10v4h-10ZM52 0h2v4h-2ZM58 0h6v4h-6ZM66 0h4v4h-4ZM72 0h12v4h-12ZM86 0h2v4h-2ZM90 0h6v4h-6ZM100 0h2v16h-2ZM106 0h6v8h-6ZM114 0h4v4h-4ZM120 0h4v8h-4ZM126 0h2v4h-2ZM136 0h8v4h-8ZM146 0h4v4h-4ZM154 0h4v4h-4ZM162 0h2v8h-2ZM166 0h6v4h-6ZM180 0h2v4h-2ZM188 0h4v16h-4ZM194 0h2v16h-2ZM200 0h2v4h-2ZM208 0h2v16h-2ZM24 4h4v4h-4ZM36 4h4v4h-4ZM44 4h2v4h-2ZM50 4h6v4h-6ZM66 4h2v4h-2ZM70 4h10v4h-10ZM82 4h4v4h-4ZM96 4h2v4h-2ZM114 4h2v8h-2ZM126 4h12v4h-12ZM142 4h4v4h-4ZM148 4h2v4h-2ZM154 4h6v8h-6ZM168 4h10v4h-10ZM182 4h2v8h-2ZM198 4h4v4h-4ZM26 8h2v4h-2ZM32 8h6v4h-6ZM42 8h4v4h-4ZM48 8h2v4h-2ZM58 8h4v4h-4ZM66 8h4v4h-4ZM74 8h2v4h-2ZM86 8h2v4h-2ZM90 8h4v4h-4ZM106 8h4v8h-4ZM120 8h2v4h-2ZM126 8h8v4h-8ZM136 8h8v4h-8ZM146 8h2v4h-2ZM166 8h6v4h-6ZM174 8h2v8h-2ZM198 8h6v4h-6ZM26 12h4v4h-4ZM32 12h4v4h-4ZM42 12h2v4h-2ZM46 12h6v4h-6ZM62 12h2v4h-2ZM66 12h6v4h-6ZM74 12h4v4h-4ZM80 12h6v4h-6ZM90 12h2v4h-2ZM114 12h4v4h-4ZM120 12h10v4h-10ZM136 12h2v4h-2ZM140 12h2v4h-2ZM144 12h4v4h-4ZM154 12h8v4h-8ZM168 12h2v4h-2ZM178 12h2v4h-2ZM198 12h8v4h-8ZM206 16h2v4h-2ZM16 20h2v4h-2ZM208 20h2v4h-2ZM18 24h2v86h-2ZM206 24h2v86h-2ZM22 28h2v82h-2ZM28 28h4v82h-4ZM36 28h2v82h-2ZM42 28h2v72h-2ZM48 28h4v72h-4ZM54 28h8v72h-8ZM64 28h2v72h-2ZM68 28h2v72h-2ZM76 28h4v72h-4ZM82 28h4v72h-4ZM92 28h2v72h-2ZM96 28h2v72h-2ZM100 28h8v72h-8ZM110 28h2v82h-2ZM114 28h2v82h-2ZM118 28h2v72h-2ZM126 28h2v72h-2ZM132 28h2v72h-2ZM138 28h2v72h-2ZM146 28h6v72h-6ZM154 28h2v72h-2ZM160 28h6v72h-6ZM170 28h2v72h-2ZM174 28h4v72h-4ZM182 28h4v72h-4ZM188 28h4v82h-4ZM194 28h4v82h-4ZM202 28h2v82h-2ZM226 46h2v54h-2ZM230 46h4v54h-4ZM238 46h4v54h-4ZM246 46h2v54h-2ZM250 46h2v54h-2ZM256 46h2v54h-2ZM262 46h4v54h-4ZM268 46h2v54h-2ZM272 46h4v54h-4ZM280 46h4v54h-4ZM286 46h2v54h-2ZM292 46h4v54h-4ZM298 46h4v54h-4ZM304 46h2v54h-2ZM310 46h4v54h-4ZM318 46h2v54h-2Z"/>
+  <path d="M12 0h4v16h-4ZM18 0h2v20h-2ZM24 0h6v4h-6ZM32 0h2v8h-2ZM40 0h10v4h-10ZM52 0h2v4h-2ZM58 0h6v4h-6ZM66 0h4v4h-4ZM72 0h12v4h-12ZM86 0h2v4h-2ZM90 0h6v4h-6ZM100 0h2v16h-2ZM106 0h6v8h-6ZM114 0h4v4h-4ZM120 0h4v8h-4ZM126 0h2v4h-2ZM136 0h8v4h-8ZM146 0h4v4h-4ZM154 0h4v4h-4ZM162 0h2v8h-2ZM166 0h6v4h-6ZM180 0h2v4h-2ZM188 0h4v16h-4ZM194 0h2v16h-2ZM200 0h2v4h-2ZM208 0h2v16h-2ZM24 4h4v4h-4ZM36 4h4v4h-4ZM44 4h2v4h-2ZM50 4h6v4h-6ZM66 4h2v4h-2ZM70 4h10v4h-10ZM82 4h4v4h-4ZM96 4h2v4h-2ZM114 4h2v8h-2ZM126 4h12v4h-12ZM142 4h4v4h-4ZM148 4h2v4h-2ZM154 4h6v8h-6ZM168 4h10v4h-10ZM182 4h2v8h-2ZM198 4h4v4h-4ZM26 8h2v4h-2ZM32 8h6v4h-6ZM42 8h4v4h-4ZM48 8h2v4h-2ZM58 8h4v4h-4ZM66 8h4v4h-4ZM74 8h2v4h-2ZM86 8h2v4h-2ZM90 8h4v4h-4ZM106 8h4v8h-4ZM120 8h2v4h-2ZM126 8h8v4h-8ZM136 8h8v4h-8ZM146 8h2v4h-2ZM166 8h6v4h-6ZM174 8h2v8h-2ZM198 8h6v4h-6ZM26 12h4v4h-4ZM32 12h4v4h-4ZM42 12h2v4h-2ZM46 12h6v4h-6ZM62 12h2v4h-2ZM66 12h6v4h-6ZM74 12h4v4h-4ZM80 12h6v4h-6ZM90 12h2v4h-2ZM114 12h4v4h-4ZM120 12h10v4h-10ZM136 12h2v4h-2ZM140 12h2v4h-2ZM144 12h4v4h-4ZM154 12h8v4h-8ZM168 12h2v4h-2ZM178 12h2v4h-2ZM198 12h8v4h-8ZM206 16h2v4h-2ZM16 20h2v4h-2ZM208 20h2v4h-2ZM18 24h2v86h-2ZM206 24h2v86h-2ZM22 28h2v82h-2ZM28 28h4v82h-4ZM36 28h2v82h-2ZM42 28h2v72h-2ZM48 28h4v72h-4ZM54 28h8v72h-8ZM64 28h2v72h-2ZM68 28h2v72h-2ZM76 28h4v72h-4ZM82 28h4v72h-4ZM92 28h2v72h-2ZM96 28h2v72h-2ZM100 28h8v72h-8ZM110 28h2v82h-2ZM114 28h2v82h-2ZM118 28h2v72h-2ZM126 28h2v72h-2ZM132 28h2v72h-2ZM138 28h2v72h-2ZM146 28h6v72h-6ZM154 28h2v72h-2ZM160 28h6v72h-6ZM170 28h2v72h-2ZM174 28h4v72h-4ZM182 28h4v72h-4ZM188 28h4v82h-4ZM194 28h4v82h-4ZM202 28h2v82h-2ZM226 46h2v64h-2ZM230 46h4v64h-4ZM238 46h4v64h-4ZM246 46h2v64h-2ZM250 46h2v64h-2ZM256 46h2v64h-2ZM262 46h4v64h-4ZM268 46h2v64h-2ZM272 46h4v64h-4ZM280 46h4v64h-4ZM286 46h2v64h-2ZM292 46h4v64h-4ZM298 46h4v64h-4ZM304 46h2v64h-2ZM310 46h4v64h-4ZM318 46h2v64h-2Z"/>
  </g>
 </svg>

backend/tests/data/svg/upce_2addon.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="184" height="118" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v82h-2ZM138 18h4v82h-4ZM146 18h4v82h-4ZM154 18h2v82h-2ZM158 18h2v82h-2ZM164 18h2v82h-2ZM170 18h4v82h-4Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v92h-2ZM138 18h4v92h-4ZM146 18h4v92h-4ZM154 18h2v92h-2ZM158 18h2v92h-2ZM164 18h2v92h-2ZM170 18h4v92h-4Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    234567
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    0
   </text>
   <text x="154" y="15.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_2addon_gws.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="184" height="118" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v82h-2ZM138 18h4v82h-4ZM146 18h4v82h-4ZM154 18h2v82h-2ZM158 18h2v82h-2ZM164 18h2v82h-2ZM170 18h4v82h-4Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v92h-2ZM138 18h4v92h-4ZM146 18h4v92h-4ZM154 18h2v92h-2ZM158 18h2v92h-2ZM164 18h2v92h-2ZM170 18h4v92h-4Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    234567
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    0
   </text>
   <text x="154" y="15.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_5addon.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="238" height="118" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v82h-2ZM138 18h4v82h-4ZM144 18h4v82h-4ZM152 18h4v82h-4ZM158 18h2v82h-2ZM164 18h2v82h-2ZM170 18h4v82h-4ZM176 18h2v82h-2ZM180 18h2v82h-2ZM190 18h2v82h-2ZM194 18h2v82h-2ZM198 18h2v82h-2ZM206 18h4v82h-4ZM212 18h2v82h-2ZM216 18h4v82h-4ZM226 18h2v82h-2Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v92h-2ZM138 18h4v92h-4ZM144 18h4v92h-4ZM152 18h4v92h-4ZM158 18h2v92h-2ZM164 18h2v92h-2ZM170 18h4v92h-4ZM176 18h2v92h-2ZM180 18h2v92h-2ZM190 18h2v92h-2ZM194 18h2v92h-2ZM198 18h2v92h-2ZM206 18h4v92h-4ZM212 18h2v92h-2ZM216 18h4v92h-4ZM226 18h2v92h-2Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    234567
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    0
   </text>
   <text x="182" y="15.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_5addon_notext.svg

@@ -4,6 +4,6 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="238" height="110" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v82h-2ZM138 18h4v82h-4ZM144 18h4v82h-4ZM152 18h4v82h-4ZM158 18h2v82h-2ZM164 18h2v82h-2ZM170 18h4v82h-4ZM176 18h2v82h-2ZM180 18h2v82h-2ZM190 18h2v82h-2ZM194 18h2v82h-2ZM198 18h2v82h-2ZM206 18h4v82h-4ZM212 18h2v82h-2ZM216 18h4v82h-4ZM226 18h2v82h-2Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 18h2v92h-2ZM138 18h4v92h-4ZM144 18h4v92h-4ZM152 18h4v92h-4ZM158 18h2v92h-2ZM164 18h2v92h-2ZM170 18h4v92h-4ZM176 18h2v92h-2ZM180 18h2v92h-2ZM190 18h2v92h-2ZM194 18h2v92h-2ZM198 18h2v92h-2ZM206 18h4v92h-4ZM212 18h2v92h-2ZM216 18h4v92h-4ZM226 18h2v92h-2Z"/>
  </g>
 </svg>

backend/tests/data/svg/upce_5addon_small.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="238" height="114" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 13.2h2v86.8h-2ZM138 13.2h4v86.8h-4ZM144 13.2h4v86.8h-4ZM152 13.2h4v86.8h-4ZM158 13.2h2v86.8h-2ZM164 13.2h2v86.8h-2ZM170 13.2h4v86.8h-4ZM176 13.2h2v86.8h-2ZM180 13.2h2v86.8h-2ZM190 13.2h2v86.8h-2ZM194 13.2h2v86.8h-2ZM198 13.2h2v86.8h-2ZM206 13.2h4v86.8h-4ZM212 13.2h2v86.8h-2ZM216 13.2h4v86.8h-4ZM226 13.2h2v86.8h-2Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 13.2h2v96.8h-2ZM138 13.2h4v96.8h-4ZM144 13.2h4v96.8h-4ZM152 13.2h4v96.8h-4ZM158 13.2h2v96.8h-2ZM164 13.2h2v96.8h-2ZM170 13.2h4v96.8h-4ZM176 13.2h2v96.8h-2ZM180 13.2h2v96.8h-2ZM190 13.2h2v96.8h-2ZM194 13.2h2v96.8h-2ZM198 13.2h2v96.8h-2ZM206 13.2h4v96.8h-4ZM212 13.2h2v96.8h-2ZM216 13.2h4v96.8h-4ZM226 13.2h2v96.8h-2Z"/>
   <text x="8.7" y="112.64" text-anchor="end" font-family="OCRB, monospace" font-size="12">
    1
   </text>
   <text x="67" y="112.64" text-anchor="middle" font-family="OCRB, monospace" font-size="14">
    234567
   </text>
-  <text x="125.3" y="112.64" text-anchor="start" font-family="OCRB, monospace" font-size="12">
+  <text x="123.3" y="112.64" text-anchor="start" font-family="OCRB, monospace" font-size="12">
    0
   </text>
   <text x="182" y="10.92" text-anchor="middle" font-family="OCRB, monospace" font-size="14">

backend/tests/data/svg/upce_5addon_small_gws.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="238" height="114" fill="#FFFFFF"/>
-  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 13.2h2v86.8h-2ZM138 13.2h4v86.8h-4ZM144 13.2h4v86.8h-4ZM152 13.2h4v86.8h-4ZM158 13.2h2v86.8h-2ZM164 13.2h2v86.8h-2ZM170 13.2h4v86.8h-4ZM176 13.2h2v86.8h-2ZM180 13.2h2v86.8h-2ZM190 13.2h2v86.8h-2ZM194 13.2h2v86.8h-2ZM198 13.2h2v86.8h-2ZM206 13.2h4v86.8h-4ZM212 13.2h2v86.8h-2ZM216 13.2h4v86.8h-4ZM226 13.2h2v86.8h-2Z"/>
+  <path d="M18 0h2v110h-2ZM22 0h2v110h-2ZM28 0h2v100h-2ZM34 0h4v100h-4ZM40 0h8v100h-8ZM50 0h2v100h-2ZM54 0h2v100h-2ZM62 0h4v100h-4ZM68 0h6v100h-6ZM78 0h2v100h-2ZM88 0h2v100h-2ZM92 0h2v100h-2ZM98 0h2v100h-2ZM106 0h2v100h-2ZM110 0h2v110h-2ZM114 0h2v110h-2ZM118 0h2v110h-2ZM134 13.2h2v96.8h-2ZM138 13.2h4v96.8h-4ZM144 13.2h4v96.8h-4ZM152 13.2h4v96.8h-4ZM158 13.2h2v96.8h-2ZM164 13.2h2v96.8h-2ZM170 13.2h4v96.8h-4ZM176 13.2h2v96.8h-2ZM180 13.2h2v96.8h-2ZM190 13.2h2v96.8h-2ZM194 13.2h2v96.8h-2ZM198 13.2h2v96.8h-2ZM206 13.2h4v96.8h-4ZM212 13.2h2v96.8h-2ZM216 13.2h4v96.8h-4ZM226 13.2h2v96.8h-2Z"/>
   <text x="8.7" y="112.64" text-anchor="end" font-family="OCRB, monospace" font-size="12">
    1
   </text>
   <text x="67" y="112.64" text-anchor="middle" font-family="OCRB, monospace" font-size="14">
    234567
   </text>
-  <text x="125.3" y="112.64" text-anchor="start" font-family="OCRB, monospace" font-size="12">
+  <text x="123.3" y="112.64" text-anchor="start" font-family="OCRB, monospace" font-size="12">
    0
   </text>
   <text x="182" y="10.92" text-anchor="middle" font-family="OCRB, monospace" font-size="14">

backend/tests/data/svg/upce_cc_2addon_cca_5x2.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="184" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v50h-2ZM138 50h4v50h-4ZM144 50h4v50h-4ZM150 50h6v50h-6ZM158 50h2v50h-2ZM164 50h2v50h-2ZM168 50h6v50h-6Z"/>
+  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v60h-2ZM138 50h4v60h-4ZM144 50h4v60h-4ZM150 50h6v60h-6ZM158 50h2v60h-2ZM164 50h2v60h-2ZM168 50h6v60h-6Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    0
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    654321
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    7
   </text>
   <text x="154" y="47.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_cc_2addon_cca_5x2_fgbgalpha.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#FF0000">
   <rect x="0" y="0" width="184" height="118" fill="#0000FF" opacity="0.067"/>
-  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v50h-2ZM138 50h4v50h-4ZM144 50h4v50h-4ZM150 50h6v50h-6ZM158 50h2v50h-2ZM164 50h2v50h-2ZM168 50h6v50h-6Z" opacity="0.933"/>
+  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v60h-2ZM138 50h4v60h-4ZM144 50h4v60h-4ZM150 50h6v60h-6ZM158 50h2v60h-2ZM164 50h2v60h-2ZM168 50h6v60h-6Z" opacity="0.933"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14" opacity="0.933">
    0
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20" opacity="0.933">
    654321
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14" opacity="0.933">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14" opacity="0.933">
    7
   </text>
   <text x="154" y="47.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20" opacity="0.933">

backend/tests/data/svg/upce_cc_2addon_cca_5x2_gws.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="184" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v50h-2ZM138 50h4v50h-4ZM144 50h4v50h-4ZM150 50h6v50h-6ZM158 50h2v50h-2ZM164 50h2v50h-2ZM168 50h6v50h-6Z"/>
+  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v60h-2ZM138 50h4v60h-4ZM144 50h4v60h-4ZM150 50h6v60h-6ZM158 50h2v60h-2ZM164 50h2v60h-2ZM168 50h6v60h-6Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    0
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    654321
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    7
   </text>
   <text x="154" y="47.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_cc_2addon_cca_5x2_nobg.svg

@@ -3,14 +3,14 @@
 <svg width="184" height="118" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
-  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v50h-2ZM138 50h4v50h-4ZM144 50h4v50h-4ZM150 50h6v50h-6ZM158 50h2v50h-2ZM164 50h2v50h-2ZM168 50h6v50h-6Z"/>
+  <path d="M12 0h4v20h-4ZM18 0h4v16h-4ZM26 0h4v4h-4ZM32 0h8v4h-8ZM42 0h6v4h-6ZM50 0h2v4h-2ZM54 0h10v4h-10ZM66 0h2v4h-2ZM70 0h2v4h-2ZM78 0h2v4h-2ZM86 0h8v4h-8ZM100 0h8v4h-8ZM110 0h2v8h-2ZM114 0h2v16h-2ZM120 0h2v20h-2ZM24 4h6v4h-6ZM32 4h6v4h-6ZM40 4h4v4h-4ZM52 4h2v4h-2ZM60 4h4v4h-4ZM66 4h6v4h-6ZM76 4h2v8h-2ZM80 4h2v4h-2ZM84 4h6v4h-6ZM100 4h6v16h-6ZM24 8h4v4h-4ZM32 8h4v4h-4ZM42 8h2v4h-2ZM46 8h10v4h-10ZM58 8h6v4h-6ZM66 8h8v4h-8ZM86 8h2v8h-2ZM92 8h2v4h-2ZM108 8h4v4h-4ZM24 12h2v8h-2ZM32 12h2v4h-2ZM38 12h6v4h-6ZM46 12h6v4h-6ZM56 12h8v4h-8ZM66 12h6v8h-6ZM76 12h8v4h-8ZM90 12h6v4h-6ZM108 12h2v8h-2ZM18 16h2v8h-2ZM32 16h4v4h-4ZM40 16h4v4h-4ZM48 16h2v4h-2ZM62 16h2v4h-2ZM74 16h2v4h-2ZM82 16h4v4h-4ZM88 16h8v4h-8ZM114 16h4v4h-4ZM118 20h2v4h-2ZM16 24h2v4h-2ZM120 24h2v4h-2ZM18 28h2v82h-2ZM118 28h2v82h-2ZM22 32h2v78h-2ZM32 32h2v68h-2ZM36 32h2v68h-2ZM40 32h4v68h-4ZM50 32h2v68h-2ZM56 32h6v68h-6ZM64 32h2v68h-2ZM68 32h8v68h-8ZM78 32h2v68h-2ZM84 32h4v68h-4ZM90 32h4v68h-4ZM98 32h4v68h-4ZM106 32h2v68h-2ZM110 32h2v78h-2ZM114 32h2v78h-2ZM134 50h2v60h-2ZM138 50h4v60h-4ZM144 50h4v60h-4ZM150 50h6v60h-6ZM158 50h2v60h-2ZM164 50h2v60h-2ZM168 50h6v60h-6Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    0
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    654321
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    7
   </text>
   <text x="154" y="47.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_cc_2addon_cca_5x2_rotate_270.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="118" height="184" fill="#FFFFFF"/>
-  <path d="M0 168h20v4h-20ZM0 162h16v4h-16ZM0 154h4v4h-4ZM0 144h4v8h-4ZM0 136h4v6h-4ZM0 132h4v2h-4ZM0 120h4v10h-4ZM0 116h4v2h-4ZM0 112h4v2h-4ZM0 104h4v2h-4ZM0 90h4v8h-4ZM0 76h4v8h-4ZM0 72h8v2h-8ZM0 68h16v2h-16ZM0 62h20v2h-20ZM4 154h4v6h-4ZM4 146h4v6h-4ZM4 140h4v4h-4ZM4 130h4v2h-4ZM4 120h4v4h-4ZM4 112h4v6h-4ZM4 106h8v2h-8ZM4 102h4v2h-4ZM4 94h4v6h-4ZM4 78h16v6h-16ZM8 156h4v4h-4ZM8 148h4v4h-4ZM8 140h4v2h-4ZM8 128h4v10h-4ZM8 120h4v6h-4ZM8 110h4v8h-4ZM8 96h8v2h-8ZM8 90h4v2h-4ZM8 72h4v4h-4ZM12 158h8v2h-8ZM12 150h4v2h-4ZM12 140h4v6h-4ZM12 132h4v6h-4ZM12 120h4v8h-4ZM12 112h8v6h-8ZM12 100h4v8h-4ZM12 88h4v6h-4ZM12 74h8v2h-8ZM16 164h8v2h-8ZM16 148h4v4h-4ZM16 140h4v4h-4ZM16 134h4v2h-4ZM16 120h4v2h-4ZM16 108h4v2h-4ZM16 98h4v4h-4ZM16 88h4v8h-4ZM16 66h4v4h-4ZM20 64h4v2h-4ZM24 166h4v2h-4ZM24 62h4v2h-4ZM28 164h82v2h-82ZM28 64h82v2h-82ZM32 160h78v2h-78ZM32 150h68v2h-68ZM32 146h68v2h-68ZM32 140h68v4h-68ZM32 132h68v2h-68ZM32 122h68v6h-68ZM32 118h68v2h-68ZM32 108h68v8h-68ZM32 104h68v2h-68ZM32 96h68v4h-68ZM32 90h68v4h-68ZM32 82h68v4h-68ZM32 76h68v2h-68ZM32 72h78v2h-78ZM32 68h78v2h-78ZM50 48h50v2h-50ZM50 42h50v4h-50ZM50 36h50v4h-50ZM50 28h50v6h-50ZM50 24h50v2h-50ZM50 18h50v2h-50ZM50 10h50v6h-50Z"/>
+  <path d="M0 168h20v4h-20ZM0 162h16v4h-16ZM0 154h4v4h-4ZM0 144h4v8h-4ZM0 136h4v6h-4ZM0 132h4v2h-4ZM0 120h4v10h-4ZM0 116h4v2h-4ZM0 112h4v2h-4ZM0 104h4v2h-4ZM0 90h4v8h-4ZM0 76h4v8h-4ZM0 72h8v2h-8ZM0 68h16v2h-16ZM0 62h20v2h-20ZM4 154h4v6h-4ZM4 146h4v6h-4ZM4 140h4v4h-4ZM4 130h4v2h-4ZM4 120h4v4h-4ZM4 112h4v6h-4ZM4 106h8v2h-8ZM4 102h4v2h-4ZM4 94h4v6h-4ZM4 78h16v6h-16ZM8 156h4v4h-4ZM8 148h4v4h-4ZM8 140h4v2h-4ZM8 128h4v10h-4ZM8 120h4v6h-4ZM8 110h4v8h-4ZM8 96h8v2h-8ZM8 90h4v2h-4ZM8 72h4v4h-4ZM12 158h8v2h-8ZM12 150h4v2h-4ZM12 140h4v6h-4ZM12 132h4v6h-4ZM12 120h4v8h-4ZM12 112h8v6h-8ZM12 100h4v8h-4ZM12 88h4v6h-4ZM12 74h8v2h-8ZM16 164h8v2h-8ZM16 148h4v4h-4ZM16 140h4v4h-4ZM16 134h4v2h-4ZM16 120h4v2h-4ZM16 108h4v2h-4ZM16 98h4v4h-4ZM16 88h4v8h-4ZM16 66h4v4h-4ZM20 64h4v2h-4ZM24 166h4v2h-4ZM24 62h4v2h-4ZM28 164h82v2h-82ZM28 64h82v2h-82ZM32 160h78v2h-78ZM32 150h68v2h-68ZM32 146h68v2h-68ZM32 140h68v4h-68ZM32 132h68v2h-68ZM32 122h68v6h-68ZM32 118h68v2h-68ZM32 108h68v8h-68ZM32 104h68v2h-68ZM32 96h68v4h-68ZM32 90h68v4h-68ZM32 82h68v4h-68ZM32 76h68v2h-68ZM32 72h78v2h-78ZM32 68h78v2h-78ZM50 48h60v2h-60ZM50 42h60v4h-60ZM50 36h60v4h-60ZM50 28h60v6h-60ZM50 24h60v2h-60ZM50 18h60v2h-60ZM50 10h60v6h-60Z"/>
   <text x="117.2" y="175.3" text-anchor="end" font-family="OCRB, monospace" font-size="14" transform="rotate(270,117.2,175.3)">
    0
   </text>
   <text x="117.2" y="117" text-anchor="middle" font-family="OCRB, monospace" font-size="20" transform="rotate(270,117.2,117)">
    654321
   </text>
-  <text x="117.2" y="58.7" text-anchor="start" font-family="OCRB, monospace" font-size="14" transform="rotate(270,117.2,58.7)">
+  <text x="117.2" y="60.7" text-anchor="start" font-family="OCRB, monospace" font-size="14" transform="rotate(270,117.2,60.7)">
    7
   </text>
   <text x="47.6" y="30" text-anchor="middle" font-family="OCRB, monospace" font-size="20" transform="rotate(270,47.6,30)">

backend/tests/data/svg/upce_cc_5addon_ccb_8x2.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="238" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v4h-4ZM20 0h2v8h-2ZM28 0h2v32h-2ZM32 0h6v4h-6ZM40 0h10v4h-10ZM52 0h6v4h-6ZM60 0h2v4h-2ZM66 0h2v4h-2ZM78 0h2v4h-2ZM88 0h2v4h-2ZM96 0h2v4h-2ZM100 0h4v4h-4ZM108 0h2v8h-2ZM116 0h2v32h-2ZM120 0h2v32h-2ZM12 4h6v8h-6ZM32 4h4v4h-4ZM38 4h2v4h-2ZM48 4h8v4h-8ZM58 4h4v4h-4ZM66 4h4v4h-4ZM74 4h2v4h-2ZM78 4h6v4h-6ZM92 4h2v4h-2ZM100 4h6v8h-6ZM20 8h4v8h-4ZM32 8h6v4h-6ZM40 8h4v4h-4ZM48 8h2v4h-2ZM54 8h10v4h-10ZM66 8h2v24h-2ZM74 8h8v4h-8ZM86 8h2v4h-2ZM96 8h2v4h-2ZM108 8h4v8h-4ZM12 12h4v16h-4ZM32 12h4v4h-4ZM40 12h6v4h-6ZM48 12h4v4h-4ZM58 12h2v4h-2ZM70 12h2v4h-2ZM74 12h10v4h-10ZM86 12h10v4h-10ZM100 12h4v16h-4ZM18 16h6v4h-6ZM32 16h10v4h-10ZM46 16h2v4h-2ZM52 16h4v4h-4ZM58 16h6v8h-6ZM72 16h12v4h-12ZM86 16h2v4h-2ZM92 16h4v4h-4ZM106 16h6v4h-6ZM18 20h8v4h-8ZM32 20h4v4h-4ZM40 20h6v4h-6ZM54 20h2v4h-2ZM72 20h4v4h-4ZM78 20h2v4h-2ZM88 20h6v4h-6ZM106 20h8v4h-8ZM20 24h6v8h-6ZM32 24h2v8h-2ZM36 24h2v4h-2ZM44 24h2v4h-2ZM56 24h2v4h-2ZM70 24h8v8h-8ZM80 24h10v4h-10ZM92 24h4v4h-4ZM108 24h6v8h-6ZM12 28h6v4h-6ZM36 28h8v4h-8ZM48 28h2v4h-2ZM52 28h8v4h-8ZM84 28h2v4h-2ZM90 28h8v4h-8ZM100 28h6v4h-6ZM18 32h2v4h-2ZM118 32h2v4h-2ZM16 36h2v4h-2ZM120 36h2v4h-2ZM18 40h2v70h-2ZM118 40h2v70h-2ZM22 44h2v66h-2ZM26 44h4v56h-4ZM32 44h6v56h-6ZM42 44h2v56h-2ZM50 44h2v56h-2ZM60 44h2v56h-2ZM64 44h2v56h-2ZM68 44h4v56h-4ZM78 44h2v56h-2ZM82 44h2v56h-2ZM90 44h4v56h-4ZM96 44h2v56h-2ZM106 44h2v56h-2ZM110 44h2v66h-2ZM114 44h2v66h-2ZM134 62h2v38h-2ZM138 62h4v38h-4ZM144 62h4v38h-4ZM154 62h2v38h-2ZM158 62h2v38h-2ZM162 62h2v38h-2ZM166 62h8v38h-8ZM176 62h2v38h-2ZM182 62h2v38h-2ZM190 62h2v38h-2ZM194 62h2v38h-2ZM198 62h4v38h-4ZM204 62h6v38h-6ZM212 62h2v38h-2ZM218 62h2v38h-2ZM222 62h6v38h-6Z"/>
+  <path d="M12 0h4v4h-4ZM20 0h2v8h-2ZM28 0h2v32h-2ZM32 0h6v4h-6ZM40 0h10v4h-10ZM52 0h6v4h-6ZM60 0h2v4h-2ZM66 0h2v4h-2ZM78 0h2v4h-2ZM88 0h2v4h-2ZM96 0h2v4h-2ZM100 0h4v4h-4ZM108 0h2v8h-2ZM116 0h2v32h-2ZM120 0h2v32h-2ZM12 4h6v8h-6ZM32 4h4v4h-4ZM38 4h2v4h-2ZM48 4h8v4h-8ZM58 4h4v4h-4ZM66 4h4v4h-4ZM74 4h2v4h-2ZM78 4h6v4h-6ZM92 4h2v4h-2ZM100 4h6v8h-6ZM20 8h4v8h-4ZM32 8h6v4h-6ZM40 8h4v4h-4ZM48 8h2v4h-2ZM54 8h10v4h-10ZM66 8h2v24h-2ZM74 8h8v4h-8ZM86 8h2v4h-2ZM96 8h2v4h-2ZM108 8h4v8h-4ZM12 12h4v16h-4ZM32 12h4v4h-4ZM40 12h6v4h-6ZM48 12h4v4h-4ZM58 12h2v4h-2ZM70 12h2v4h-2ZM74 12h10v4h-10ZM86 12h10v4h-10ZM100 12h4v16h-4ZM18 16h6v4h-6ZM32 16h10v4h-10ZM46 16h2v4h-2ZM52 16h4v4h-4ZM58 16h6v8h-6ZM72 16h12v4h-12ZM86 16h2v4h-2ZM92 16h4v4h-4ZM106 16h6v4h-6ZM18 20h8v4h-8ZM32 20h4v4h-4ZM40 20h6v4h-6ZM54 20h2v4h-2ZM72 20h4v4h-4ZM78 20h2v4h-2ZM88 20h6v4h-6ZM106 20h8v4h-8ZM20 24h6v8h-6ZM32 24h2v8h-2ZM36 24h2v4h-2ZM44 24h2v4h-2ZM56 24h2v4h-2ZM70 24h8v8h-8ZM80 24h10v4h-10ZM92 24h4v4h-4ZM108 24h6v8h-6ZM12 28h6v4h-6ZM36 28h8v4h-8ZM48 28h2v4h-2ZM52 28h8v4h-8ZM84 28h2v4h-2ZM90 28h8v4h-8ZM100 28h6v4h-6ZM18 32h2v4h-2ZM118 32h2v4h-2ZM16 36h2v4h-2ZM120 36h2v4h-2ZM18 40h2v70h-2ZM118 40h2v70h-2ZM22 44h2v66h-2ZM26 44h4v56h-4ZM32 44h6v56h-6ZM42 44h2v56h-2ZM50 44h2v56h-2ZM60 44h2v56h-2ZM64 44h2v56h-2ZM68 44h4v56h-4ZM78 44h2v56h-2ZM82 44h2v56h-2ZM90 44h4v56h-4ZM96 44h2v56h-2ZM106 44h2v56h-2ZM110 44h2v66h-2ZM114 44h2v66h-2ZM134 62h2v48h-2ZM138 62h4v48h-4ZM144 62h4v48h-4ZM154 62h2v48h-2ZM158 62h2v48h-2ZM162 62h2v48h-2ZM166 62h8v48h-8ZM176 62h2v48h-2ZM182 62h2v48h-2ZM190 62h2v48h-2ZM194 62h2v48h-2ZM198 62h4v48h-4ZM204 62h6v48h-6ZM212 62h2v48h-2ZM218 62h2v48h-2ZM222 62h6v48h-6Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    876543
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    5
   </text>
   <text x="182" y="59.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_cc_5addon_ccb_8x2_gws.svg

@@ -4,14 +4,14 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="238" height="118" fill="#FFFFFF"/>
-  <path d="M12 0h4v4h-4ZM20 0h2v8h-2ZM28 0h2v32h-2ZM32 0h6v4h-6ZM40 0h10v4h-10ZM52 0h6v4h-6ZM60 0h2v4h-2ZM66 0h2v4h-2ZM78 0h2v4h-2ZM88 0h2v4h-2ZM96 0h2v4h-2ZM100 0h4v4h-4ZM108 0h2v8h-2ZM116 0h2v32h-2ZM120 0h2v32h-2ZM12 4h6v8h-6ZM32 4h4v4h-4ZM38 4h2v4h-2ZM48 4h8v4h-8ZM58 4h4v4h-4ZM66 4h4v4h-4ZM74 4h2v4h-2ZM78 4h6v4h-6ZM92 4h2v4h-2ZM100 4h6v8h-6ZM20 8h4v8h-4ZM32 8h6v4h-6ZM40 8h4v4h-4ZM48 8h2v4h-2ZM54 8h10v4h-10ZM66 8h2v24h-2ZM74 8h8v4h-8ZM86 8h2v4h-2ZM96 8h2v4h-2ZM108 8h4v8h-4ZM12 12h4v16h-4ZM32 12h4v4h-4ZM40 12h6v4h-6ZM48 12h4v4h-4ZM58 12h2v4h-2ZM70 12h2v4h-2ZM74 12h10v4h-10ZM86 12h10v4h-10ZM100 12h4v16h-4ZM18 16h6v4h-6ZM32 16h10v4h-10ZM46 16h2v4h-2ZM52 16h4v4h-4ZM58 16h6v8h-6ZM72 16h12v4h-12ZM86 16h2v4h-2ZM92 16h4v4h-4ZM106 16h6v4h-6ZM18 20h8v4h-8ZM32 20h4v4h-4ZM40 20h6v4h-6ZM54 20h2v4h-2ZM72 20h4v4h-4ZM78 20h2v4h-2ZM88 20h6v4h-6ZM106 20h8v4h-8ZM20 24h6v8h-6ZM32 24h2v8h-2ZM36 24h2v4h-2ZM44 24h2v4h-2ZM56 24h2v4h-2ZM70 24h8v8h-8ZM80 24h10v4h-10ZM92 24h4v4h-4ZM108 24h6v8h-6ZM12 28h6v4h-6ZM36 28h8v4h-8ZM48 28h2v4h-2ZM52 28h8v4h-8ZM84 28h2v4h-2ZM90 28h8v4h-8ZM100 28h6v4h-6ZM18 32h2v4h-2ZM118 32h2v4h-2ZM16 36h2v4h-2ZM120 36h2v4h-2ZM18 40h2v70h-2ZM118 40h2v70h-2ZM22 44h2v66h-2ZM26 44h4v56h-4ZM32 44h6v56h-6ZM42 44h2v56h-2ZM50 44h2v56h-2ZM60 44h2v56h-2ZM64 44h2v56h-2ZM68 44h4v56h-4ZM78 44h2v56h-2ZM82 44h2v56h-2ZM90 44h4v56h-4ZM96 44h2v56h-2ZM106 44h2v56h-2ZM110 44h2v66h-2ZM114 44h2v66h-2ZM134 62h2v38h-2ZM138 62h4v38h-4ZM144 62h4v38h-4ZM154 62h2v38h-2ZM158 62h2v38h-2ZM162 62h2v38h-2ZM166 62h8v38h-8ZM176 62h2v38h-2ZM182 62h2v38h-2ZM190 62h2v38h-2ZM194 62h2v38h-2ZM198 62h4v38h-4ZM204 62h6v38h-6ZM212 62h2v38h-2ZM218 62h2v38h-2ZM222 62h6v38h-6Z"/>
+  <path d="M12 0h4v4h-4ZM20 0h2v8h-2ZM28 0h2v32h-2ZM32 0h6v4h-6ZM40 0h10v4h-10ZM52 0h6v4h-6ZM60 0h2v4h-2ZM66 0h2v4h-2ZM78 0h2v4h-2ZM88 0h2v4h-2ZM96 0h2v4h-2ZM100 0h4v4h-4ZM108 0h2v8h-2ZM116 0h2v32h-2ZM120 0h2v32h-2ZM12 4h6v8h-6ZM32 4h4v4h-4ZM38 4h2v4h-2ZM48 4h8v4h-8ZM58 4h4v4h-4ZM66 4h4v4h-4ZM74 4h2v4h-2ZM78 4h6v4h-6ZM92 4h2v4h-2ZM100 4h6v8h-6ZM20 8h4v8h-4ZM32 8h6v4h-6ZM40 8h4v4h-4ZM48 8h2v4h-2ZM54 8h10v4h-10ZM66 8h2v24h-2ZM74 8h8v4h-8ZM86 8h2v4h-2ZM96 8h2v4h-2ZM108 8h4v8h-4ZM12 12h4v16h-4ZM32 12h4v4h-4ZM40 12h6v4h-6ZM48 12h4v4h-4ZM58 12h2v4h-2ZM70 12h2v4h-2ZM74 12h10v4h-10ZM86 12h10v4h-10ZM100 12h4v16h-4ZM18 16h6v4h-6ZM32 16h10v4h-10ZM46 16h2v4h-2ZM52 16h4v4h-4ZM58 16h6v8h-6ZM72 16h12v4h-12ZM86 16h2v4h-2ZM92 16h4v4h-4ZM106 16h6v4h-6ZM18 20h8v4h-8ZM32 20h4v4h-4ZM40 20h6v4h-6ZM54 20h2v4h-2ZM72 20h4v4h-4ZM78 20h2v4h-2ZM88 20h6v4h-6ZM106 20h8v4h-8ZM20 24h6v8h-6ZM32 24h2v8h-2ZM36 24h2v4h-2ZM44 24h2v4h-2ZM56 24h2v4h-2ZM70 24h8v8h-8ZM80 24h10v4h-10ZM92 24h4v4h-4ZM108 24h6v8h-6ZM12 28h6v4h-6ZM36 28h8v4h-8ZM48 28h2v4h-2ZM52 28h8v4h-8ZM84 28h2v4h-2ZM90 28h8v4h-8ZM100 28h6v4h-6ZM18 32h2v4h-2ZM118 32h2v4h-2ZM16 36h2v4h-2ZM120 36h2v4h-2ZM18 40h2v70h-2ZM118 40h2v70h-2ZM22 44h2v66h-2ZM26 44h4v56h-4ZM32 44h6v56h-6ZM42 44h2v56h-2ZM50 44h2v56h-2ZM60 44h2v56h-2ZM64 44h2v56h-2ZM68 44h4v56h-4ZM78 44h2v56h-2ZM82 44h2v56h-2ZM90 44h4v56h-4ZM96 44h2v56h-2ZM106 44h2v56h-2ZM110 44h2v66h-2ZM114 44h2v66h-2ZM134 62h2v48h-2ZM138 62h4v48h-4ZM144 62h4v48h-4ZM154 62h2v48h-2ZM158 62h2v48h-2ZM162 62h2v48h-2ZM166 62h8v48h-8ZM176 62h2v48h-2ZM182 62h2v48h-2ZM190 62h2v48h-2ZM194 62h2v48h-2ZM198 62h4v48h-4ZM204 62h6v48h-6ZM212 62h2v48h-2ZM218 62h2v48h-2ZM222 62h6v48h-6Z"/>
   <text x="8.7" y="117.2" text-anchor="end" font-family="OCRB, monospace" font-size="14">
    1
   </text>
   <text x="67" y="117.2" text-anchor="middle" font-family="OCRB, monospace" font-size="20">
    876543
   </text>
-  <text x="125.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
+  <text x="123.3" y="117.2" text-anchor="start" font-family="OCRB, monospace" font-size="14">
    5
   </text>
   <text x="182" y="59.6" text-anchor="middle" font-family="OCRB, monospace" font-size="20">

backend/tests/data/svg/upce_cc_5addon_ccb_8x2_notext.svg

@@ -4,6 +4,6 @@
  <desc>Zint Generated Symbol</desc>
  <g id="barcode" fill="#000000">
   <rect x="0" y="0" width="238" height="110" fill="#FFFFFF"/>
-  <path d="M12 0h4v4h-4ZM20 0h2v8h-2ZM28 0h2v32h-2ZM32 0h6v4h-6ZM40 0h10v4h-10ZM52 0h6v4h-6ZM60 0h2v4h-2ZM66 0h2v4h-2ZM78 0h2v4h-2ZM88 0h2v4h-2ZM96 0h2v4h-2ZM100 0h4v4h-4ZM108 0h2v8h-2ZM116 0h2v32h-2ZM120 0h2v32h-2ZM12 4h6v8h-6ZM32 4h4v4h-4ZM38 4h2v4h-2ZM48 4h8v4h-8ZM58 4h4v4h-4ZM66 4h4v4h-4ZM74 4h2v4h-2ZM78 4h6v4h-6ZM92 4h2v4h-2ZM100 4h6v8h-6ZM20 8h4v8h-4ZM32 8h6v4h-6ZM40 8h4v4h-4ZM48 8h2v4h-2ZM54 8h10v4h-10ZM66 8h2v24h-2ZM74 8h8v4h-8ZM86 8h2v4h-2ZM96 8h2v4h-2ZM108 8h4v8h-4ZM12 12h4v16h-4ZM32 12h4v4h-4ZM40 12h6v4h-6ZM48 12h4v4h-4ZM58 12h2v4h-2ZM70 12h2v4h-2ZM74 12h10v4h-10ZM86 12h10v4h-10ZM100 12h4v16h-4ZM18 16h6v4h-6ZM32 16h10v4h-10ZM46 16h2v4h-2ZM52 16h4v4h-4ZM58 16h6v8h-6ZM72 16h12v4h-12ZM86 16h2v4h-2ZM92 16h4v4h-4ZM106 16h6v4h-6ZM18 20h8v4h-8ZM32 20h4v4h-4ZM40 20h6v4h-6ZM54 20h2v4h-2ZM72 20h4v4h-4ZM78 20h2v4h-2ZM88 20h6v4h-6ZM106 20h8v4h-8ZM20 24h6v8h-6ZM32 24h2v8h-2ZM36 24h2v4h-2ZM44 24h2v4h-2ZM56 24h2v4h-2ZM70 24h8v8h-8ZM80 24h10v4h-10ZM92 24h4v4h-4ZM108 24h6v8h-6ZM12 28h6v4h-6ZM36 28h8v4h-8ZM48 28h2v4h-2ZM52 28h8v4h-8ZM84 28h2v4h-2ZM90 28h8v4h-8ZM100 28h6v4h-6ZM18 32h2v4h-2ZM118 32h2v4h-2ZM16 36h2v4h-2ZM120 36h2v4h-2ZM18 40h2v70h-2ZM118 40h2v70h-2ZM22 44h2v66h-2ZM26 44h4v56h-4ZM32 44h6v56h-6ZM42 44h2v56h-2ZM50 44h2v56h-2ZM60 44h2v56h-2ZM64 44h2v56h-2ZM68 44h4v56h-4ZM78 44h2v56h-2ZM82 44h2v56h-2ZM90 44h4v56h-4ZM96 44h2v56h-2ZM106 44h2v56h-2ZM110 44h2v66h-2ZM114 44h2v66h-2ZM134 62h2v38h-2ZM138 62h4v38h-4ZM144 62h4v38h-4ZM154 62h2v38h-2ZM158 62h2v38h-2ZM162 62h2v38h-2ZM166 62h8v38h-8ZM176 62h2v38h-2ZM182 62h2v38h-2ZM190 62h2v38h-2ZM194 62h2v38h-2ZM198 62h4v38h-4ZM204 62h6v38h-6ZM212 62h2v38h-2ZM218 62h2v38h-2ZM222 62h6v38h-6Z"/>
+  <path d="M12 0h4v4h-4ZM20 0h2v8h-2ZM28 0h2v32h-2ZM32 0h6v4h-6ZM40 0h10v4h-10ZM52 0h6v4h-6ZM60 0h2v4h-2ZM66 0h2v4h-2ZM78 0h2v4h-2ZM88 0h2v4h-2ZM96 0h2v4h-2ZM100 0h4v4h-4ZM108 0h2v8h-2ZM116 0h2v32h-2ZM120 0h2v32h-2ZM12 4h6v8h-6ZM32 4h4v4h-4ZM38 4h2v4h-2ZM48 4h8v4h-8ZM58 4h4v4h-4ZM66 4h4v4h-4ZM74 4h2v4h-2ZM78 4h6v4h-6ZM92 4h2v4h-2ZM100 4h6v8h-6ZM20 8h4v8h-4ZM32 8h6v4h-6ZM40 8h4v4h-4ZM48 8h2v4h-2ZM54 8h10v4h-10ZM66 8h2v24h-2ZM74 8h8v4h-8ZM86 8h2v4h-2ZM96 8h2v4h-2ZM108 8h4v8h-4ZM12 12h4v16h-4ZM32 12h4v4h-4ZM40 12h6v4h-6ZM48 12h4v4h-4ZM58 12h2v4h-2ZM70 12h2v4h-2ZM74 12h10v4h-10ZM86 12h10v4h-10ZM100 12h4v16h-4ZM18 16h6v4h-6ZM32 16h10v4h-10ZM46 16h2v4h-2ZM52 16h4v4h-4ZM58 16h6v8h-6ZM72 16h12v4h-12ZM86 16h2v4h-2ZM92 16h4v4h-4ZM106 16h6v4h-6ZM18 20h8v4h-8ZM32 20h4v4h-4ZM40 20h6v4h-6ZM54 20h2v4h-2ZM72 20h4v4h-4ZM78 20h2v4h-2ZM88 20h6v4h-6ZM106 20h8v4h-8ZM20 24h6v8h-6ZM32 24h2v8h-2ZM36 24h2v4h-2ZM44 24h2v4h-2ZM56 24h2v4h-2ZM70 24h8v8h-8ZM80 24h10v4h-10ZM92 24h4v4h-4ZM108 24h6v8h-6ZM12 28h6v4h-6ZM36 28h8v4h-8ZM48 28h2v4h-2ZM52 28h8v4h-8ZM84 28h2v4h-2ZM90 28h8v4h-8ZM100 28h6v4h-6ZM18 32h2v4h-2ZM118 32h2v4h-2ZM16 36h2v4h-2ZM120 36h2v4h-2ZM18 40h2v70h-2ZM118 40h2v70h-2ZM22 44h2v66h-2ZM26 44h4v56h-4ZM32 44h6v56h-6ZM42 44h2v56h-2ZM50 44h2v56h-2ZM60 44h2v56h-2ZM64 44h2v56h-2ZM68 44h4v56h-4ZM78 44h2v56h-2ZM82 44h2v56h-2ZM90 44h4v56h-4ZM96 44h2v56h-2ZM106 44h2v56h-2ZM110 44h2v66h-2ZM114 44h2v66h-2ZM134 62h2v48h-2ZM138 62h4v48h-4ZM144 62h4v48h-4ZM154 62h2v48h-2ZM158 62h2v48h-2ZM162 62h2v48h-2ZM166 62h8v48h-8ZM176 62h2v48h-2ZM182 62h2v48h-2ZM190 62h2v48h-2ZM194 62h2v48h-2ZM198 62h4v48h-4ZM204 62h6v48h-6ZM212 62h2v48h-2ZM218 62h2v48h-2ZM222 62h6v48h-6Z"/>
  </g>
 </svg>

backend/tests/test_raster.c

@@ -1381,26 +1381,28 @@ static void test_guard_descent(const testCtx *const p_ctx) {
         /*  8*/ { BARCODE_UPCE, 8.5, "1234567", 0, 50, 1, 51, 134, 117, 1 /*set*/, 100 /*set_row*/, 100 + 17, 18, 2 },
         /*  9*/ { BARCODE_UPCE, 20, "1234567", 0, 50, 1, 51, 134, 140, 1 /*set*/, 100 /*set_row*/, 100 + 40, 18, 2 },
         /* 10*/ { BARCODE_UPCE, -1, "1234567+12", 0, 50, 1, 78, 184, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 18, 2 },
-        /* 11*/ { BARCODE_UPCE, -1, "1234567+12", 0, 50, 1, 78, 184, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 134, 2 },
+        /* 11*/ { BARCODE_UPCE, -1, "1234567+12", 0, 50, 1, 78, 184, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 134, 2 },
-        /* 12*/ { BARCODE_UPCE, 9, "1234567+12", 0, 50, 1, 78, 184, 118, 0 /*set*/, 100 /*set_row*/, 100 + 18, 134, 2 },
+        /* 12*/ { BARCODE_UPCE, -1, "1234567+12", 0, 50, 1, 78, 184, 116, 0 /*set*/, 110 /*set_row*/, 110 + 6, 134, 2 },
-        /* 13*/ { BARCODE_UPCA, -1, "12345678901", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
+        /* 13*/ { BARCODE_UPCE, 9, "1234567+12", 0, 50, 1, 78, 184, 118, 1 /*set*/, 110 /*set_row*/, 110 + 8, 134, 2 },
-        /* 14*/ { BARCODE_UPCA, 0, "12345678901", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
+        /* 14*/ { BARCODE_UPCA, -1, "12345678901", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
-        /* 15*/ { BARCODE_UPCA, 2.75, "12345678901", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 5, 206, 2 },
+        /* 15*/ { BARCODE_UPCA, 0, "12345678901", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
-        /* 16*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
+        /* 16*/ { BARCODE_UPCA, 2.75, "12345678901", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 5, 206, 2 },
-        /* 17*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 262, 4 },
+        /* 17*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
-        /* 18*/ { BARCODE_UPCA, 10, "12345678901+12", 0, 50, 1, 124, 276, 120, 0 /*set*/, 100 /*set_row*/, 100 + 20, 262, 4 },
+        /* 18*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 262, 4 },
-        /* 19*/ { BARCODE_EANX, -1, "123456789012", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 114, 2 },
+        /* 19*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 116, 0 /*set*/, 110 /*set_row*/, 110 + 6, 262, 4 },
-        /* 20*/ { BARCODE_EANX, -1, "123456789012", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 + 10 /*set_row*/, 100 + 16, 114, 2 },
+        /* 20*/ { BARCODE_UPCA, 10, "12345678901+12", 0, 50, 1, 124, 276, 120, 1 /*set*/, 110 /*set_row*/, 110 + 10, 262, 4 },
-        /* 21*/ { BARCODE_EANX, 0, "123456789012", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 114, 2 },
+        /* 21*/ { BARCODE_EANX, -1, "123456789012", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 114, 2 },
-        /* 22*/ { BARCODE_EANX, 2, "123456789012", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 4, 114, 2 },
+        /* 22*/ { BARCODE_EANX, -1, "123456789012", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 + 10 /*set_row*/, 100 + 16, 114, 2 },
-        /* 23*/ { BARCODE_EANX, 2, "123456789012", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 + 4 /*set_row*/, 100 + 16, 114, 2 },
+        /* 23*/ { BARCODE_EANX, 0, "123456789012", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 114, 2 },
-        /* 24*/ { BARCODE_EANX, -1, "123456789012+12345", 0, 50, 1, 149, 330, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 308, 4 },
+        /* 24*/ { BARCODE_EANX, 2, "123456789012", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 4, 114, 2 },
-        /* 25*/ { BARCODE_EANX, -1, "123456789012+12345", 0, 50, 1, 149, 330, 116, 0 /*set*/, 100 + 10 /*set_row*/, 100 + 16, 308, 4 },
+        /* 25*/ { BARCODE_EANX, 2, "123456789012", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 + 4 /*set_row*/, 100 + 16, 114, 2 },
-        /* 26*/ { BARCODE_EANX, 0, "123456789012+12345", 0, 50, 1, 149, 330, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 308, 4 },
+        /* 26*/ { BARCODE_EANX, -1, "123456789012+12345", 0, 50, 1, 149, 330, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 308, 4 },
-        /* 27*/ { BARCODE_EANX, 18, "123456789012+12345", 0, 50, 1, 149, 330, 136, 1 /*set*/, 100 /*set_row*/, 100 + 36, 308, 4 },
+        /* 27*/ { BARCODE_EANX, -1, "123456789012+12345", 0, 50, 1, 149, 330, 116, 0 /*set*/, 100 + 10 /*set_row*/, 100 + 16, 308, 4 },
-        /* 28*/ { BARCODE_ISBNX, -1, "123456789", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
+        /* 28*/ { BARCODE_EANX, 0, "123456789012+12345", 0, 50, 1, 149, 330, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 308, 4 },
-        /* 29*/ { BARCODE_ISBNX, -1, "123456789", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 + 10 /*set_row*/, 100 + 16, 206, 2 },
+        /* 29*/ { BARCODE_EANX, 18, "123456789012+12345", 0, 50, 1, 149, 330, 136, 1 /*set*/, 100 /*set_row*/, 100 + 36, 308, 4 },
-        /* 30*/ { BARCODE_ISBNX, 0, "123456789", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 206, 2 },
+        /* 30*/ { BARCODE_ISBNX, -1, "123456789", 0, 50, 1, 95, 226, 116, 1 /*set*/, 100 /*set_row*/, 100 + 10, 206, 2 },
+        /* 31*/ { BARCODE_ISBNX, -1, "123456789", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 + 10 /*set_row*/, 100 + 16, 206, 2 },
+        /* 32*/ { BARCODE_ISBNX, 0, "123456789", 0, 50, 1, 95, 226, 116, 0 /*set*/, 100 /*set_row*/, 100 + 16, 206, 2 },
     };
     const int data_size = ARRAY_SIZE(data);
     int i, length, ret;

backend/tests/test_vector.c

@@ -1612,20 +1612,20 @@ static void test_guard_descent(const testCtx *const p_ctx) {
         /*  6*/ { BARCODE_UPCE, 8.3, "1234567", 0, 50, 1, 51, 134, 118, 18, 0, 2, 116.6 },
         /*  7*/ { BARCODE_UPCE, 19.6, "1234567", 0, 50, 1, 51, 134, 139.2, 18, 0, 2, 139.2 },
         /*  8*/ { BARCODE_UPCE, -1, "1234567+12345", 0, 50, 1, 105, 238, 118, 118, 0, 2, 110 },
-        /*  9*/ { BARCODE_UPCE, -1, "1234567+12345", 0, 50, 1, 105, 238, 118, 134, 18, 2, 82 },
+        /*  9*/ { BARCODE_UPCE, -1, "1234567+12345", 0, 50, 1, 105, 238, 118, 134, 18, 2, 92 },
         /* 10*/ { BARCODE_UPCE, 0, "1234567+12345", 0, 50, 1, 105, 238, 118, 118, 0, 2, 100 },
         /* 11*/ { BARCODE_UPCE, 0, "1234567+12345", 0, 50, 1, 105, 238, 118, 134, 18, 2, 82 },
         /* 12*/ { BARCODE_UPCE, 4, "1234567+12345", 0, 50, 1, 105, 238, 118, 118, 0, 2, 108 },
-        /* 13*/ { BARCODE_UPCE, 4, "1234567+12345", 0, 50, 1, 105, 238, 118, 134, 18, 2, 82 },
+        /* 13*/ { BARCODE_UPCE, 4, "1234567+12345", 0, 50, 1, 105, 238, 118, 134, 18, 2, 90 },
         /* 14*/ { BARCODE_UPCA, -1, "12345678901", 0, 50, 1, 95, 226, 118, 188, 0, 4, 110 },
         /* 15*/ { BARCODE_UPCA, 0, "12345678901", 0, 50, 1, 95, 226, 118, 188, 0, 4, 100 },
         /* 16*/ { BARCODE_UPCA, 6, "12345678901", 0, 50, 1, 95, 226, 118, 188, 0, 4, 112 },
         /* 17*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 118, 188, 0, 4, 110 },
-        /* 18*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 118, 262, 18, 4, 82 },
+        /* 18*/ { BARCODE_UPCA, -1, "12345678901+12", 0, 50, 1, 124, 276, 118, 262, 18, 4, 92 },
         /* 19*/ { BARCODE_UPCA, 0, "12345678901+12", 0, 50, 1, 124, 276, 118, 188, 0, 4, 100 },
         /* 20*/ { BARCODE_UPCA, 0, "12345678901+12", 0, 50, 1, 124, 276, 118, 262, 18, 4, 82 },
         /* 21*/ { BARCODE_UPCA, 9, "12345678901+12", 0, 50, 1, 124, 276, 118, 188, 0, 4, 118 },
-        /* 22*/ { BARCODE_UPCA, 9, "12345678901+12", 0, 50, 1, 124, 276, 118, 262, 18, 4, 82 },
+        /* 22*/ { BARCODE_UPCA, 9, "12345678901+12", 0, 50, 1, 124, 276, 118, 262, 18, 4, 100 },
         /* 23*/ { BARCODE_EANX, -1, "123456789012", 0, 50, 1, 95, 226, 118, 22, 0, 2, 110 },
         /* 24*/ { BARCODE_EANX, 0, "123456789012", 0, 50, 1, 95, 226, 118, 22, 0, 2, 100 },
         /* 25*/ { BARCODE_EANX, 7, "123456789012", 0, 50, 1, 95, 226, 118, 22, 0, 2, 114 },
@@ -1814,18 +1814,18 @@ static void test_quiet_zones(const testCtx *const p_ctx) {
         /* 94*/ { BARCODE_UPCE, -1, -1, -1, 0, "8145713", "", 0, 50, 1, 51, 134, 110, 18, 0, 2, 110 }, /* Hide text */
         /* 95*/ { BARCODE_UPCE, BARCODE_QUIET_ZONES, -1, -1, 0, "8145713", "", 0, 50, 1, 51, 134, 110, 18, 0, 2, 110 }, /* Hide text */
         /* 96*/ { BARCODE_UPCE, BARCODE_NO_QUIET_ZONES, -1, -1, 0, "8145713", "", 0, 50, 1, 51, 102, 110, 0, 0, 2, 110 }, /* Hide text */
-        /* 97*/ { BARCODE_UPCE_CHK, -1, -1, -1, -1, "81457132+12", "", 0, 50, 1, 78, 184, 118, 170, 18, 4, 82 },
+        /* 97*/ { BARCODE_UPCE_CHK, -1, -1, -1, -1, "81457132+12", "", 0, 50, 1, 78, 184, 118, 170, 18, 4, 92 },
-        /* 98*/ { BARCODE_UPCE_CHK, BARCODE_QUIET_ZONES, -1, -1, -1, "81457132+12", "", 0, 50, 1, 78, 184, 118, 170, 18, 4, 82 },
+        /* 98*/ { BARCODE_UPCE_CHK, BARCODE_QUIET_ZONES, -1, -1, -1, "81457132+12", "", 0, 50, 1, 78, 184, 118, 170, 18, 4, 92 },
-        /* 99*/ { BARCODE_UPCE_CHK, BARCODE_NO_QUIET_ZONES, -1, -1, -1, "81457132+12", "", 0, 50, 1, 78, 174, 118, 170, 18, 4, 82 },
+        /* 99*/ { BARCODE_UPCE_CHK, BARCODE_NO_QUIET_ZONES, -1, -1, -1, "81457132+12", "", 0, 50, 1, 78, 174, 118, 170, 18, 4, 92 },
-        /*100*/ { BARCODE_UPCE_CHK, -1, -1, -1, 0, "81457132+12", "", 0, 50, 1, 78, 184, 110, 170, 18, 4, 82 }, /* Hide text */
+        /*100*/ { BARCODE_UPCE_CHK, -1, -1, -1, 0, "81457132+12", "", 0, 50, 1, 78, 184, 110, 170, 18, 4, 92 }, /* Hide text */
-        /*101*/ { BARCODE_UPCE_CHK, BARCODE_QUIET_ZONES, -1, -1, 0, "81457132+12", "", 0, 50, 1, 78, 184, 110, 170, 18, 4, 82 }, /* Hide text */
+        /*101*/ { BARCODE_UPCE_CHK, BARCODE_QUIET_ZONES, -1, -1, 0, "81457132+12", "", 0, 50, 1, 78, 184, 110, 170, 18, 4, 92 }, /* Hide text */
-        /*102*/ { BARCODE_UPCE_CHK, BARCODE_NO_QUIET_ZONES, -1, -1, 0, "81457132+12", "", 0, 50, 1, 78, 156, 110, 152, 18, 4, 82 }, /* Hide text */
+        /*102*/ { BARCODE_UPCE_CHK, BARCODE_NO_QUIET_ZONES, -1, -1, 0, "81457132+12", "", 0, 50, 1, 78, 156, 110, 152, 18, 4, 92 }, /* Hide text */
-        /*103*/ { BARCODE_UPCE, -1, -1, -1, -1, "8145713+12345", "", 0, 50, 1, 105, 238, 118, 226, 18, 2, 82 },
+        /*103*/ { BARCODE_UPCE, -1, -1, -1, -1, "8145713+12345", "", 0, 50, 1, 105, 238, 118, 226, 18, 2, 92 },
-        /*104*/ { BARCODE_UPCE, BARCODE_QUIET_ZONES, -1, -1, -1, "8145713+12345", "", 0, 50, 1, 105, 238, 118, 226, 18, 2, 82 },
+        /*104*/ { BARCODE_UPCE, BARCODE_QUIET_ZONES, -1, -1, -1, "8145713+12345", "", 0, 50, 1, 105, 238, 118, 226, 18, 2, 92 },
-        /*105*/ { BARCODE_UPCE, BARCODE_NO_QUIET_ZONES, -1, -1, -1, "8145713+12345", "", 0, 50, 1, 105, 228, 118, 226, 18, 2, 82 },
+        /*105*/ { BARCODE_UPCE, BARCODE_NO_QUIET_ZONES, -1, -1, -1, "8145713+12345", "", 0, 50, 1, 105, 228, 118, 226, 18, 2, 92 },
-        /*106*/ { BARCODE_UPCE, -1, -1, -1, 0, "8145713+12345", "", 0, 50, 1, 105, 238, 110, 226, 18, 2, 82 }, /* Hide text */
+        /*106*/ { BARCODE_UPCE, -1, -1, -1, 0, "8145713+12345", "", 0, 50, 1, 105, 238, 110, 226, 18, 2, 92 }, /* Hide text */
-        /*107*/ { BARCODE_UPCE, BARCODE_QUIET_ZONES, -1, -1, 0, "8145713+12345", "", 0, 50, 1, 105, 238, 110, 226, 18, 2, 82 }, /* Hide text */
+        /*107*/ { BARCODE_UPCE, BARCODE_QUIET_ZONES, -1, -1, 0, "8145713+12345", "", 0, 50, 1, 105, 238, 110, 226, 18, 2, 92 }, /* Hide text */
-        /*108*/ { BARCODE_UPCE, BARCODE_NO_QUIET_ZONES, -1, -1, 0, "8145713+12345", "", 0, 50, 1, 105, 210, 110, 208, 18, 2, 82 }, /* Hide text */
+        /*108*/ { BARCODE_UPCE, BARCODE_NO_QUIET_ZONES, -1, -1, 0, "8145713+12345", "", 0, 50, 1, 105, 210, 110, 208, 18, 2, 92 }, /* Hide text */
         /*109*/ { BARCODE_POSTNET, -1, -1, -1, -1, "12345", "", 0, 12, 2, 63, 126, 24, 0, 0, 2, 24 },
         /*110*/ { BARCODE_POSTNET, BARCODE_QUIET_ZONES, -1, -1, -1, "12345", "", 0, 12, 2, 63, 146, 30.4, 10, 3.2, 2, 24 },
         /*111*/ { BARCODE_MSI_PLESSEY, -1, -1, -1, -1, "1234", "", 0, 50, 1, 55, 110, 116.28, 0, 0, 4, 100 },
@@ -2155,27 +2155,27 @@ static void test_text_gap(const testCtx *const p_ctx) {
         /* 37*/ { BARCODE_UPCA, -1, -1, -1, 1.6, 0, "01457130763", "", 0, 50, 1, 95, 226, 119.2, 74.0, 118.4, -1, -1 },
         /* 38*/ { BARCODE_UPCA, -1, -1, -1, 1.6, 2.5, "01457130763", "", 0, 50, 1, 95, 565, 298, 185.0, 296.0, -1, -1 }, /* Scale */
         /* 39*/ { BARCODE_UPCA, -1, -1, -1, 1, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 118, 74.0, 117.2, -1, -1 }, /* Default */
-        /* 40*/ { BARCODE_UPCA, -1, -1, -1, 1, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 118, 230.0, 18, 4.0, 82 }, /* Default */
+        /* 40*/ { BARCODE_UPCA, -1, -1, -1, 1, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 118, 230.0, 18, 4.0, 92 }, /* Default */
-        /* 41*/ { BARCODE_UPCA, -1, -1, -1, 0, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116, 230.0, 16, 4.0, 84 },
+        /* 41*/ { BARCODE_UPCA, -1, -1, -1, 0, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116, 230.0, 16, 4.0, 94 },
-        /* 42*/ { BARCODE_UPCA, -1, -1, -1, 0.1, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116.2, 230.0, 16.2, 4.0, 83.8 },
+        /* 42*/ { BARCODE_UPCA, -1, -1, -1, 0.1, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 116.2, 230.0, 16.2, 4.0, 93.8 },
-        /* 43*/ { BARCODE_UPCA, -1, -1, -1, 0.6, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117.2, 230.0, 17.2, 4.0, 82.8 },
+        /* 43*/ { BARCODE_UPCA, -1, -1, -1, 0.6, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117.2, 230.0, 17.2, 4.0, 92.8 },
-        /* 44*/ { BARCODE_UPCA, -1, -1, -1, 0.75, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117.5, 230.0, 17.5, 4.0, 82.5 },
+        /* 44*/ { BARCODE_UPCA, -1, -1, -1, 0.75, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117.5, 230.0, 17.5, 4.0, 92.5 },
-        /* 45*/ { BARCODE_UPCA, -1, -1, -1, 0.9, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117.8, 230.0, 17.8, 4.0, 82.2 },
+        /* 45*/ { BARCODE_UPCA, -1, -1, -1, 0.9, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 117.8, 230.0, 17.8, 4.0, 92.2 },
         /* 46*/ { BARCODE_UPCA, -1, -1, -1, 1.1, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 118.2, 74.0, 117.4, -1, -1 },
-        /* 47*/ { BARCODE_UPCA, -1, -1, -1, 4.2, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 124.4, 230.0, 24.4, 4.0, 75.6 },
+        /* 47*/ { BARCODE_UPCA, -1, -1, -1, 4.2, 0, "01457130763+10", "", 0, 50, 1, 124, 276, 124.4, 230.0, 24.4, 4.0, 85.6 },
         /* 48*/ { BARCODE_UPCA_CC, -1, -1, -1, 1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 118, 74.0, 117.2, -1, -1 }, /* Default */
         /* 49*/ { BARCODE_UPCA_CC, -1, -1, -1, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 116, 74.0, 115.2, -1, -1 },
         /* 50*/ { BARCODE_UPCA_CC, -1, -1, -1, 0.1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 116.2, 74.0, 115.4, -1, -1 },
-        /* 51*/ { BARCODE_UPCA_CC, -1, -1, -1, 1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 118, 236.0, 42, 4.0, 58 }, /* Default */
+        /* 51*/ { BARCODE_UPCA_CC, -1, -1, -1, 1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 118, 236.0, 42, 4.0, 68 }, /* Default */
-        /* 52*/ { BARCODE_UPCA_CC, -1, -1, -1, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 116, 236.0, 40, 4.0, 60 },
+        /* 52*/ { BARCODE_UPCA_CC, -1, -1, -1, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 116, 236.0, 40, 4.0, 70 },
-        /* 53*/ { BARCODE_UPCA_CC, -1, -1, -1, 0.1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 116.2, 236.0, 40.2, 4.0, 59.8 },
+        /* 53*/ { BARCODE_UPCA_CC, -1, -1, -1, 0.1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 116.2, 236.0, 40.2, 4.0, 69.8 },
-        /* 54*/ { BARCODE_UPCA_CC, -1, -1, -1, 0.6, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 117.2, 236.0, 41.2, 4.0, 58.8 },
+        /* 54*/ { BARCODE_UPCA_CC, -1, -1, -1, 0.6, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 117.2, 236.0, 41.2, 4.0, 68.8 },
-        /* 55*/ { BARCODE_UPCA_CC, -1, -1, -1, 0.75, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 117.5, 236.0, 41.5, 4.0, 58.5 },
+        /* 55*/ { BARCODE_UPCA_CC, -1, -1, -1, 0.75, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 117.5, 236.0, 41.5, 4.0, 68.5 },
-        /* 56*/ { BARCODE_UPCA_CC, -1, -1, -1, 1.1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 118.2, 236.0, 42.2, 4.0, 57.8 },
+        /* 56*/ { BARCODE_UPCA_CC, -1, -1, -1, 1.1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 118.2, 236.0, 42.2, 4.0, 67.8 },
-        /* 57*/ { BARCODE_UPCA_CC, -1, -1, -1, 1.5, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 119.0, 236.0, 43.0, 4.0, 57.0 },
+        /* 57*/ { BARCODE_UPCA_CC, -1, -1, -1, 1.5, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 119.0, 236.0, 43.0, 4.0, 67.0 },
-        /* 58*/ { BARCODE_UPCA_CC, -1, -1, 0, 1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 110, 236.0, 42, 4.0, 58 }, /* Hide text default */
+        /* 58*/ { BARCODE_UPCA_CC, -1, -1, 0, 1, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 110, 236.0, 42, 4.0, 68 }, /* Hide text default */
-        /* 59*/ { BARCODE_UPCA_CC, -1, -1, 0, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 110, 236.0, 40, 4.0, 60 }, /* Hide text */
+        /* 59*/ { BARCODE_UPCA_CC, -1, -1, 0, 0, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 110, 236.0, 40, 4.0, 70 }, /* Hide text */
-        /* 60*/ { BARCODE_UPCA_CC, -1, -1, 0, 1.5, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 110, 236.0, 43.0, 4.0, 57.0 }, /* Hide text */
+        /* 60*/ { BARCODE_UPCA_CC, -1, -1, 0, 1.5, 0, "01457130763+10", "[91]12", 0, 50, 7, 127, 276, 110, 236.0, 43.0, 4.0, 67.0 }, /* Hide text */
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;

backend/tests/testcommon.c

@@ -2524,7 +2524,7 @@ static char *testUtilBwippEscape(char *bwipp_data, int bwipp_data_size, const ch
                 sprintf(b, "^%03d", val);
                 b += 4;
             } else {
-                if (d + 1 < de && ((*(d + 1) >= 'A' && *(d + 1) <= 'C') || *(d + 1) == '1')) {
+                if (*d == '^' && d + 1 < de && ((*(d + 1) >= 'A' && *(d + 1) <= 'C') || *(d + 1) == '1')) {
                     d++;
                     if (*d == '1') {
                         if (b + 5 >= be) {
@@ -2542,7 +2542,7 @@ static char *testUtilBwippEscape(char *bwipp_data, int bwipp_data_size, const ch
                     }
                     sprintf(b, "^%03d^%03d", '\\', *d);
                     b += 8;
-                    if (*d == '^') {
+                    if (*d == '^' && d + 1 < de && *(d + 1) == '^') {
                         d++;
                     }
                 }
@@ -3363,6 +3363,10 @@ int testUtilBwipp(int index, const struct zint_symbol *symbol, int option_1, int
         return -1;
     }
 
+    if (symbol->rows == 0) { /* For testing BWIPP against ZXingC++ (`ZBarcode_Encode()` not called) */
+        cnt = (int) fread(b, 1, buffer_size - 1, fp); /* Just read the whole output */
+        b += cnt;
+    } else {
         for (r = 0; r < symbol->rows; r++) {
             if (b + symbol->width > be) {
                 fprintf(stderr, "i:%d testUtilBwipp: row %d, width %d, row width iteration overrun (%s)\n",
@@ -3393,6 +3397,7 @@ int testUtilBwipp(int index, const struct zint_symbol *symbol, int option_1, int
                 }
             }
         }
+    }
     *b = '\0';
 
     if (fgetc(fp) != EOF) {

backend/vector.c

@@ -612,9 +612,9 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
                     }
                     addon_row_yposn = yposn + font_height + text_gap + antialias_fudge;
                     addon_row_height = row_height - (addon_row_yposn - yposn);
-                    if (upceanflag != 12 && upceanflag != 6) { /* UPC-A/E add-ons don't descend */
+                    /* Following ISO/IEC 15420:2009 Figure 5 — UPC-A bar code symbol with 2-digit add-on (contrary to
+                       GS1 General Specs v24.0 Figure 5.2.6.6-5) descends for all including UPC-A/E */
                     addon_row_height += guard_descent;
-                    }
                     if (addon_row_height < 0.5f) {
                         addon_row_height = 0.5f;
                     }
@@ -750,7 +750,9 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
                 textwidth = 6.0f * 8.5f;
                 if (!vector_add_string(symbol, symbol->text + 1, 6, text_xposn, text_yposn, font_height, textwidth,
                         0 /*centre align*/, &last_string)) return ZINT_ERROR_MEMORY;
-                text_xposn = (51.0f - 0.35f) + 3.0f + xoffset_comp;
+                /* TODO: GS1 General Specs v24.0 5.2.5 Human readable interpretation says 3X but this could cause
+                   digit's righthand to touch any add-on, now that they descend, so use 2X, until clarified */
+                text_xposn = (51.0f - 0.35f) + 2.0f + xoffset_comp;
                 textwidth = 6.2f;
                 if (!vector_add_string(symbol, symbol->text + 7, 1, text_xposn, text_yposn, upcae_outside_font_height,
                         textwidth, 1 /*left align*/, &last_string)) return ZINT_ERROR_MEMORY;
@@ -812,7 +814,9 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
                 text_xposn = 67.0f + xoffset_comp;
                 if (!vector_add_string(symbol, symbol->text + 6, 5, text_xposn, text_yposn, font_height, textwidth,
                         0 /*centre align*/, &last_string)) return ZINT_ERROR_MEMORY;
-                text_xposn = (95.0f - 0.35f) + 5.0f + xoffset_comp;
+                /* TODO: GS1 General Specs v24.0 5.2.5 Human readable interpretation says 5X but this could cause
+                   digit's righthand to touch any add-on, now that they descend, so use 4X, until clarified */
+                text_xposn = (95.0f - 0.35f) + 4.0f + xoffset_comp;
                 textwidth = 6.2f;
                 if (!vector_add_string(symbol, symbol->text + 11, 1, text_xposn, text_yposn,
                         upcae_outside_font_height, textwidth, 1 /*left align*/, &last_string)) {