From 7a016e42693f7c80acf7a794af57f2e519ee81e0 Mon Sep 17 00:00:00 2001 From: gitlost Date: Mon, 9 Nov 2026 22:07:24 +0000 Subject: [PATCH] DotCode: Do not encode sampos/samtotal as double digits Do not count sampos/samtotal <= 9 as digits so won't be encoded in Code Set C but in A/B, as per DotCode Rev. 4.0 5.2.1.2 (2)(b). --- src/dotcode.ps.src | 4 +++- tests/ps_tests/dotcode.ps.test | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/dotcode.ps.src b/src/dotcode.ps.src index 6208d732..203bf29f 100644 --- a/src/dotcode.ps.src +++ b/src/dotcode.ps.src @@ -568,7 +568,9 @@ begin /i exch def /barchar msg i get def barchar 48 ge barchar 57 le and { - nDigits i nDigits i 1 add get 1 add put + structapp not i 3 add msglen lt or { % Exclude sampos/total + nDigits i nDigits i 1 add get 1 add put + } if } if Avals barchar known {DatumA i true put} if Bvals barchar known {DatumB i true put} if diff --git a/tests/ps_tests/dotcode.ps.test b/tests/ps_tests/dotcode.ps.test index d36698b2..2ab8cf3a 100644 --- a/tests/ps_tests/dotcode.ps.test +++ b/tests/ps_tests/dotcode.ps.test @@ -503,6 +503,9 @@ uk.co.terryburton.bwipp.global_ctx dup /dotcode.maxrows undef /dotcode.maxcols u { (ABC) (sampos=10 samtotal=35 debugcws) dotcode % ABC A Z FNC2 } [106 33 34 35 33 58 108] debugIsEqual +{ + (1234) (sampos=9 samtotal=9 debugcws) dotcode % 12 34 9 9 FNC2, do not encode sampos/total as "99" +} [107 12 34 104 25 25 108] debugIsEqual { (Hello World) (sampos=10 samtotal=35 columns=20 mask=1 dontdraw) dotcode /pixs get } [ @@ -556,7 +559,7 @@ uk.co.terryburton.bwipp.global_ctx dup /dotcode.maxrows undef /dotcode.maxcols u { (^FNC@991234567890) (parsefnc debugcws) dotcode } [99 107 12 34 56 78 90] debugIsEqual { (AB^FNC3^FNC@99CD) (parsefnc debugcws) dotcode } [103 33 34 109 99 107 103 35 36] debugIsEqual % Start of a message segment { (^FNC@TA^FNC3^FNC@99B) (parsefnc debugcws) dotcode } [104 52 107 33 109 99 107 102 34] debugIsEqual -{ (^FNC@TABC) (parsefnc sampos=1 samtotal=2 debugcws) dotcode } [106 52 107 33 34 35 103 12 108] debugIsEqual +{ (^FNC@TABC) (parsefnc sampos=1 samtotal=2 debugcws) dotcode } [106 52 107 33 34 35 17 18 108] debugIsEqual (A^FNC@TB) (parsefnc dontdraw) /bwipp.dotcodeFNC1secondNotFirst er_tmpl (^FNC3^FNC@TB) (parsefnc dontdraw) /bwipp.dotcodeFNC1secondNotFirst er_tmpl (^FNC@T^ECI000026A) (parsefnc dontdraw) /bwipp.dotcodeECIwithFNC1 er_tmpl