Avoid mag leaking; tests for mag and ast leaks; additional bestfit tests

terryburton · terryburton · commit 9a128d82c670 · 2026-04-07T01:14:01.000+01:00
diff --git a/src/databarexpandedcomposite.ps.src b/src/databarexpandedcomposite.ps.src
@@ -98,6 +98,7 @@ begin
     /databarexpandedcomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databarexpandedstacked.ps.src b/src/databarexpandedstacked.ps.src
@@ -87,6 +87,7 @@ begin
     %
     options (format) (expandedstacked) put
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databarexpandedstackedcomposite.ps.src b/src/databarexpandedstackedcomposite.ps.src
@@ -101,6 +101,7 @@ begin
     /databarexpandedstackedcomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databarlimitedcomposite.ps.src b/src/databarlimitedcomposite.ps.src
@@ -102,6 +102,7 @@ begin
     /databarlimitedcomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databaromnicomposite.ps.src b/src/databaromnicomposite.ps.src
@@ -103,6 +103,7 @@ begin
     /databaromnicomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databarstacked.ps.src b/src/databarstacked.ps.src
@@ -121,6 +121,7 @@ begin
     %
     options (format) (stacked) put
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databarstackedcomposite.ps.src b/src/databarstackedcomposite.ps.src
@@ -103,6 +103,7 @@ begin
     /databarstackedcomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databarstackedomni.ps.src b/src/databarstackedomni.ps.src
@@ -121,6 +121,7 @@ begin
     %
     options (format) (stackedomni) put
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databarstackedomnicomposite.ps.src b/src/databarstackedomnicomposite.ps.src
@@ -103,6 +103,7 @@ begin
     /databarstackedomnicomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databartruncated.ps.src b/src/databartruncated.ps.src
@@ -121,6 +121,7 @@ begin
     %
     options (format) (truncated) put
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/databartruncatedcomposite.ps.src b/src/databartruncatedcomposite.ps.src
@@ -104,6 +104,7 @@ begin
     /databartruncatedcomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/ean13composite.ps.src b/src/ean13composite.ps.src
@@ -102,6 +102,7 @@ begin
     /resolve_physspec //render exec
 
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/ean8composite.ps.src b/src/ean8composite.ps.src
@@ -101,6 +101,7 @@ begin
     /ean8composite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/gs1-128.ps.src b/src/gs1-128.ps.src
@@ -154,9 +154,9 @@ begin
     options (parsefnc) true put
     options (propspec) propspec put
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (ast) undef
+    options (mag) undef
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
diff --git a/src/gs1-128composite.ps.src b/src/gs1-128composite.ps.src
@@ -98,6 +98,7 @@ begin
     /gs1-128composite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/gs1datamatrix.ps.src b/src/gs1datamatrix.ps.src
@@ -131,9 +131,9 @@ begin
     %
     options (parse) undef
     options (ast) undef
+    options (mag) undef
     options (parsefnc) true put
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (xnom) xnom put
     options (xmin) xmin put
diff --git a/src/gs1datamatrixrectangular.ps.src b/src/gs1datamatrixrectangular.ps.src
@@ -131,10 +131,10 @@ begin
     %
     options (parse) undef
     options (ast) undef
+    options (mag) undef
     options (parsefnc) true put
     options (format) (rectangle) put
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (xnom) xnom put
     options (xmin) xmin put
diff --git a/src/gs1dldatamatrix.ps.src b/src/gs1dldatamatrix.ps.src
@@ -112,8 +112,8 @@ begin
     %
     options (parse) undef
     options (ast) undef
+    options (mag) undef
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (xnom) xnom put
     options (xmin) xmin put
diff --git a/src/gs1dlqrcode.ps.src b/src/gs1dlqrcode.ps.src
@@ -112,8 +112,8 @@ begin
     %
     options (parse) undef
     options (ast) undef
+    options (mag) undef
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (xnom) xnom put
     options (xmin) xmin put
diff --git a/src/gs1dotcode.ps.src b/src/gs1dotcode.ps.src
@@ -130,9 +130,9 @@ begin
     %
     options (parse) undef
     options (ast) undef
+    options (mag) undef
     options (parsefnc) true put
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (xnom) xnom put
     options (xmin) xmin put
diff --git a/src/gs1northamericancoupon.ps.src b/src/gs1northamericancoupon.ps.src
@@ -121,9 +121,9 @@ begin
 
     % Get the result of encoding with databarexpandedstacked
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (ast) undef
+    options (mag) undef
     options (xnom) xnom put
     options (xmin) xmin put
     options (xmax) xmax put
