Define modunit as an option accessible only from global_ctx

terryburton · terryburton · commit 5865a95c74c3 · 2026-04-15T14:26:29.000+01:00
diff --git a/src/azteccode.ps.src b/src/azteccode.ps.src
@@ -332,7 +332,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -344,6 +343,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -1132,8 +1136,8 @@ begin
     /pixs pixs
     /pixx size
     /pixy size
-    /height size 2 mul 72 div
-    /width size 2 mul 72 div
+    /height size modunit mul 72 div
+    /width size modunit mul 72 div
     /strictspec strictspec
     /loosespec loosespec
     /xdim xdim
diff --git a/src/codeone.ps.src b/src/codeone.ps.src
@@ -396,7 +396,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -412,6 +411,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -1228,8 +1232,8 @@ begin
     /pixs pixs
     /pixx cols
     /pixy rows
-    /height rows 72 div 2 mul
-    /width cols 72 div 2 mul
+    /height rows modunit mul 72 div
+    /width cols modunit mul 72 div
     stype ttype or {
         /borderleft 1.0
         /borderright 1.0
diff --git a/src/datamatrix.ps.src b/src/datamatrix.ps.src
@@ -386,7 +386,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -398,6 +397,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -1202,8 +1206,8 @@ begin
     /pixs pixs
     /pixx cols
     /pixy rows
-    /height rows 2 mul 72 div
-    /width cols 2 mul 72 div
+    /height rows modunit mul 72 div
+    /width cols modunit mul 72 div
     /borderleft 1.0
     /borderright 1.0
     /bordertop 1.0
diff --git a/src/dotcode.ps.src b/src/dotcode.ps.src
@@ -268,7 +268,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -284,6 +283,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -1312,8 +1316,8 @@ begin
     /pixs pixs
     /pixx columns
     /pixy rows
-    /height rows 2 mul 72 div
-    /width columns 2 mul 72 div
+    /height rows modunit mul 72 div
+    /width columns modunit mul 72 div
     /borderleft 3.0
     /borderright 3.0
     /bordertop 3.0
diff --git a/src/gs1datamatrix.ps.src b/src/gs1datamatrix.ps.src
@@ -68,7 +68,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -139,7 +138,6 @@ begin
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
-    options (modunit) modunit put
 
     /uk.co.terryburton.bwipp._dontdraw true def
     barcode options //datamatrix exec /args exch def
diff --git a/src/gs1datamatrixrectangular.ps.src b/src/gs1datamatrixrectangular.ps.src
@@ -68,7 +68,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -140,7 +139,6 @@ begin
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
-    options (modunit) modunit put
 
     /uk.co.terryburton.bwipp._dontdraw true def
     barcode options //datamatrix exec /args exch def
diff --git a/src/gs1dldatamatrix.ps.src b/src/gs1dldatamatrix.ps.src
@@ -69,7 +69,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -119,7 +118,6 @@ begin
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
-    options (modunit) modunit put
     /uk.co.terryburton.bwipp._dontdraw true def
     barcode options //datamatrix exec /args exch def
 
diff --git a/src/gs1dlqrcode.ps.src b/src/gs1dlqrcode.ps.src
@@ -69,7 +69,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -119,7 +118,6 @@ begin
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
-    options (modunit) modunit put
     /uk.co.terryburton.bwipp._dontdraw true def
     barcode options //qrcode exec /args exch def
 
diff --git a/src/gs1dotcode.ps.src b/src/gs1dotcode.ps.src
@@ -67,7 +67,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -138,7 +137,6 @@ begin
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
-    options (modunit) modunit put
 
     /uk.co.terryburton.bwipp._dontdraw true def
     barcode options //dotcode exec /args exch def
diff --git a/src/gs1qrcode.ps.src b/src/gs1qrcode.ps.src
@@ -68,7 +68,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -140,7 +139,6 @@ begin
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
-    options (modunit) modunit put
 
     /uk.co.terryburton.bwipp._dontdraw true def
     barcode options //qrcode exec /args exch def
diff --git a/src/hanxin.ps.src b/src/hanxin.ps.src
@@ -586,7 +586,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -598,6 +597,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -1126,8 +1130,8 @@ begin
     /pixs pixs
     /pixx size
     /pixy size
-    /height size 2 mul 72 div
-    /width size 2 mul 72 div
+    /height size modunit mul 72 div
+    /width size modunit mul 72 div
     /borderleft 3.0
     /borderright 3.0
     /bordertop 3.0
diff --git a/src/jabcode.ps.src b/src/jabcode.ps.src
@@ -347,7 +347,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -388,6 +387,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -1441,8 +1445,8 @@ begin
     /pixx cols
     /pixy rows
     /colormap palette
-    /height rows 2 mul 72 div
-    /width  cols 2 mul 72 div
+    /height rows modunit mul 72 div
+    /width  cols modunit mul 72 div
     /borderleft 0.0
     /borderright 0.0
     /bordertop 0.0
diff --git a/src/qrcode.ps.src b/src/qrcode.ps.src
@@ -708,7 +708,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
     /format (unset) def    % full or micro. rMQR symbols are specified using version
     /version (unset) def   % 1-40 or M1-M4 or R7x43, etc
     /eclevel (unset) def   % full: L, M, Q, H; micro: L, M, Q; rmqr: M, H
@@ -728,6 +727,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -1854,8 +1858,8 @@ begin
     /pixs pixs
     /pixx cols
     /pixy rows
-    /height rows 2 mul 72 div
-    /width cols 2 mul 72 div
+    /height rows modunit mul 72 div
+    /width cols modunit mul 72 div
     /borderleft format (full) eq {4.0} {2.0} ifelse
     /borderright format (full) eq {4.0} {2.0} ifelse
     /bordertop format (full) eq {4.0} {2.0} ifelse
diff --git a/src/ultracode.ps.src b/src/ultracode.ps.src
@@ -245,7 +245,6 @@ begin
     /xnom -1.0 def
     /xmin -1.0 def
     /xmax -1.0 def
-    /modunit 2 def
 
     /apply //processoptions exec /options exch def
     /global_encoder_defaults //render exec
@@ -257,6 +256,11 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
+    /modunit 2 def
+    /uk.co.terryburton.bwipp.global_ctx dup where {
+        exch get /default_modunit 2 copy known {get /modunit exch def} {pop pop} ifelse
+    } {pop} ifelse
+
     %
     % Apply AST spec overrides and resolve physical specification
     %
@@ -539,8 +543,8 @@ begin
     /pixs pixs
     /pixx columns
     /pixy rows
-    /height rows 72 div 2 mul
-    /width columns 72 div 2 mul
+    /height rows modunit mul 72 div
+    /width columns modunit mul 72 div
     /colormap //ultracode.colormap
     /borderleft 1.0
     /borderright 1.0
