Convert encoders to use rowmult

Author: terryburton

src/codablockf.ps.src

@@ -629,11 +629,12 @@ begin
     } for
 
     %
-    % Populate the bitmap
+    % Populate the bitmap with one copy of each unique row
     %
     /symwid c 11 mul 57 add def
     /symhgt sepheight r 1 add mul r rowheight mul add def
-    symwid symhgt mul { array } stopped {
+    /numcomprows r 2 mul 1 add def
+    symwid numcomprows mul { array } stopped {
         pop /bwipp.codablockfSymbolTooLarge (The symbol size exceeds the implementation limits) //raiseerror exec
     } if /pixs exch def
 
@@ -645,44 +646,40 @@ begin
         1 1 0 0 0 1 1 1 0 1 0 1 1
     ] def
 
-    /pos 0 def
+    /rowmult numcomprows array def
+    /pos 0 def  /ri 0 def
 
     % Top separator
-    sepheight {
-        pixs pos allone putinterval
-        /pos pos symwid add def
-    } repeat
+    pixs pos allone putinterval
+    /pos pos symwid add def
+    rowmult ri sepheight put  /ri ri 1 add def
 
     % Data rows with separators
     0 1 r 2 sub {
         /i exch def
-        rowheight {
-            pixs pos rowbits i get putinterval
-            /pos pos symwid add def
-        } repeat
-        sepheight {
-            pixs pos seprow putinterval
-            /pos pos symwid add def
-        } repeat
+        pixs pos rowbits i get putinterval
+        /pos pos symwid add def
+        rowmult ri rowheight put  /ri ri 1 add def
+        pixs pos seprow putinterval
+        /pos pos symwid add def
+        rowmult ri sepheight put  /ri ri 1 add def
     } for
 
     % Last data row
-    rowheight {
-        pixs pos rowbits r 1 sub get putinterval
-        /pos pos symwid add def
-    } repeat
+    pixs pos rowbits r 1 sub get putinterval
+    /pos pos symwid add def
+    rowmult ri rowheight put  /ri ri 1 add def
 
     % Bottom separator
-    sepheight {
-        pixs pos allone putinterval
-        /pos pos symwid add def
-    } repeat
+    pixs pos allone putinterval
+    rowmult ri sepheight put
 
     <<
     /ren /renmatrix
     /pixs pixs
     /pixx symwid
     /pixy symhgt
+    /rowmult rowmult
     /height symhgt 72 div
     /width symwid 72 div
     /physspec physspec

src/code16k.ps.src

@@ -836,55 +836,52 @@ begin
     } for
 
     %
-    % Populate the bitmap
+    % Populate the bitmap with one copy of each unique row
     %
     /symhgt sepheight r 1 add mul r rowheight mul add def
-    81 symhgt mul { array } stopped {
+    /numcomprows r 2 mul 1 add def
+    81 numcomprows mul { array } stopped {
         pop /bwipp.code16kSymbolTooLarge (The symbol size exceeds the implementation limits) //raiseerror exec
     } if /pixs exch def
 
     % Reusable row templates
     /allone [ 81 {1} repeat ] def
     /seprow [ 10 {0} repeat 70 {1} repeat 0 ] def
 
-    /pos 0 def
+    /rowmult numcomprows array def
+    /pos 0 def  /ri 0 def
 
     % Top separator
-    sepheight {
-        pixs pos allone putinterval
-        /pos pos 81 add def
-    } repeat
+    pixs pos allone putinterval
+    /pos pos 81 add def
+    rowmult ri sepheight put  /ri ri 1 add def
 
     % Data rows with separators
     0 1 r 2 sub {
         /i exch def
-        rowheight {
-            pixs pos rowbits i get putinterval
-            /pos pos 81 add def
-        } repeat
-        sepheight {
-            pixs pos seprow putinterval
-            /pos pos 81 add def
-        } repeat
+        pixs pos rowbits i get putinterval
+        /pos pos 81 add def
+        rowmult ri rowheight put  /ri ri 1 add def
+        pixs pos seprow putinterval
+        /pos pos 81 add def
+        rowmult ri sepheight put  /ri ri 1 add def
     } for
 
     % Last data row
-    rowheight {
-        pixs pos rowbits r 1 sub get putinterval
-        /pos pos 81 add def
-    } repeat
+    pixs pos rowbits r 1 sub get putinterval
+    /pos pos 81 add def
+    rowmult ri rowheight put  /ri ri 1 add def
 
     % Bottom separator
-    sepheight {
-        pixs pos allone putinterval
-        /pos pos 81 add def
-    } repeat
+    pixs pos allone putinterval
+    rowmult ri sepheight put
 
     <<
     /ren /renmatrix
     /pixs pixs
     /pixx 81
     /pixy symhgt
+    /rowmult rowmult
     /height symhgt 72 div
     /width 81 72 div
     /physspec physspec

src/code49.ps.src

@@ -1183,25 +1183,35 @@ dup [ exch 16 exch 1 32 getinterval aload pop ] /code49.weighty exch readonly de
     } for
 
     %