diff --git a/src/gs1qrcode.ps.src b/src/gs1qrcode.ps.src
@@ -131,9 +131,9 @@ begin
     %
     options (parse) undef
     options (ast) undef
+    options (mag) undef
     options (parsefnc) true put
     options (physspec) physspec put
-    options (mag) mag put
     options (xdim) xdim put
     options (hdim) hdim put
     options (xnom) xnom put
diff --git a/src/isbn.ps.src b/src/isbn.ps.src
@@ -287,6 +287,7 @@ begin
     %
     options (addongap) addongap put
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/ismn.ps.src b/src/ismn.ps.src
@@ -266,6 +266,7 @@ begin
     %
     options (addongap) addongap put
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/issn.ps.src b/src/issn.ps.src
@@ -213,6 +213,7 @@ begin
     %
     options (addongap) addongap put
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/itf14.ps.src b/src/itf14.ps.src
@@ -156,6 +156,7 @@ begin
     options (propspec) propspec put
     options (physspec) physspec put
     options (ast) undef
+    options (mag) undef
     options (xdim) xdim put
     options (xnom) xnom put
     options (xmin) xmin put
diff --git a/src/upcacomposite.ps.src b/src/upcacomposite.ps.src
@@ -101,6 +101,7 @@ begin
     /upcacomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/src/upcecomposite.ps.src b/src/upcecomposite.ps.src
@@ -101,6 +101,7 @@ begin
     /upcecomposite ast /apply_ast //render exec not { //raiseerror exec } if
     /resolve_physspec //render exec
     options (ast) undef
+    options (mag) undef
     options (propspec) propspec put
     options (physspec) physspec put
     options (xdim) xdim put
diff --git a/tests/ps_tests/ean13composite.ps.test b/tests/ps_tests/ean13composite.ps.test
@@ -232,3 +232,9 @@
 /uk.co.terryburton.bwipp.global_ctx << /enabledebug true /enabledontdraw true /bestfit true >> def
 { (9520123456788|\(21\)A1B2C3D4E5F6G7H8) (dontdraw) ean13composite dup /physspec get exch /xdim get 2 array astore } [true 0.330] isEqual
 /uk.co.terryburton.bwipp.global_ctx << /enabledebug true /enabledontdraw true >> def
+
+%
+% ast consumed: does not leak to gs1-cc/micropdf417
+% (micropdf417 would error on ast=gs1.sst2 if it leaked)
+%
+{ 0 0 moveto (9520123456788|\(21\)A1B2C3D4E5F6G7H8) (ast=gs1.sst2) ean13composite true } true isEqual
diff --git a/tests/ps_tests/ean8.ps.test b/tests/ps_tests/ean8.ps.test
@@ -71,4 +71,4 @@
 { (12345670) (dontdraw propspec height=0.5) ean8 /bhs get 0 get 1 array astore } [0.5] isEqual
 
 % physspec: xdim resolves from default AST xnom (0.330)
-{ (12345670) (dontdraw physspec) ean8 dup /physspec get exch /xdim get 2 array astore } [true 0.330] isEqual
+{ (12345670) (dontdraw physspec) ean8 dup /physspec get exch /xdim get 2 array astore } [true 0.330] isEqual
diff --git a/tests/ps_tests/ean8composite.ps.test b/tests/ps_tests/ean8composite.ps.test
@@ -227,3 +227,8 @@
 
 % propspec with SST smoke test
 { 0 0 moveto (95200002|\(21\)A12345678) (propspec) ean8composite true } true isEqual
+
+%
+% physspec mag through composite: mag consumed at outer layer, no leak to inner
+%
+{ 0 0 moveto (95200002|\(21\)A12345678) (physspec mag=2) ean8composite true } true isEqual
diff --git a/tests/ps_tests/gs1-128.ps.test b/tests/ps_tests/gs1-128.ps.test
@@ -90,3 +90,8 @@
 /uk.co.terryburton.bwipp.global_ctx << /enabledebug true /enabledontdraw true /bestfit true >> def
 { (\(01\)09521234543213\(3103\)000123) (dontdraw ast=gs1.sst2) gs1-128 dup /physspec get exch /xdim get 2 array astore } [true 0.495] isEqual
 /uk.co.terryburton.bwipp.global_ctx << /enabledebug true /enabledontdraw true >> def
+
+%
+% ast consumed: does not leak to code128
+%
+{ 0 0 moveto (\(01\)09521234543213\(3103\)000123) (includetext ast=gs1.sst2) gs1-128 true } true isEqual
diff --git a/tests/ps_tests/gs1-128composite.ps.test b/tests/ps_tests/gs1-128composite.ps.test
@@ -457,3 +457,8 @@
     /rowmult get dup length 1 sub get
     1 array astore
 } [36] isEqual
