Complete the internal dontdraw conversions

terryburton · terryburton · commit 98a8028d9ef3 · 2026-01-12T06:44:49.000Z
diff --git a/src/databarexpandedcomposite.ps.src b/src/databarexpandedcomposite.ps.src
@@ -65,7 +65,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/databarexpandedstackedcomposite.ps.src b/src/databarexpandedstackedcomposite.ps.src
@@ -67,7 +67,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/databarlimitedcomposite.ps.src b/src/databarlimitedcomposite.ps.src
@@ -69,7 +69,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/databaromnicomposite.ps.src b/src/databaromnicomposite.ps.src
@@ -70,7 +70,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/databarstackedcomposite.ps.src b/src/databarstackedcomposite.ps.src
@@ -69,7 +69,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/databarstackedomnicomposite.ps.src b/src/databarstackedomnicomposite.ps.src
@@ -69,7 +69,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/databartruncatedcomposite.ps.src b/src/databartruncatedcomposite.ps.src
@@ -71,7 +71,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/ean13composite.ps.src b/src/ean13composite.ps.src
@@ -65,7 +65,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/ean8composite.ps.src b/src/ean8composite.ps.src
@@ -65,7 +65,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/gs1-128composite.ps.src b/src/gs1-128composite.ps.src
@@ -65,7 +65,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/swissqrcode.ps.src b/src/swissqrcode.ps.src
@@ -98,7 +98,7 @@ begin
     % So for now we simply do as we're told and paint over the top of the
     % barcode image that has been scaled to 46mm, user be damned!
     %
-    dontdraw not {
+    _render {
 
         gsave
         currentpoint translate
diff --git a/src/symbol.ps.src b/src/symbol.ps.src
@@ -111,7 +111,7 @@ begin
     //symbol.symbols barcode get exec
     dup /opt options put
 
-    dontdraw not { dup /ren get //symbol.renmap exch get exec } if
+    _render { dup /ren get //symbol.renmap exch get exec } if
 
     end
 
diff --git a/src/upcacomposite.ps.src b/src/upcacomposite.ps.src
@@ -65,7 +65,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts
diff --git a/src/upcecomposite.ps.src b/src/upcecomposite.ps.src
@@ -65,7 +65,7 @@ begin
         /uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not
     def
 
-    dontdraw { /usematrix true def } if
+    _render not { /usematrix true def } if
 
     %
     % Split the linear and composite parts

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ begin`
`65`	`65`	`/uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not`
`66`	`66`	`def`
`67`	`67`
`68`		`- dontdraw { /usematrix true def } if`
	`68`	`+ _render not { /usematrix true def } if`
`69`	`69`
`70`	`70`	`%`
`71`	`71`	`% Split the linear and composite parts`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ begin`
`67`	`67`	`/uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not`
`68`	`68`	`def`
`69`	`69`
`70`		`- dontdraw { /usematrix true def } if`
	`70`	`+ _render not { /usematrix true def } if`
`71`	`71`
`72`	`72`	`%`
`73`	`73`	`% Split the linear and composite parts`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ begin`
`69`	`69`	`/uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not`
`70`	`70`	`def`
`71`	`71`
`72`		`- dontdraw { /usematrix true def } if`
	`72`	`+ _render not { /usematrix true def } if`
`73`	`73`
`74`	`74`	`%`
`75`	`75`	`% Split the linear and composite parts`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ begin`
`70`	`70`	`/uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not`
`71`	`71`	`def`
`72`	`72`
`73`		`- dontdraw { /usematrix true def } if`
	`73`	`+ _render not { /usematrix true def } if`
`74`	`74`
`75`	`75`	`%`
`76`	`76`	`% Split the linear and composite parts`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ begin`
`71`	`71`	`/uk.co.terryburton.bwipp._dontdraw dup where {exch get} {pop false} ifelse or not`
`72`	`72`	`def`
`73`	`73`
`74`		`- dontdraw { /usematrix true def } if`
	`74`	`+ _render not { /usematrix true def } if`
`75`	`75`
`76`	`76`	`%`
`77`	`77`	`% Split the linear and composite parts`