From 25807ad43c5c6dd7f04999865aee337876e6ac90 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Sat, 1 Jan 2022 15:24:59 +0000
Subject: [PATCH] Matrix symbols: change horizontal boundary bars to appear
 outside any   vertical whitespace, as they're decorative rather than
 functional (#247) Allow for dot overspill in height of vertical box sides
 (dotty mode) Move is_dotty(), is_fixed_ratio() from library.c to common.c

---
 ChangeLog                                     |   6 +
 backend/common.c                              |  43 +++++++
 backend/common.h                              |   2 +
 backend/library.c                             |  43 -------
 backend/raster.c                              |  20 ++-
 .../data/bmp/ultracode_fg_bg_hvwsp1_box1.bmp  | Bin 774 -> 774 bytes
 .../tests/data/emf/ultracode_fg_bg_box2.emf   | Bin 2940 -> 2940 bytes
 .../tests/data/eps/ultra_fg_bg_box_cmyk.eps   |   8 +-
 .../tests/data/gif/ultra_fgbg_hvwsp1_box1.gif | Bin 324 -> 330 bytes
 .../data/pcx/ultra_fg_bg_hvwsp1_box1.pcx      | Bin 2068 -> 2100 bytes
 .../png/datamatrix_2.0_hvwsp1_bind1_dotty.png | Bin 191 -> 190 bytes
 .../tests/data/png/maxicode_hvwsp1_box2.png   | Bin 2149 -> 2147 bytes
 .../tests/data/png/maxicode_vwsp1_bind1.png   | Bin 2064 -> 2061 bytes
 .../data/png/ultra_fgalpha_hvwsp1_box1.png    | Bin 248 -> 246 bytes
 backend/tests/data/png/ultra_hvwsp1_box1.png  | Bin 214 -> 219 bytes
 .../svg/datamatrix_hvwsp1_bind1_dotty.svg     |   4 +-
 .../data/svg/datamatrix_vwsp1_bind1_dotty.svg |   4 +-
 .../tests/data/svg/maxicode_vwsp1_bind1.svg   |   4 +-
 .../tests/data/svg/ultra_fgbg_hvwsp2_box3.svg |   8 +-
 .../tests/data/tif/ultra_fgbg_hvwsp1_box1.tif | Bin 506 -> 502 bytes
 backend/tests/test_raster.c                   | 119 ++++++++++--------
 backend/tests/test_vector.c                   |  52 ++++----
 backend/vector.c                              |  64 +++++-----
 docs/manual.txt                               |   7 +-
 24 files changed, 217 insertions(+), 167 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 332361e4..bad5d32e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@ Version 2.10.0.9 (dev) not released yet
   NOTE: previously was silently truncated
 - PDF417: return warning if specified cols increased
   NOTE: previously no warning was returned
+- Matrix symbols: horizontal boundary bars appear outside any vertical
+  whitespace
+  NOTE: previously appeared inside vertical whitespace
 
 Changes
 -------
@@ -47,6 +50,8 @@ Changes
 - DATAMATRIX: new algorithm for (near-)optimal encoding, props Alex Geller
 - CLI/GUI/Tcl: add --fast option to select faster but less optimal DATAMATRIX
   algorithm (previous default)
+- Matrix symbols: change horizontal boundary bars to appear outside any
+  vertical whitespace, as they're decorative rather than functional (#247)
 
 Bugs
 ----
@@ -69,6 +74,7 @@ Bugs
 - DATAMATRIX: fix mis-encoding of non-encodables in X12 and EDIFACT modes,
   props Alex Geller
 - DATAMATRIX: fix mis-encoding of FNC1/GS in EDIFACT in GS1 mode
+- Allow for dot overspill in height of vertical box sides (dotty mode)
 
 
 Version 2.10.0 2021-08-14
diff --git a/backend/common.c b/backend/common.c
index 00a46df6..2d1ae2cb 100644
--- a/backend/common.c
+++ b/backend/common.c
@@ -298,6 +298,49 @@ INTERNAL int is_composite(const int symbology) {
     return symbology >= BARCODE_EANX_CC && symbology <= BARCODE_DBAR_EXPSTK_CC;
 }
 
+/* Returns 1 if symbology is a matrix design renderable as dots */
+INTERNAL int is_dotty(const int symbology) {
+
+    switch (symbology) {
+        /* Note MAXICODE and ULTRA absent */
+        case BARCODE_QRCODE:
+        case BARCODE_DATAMATRIX:
+        case BARCODE_MICROQR:
+        case BARCODE_HIBC_DM:
+        case BARCODE_AZTEC:
+        case BARCODE_HIBC_QR:
+        case BARCODE_HIBC_AZTEC:
+        case BARCODE_AZRUNE:
+        case BARCODE_CODEONE:
+        case BARCODE_GRIDMATRIX:
+        case BARCODE_HANXIN:
+        case BARCODE_DOTCODE:
+        case BARCODE_UPNQR:
+        case BARCODE_RMQR:
+            return 1;
+            break;
+    }
+
+    return 0;
+}
+
+/* Returns 1 if symbology has fixed aspect ratio (matrix design) */
+INTERNAL int is_fixed_ratio(const int symbology) {
+
+    if (is_dotty(symbology)) {
+        return 1;
+    }
+
+    switch (symbology) {
+        case BARCODE_MAXICODE:
+        case BARCODE_ULTRA:
+            return 1;
+            break;
+    }
+
+    return 0;
+}
+
 /* Whether next two characters are digits */
 INTERNAL int is_twodigits(const unsigned char source[], const int length, const int position) {
     if ((position + 1 < length) && (source[position] >= '0') && (source[position] <= '9')
diff --git a/backend/common.h b/backend/common.h
index 84ac4a42..724f2a08 100644
--- a/backend/common.h
+++ b/backend/common.h
@@ -168,6 +168,8 @@ extern "C" {
     INTERNAL int is_stackable(const int symbology);
     INTERNAL int is_extendable(const int symbology);
     INTERNAL int is_composite(const int symbology);
+    INTERNAL int is_dotty(const int symbology);
+    INTERNAL int is_fixed_ratio(const int symbology);
 
     INTERNAL int is_twodigits(const unsigned char source[], const int length, const int position);
 
diff --git a/backend/library.c b/backend/library.c
index c823ba5c..e4f87103 100644
--- a/backend/library.c
+++ b/backend/library.c
@@ -393,49 +393,6 @@ static int gs1_compliant(const int symbology) {
     return check_force_gs1(symbology);
 }
 
-static int is_dotty(const int symbology) {
-    /* Returns 1 if symbology is a matrix design renderable as dots */
-
-    switch (symbology) {
-        /* Note MAXICODE and ULTRA absent */
-        case BARCODE_QRCODE:
-        case BARCODE_DATAMATRIX:
-        case BARCODE_MICROQR:
-        case BARCODE_HIBC_DM:
-        case BARCODE_AZTEC:
-        case BARCODE_HIBC_QR:
-        case BARCODE_HIBC_AZTEC:
-        case BARCODE_AZRUNE:
-        case BARCODE_CODEONE:
-        case BARCODE_GRIDMATRIX:
-        case BARCODE_HANXIN:
-        case BARCODE_DOTCODE:
-        case BARCODE_UPNQR:
-        case BARCODE_RMQR:
-            return 1;
-            break;
-    }
-
-    return 0;
-}
-
-static int is_fixed_ratio(const int symbology) {
-    /* Returns 1 if symbology has fixed aspect ratio (matrix design) */
-
-    if (is_dotty(symbology)) {
-        return 1;
-    }
-
-    switch (symbology) {
-        case BARCODE_MAXICODE:
-        case BARCODE_ULTRA:
-            return 1;
-            break;
-    }
-
-    return 0;
-}
-
 static int supports_eci(const int symbology) {
     /* Returns 1 if symbology can encode the ECI character */
 
diff --git a/backend/raster.c b/backend/raster.c
index e2f615cc..25ce22fc 100644
--- a/backend/raster.c
+++ b/backend/raster.c
@@ -668,9 +668,14 @@ static void draw_bind_box(const struct zint_symbol *symbol, unsigned char *pixel
             const int xoffset_si, const int yoffset_si, const int symbol_height_si, const int dot_overspill_si,
             const int image_width, const int image_height, const int si) {
     if (symbol->border_width > 0 && (symbol->output_options & (BARCODE_BOX | BARCODE_BIND))) {
+        const int horz_outside = is_fixed_ratio(symbol->symbology);
         const int bwidth_si = symbol->border_width * si;
-        const int ybind_top = yoffset_si - bwidth_si;
-        const int ybind_bot = yoffset_si + symbol_height_si + dot_overspill_si;
+        int ybind_top = yoffset_si - bwidth_si;
+        int ybind_bot = yoffset_si + symbol_height_si + dot_overspill_si;
+        if (horz_outside) {
+            ybind_top = 0;
+            ybind_bot = image_height - bwidth_si;
+        }
         /* Horizontal boundary bars */
         if ((symbol->output_options & BARCODE_BOX)
                 || (symbol->symbology != BARCODE_CODABLOCKF && symbol->symbology != BARCODE_HIBC_BLOCKF)) {
@@ -686,9 +691,14 @@ static void draw_bind_box(const struct zint_symbol *symbol, unsigned char *pixel
         if (symbol->output_options & BARCODE_BOX) {
             /* Vertical side bars */
             const int xbox_right = image_width - bwidth_si;
-            draw_bar(pixelbuf, 0, bwidth_si, yoffset_si, symbol_height_si, image_width, image_height, DEFAULT_INK);
-            draw_bar(pixelbuf, xbox_right, bwidth_si, yoffset_si, symbol_height_si, image_width, image_height,
-                    DEFAULT_INK);
+            int box_top = yoffset_si;
+            int box_height = symbol_height_si + dot_overspill_si;
+            if (horz_outside) {
+                box_top = bwidth_si;
+                box_height = image_height - bwidth_si * 2;
+            }
+            draw_bar(pixelbuf, 0, bwidth_si, box_top, box_height, image_width, image_height, DEFAULT_INK);
+            draw_bar(pixelbuf, xbox_right, bwidth_si, box_top, box_height, image_width, image_height, DEFAULT_INK);
         }
     }
 }
diff --git a/backend/tests/data/bmp/ultracode_fg_bg_hvwsp1_box1.bmp b/backend/tests/data/bmp/ultracode_fg_bg_hvwsp1_box1.bmp
index e8eca02aa012149ae464f44f1f91d762e5ed821c..59fe78fc5cfecead0102e61dd760f3a3760156c6 100644
GIT binary patch
delta 92
ucmZo;Yh#-bH?d7ii2)VNWMBXy6fkk0^v0u~7*$aOfgCJK8D>sw(E<QWg$tel

delta 105
qcmZo;Yh#-br^Y}Om{=e_u~>BC5z&oDKQT@$7MWNqtU;7UpdtW?s0xSx

diff --git a/backend/tests/data/emf/ultracode_fg_bg_box2.emf b/backend/tests/data/emf/ultracode_fg_bg_box2.emf
index 915704f9f1e0c7817b50d7302e6a747899734749..807a675e1fad02862c16ac3aaf7ccea061bdf92b 100644
GIT binary patch
delta 94
zcmew(_D5{P9L7KfAkYC~79iFJVhJDy0W}~7iE9BdvN%W`2!rHd;u=sfkb1SvZyEbJ
E0lZ%b9RL6T

delta 94
zcmew(_D5{P9L7Kv1_lNlAm#vKZ6KBaVh~UQVvx8R5F?9&)PeMX<YD3(KsHDmq+V(B
ITgHA)0KH!b9RL6T

diff --git a/backend/tests/data/eps/ultra_fg_bg_box_cmyk.eps b/backend/tests/data/eps/ultra_fg_bg_box_cmyk.eps
index f2c5ead8..e1434f4c 100644
--- a/backend/tests/data/eps/ultra_fg_bg_box_cmyk.eps
+++ b/backend/tests/data/eps/ultra_fg_bg_box_cmyk.eps
@@ -12,13 +12,13 @@ newpath
 38.00 0.00 TB 0.00 40.00 TR
 TE
 1.00 1.00 0.00 0.00 setcmykcolor
-4.00 32.00 TB 0.00 40.00 TR
+4.00 34.00 TB 0.00 40.00 TR
 TE
-4.00 2.00 TB 0.00 40.00 TR
+4.00 0.00 TB 0.00 40.00 TR
 TE
-26.00 6.00 TB 0.00 4.00 TR
+30.00 4.00 TB 0.00 4.00 TR
 TE
-26.00 6.00 TB 36.00 4.00 TR
+30.00 4.00 TB 36.00 4.00 TR
 TE
 1.00 0.00 0.00 0.00 setcmykcolor
 2.00 28.00 TB 22.00 4.00 TR
diff --git a/backend/tests/data/gif/ultra_fgbg_hvwsp1_box1.gif b/backend/tests/data/gif/ultra_fgbg_hvwsp1_box1.gif
index 25036164407644c97e7953549a2b7543e118d5ae..1043b448b1572ed45ffca16a026ffa483316552b 100644
GIT binary patch
delta 305
zcmV-10nYx!0?GmtM@dFFH(?|IA^`FM00030{{R4y6C{5LgS|NGjT!%7<^@7&o@lCC
zqw2mVyIAEg5JWu`g<%{A9uEh^m1GK<z-C<TdcUBMcxWO4%92m#6Bd9#FYp*>nYPZZ
z5G>`51y`l*Z5tARJ|ERuo{^k%PgHpZdpU4@Nq;3xOm_!*k9Kcyivo=|kC9;oRAgp0
zXmgN-1a^Nok)M8C20D19rv#~pW;(V`w>GzxC%U-5zQF^kiaI>5Rgzz9V8mE|bp^;&
zZp@U4&nJOCMY4njJZQWo+fk_B;jOf*PMF=?$!vU}nbY3g@`vLk$4=EaUM3xImPJ6n
zXx##KdPES~fI#P7y|U8~nU090CN8W9qZea}eI6A<RtiCK!-$e7FHl&?vZYG~2><{)
DK9_>7

delta 299
zcmV+`0o4A=0>lCnM@dFFH(?|IA^`FL0RI300094y6C{7>g1tEF&Ab1cB8+5do~VL}
zXzP;d#SQ~OjC4^L#&PI6o6k0iS!T7HAh+xNfWiY&U<|NEJluc>Eckp~UlFhZl(NgM
zA^c^J%UW?dNbvD^(P<SaXGZS^c}ja`BvUkhfpt$&Z!(1=he>vdU<Hj-WRF^CG?X@U
zHh6=YM}>bhodcf)p#-CjrX@65v}v`onQ$byyaTtswz->g1#wb~I$z2MuvVu7I>u4S
z%W{MzeQHClfNM?7R|45Q+uh!1*J+aFPEp(7&+EtJ$I5!8&Lz>r+g)_l_`>aD($62J
xbe@>0<3@=R9eBpHh;l-Y%Oz5}UT8FtZV{tLVIU7eiX2JO6or#0Q>sh=06U-7iWUF>

diff --git a/backend/tests/data/pcx/ultra_fg_bg_hvwsp1_box1.pcx b/backend/tests/data/pcx/ultra_fg_bg_hvwsp1_box1.pcx
index 060a6de63b3daacbd354a45e1c785789a9d8e272..f6ee116345ace01a3404c3a9054be5f16e5aed79 100644
GIT binary patch
delta 83
zcmbOtuti`(quT!;3_u7b5B>kba0tjc#PH?+As`Ehw{dzZ`@~gTau^a&tq=nM0_ico

delta 54
pcmdlYFhyWOBR9hjh9Ccd7)VZR5Sz@xA++&`2fGAJ3@n4B1_0Mb9IF5T

diff --git a/backend/tests/data/png/datamatrix_2.0_hvwsp1_bind1_dotty.png b/backend/tests/data/png/datamatrix_2.0_hvwsp1_bind1_dotty.png
index fe9d172405d97848e8d0696279ad0e6d93452221..d8f0f8d5fe1850f2d6968a8ffd16b04993740f2d 100644
GIT binary patch
delta 144
zcmV;B0B`@l0loo{Hh*(TL_t&-(~Xfa3Ist21Phb?hWJ7=)BCv>%rTlQx1C5)G$_*D
z-TmQdzKxlg0g|M}*E<moN~&^rykUS+Xz}Xfr%&ea_%HxvY4i2Chl9wh93Fqx71HMG
y!`&QInabhmLjVG5@$}=|Uv=*P@!S0Q(-*PgMVnV5pF{uv00{s|MNUMnLSTaSkw}FA

delta 145
zcmV;C0B--j0lxu|Hh*+UL_t&-)0L1h3PVu{1P7bFhIm3d+uYm~FL~O0Lbj1%SWw|d
zy1TnykMkQdGXo?^i?4Sg9F$b$@OZ-jrO@Kl$4{Tk;qhSr%F^cRaSsQPSvfrZtSh9=
z*N3|~s4|tq(}w^A)Z*#Kxxeb%|KWfC{E#=X;zgUZ>}nqX015yANkvXXu0mjfVrxer

diff --git a/backend/tests/data/png/maxicode_hvwsp1_box2.png b/backend/tests/data/png/maxicode_hvwsp1_box2.png
index fece2091b5bb21c1fdfffb51dc5069c6a380486e..b9a53890e14b0a8b29bbb3b33f36319696e7870b 100644
GIT binary patch
delta 2061
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

delta 2063
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

diff --git a/backend/tests/data/png/maxicode_vwsp1_bind1.png b/backend/tests/data/png/maxicode_vwsp1_bind1.png
index 2f7cb51f74e0f5f0acf491a8ffd26a7f703da372..19cc68640c5ef251f3f8aebacc37e1fe7ebb806e 100644
GIT binary patch
delta 2029
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
LNkvXXu0mjffvM&W

delta 2032
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
O0000<MNUMnLSTX}o9E8}

diff --git a/backend/tests/data/png/ultra_fgalpha_hvwsp1_box1.png b/backend/tests/data/png/ultra_fgalpha_hvwsp1_box1.png
index 37f38e12d056791591423c32f4fa0b31aec60bbe..91af856ef2aa1d7064a59de9d3621d94969bd714 100644
GIT binary patch
delta 155
zcmV;M0A&C80rmlqV}E{0L_t(2&yCVa5yU_Y13*y_7GV(uQ4obt2-|&bj)`mJUq4*s
z1IIg9+WE|v^`38oi;$s74ptRXtRxu>EMm$gHCR(PX5w%#sGwzA_F%=O215!uAusbT
ztSl5!N;DW!m~=>au&SUO#<!h54J;B;%D>;jHt)OnFMI#@0~Dq?19B1A;vfJ3002ov
JPDHLkV1h!7KSlrm

delta 157
zcmV;O0Am040r&xsV}F22L_t(2&yCVc5yL<X15i;A7GV(uQ4obvShhVjX*QmfZ|~q4
zf3Tjx&OXoVZS|h@YH$%UG|9oLLW-3ngMmd%*`x+*3dc+w4h9vpY|9?3xYS@sK_}#8
z-i?)oB1(w{Lkg1)DGyc^l*9P8(|-etgp~5@x3RPP9{$VW{}z1#TId7%Iu0pq00000
LNkvXXu0mjf+vY?k

diff --git a/backend/tests/data/png/ultra_hvwsp1_box1.png b/backend/tests/data/png/ultra_hvwsp1_box1.png
index cfa074f7523c976da2a805b2274edc59f7eefbd9..aa151d43ec617000354aba6ca482551f794f7a54 100644
GIT binary patch
delta 155
zcmV;M0A&Bx0owtPNPm7wL_t(2&yCW-4Z|=DLs72qXW=Ydfh%bJo{FZ4W0*HTK?W>K
z^Ng0Jd*1BX`C`hbPy%dhJhB_N?Z(8Y!3lU{(@`4Ql#R(F;v`Ns_AOlxD^o|Lh0A*v
zHjG?jx89gK3Z&p{Y&^m#&EHJ#CPppT{oS{)!~Z?pm$Uu*02E;KvZLHLIiCOk002ov
JPDHLkV1m)FO9=n~

delta 150
zcmV;H0BQf*0oDPKNPl@rL_t(2&yCX22}3aqLs6}8XVENLK`VIuewDtq!9;&P27}{B
zmzn>ZO$RxfGAfh+i;YKi<F;K)j2fJP7n_dK(55UVkBE~vS?t|<7AI3jq=m=62OCDN
zv0E>ujsht-i;YJ(rTKc(UlXGi?0)7Q?C!po|K&0-a7nJ~<PWGM+5i9m07*qoM6N<$
Eg3h2rj{pDw

diff --git a/backend/tests/data/svg/datamatrix_hvwsp1_bind1_dotty.svg b/backend/tests/data/svg/datamatrix_hvwsp1_bind1_dotty.svg
index 32419cc3..2b44a900 100644
--- a/backend/tests/data/svg/datamatrix_hvwsp1_bind1_dotty.svg
+++ b/backend/tests/data/svg/datamatrix_hvwsp1_bind1_dotty.svg
@@ -8,8 +8,8 @@
 
    <g id="barcode" fill="#000000">
       <rect x="0" y="0" width="44" height="48" fill="#FFFFFF" />
-      <rect x="0.00" y="2.00" width="44.00" height="2.00" />
-      <rect x="0.00" y="44.00" width="44.00" height="2.00" />
+      <rect x="0.00" y="0.00" width="44.00" height="2.00" />
+      <rect x="0.00" y="46.00" width="44.00" height="2.00" />
       <circle cx="3.00" cy="5.00" r="0.80" />
       <circle cx="7.00" cy="5.00" r="0.80" />
       <circle cx="11.00" cy="5.00" r="0.80" />
diff --git a/backend/tests/data/svg/datamatrix_vwsp1_bind1_dotty.svg b/backend/tests/data/svg/datamatrix_vwsp1_bind1_dotty.svg
index 0c3108c9..2a1dd1d6 100644
--- a/backend/tests/data/svg/datamatrix_vwsp1_bind1_dotty.svg
+++ b/backend/tests/data/svg/datamatrix_vwsp1_bind1_dotty.svg
@@ -8,8 +8,8 @@
 
    <g id="barcode" fill="#000000">
       <rect x="0" y="0" width="40" height="48" fill="#FFFFFF" />
-      <rect x="0.00" y="2.00" width="40.00" height="2.00" />
-      <rect x="0.00" y="44.00" width="40.00" height="2.00" />
+      <rect x="0.00" y="0.00" width="40.00" height="2.00" />
+      <rect x="0.00" y="46.00" width="40.00" height="2.00" />
       <circle cx="1.00" cy="5.00" r="0.80" />
       <circle cx="5.00" cy="5.00" r="0.80" />
       <circle cx="9.00" cy="5.00" r="0.80" />
diff --git a/backend/tests/data/svg/maxicode_vwsp1_bind1.svg b/backend/tests/data/svg/maxicode_vwsp1_bind1.svg
index 6aaf1974..d4d10d24 100644
--- a/backend/tests/data/svg/maxicode_vwsp1_bind1.svg
+++ b/backend/tests/data/svg/maxicode_vwsp1_bind1.svg
@@ -8,8 +8,8 @@
 
    <g id="barcode" fill="#000000">
       <rect x="0" y="0" width="60" height="66" fill="#FFFFFF" />
-      <rect x="0.00" y="2.00" width="60.00" height="2.00" />
-      <rect x="0.00" y="61.73" width="60.00" height="2.00" />
+      <rect x="0.00" y="0.00" width="60.00" height="2.00" />
+      <rect x="0.00" y="63.73" width="60.00" height="2.00" />
       <path d="M 25.00 6.15 L 25.87 5.65 L 25.87 4.65 L 25.00 4.15 L 24.13 4.65 L 24.13 5.65 Z" />
       <path d="M 29.00 6.15 L 29.87 5.65 L 29.87 4.65 L 29.00 4.15 L 28.13 4.65 L 28.13 5.65 Z" />
       <path d="M 33.00 6.15 L 33.87 5.65 L 33.87 4.65 L 33.00 4.15 L 32.13 4.65 L 32.13 5.65 Z" />
diff --git a/backend/tests/data/svg/ultra_fgbg_hvwsp2_box3.svg b/backend/tests/data/svg/ultra_fgbg_hvwsp2_box3.svg
index 2c4d23b2..4f4b84b9 100644
--- a/backend/tests/data/svg/ultra_fgbg_hvwsp2_box3.svg
+++ b/backend/tests/data/svg/ultra_fgbg_hvwsp2_box3.svg
@@ -173,9 +173,9 @@
       <rect x="52.00" y="32.00" width="2.00" height="2.00" fill="#00ff00" />
       <rect x="54.00" y="32.00" width="2.00" height="2.00" fill="#ffff00" />
       <rect x="10.00" y="34.00" width="48.00" height="2.00" fill="#000000" />
-      <rect x="0.00" y="4.00" width="68.00" height="6.00" />
-      <rect x="0.00" y="36.00" width="68.00" height="6.00" />
-      <rect x="0.00" y="10.00" width="6.00" height="26.00" />
-      <rect x="62.00" y="10.00" width="6.00" height="26.00" />
+      <rect x="0.00" y="0.00" width="68.00" height="6.00" />
+      <rect x="0.00" y="40.00" width="68.00" height="6.00" />
+      <rect x="0.00" y="6.00" width="6.00" height="34.00" />
+      <rect x="62.00" y="6.00" width="6.00" height="34.00" />
    </g>
 </svg>
diff --git a/backend/tests/data/tif/ultra_fgbg_hvwsp1_box1.tif b/backend/tests/data/tif/ultra_fgbg_hvwsp1_box1.tif
index c2d02c46146dc75469656c2225f2f157aa72738c..d199ed98ebbee36ce138168de2a045599404ea37 100644
GIT binary patch
delta 318
zcmeyx{EfNZ(^HG#0|Ns?gIYp>g^Cz2dyB(GfgLGkvfPc%j{<IV-qRKDaSIfTI8&xC
z?X!sQ0n?hEGlIsVZm9tsZr%zLJykAshHQ!{pW)h8WH@JCSlR-XbitE1n5s<|c)lo-
zl;vRboP2ia#{gEVg?iJjylgKv>C3g(y0qN%)R%1slU4=Rr%jcN%}UOia+_=0iw#Wf
z<-6mOu32CG_TGEO^{maFdE$&}%N`nR(U!HUGUhm+A-pH&Q}sm2Cm+82`m!lJZCAR=
z%vXOeyf2u1LG4DZty%M`Y0q9>w=7w4R{Lgp+0MB~`)p<J=RX$anB%8>w9~0FW`_?8
z4+8@uGXo>g%W6P8nTavL@CA?|#mEX4Yy-+jL)m>mwgyx&6Htu<kZk~@r%i5VEC&E*
C7Ip3b

delta 317
zcmeyy{ENBX(^HG#3j+f~gOWmkg^Cz2dyB(lgB>Ymviuz`i5<;*!gR%ZloSg+j+E(2
z`5a|n4c@_UM$lN)Ej6IS%~N5br^=<ykWDe=GhE$@0_Us?OIyH_F1Yi`r<%|Oo-c|d
zb-8>!r+cS<abUHYtUf#BWqYy7v|Rfo0n1HKec5)<YfeMGdTFF@Qh3zFsAtn2tv#g0
zFzH^t_>Q%GKkN5gdJ=kT&86t}gPsMGZu-eZcUoUwzSyAWTch>HC(CyR&WjgTTkow}
zmc6aXebM^6ec!csnQ|vw^Za__x3AS}y{VE*EB|iU^m^{y8;>vE6X(-c=q#!X<nTA2
z%hAxl!@$7E%)kir_QYQyhHrqh6eBB`-vtzuhO#FC*&0xFOh7dbK(+ypo;A6iu^a%b
CE_TTP

diff --git a/backend/tests/test_raster.c b/backend/tests/test_raster.c
index c7426f5a..3ecc4498 100644
--- a/backend/tests/test_raster.c
+++ b/backend/tests/test_raster.c
@@ -818,60 +818,71 @@ static void test_output_options(int index, int debug) {
         /* 22*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 42, 54, 1, 2, 2 },
         /* 23*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 42, 54, 0, 20, 0 },
         /* 24*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BOX, 0, 0, "A123", 0, 21, 21, 21, 54, 54, 1, 20, 0 },
-        /* 25*/ { BARCODE_QRCODE, -1, -1, -1, -1, 0, 0, "A123", 0, 21, 21, 21, 42, 42, 1, 0, 0 },
-        /* 26*/ { BARCODE_QRCODE, 5, -1, -1, -1, 0, 0, "A123", 0, 21, 21, 21, 62, 42, 0, 0, 0 },
-        /* 27*/ { BARCODE_QRCODE, 5, -1, 6, -1, 0, 0, "A123", 0, 21, 21, 21, 62, 42, 0, 0, 0 },
-        /* 28*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 62, 66, 1, 0, 0 },
-        /* 29*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 62, 66, 0, 12, 0 },
-        /* 30*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BOX, 0, 0, "A123", 0, 21, 21, 21, 86, 66, 1, 12, 0 },
-        /* 31*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 },
-        /* 32*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0.5, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 }, // Scale 0.5 -> 1
-        /* 33*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 2, 2 },
-        /* 34*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 41, 1 },
-        /* 35*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 40, 2 },
-        /* 36*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 },
-        /* 37*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 2, 2 },
-        /* 38*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BIND | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 59, 1, 2, 2 },
-        /* 39*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 59, 59, 1, 9, 9 },
-        /* 40*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 59, 0, 9, 9 },
-        /* 41*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 59, 1, 0, 0 },
-        /* 42*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 59, 1, 9, 11 },
-        /* 43*/ { BARCODE_QRCODE, 1, 1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 63, 0, 0, 0 },
-        /* 44*/ { BARCODE_QRCODE, 1, 1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 63, 1, 9, 13 },
-        /* 45*/ { BARCODE_QRCODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 42, 42, 1, 1, 1 },
-        /* 46*/ { BARCODE_QRCODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 42, 42, 0, 2, 2 },
-        /* 47*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 },
-        /* 48*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 2, 2 },
-        /* 49*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 180, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 41, 1 },
-        /* 50*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 180, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 40, 2 },
-        /* 51*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 4, 4 },
-        /* 52*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 4, 14 },
-        /* 53*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 1, 4, 4 },
-        /* 54*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 0, 4, 14 },
-        /* 55*/ { BARCODE_MAXICODE, -1, -1, 5, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 0, 0 },
-        /* 56*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 1, 0, 0 },
-        /* 57*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 0, 50, 0 },
-        /* 58*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 0, 347, 50 },
-        /* 59*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 1, 348, 50 },
-        /* 60*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + 50 * 2, 298 + 50 * 2, 1, 50, 0 },
-        /* 61*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + 50 * 2, 298 + 50 * 2, 0, 347, 50 },
-        /* 62*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 0, 14 },
-        /* 63*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 14 },
-        /* 64*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 47 },
-        /* 65*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 1, 0, 47 },
-        /* 66*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 0, 50, 0 },
-        /* 67*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + (60 + 50) * 2, 298 + 50 * 2, 1, 50, 0 },
-        /* 68*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 },
-        /* 69*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 4, 4 },
-        /* 70*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 4, 14 },
-        /* 71*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 1, 4, 4 },
-        /* 72*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 0, 4, 14 },
-        /* 73*/ { BARCODE_ITF14, -1, -1, -1, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 },
-        /* 74*/ { BARCODE_ITF14, -1, -1, -1, -1, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 },
-        /* 75*/ { BARCODE_ITF14, -1, -1, 0, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 },
-        /* 76*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, 0, 0, "123", 0, 50, 1, 135, 310, 116, 0, 100, 0 },
-        /* 77*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 },
-        /* 78*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 },
+        /* 25*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 42, 54, 1, 6, 0 },
+        /* 26*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND | BARCODE_QUIET_ZONES, 0, 0, "A123", 0, 21, 21, 21, 58, 70, 0, 6, 0 },
+        /* 27*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BOX | BARCODE_QUIET_ZONES, 0, 0, "A123", 0, 21, 21, 21, 70, 70, 1, 6, 0 },
+        /* 28*/ { BARCODE_QRCODE, -1, -1, -1, -1, 0, 0, "A123", 0, 21, 21, 21, 42, 42, 1, 0, 0 },
+        /* 29*/ { BARCODE_QRCODE, 5, -1, -1, -1, 0, 0, "A123", 0, 21, 21, 21, 62, 42, 0, 0, 0 },
+        /* 30*/ { BARCODE_QRCODE, 5, -1, 6, -1, 0, 0, "A123", 0, 21, 21, 21, 62, 42, 0, 0, 0 },
+        /* 31*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 62, 66, 1, 0, 0 },
+        /* 32*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 62, 66, 0, 12, 0 },
+        /* 33*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BOX, 0, 0, "A123", 0, 21, 21, 21, 86, 66, 1, 12, 0 },
+        /* 34*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, 0, 0, "A123", 0, 21, 21, 21, 62, 66, 1, 12, 10 },
+        /* 35*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND | BARCODE_QUIET_ZONES, 0, 0, "A123", 0, 21, 21, 21, 78, 82, 0, 12, 10 },
+        /* 36*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND | BARCODE_QUIET_ZONES, 0, 0, "A123", 0, 21, 21, 21, 78, 82, 1, 20, 19 },
+        /* 37*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BOX | BARCODE_QUIET_ZONES, 0, 0, "A123", 0, 21, 21, 21, 102, 82, 0, 20, 19 },
+        /* 38*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 },
+        /* 39*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0.5, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 }, // Scale 0.5 -> 1
+        /* 40*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 2, 2 },
+        /* 41*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 41, 1 },
+        /* 42*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 40, 2 },
+        /* 43*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 },
+        /* 44*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 2, 2 },
+        /* 45*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BIND | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 43, 59, 1, 2, 2 },
+        /* 46*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 59, 59, 1, 9, 9 },
+        /* 47*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 59, 0, 9, 9 },
+        /* 48*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 59, 1, 0, 0 },
+        /* 49*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 59, 0, 8, 11 },
+        /* 50*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 59, 1, 9, 11 },
+        /* 51*/ { BARCODE_QRCODE, 1, 1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 63, 0, 8, 11 },
+        /* 52*/ { BARCODE_QRCODE, 1, 1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 63, 0, 9, 11 },
+        /* 53*/ { BARCODE_QRCODE, 1, 1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, 0, 0, "A123", 0, 21, 21, 21, 63, 63, 1, 11, 11 },
+        /* 54*/ { BARCODE_QRCODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 42, 42, 1, 1, 1 },
+        /* 55*/ { BARCODE_QRCODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 42, 42, 0, 2, 2 },
+        /* 56*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 1, 1 },
+        /* 57*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 2, 2 },
+        /* 58*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 180, 0, "A123", 0, 21, 21, 21, 43, 43, 1, 41, 1 },
+        /* 59*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE | OUT_BUFFER_INTERMEDIATE, 180, 0, "A123", 0, 21, 21, 21, 43, 43, 0, 40, 2 },
+        /* 60*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 4, 4 },
+        /* 61*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 4, 14 },
+        /* 62*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 1, 4, 4 },
+        /* 63*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 0, 4, 14 },
+        /* 64*/ { BARCODE_MAXICODE, -1, -1, 5, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 0, 0 },
+        /* 65*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 1, 0, 0 },
+        /* 66*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 0, 50, 0 },
+        /* 67*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 0, 347, 50 },
+        /* 68*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 1, 348, 50 },
+        /* 69*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + 50 * 2, 298 + 50 * 2, 1, 50, 0 },
+        /* 70*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + 50 * 2, 298 + 50 * 2, 0, 347, 50 },
+        /* 71*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 1, 50, 15 },
+        /* 72*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND | BARCODE_QUIET_ZONES, 0, 0, "A123", 0, 165, 33, 30, 299 + 10 * 2, 298 + (50 + 10) * 2, 0, 50, 15 },
+        /* 73*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 0, 14 },
+        /* 74*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 14 },
+        /* 75*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 47 },
+        /* 76*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 1, 0, 47 },
+        /* 77*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 0, 50, 0 },
+        /* 78*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + (60 + 50) * 2, 298 + 50 * 2, 1, 50, 0 },
+        /* 79*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 },
+        /* 80*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 4, 4 },
+        /* 81*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 4, 14 },
+        /* 82*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 1, 4, 4 },
+        /* 83*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 0, 4, 14 },
+        /* 84*/ { BARCODE_ITF14, -1, -1, -1, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 },
+        /* 85*/ { BARCODE_ITF14, -1, -1, -1, -1, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 },
+        /* 86*/ { BARCODE_ITF14, -1, -1, 0, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 },
+        /* 87*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, 0, 0, "123", 0, 50, 1, 135, 310, 116, 0, 100, 0 },
+        /* 88*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 },
+        /* 89*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 },
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
diff --git a/backend/tests/test_vector.c b/backend/tests/test_vector.c
index acc357ab..ab283458 100644
--- a/backend/tests/test_vector.c
+++ b/backend/tests/test_vector.c
@@ -656,28 +656,36 @@ static void test_output_options(int index, int debug) {
         /* 18*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND, "A123", 0, 21, 21, 21, 42, 54, 1, 0, 6 },
         /* 19*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND, "A123", 0, 21, 21, 21, 42, 54, 0, 22, 8 },
         /* 20*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BOX, "A123", 0, 21, 21, 21, 54, 54, 1, 22, 8 },
-        /* 21*/ { BARCODE_QRCODE, -1, -1, -1, -1, "A123", 0, 21, 21, 21, 42, 42, 0, 10, 12 },
-        /* 22*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, "A123", 0, 21, 21, 21, 62, 66, 1, 10, 12 },
-        /* 23*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, "A123", 0, 21, 21, 21, 62, 66, 0, 22, 12 },
-        /* 24*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BOX, "A123", 0, 21, 21, 21, 86, 66, 1, 22, 12 },
-        /* 25*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 42, 0, 0, 50 },
-        /* 26*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 42, 0, 0, 50 },
-        /* 27*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BIND | BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 58, 1, 0, 50 },
-        /* 28*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BIND | BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 58, 0, 54, 8 },
-        /* 29*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 62, 58, 1, 54, 8 },
-        /* 30*/ { BARCODE_MAXICODE, -1, -1, -1, -1, "A123", 0, 165, 33, 30, 60, 57.733398, 0, 0, 67.7334 },
-        /* 31*/ { BARCODE_MAXICODE, -1, -1, 5, -1, "A123", 0, 165, 33, 30, 60, 57.733398, 0, 0, 67.7334 },
-        /* 32*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 77.733398, 1, 0, 67.7334 },
-        /* 33*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 77.733398, 0, 70, 10 },
-        /* 34*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BOX, "A123", 0, 165, 33, 30, 80, 77.733398, 1, 70, 10 },
-        /* 35*/ { BARCODE_MAXICODE, -1, -1, -1, -1, "A123", 0, 165, 33, 30, 60, 57.733398, 0, 0, 67.7334 },
-        /* 36*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 84, 77.733398, 1, 0, 67.7334 },
-        /* 37*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 84, 77.733398, 0, 94, 10 },
-        /* 38*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BOX, "A123", 0, 165, 33, 30, 104, 77.733398, 1, 94, 10 },
-        /* 39*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 },
-        /* 40*/ { BARCODE_ITF14, -1, -1, -1, -1, "123", 0, 50, 1, 135, 330, 138.89999, 1, 320, 10 },
-        /* 41*/ { BARCODE_ITF14, -1, -1, 0, -1, "123", 0, 50, 1, 135, 330, 138.89999, 1, 320, 10 },
-        /* 42*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, "123", 0, 50, 1, 135, 310, 118.9, 0, 300, 0 }, // No zero-width/height rectangles
+        /* 21*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND | BARCODE_QUIET_ZONES, "A123", 0, 21, 21, 21, 58, 70, 0, 0, 6 },
+        /* 22*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BIND | BARCODE_QUIET_ZONES, "A123", 0, 21, 21, 21, 58, 70, 1, 0, 0 },
+        /* 23*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BOX | BARCODE_QUIET_ZONES, "A123", 0, 21, 21, 21, 70, 70, 0, 22, 8 },
+        /* 24*/ { BARCODE_QRCODE, -1, -1, 3, BARCODE_BOX | BARCODE_QUIET_ZONES, "A123", 0, 21, 21, 21, 70, 70, 1, 30, 16 },
+        /* 25*/ { BARCODE_QRCODE, -1, -1, -1, -1, "A123", 0, 21, 21, 21, 42, 42, 0, 10, 12 },
+        /* 26*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, "A123", 0, 21, 21, 21, 62, 66, 1, 10, 12 },
+        /* 27*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND, "A123", 0, 21, 21, 21, 62, 66, 0, 22, 12 },
+        /* 28*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BOX, "A123", 0, 21, 21, 21, 86, 66, 1, 22, 12 },
+        /* 29*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND | BARCODE_QUIET_ZONES, "A123", 0, 21, 21, 21, 78, 82, 0, 10, 12 },
+        /* 30*/ { BARCODE_QRCODE, 5, -1, 6, BARCODE_BIND | BARCODE_QUIET_ZONES, "A123", 0, 21, 21, 21, 78, 82, 1, 18, 20 },
+        /* 31*/ { BARCODE_QRCODE, -1, -1, -1, BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 42, 0, 0, 50 },
+        /* 32*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 42, 0, 0, 50 },
+        /* 33*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BIND | BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 58, 1, 0, 50 },
+        /* 34*/ { BARCODE_QRCODE, -1, -1, 4, BARCODE_BIND | BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 42, 58, 0, 54, 8 },
+        /* 35*/ { BARCODE_QRCODE, 1, -1, 4, BARCODE_BOX | BARCODE_DOTTY_MODE, "A123", 0, 21, 21, 21, 62, 58, 1, 54, 8 },
+        /* 36*/ { BARCODE_MAXICODE, -1, -1, -1, -1, "A123", 0, 165, 33, 30, 60, 57.733398, 0, 0, 67.7334 },
+        /* 37*/ { BARCODE_MAXICODE, -1, -1, 5, -1, "A123", 0, 165, 33, 30, 60, 57.733398, 0, 0, 67.7334 },
+        /* 38*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 77.733398, 1, 0, 67.7334 },
+        /* 39*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 77.733398, 0, 70, 10 },
+        /* 40*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BOX, "A123", 0, 165, 33, 30, 80, 77.733398, 1, 70, 10 },
+        /* 41*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND | BARCODE_QUIET_ZONES, "A123", 0, 165, 33, 30, 64, 81.733398, 0, 0, 67.7334 },
+        /* 42*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND | BARCODE_QUIET_ZONES, "A123", 0, 165, 33, 30, 64, 81.733398, 1, 0, 71.7334 },
+        /* 43*/ { BARCODE_MAXICODE, -1, -1, -1, -1, "A123", 0, 165, 33, 30, 60, 57.733398, 0, 0, 67.7334 },
+        /* 44*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 84, 77.733398, 1, 0, 67.7334 },
+        /* 45*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 84, 77.733398, 0, 94, 10 },
+        /* 46*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BOX, "A123", 0, 165, 33, 30, 104, 77.733398, 1, 94, 10 },
+        /* 47*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 },
+        /* 48*/ { BARCODE_ITF14, -1, -1, -1, -1, "123", 0, 50, 1, 135, 330, 138.89999, 1, 320, 10 },
+        /* 49*/ { BARCODE_ITF14, -1, -1, 0, -1, "123", 0, 50, 1, 135, 330, 138.89999, 1, 320, 10 },
+        /* 50*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, "123", 0, 50, 1, 135, 310, 118.9, 0, 300, 0 }, // No zero-width/height rectangles
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
diff --git a/backend/vector.c b/backend/vector.c
index 193b8829..9900047b 100644
--- a/backend/vector.c
+++ b/backend/vector.c
@@ -878,42 +878,50 @@ INTERNAL int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_
     }
 
     // Bind/box
-    if (symbol->border_width > 0) {
-        if (symbol->output_options & (BARCODE_BOX | BARCODE_BIND)) {
-            const float ybind_top = yoffset - symbol->border_width;
-            // Following equivalent to yoffset + symbol->height + dot_overspill except for BARCODE_MAXICODE
-            const float ybind_bot = vector->height - textoffset - boffset;
-            // Top
-            rect = vector_plot_create_rect(symbol, 0.0f, ybind_top, vector->width, symbol->border_width);
-            if (!rect) return ZINT_ERROR_MEMORY;
-            if (!(symbol->output_options & BARCODE_BOX)
-                    && (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF)) {
-                /* CodaBlockF bind - does not extend over horizontal whitespace */
-                rect->x = xoffset;
-                rect->width -= xoffset + roffset;
-            }
-            vector_plot_add_rect(symbol, rect, &last_rectangle);
-            // Bottom
-            rect = vector_plot_create_rect(symbol, 0.0f, ybind_bot, vector->width, symbol->border_width);
-            if (!rect) return ZINT_ERROR_MEMORY;
-            if (!(symbol->output_options & BARCODE_BOX)
-                    && (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF)) {
-                /* CodaBlockF bind - does not extend over horizontal whitespace */
-                rect->x = xoffset;
-                rect->width -= xoffset + roffset;
-            }
-            vector_plot_add_rect(symbol, rect, &last_rectangle);
+    if (symbol->border_width > 0 && (symbol->output_options & (BARCODE_BOX | BARCODE_BIND))) {
+        const int horz_outside = is_fixed_ratio(symbol->symbology);
+        float ybind_top = yoffset - symbol->border_width;
+        // Following equivalent to yoffset + symbol->height + dot_overspill except for BARCODE_MAXICODE
+        float ybind_bot = vector->height - textoffset - boffset;
+        if (horz_outside) {
+            ybind_top = 0;
+            ybind_bot = vector->height - symbol->border_width;
         }
+        // Top
+        rect = vector_plot_create_rect(symbol, 0.0f, ybind_top, vector->width, symbol->border_width);
+        if (!rect) return ZINT_ERROR_MEMORY;
+        if (!(symbol->output_options & BARCODE_BOX)
+                && (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF)) {
+            /* CodaBlockF bind - does not extend over horizontal whitespace */
+            rect->x = xoffset;
+            rect->width -= xoffset + roffset;
+        }
+        vector_plot_add_rect(symbol, rect, &last_rectangle);
+        // Bottom
+        rect = vector_plot_create_rect(symbol, 0.0f, ybind_bot, vector->width, symbol->border_width);
+        if (!rect) return ZINT_ERROR_MEMORY;
+        if (!(symbol->output_options & BARCODE_BOX)
+                && (symbol->symbology == BARCODE_CODABLOCKF || symbol->symbology == BARCODE_HIBC_BLOCKF)) {
+            /* CodaBlockF bind - does not extend over horizontal whitespace */
+            rect->x = xoffset;
+            rect->width -= xoffset + roffset;
+        }
+        vector_plot_add_rect(symbol, rect, &last_rectangle);
         if (symbol->output_options & BARCODE_BOX) {
             const float xbox_right = vector->width - symbol->border_width;
+            float box_top = yoffset;
             // Following equivalent to symbol->height except for BARCODE_MAXICODE
-            const float box_height = vector->height - textoffset - dot_overspill - yoffset - boffset;
+            float box_height = vector->height - textoffset - dot_overspill - yoffset - boffset;
+            if (horz_outside) {
+                box_top = symbol->border_width;
+                box_height = vector->height - symbol->border_width * 2;
+            }
             // Left
-            rect = vector_plot_create_rect(symbol, 0.0f, yoffset, symbol->border_width, box_height);
+            rect = vector_plot_create_rect(symbol, 0.0f, box_top, symbol->border_width, box_height);
             if (!rect) return ZINT_ERROR_MEMORY;
             vector_plot_add_rect(symbol, rect, &last_rectangle);
             // Right
-            rect = vector_plot_create_rect(symbol, xbox_right, yoffset, symbol->border_width, box_height);
+            rect = vector_plot_create_rect(symbol, xbox_right, box_top, symbol->border_width, box_height);
             if (!rect) return ZINT_ERROR_MEMORY;
             vector_plot_add_rect(symbol, rect, &last_rectangle);
         }
diff --git a/docs/manual.txt b/docs/manual.txt
index d6e68538..409a1034 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -471,7 +471,7 @@ symbol by corrupting a scan if the scanning beam strays off the top or bottom of
 the symbol. Zint can also put a border right around the symbol and its
 horizontal whitespace with the --box option.
 
-The width of the boundary or box can be specified using the --border switch.
+The width of the boundary or box must be specified using the --border switch.
 For example:
 
 zint --box --border=10 -w 10 -d "This"
@@ -480,6 +480,11 @@ gives a box with a width 10 times the X-dimension of the symbol. Note that when
 specifying a box, horizontal whitespace is usually required in order to create a
 quiet zone between the barcode and the sides of the box.
 
+For linear symbols, horizontal boundary bars appear tight against the barcode,
+inside any vertical whitespace (or text). For matrix symbols, however, where
+they are decorative rather than functional, boundary bars appear outside any
+whitespace.
+
 Codablock-F, Code 16K and Code 49 always have boundary bars, and default to
 particular horizontal whitespace values. Special considerations apply to ITF-14
 - see the specific section 6.1.2.6 for that symbology.