+
+%
+% ast consumed: does not leak to gs1-cc/pdf417
+%
+{ 0 0 moveto (\(00\)095287654321012346|\(02\)09521234543213\(37\)24\(10\)1234567ABCDEFG) (ast=gs1.sst2 ccversion=c) gs1-128composite true } true isEqual
diff --git a/tests/ps_tests/itf14.ps.test b/tests/ps_tests/itf14.ps.test
@@ -68,3 +68,14 @@
 { (0952876543210) (dontdraw) itf14 dup /physspec get exch /xdim get 2 array astore } [true 0.495] isEqual
 { (0952876543210) (dontdraw) itf14 /bhs get 0 get 1 array astore } [0.8909] isEqual
 /uk.co.terryburton.bwipp.global_ctx << /enabledebug true /enabledontdraw true >> def
+
+%
+% physspec mag through wrapper: mag consumed at outer layer
+%
+{ 0 0 moveto (0952876543210) (physspec mag=1.5) itf14 true } true isEqual
+
+%
+% ast consumed: does not leak to interleaved2of5
+% (interleaved2of5 would error on ast=gs1.sst2 if it leaked)
+%
+{ 0 0 moveto (0952876543210) (ast=gs1.sst2) itf14 true } true isEqual
diff --git a/tests/ps_tests/renderresolve.ps.test b/tests/ps_tests/renderresolve.ps.test
@@ -359,3 +359,76 @@
     physspec 1 array astore
     end
 } [false] isEqual
+
+%
+% global_encoder_defaults: bestfit from global_ctx implies physspec
+%
+{
+    8 dict begin
+    /propspec false def /bestfit false def /physspec false def
+    /uk.co.terryburton.bwipp.global_ctx << /bestfit true >> def
+    /global_encoder_defaults render
+    physspec bestfit 2 array astore
+    end
+} [true true] isEqual
+
+%
+% global_encoder_defaults: physspec from global_ctx
+%
+{
+    8 dict begin
+    /propspec false def /bestfit false def /physspec false def
+    /uk.co.terryburton.bwipp.global_ctx << /physspec true >> def
+    /global_encoder_defaults render
+    physspec bestfit 2 array astore
+    end
+} [true false] isEqual
+
+%
+% global_encoder_defaults: propspec from global_ctx
+%
+{
+    8 dict begin
+    /propspec false def /bestfit false def /physspec false def
+    /uk.co.terryburton.bwipp.global_ctx << /propspec true >> def
+    /global_encoder_defaults render
+    propspec physspec 2 array astore
+    end
+} [true false] isEqual
+
+%
+% global_encoder_defaults: user option overrides (not downgraded by global_ctx)
+%
+{
+    8 dict begin
+    /propspec true def /bestfit false def /physspec true def
+    /uk.co.terryburton.bwipp.global_ctx << >> def
+    /global_encoder_defaults render
+    physspec propspec 2 array astore
+    end
+} [true true] isEqual
+
+%
+% global_encoder_defaults: suppressed by _dontdraw (sub-encoder)
+%
+{
+    8 dict begin
+    /propspec false def /bestfit false def /physspec false def
+    /uk.co.terryburton.bwipp.global_ctx << /bestfit true /propspec true >> def
+    /uk.co.terryburton.bwipp._dontdraw true def
+    /global_encoder_defaults render
+    physspec propspec bestfit 3 array astore
+    end
+} [false false false] isEqual
+
+%
+% global_encoder_defaults: not suppressed without _dontdraw
+%
+{
+    8 dict begin
+    /propspec false def /bestfit false def /physspec false def
+    /uk.co.terryburton.bwipp.global_ctx << /bestfit true /propspec true >> def
+    /global_encoder_defaults render
+    physspec propspec bestfit 3 array astore
+    end
+} [true true true] isEqual

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ begin`
`87`	`87`	`%`
`88`	`88`	`options (format) (expandedstacked) put`
`89`	`89`	`options (ast) undef`
	`90`	`+ options (mag) undef`
`90`	`91`	`options (propspec) propspec put`
`91`	`92`	`options (physspec) physspec put`
`92`	`93`	`options (xdim) xdim put`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ begin`
`121`	`121`	`%`
`122`	`122`	`options (format) (stacked) put`
`123`	`123`	`options (ast) undef`
	`124`	`+ options (mag) undef`
`124`	`125`	`options (propspec) propspec put`
`125`	`126`	`options (physspec) physspec put`
`126`	`127`	`options (xdim) xdim put`