-    % Populate the bitmap
+    % Populate the bitmap with one copy of each unique row
     %
+    /numcomprows r 2 mul 1 add def
     /pixs [
-        81 sepheight mul {1} repeat
+        81 {1} repeat
         0 1 r 2 sub {
             /i exch def
-            rowheight {rowbits i get aload pop} repeat
-            sepheight {10 {0} repeat 70 {1} repeat 0} repeat
+            rowbits i get aload pop
+            10 {0} repeat 70 {1} repeat 0
         } for
-        rowheight {rowbits r 1 sub get aload pop} repeat
-        81 sepheight mul {1} repeat
+        rowbits r 1 sub get aload pop
+        81 {1} repeat
+    ] def
+    /symhgt sepheight r 1 add mul r rowheight mul add def
+
+    /rowmult [
+        sepheight
+        0 1 r 2 sub { pop rowheight sepheight } for
+        rowheight
+        sepheight
     ] def
 
     <<
     /ren /renmatrix
     /pixs pixs
     /pixx 81
-    /pixy pixs length 81 idiv
-    /height pixs length 81 idiv 72 div
+    /pixy symhgt
+    /rowmult rowmult
+    /height symhgt 72 div
     /width 81 72 div
     /physspec physspec
     /xdim xdim

src/databarexpanded.ps.src

@@ -957,28 +957,38 @@ begin
         sep pixx 4 sub //databarexpanded.seppad putinterval
 
         %
-        % Compose the symbol
+        % Compose the symbol with one copy of each unique row
         %
         /pixs [
             0 1 numrows 1 sub {
                 /r exch def
                 r 0 ne {
                     seps r get aload pop
                 } if
-                barxmult {rows r get aload pop} repeat
+                rows r get aload pop
                 r numrows 1 sub ne {
                     seps r get aload pop
                     sep aload pop
                 } if
             } for
         ] def
+        /rowmult [
+            0 1 numrows 1 sub {
+                /r exch def
+                r 0 ne { 1 } if
+                barxmult
+                r numrows 1 sub ne { 1 1 } if
+            } for
+        ] def
+        /pixy 0 rowmult {add} forall def
 
         <<
         /ren /renmatrix
         /pixs pixs
         /pixx pixx
-        /pixy pixs length pixx idiv
-        /height pixs length pixx idiv 72 div
+        /pixy pixy
+        /rowmult rowmult
+        /height pixy 72 div
         /width pixx 72 div
         /borderleft 0.0
         /borderright 0.0

src/databarexpandedcomposite.ps.src

@@ -155,15 +155,17 @@ begin
     /sep [ 0 sep aload pop ] def  % Offset by 1
 
     /linheight linheight cvi def
+    /ccrows ccpixs length ccpixx idiv def
     /diff linpixs length ccpixx sub def  % Minimum linpixs length is 102, ccpixx is 99
     /ccrpad [ diff 2 sub {0} repeat ] def
     /pixs [
         0 ccpixx ccpixs length 1 sub {
             /i exch def
             0 0 ccpixs i ccpixx getinterval aload pop ccrpad aload pop
         } for
-        sep aload pop linheight { linpixs aload pop } repeat
+        sep aload pop linpixs aload pop
     ] def
+    /rowmult [ ccrows { 1 } repeat 1 linheight ] def
 
     /pixx linpixs length def
 
@@ -173,7 +175,7 @@ begin
         } forall } { pop pop } ifelse
     ] def
 
