hibccodablockf: Uplift

Author: terryburton

src/hibccodablockf.ps.src

@@ -38,17 +38,41 @@
 currentglobal
 true setglobal
 /setpacking where {pop currentpacking true setpacking} if
-10 dict
-dup /loadctx dup /uk.co.terryburton.bwipp findresource put
-dup /unloadctx dup /uk.co.terryburton.bwipp findresource put
+50 dict
 dup /raiseerror dup /uk.co.terryburton.bwipp findresource put
 dup /processoptions dup /uk.co.terryburton.bwipp findresource put
 dup /renmatrix dup /uk.co.terryburton.bwipp findresource put
 dup /codablockf dup /uk.co.terryburton.bwipp findresource put
 begin
+
+/hibccodablockf.barchars (0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%) readonly def
+
+/hibccodablockf.latevars dup 1 dict def load /init {
+
+    currentglobal
+    true setglobal
+
+    //hibccodablockf.latevars begin
+
+    /charvals 43 dict def
+    0 1 42 {
+        charvals exch dup //hibccodablockf.barchars exch 1 getinterval exch put
+    } for
+    /charvals charvals readonly def
+
+    /init { //hibccodablockf.latevars {def} forall } def
+
+    end
+
+    //hibccodablockf.latevars /init get exec
+
+    setglobal
+
+} bind put
+
 /hibccodablockf {
 
-    20 dict begin                 % Confine variables to local scope
+    20 dict begin
 
     /ctx null def
     /dontdraw false def
@@ -57,20 +81,15 @@ begin
     //processoptions exec /options exch def
     /barcode exch def
 
+    //hibccodablockf.latevars /init get exec
+
     barcode () eq {
         /bwipp.hibccodablockfEmptyData (The data must not be empty) //raiseerror exec
     } if
 
-    /hibccodablockf //loadctx exec
-
-    % Create a string of the available characters
-{
-    /barchars (0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%) def
-    /charvals 43 dict def
-    0 1 42 {charvals exch dup barchars exch 1 getinterval exch put} for
-} ctxdef
-
+    %
     % Validate the input
+    %
     0 1 barcode length 1 sub {
         barcode exch 1 getinterval charvals exch known not {
             /bwipp.hibccodablockfBadCharacter (HIBC Codablock F must contain only digits, capital letters, spaces and the symbols -.$/+%) //raiseerror exec
@@ -86,17 +105,19 @@ begin
     } for
     /checksum checksum 43 mod def
     validatecheck {
-        barcode barlen get barchars checksum get ne {
+        barcode barlen get //hibccodablockf.barchars checksum get ne {
             /bwipp.hibccodablockfBadCheckDigit (Incorrect HIBC Codablock F check digit provided) //raiseerror exec
         } if
         /barcode barcode 0 barlen getinterval def
     } if
 
     /barcode barlen 2 add string dup 1 barcode putinterval def
     barcode 0 43 put
-    barcode barlen 1 add barchars checksum get put
+    barcode barlen 1 add //hibccodablockf.barchars checksum get put
 
+    %
     % Get the result of encoding with codablockf
+    %
     options (dontdraw) true put
     options (validatecheck) false put
     /args barcode options //codablockf exec def
@@ -106,8 +127,6 @@ begin
 
     dontdraw not //renmatrix if
 
-    //unloadctx exec
-
     end
 
 }