diff --git a/backend/tests/testcommon.c b/backend/tests/testcommon.c index 11e54707..5f16a06b 100644 --- a/backend/tests/testcommon.c +++ b/backend/tests/testcommon.c @@ -3637,7 +3637,7 @@ static const char *testUtilZXingCPPName(int index, const struct zint_symbol *sym { "", BARCODE_GRIDMATRIX, 142, }, { "QRCode", BARCODE_UPNQR, 143, }, { "", BARCODE_ULTRA, 144, }, - { "rMQR", BARCODE_RMQR, 145, }, + { "RMQRCode", BARCODE_RMQR, 145, }, }; static const int data_size = ARRAY_SIZE(data); diff --git a/docs/manual.html b/docs/manual.html index dd3bc5d8..89f4422a 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -197,7 +197,7 @@ vertical-align: top; } tbody tr:first-child td { - padding-top: 0.5em; + padding-top: 0.5em; } header { margin-bottom: 4em; @@ -9083,12 +9083,14 @@ is 10 and minimum is -5. The default is 1.

10 41x41 22 91x91 34 143x143 11 45x45 23 95x95 35 147x147 12 49x49 24 101x101 36 151x151 + Code One 1 to 10 (9 and 10 variable width) (WxH) 1 16x18 6 70x76 2 22x22 7 104x98 3 28x28 8 148x134 4 40x42 9 Wx8 5 52x54 10 Wx16 + Data Matrix 1 to 48 (31 to 48 DMRE) (HxW) 1 10x10 17 72x72 33 8x80 2 12x12 18 80x80 34 8x96 @@ -9106,12 +9108,14 @@ Data Matrix 1 to 48 (31 to 48 DMRE) (HxW) 14 48x48 30 16x48 46 26x40 15 52x52 31 8x48 47 26x48 16 64x64 32 8x64 48 26x64 + Grid Matrix 1 to 13 1 18x18 6 78x78 11 138x138 2 30x30 7 90x90 12 150x150 3 42x42 8 102x102 13 162x162 4 54x54 9 114x114 5 66x66 10 126x126 + Han Xin 1 to 84 1 23x23 29 79x79 57 135x135 2 25x25 30 81x81 58 137x137 @@ -9141,9 +9145,11 @@ Han Xin 1 to 84 26 73x73 54 129x129 82 185x185 27 75x75 55 131x131 83 187x187 28 77x77 56 133x133 84 189x189 + Micro QR 1 to 4 (M1, M2, M3, M4) 1 11x11 3 15x15 2 13x13 4 17x17 + QR Code 1 to 40 1 21x21 15 77x77 29 133x133 2 25x25 16 81x81 30 137x137 @@ -9159,6 +9165,7 @@ QR Code 1 to 40 12 65x65 26 121x121 40 177x177 13 69x69 27 125x125 14 73x73 28 129x129 + rMQR 1 to 38 (33 to 38 automatic width) (HxW) 1 7x43 14 11x77 27 15x139 2 7x59 15 11x99 28 17x43 diff --git a/docs/manual.txt b/docs/manual.txt index c8acddbf..9a8cafdd 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -5195,12 +5195,14 @@ OPTIONS 10 41x41 22 91x91 34 143x143 11 45x45 23 95x95 35 147x147 12 49x49 24 101x101 36 151x151 + Code One 1 to 10 (9 and 10 variable width) (WxH) 1 16x18 6 70x76 2 22x22 7 104x98 3 28x28 8 148x134 4 40x42 9 Wx8 5 52x54 10 Wx16 + Data Matrix 1 to 48 (31 to 48 DMRE) (HxW) 1 10x10 17 72x72 33 8x80 2 12x12 18 80x80 34 8x96 @@ -5218,12 +5220,14 @@ OPTIONS 14 48x48 30 16x48 46 26x40 15 52x52 31 8x48 47 26x48 16 64x64 32 8x64 48 26x64 + Grid Matrix 1 to 13 1 18x18 6 78x78 11 138x138 2 30x30 7 90x90 12 150x150 3 42x42 8 102x102 13 162x162 4 54x54 9 114x114 5 66x66 10 126x126 + Han Xin 1 to 84 1 23x23 29 79x79 57 135x135 2 25x25 30 81x81 58 137x137 @@ -5253,9 +5257,11 @@ OPTIONS 26 73x73 54 129x129 82 185x185 27 75x75 55 131x131 83 187x187 28 77x77 56 133x133 84 189x189 + Micro QR 1 to 4 (M1, M2, M3, M4) 1 11x11 3 15x15 2 13x13 4 17x17 + QR Code 1 to 40 1 21x21 15 77x77 29 133x133 2 25x25 16 81x81 30 137x137 @@ -5271,6 +5277,7 @@ OPTIONS 12 65x65 26 121x121 40 177x177 13 69x69 27 125x125 14 73x73 28 129x129 + rMQR 1 to 38 (33 to 38 automatic width) (HxW) 1 7x43 14 11x77 27 15x139 2 7x59 15 11x99 28 17x43 diff --git a/docs/templates/styles.html b/docs/templates/styles.html index 671913ac..b307ffe2 100644 --- a/docs/templates/styles.html +++ b/docs/templates/styles.html @@ -218,7 +218,7 @@ td { vertical-align: top; } tbody tr:first-child td { - padding-top: 0.5em; + padding-top: 0.5em; } header { margin-bottom: 4em; diff --git a/docs/zint.1 b/docs/zint.1 index f1bf8a1e..44d059ae 100644 --- a/docs/zint.1 +++ b/docs/zint.1 @@ -465,12 +465,14 @@ Aztec Code 1 to 36 (1 to 4 compact) 10 41x41 22 91x91 34 143x143 11 45x45 23 95x95 35 147x147 12 49x49 24 101x101 36 151x151 + Code One 1 to 10 (9 and 10 variable width) (WxH) 1 16x18 6 70x76 2 22x22 7 104x98 3 28x28 8 148x134 4 40x42 9 Wx8 5 52x54 10 Wx16 + Data Matrix 1 to 48 (31 to 48 DMRE) (HxW) 1 10x10 17 72x72 33 8x80 2 12x12 18 80x80 34 8x96 @@ -488,12 +490,14 @@ Data Matrix 1 to 48 (31 to 48 DMRE) (HxW) 14 48x48 30 16x48 46 26x40 15 52x52 31 8x48 47 26x48 16 64x64 32 8x64 48 26x64 + Grid Matrix 1 to 13 1 18x18 6 78x78 11 138x138 2 30x30 7 90x90 12 150x150 3 42x42 8 102x102 13 162x162 4 54x54 9 114x114 5 66x66 10 126x126 + Han Xin 1 to 84 1 23x23 29 79x79 57 135x135 2 25x25 30 81x81 58 137x137 @@ -523,9 +527,11 @@ Han Xin 1 to 84 26 73x73 54 129x129 82 185x185 27 75x75 55 131x131 83 187x187 28 77x77 56 133x133 84 189x189 + Micro QR 1 to 4 (M1, M2, M3, M4) 1 11x11 3 15x15 2 13x13 4 17x17 + QR Code 1 to 40 1 21x21 15 77x77 29 133x133 2 25x25 16 81x81 30 137x137 @@ -541,6 +547,7 @@ QR Code 1 to 40 12 65x65 26 121x121 40 177x177 13 69x69 27 125x125 14 73x73 28 129x129 + rMQR 1 to 38 (33 to 38 automatic width) (HxW) 1 7x43 14 11x77 27 15x139 2 7x59 15 11x99 28 17x43 diff --git a/docs/zint.1.pmd b/docs/zint.1.pmd index 86d901b7..d0ca08e6 100644 --- a/docs/zint.1.pmd +++ b/docs/zint.1.pmd @@ -405,12 +405,14 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S 10 41x41 22 91x91 34 143x143 11 45x45 23 95x95 35 147x147 12 49x49 24 101x101 36 151x151 + Code One 1 to 10 (9 and 10 variable width) (WxH) 1 16x18 6 70x76 2 22x22 7 104x98 3 28x28 8 148x134 4 40x42 9 Wx8 5 52x54 10 Wx16 + Data Matrix 1 to 48 (31 to 48 DMRE) (HxW) 1 10x10 17 72x72 33 8x80 2 12x12 18 80x80 34 8x96 @@ -428,12 +430,14 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S 14 48x48 30 16x48 46 26x40 15 52x52 31 8x48 47 26x48 16 64x64 32 8x64 48 26x64 + Grid Matrix 1 to 13 1 18x18 6 78x78 11 138x138 2 30x30 7 90x90 12 150x150 3 42x42 8 102x102 13 162x162 4 54x54 9 114x114 5 66x66 10 126x126 + Han Xin 1 to 84 1 23x23 29 79x79 57 135x135 2 25x25 30 81x81 58 137x137 @@ -463,9 +467,11 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S 26 73x73 54 129x129 82 185x185 27 75x75 55 131x131 83 187x187 28 77x77 56 133x133 84 189x189 + Micro QR 1 to 4 (M1, M2, M3, M4) 1 11x11 3 15x15 2 13x13 4 17x17 + QR Code 1 to 40 1 21x21 15 77x77 29 133x133 2 25x25 16 81x81 30 137x137 @@ -481,6 +487,7 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S 12 65x65 26 121x121 40 177x177 13 69x69 27 125x125 14 73x73 28 129x129 + rMQR 1 to 38 (33 to 38 automatic width) (HxW) 1 7x43 14 11x77 27 15x139 2 7x59 15 11x99 28 17x43