-    /pixy pixs length pixx idiv def
+    /pixy ccrows 1 add linheight add def
 
     /borderleft
         linsym /borderleft 2 copy known { get } { pop pop 10 } ifelse pixx linpixs length sub 1 add sub
@@ -193,6 +195,7 @@ begin
     /pixs pixs
     /pixx pixx
     /pixy pixy
+    /rowmult rowmult
     /height pixy 72 div
     /width pixx 72 div
     /borderleft borderleft

src/databarexpandedstackedcomposite.ps.src

@@ -118,6 +118,7 @@ begin
     dup (pixy) get /linheight exch def
     /linsym exch def
     /linpixs linsym /pixs get def
+    /linrowmult linsym /rowmult get def
 
     %
     % Plot the separator
@@ -153,21 +154,23 @@ begin
     /pixx sep length def
     /cclpad [ pixx ccpixx sub 1 add 2 idiv {0} repeat ] def  % Add 1 to allow for odd difference
     /ccrpad [ pixx ccpixx sub 2 idiv {0} repeat ] def
+    /ccrows ccpixs length ccpixx idiv def
     /pixs [
         0 ccpixx ccpixs length 1 sub {  % Centre align composite
             /i exch def
             cclpad aload pop ccpixs i ccpixx getinterval aload pop ccrpad aload pop
         } for
         sep aload pop linpixs aload pop
     ] def
+    /rowmult [ ccrows { 1 } repeat 1 linrowmult aload pop ] def
 
     /txt [
         linsym /txt 2 copy known { get {
             aload pop 5 array astore  % No x offset needed; linear at column 0
         } forall } { pop pop } ifelse
     ] def
 
-    /pixy pixs length pixx idiv def
+    /pixy 0 rowmult {add} forall def
 
     % Quiet zone borders: T=2D, L/R=max(1D,2D), B=1D
     /borderleft
@@ -188,6 +191,7 @@ begin
     /pixs pixs
     /pixx pixx
     /pixy pixy
+    /rowmult rowmult
     /height pixy 72 div
     /width pixx 72 div
     /borderleft borderleft

src/databarlimitedcomposite.ps.src

@@ -139,14 +139,15 @@ begin
     /sep [ 0 sep 0 linpixs length 1 sub getinterval aload pop ] def  % Offset by 1; trim to match
 
     /linheight linheight cvi def
+    /ccrows ccpixs length ccpixx idiv def
     % ccpixx is 72 for CC-A and 82 for CC-B; linpixs length is 74
     ccpixx 72 eq {  % 3-col CC-A
         /pixs [
             0 ccpixx ccpixs length 1 sub {  % Left pad composite with 1 space & right pad with 1 space
                 /i exch def
                 0 ccpixs i ccpixx getinterval aload pop 0
             } for
-            sep aload pop linheight { linpixs aload pop } repeat
+            sep aload pop linpixs aload pop
         ] def
         /pixx linpixs length def  % 74
     } {  % 3-col CC-B
@@ -155,18 +156,19 @@ begin
                 /i exch def
                 ccpixs i ccpixx getinterval aload pop 0
             } for
-            0 0 0 0 0 0 0 0 0 sep aload pop linheight { 0 0 0 0 0 0 0 0 0 linpixs aload pop } repeat  % Left pad with 9 spaces
+            0 0 0 0 0 0 0 0 0 sep aload pop 0 0 0 0 0 0 0 0 0 linpixs aload pop  % Left pad with 9 spaces
         ] def
         /pixx ccpixx 1 add def  % 83
     } ifelse
+    /rowmult [ ccrows { 1 } repeat 1 linheight ] def
 
     /txt [
         linsym /txt 2 copy known { get {
             aload pop 4 -1 roll pixx linpixs length sub 1 add add 4 1 roll 5 array astore
         } forall } { pop pop } ifelse
     ] def
 
-    /pixy pixs length pixx idiv def
+    /pixy ccrows 1 add linheight add def
 
     /borderleft
         linsym /borderleft 2 copy known { get } { pop pop 10 } ifelse pixx linpixs length sub 1 add sub
@@ -186,6 +188,7 @@ begin
     /pixs pixs
     /pixx pixx
     /pixy pixy
+    /rowmult rowmult
     /height pixy 72 div
     /width pixx 72 div
     /borderleft borderleft