d3aqr: Invert polarity of p0

Author: terryburton

src/d3aqr.ps.src

@@ -54,11 +54,6 @@ begin
 %
 /d3aqr.tips [ [ 6 2 ] [ 6 3 ]  [ 2 6 ] [ 3 6 ] ] readonly def
 
-%
-% x/y-positions of timing modules
-%
-/d3aqr.timingxs [ 19 23 27 31 ] readonly def
-
 %
 % Accepted D3:host pitch ratios mapped to (halfx, hostmod) cell counts.
 %
@@ -219,32 +214,27 @@ begin
     13 2 paintmodsym
 
     %
-    % Timing modules
-    %
-    //d3aqr.timingxs {
-        0 paintmodsym
-    } forall
-
-    %
-    % Place data bits and accumulated parity
+    % Place timing modules alongside data bits and accumulated parity.
     %
-    1
-    7 1 13 {
+    0
+    0 1 6 {
         /i exch def
+        i 2 mod 0 eq { 0 31 i 2 mul sub paintmod } if
         category -1 i mul bitshift 1 and
-        dup 1 eq { 45 i 2 mul sub 2 paintmod } if
+        dup 1 eq { 2 31 i 2 mul sub paintmod } if
         xor
     } for
-    1 eq { 33 2 paintmod } if  % parity
+    1 eq { 2 33 paintmod } if  % parity p0
 
     1
-    0 1 6 {
+    7 1 13 {
         /i exch def
+        i 2 mod 1 eq { 45 i 2 mul sub 0 paintmod } if
         category -1 i mul bitshift 1 and
-        dup 1 eq { 2 31 i 2 mul sub paintmod } if
+        dup 1 eq { 45 i 2 mul sub 2 paintmod } if
         xor
     } for
-    1 eq { 2 33 paintmod } if  % parity
+    1 eq { 33 2 paintmod } if  % parity p1
 
     %
     % Build the intermediate dictionary.

tests/ps_tests/d3aqr.ps.test

@@ -39,8 +39,8 @@
 %
 (https://zappar.com) (category=2842 version=2 eclevel=M fixedeclevel dontdraw)
 [
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0
     0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1
     0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1
     0 0 0 0 1 1 1 1 1 1 1 0 1 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 1 0 0 1 1 0 0
@@ -84,8 +84,8 @@
 [
     0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
     0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 1 1 1 1 1 1 1 0 0 0 0 0 1 0 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 0 0 0 0 0
-    0 0 1 0 0 0 0 0 1 0 1 1 1 1 0 1 1 0 1 0 1 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 0
+    0 0 1 1 1 1 1 1 1 0 0 0 0 0 1 0 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 0 1 1 0 0
+    0 0 1 0 0 0 0 0 1 0 1 1 1 1 0 1 1 0 1 0 1 0 1 0 1 0 0 0 0 0 1 0 0 1 1 0 0
     0 0 1 0 1 1 1 0 1 0 0 1 1 0 1 1 0 0 1 1 0 1 1 0 1 0 1 1 1 0 1 0 0 0 0 1 1
     0 0 1 0 1 1 1 0 1 0 0 1 0 1 0 0 1 1 0 0 1 1 1 0 1 0 1 1 1 0 1 0 0 0 0 1 1
     0 0 1 0 1 1 1 0 1 0 0 1 0 1 0 0 1 1 0 0 0 0 0 0 1 0 1 1 1 0 1 0 0 1 1 0 0
@@ -133,8 +133,8 @@
     0 0 1 0 0 0 0 0 1 0 0 1 0 0 1 0 1 0 1 1 0 1 0 1 1 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 0
     0 0 1 0 1 1 1 0 1 0 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 0 1 1 1 0 1 0 0 0 0 0 0
     0 0 1 0 1 1 1 0 1 0 1 0 1 1 0 1 1 0 1 0 1 0 1 1 0 1 0 0 1 0 1 1 1 0 1 0 0 0 0 0 0
-    0 0 1 0 1 1 1 0 1 0 0 0 1 1 0 1 1 0 0 0 0 0 0 1 0 1 1 0 1 0 1 1 1 0 1 0 0 0 0 0 0
-    0 0 1 0 0 0 0 0 1 0 0 1 1 1 0 1 1 0 1 0 0 0 1 0 1 1 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0
+    0 0 1 0 1 1 1 0 1 0 0 0 1 1 0 1 1 0 0 0 0 0 0 1 0 1 1 0 1 0 1 1 1 0 1 0 0 1 1 0 0
+    0 0 1 0 0 0 0 0 1 0 0 1 1 1 0 1 1 0 1 0 0 0 1 0 1 1 0 0 1 0 0 0 0 0 1 0 0 1 1 0 0
     0 0 1 1 1 1 1 1 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 1 1 1 1 1 1 0 0 0 0 1 1
     0 0 0 0 0 0 0 0 0 0 0 1 0 1 1 1 1 1 0 0 0 1 1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
     0 0 0 0 0 1 1 0 1 1 0 0 0 1 1 1 0 1 0 0 1 1 0 1 1 0 1 0 0 0 0 1 1 0 0 0 0 1 1 0 0
@@ -186,8 +186,8 @@
     0 0 1 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 1 0 1 0 1 1 1 0 1 1 1 1 0 1 0 0 0 0 0 1 0 0 0 0 0 0
     0 0 1 1 1 1 1 1 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0
     0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 1 0 0 0 0 0 1 0 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 1 1 1 0 1 0 1 0 0 1 0 1 1 0 1 1 1 0 0 0 0 1 1 0 1 0 1 1 1 1 0 0 1 1 1 0 0 0 0 0 0
-    0 0 1 0 1 0 0 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 0 0 1 0 1 1 0 1 0 0 1 1 1 1 0 0 1 0 0 0 0 0 0
+    0 0 0 0 1 1 1 0 1 0 1 0 0 1 0 1 1 0 1 1 1 0 0 0 0 1 1 0 1 0 1 1 1 1 0 0 1 1 1 0 0 1 1 0 0
+    0 0 1 0 1 0 0 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 0 0 1 0 1 1 0 1 0 0 1 1 1 1 0 0 1 0 0 1 1 0 0
     0 0 1 0 1 1 0 1 1 1 0 0 1 1 0 1 0 0 1 1 1 0 1 1 0 1 1 1 1 1 1 0 1 0 1 0 0 0 1 0 0 0 0 1 1
     0 0 0 0 1 1 1 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 0 1 1 0 0 1 1 0 0 1 1 1 1 0 1 1 0 0 0 0 1 1
     0 0 1 1 0 0 0 1 1 1 1 1 0 0 1 0 0 1 1 0 0 1 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 1 0 0 0 1 1 0 0