Skip to content

Commit a5b2d1e

Browse files
committed
d3aqr: Invert polarity of p0
1 parent efaf2e4 commit a5b2d1e

2 files changed

Lines changed: 18 additions & 28 deletions

File tree

src/d3aqr.ps.src

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ begin
5454
%
5555
/d3aqr.tips [ [ 6 2 ] [ 6 3 ] [ 2 6 ] [ 3 6 ] ] readonly def
5656

57-
%
58-
% x/y-positions of timing modules
59-
%
60-
/d3aqr.timingxs [ 19 23 27 31 ] readonly def
61-
6257
%
6358
% Accepted D3:host pitch ratios mapped to (halfx, hostmod) cell counts.
6459
%
@@ -219,32 +214,27 @@ begin
219214
13 2 paintmodsym
220215

221216
%
222-
% Timing modules
223-
%
224-
//d3aqr.timingxs {
225-
0 paintmodsym
226-
} forall
227-
228-
%
229-
% Place data bits and accumulated parity
217+
% Place timing modules alongside data bits and accumulated parity.
230218
%
231-
1
232-
7 1 13 {
219+
0
220+
0 1 6 {
233221
/i exch def
222+
i 2 mod 0 eq { 0 31 i 2 mul sub paintmod } if
234223
category -1 i mul bitshift 1 and
235-
dup 1 eq { 45 i 2 mul sub 2 paintmod } if
224+
dup 1 eq { 2 31 i 2 mul sub paintmod } if
236225
xor
237226
} for
238-
1 eq { 33 2 paintmod } if % parity
227+
1 eq { 2 33 paintmod } if % parity p0
239228

240229
1
241-
0 1 6 {
230+
7 1 13 {
242231
/i exch def
232+
i 2 mod 1 eq { 45 i 2 mul sub 0 paintmod } if
243233
category -1 i mul bitshift 1 and
244-
dup 1 eq { 2 31 i 2 mul sub paintmod } if
234+
dup 1 eq { 45 i 2 mul sub 2 paintmod } if
245235
xor
246236
} for
247-
1 eq { 2 33 paintmod } if % parity
237+
1 eq { 33 2 paintmod } if % parity p1
248238

249239
%
250240
% Build the intermediate dictionary.

tests/ps_tests/d3aqr.ps.test

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
%
4040
(https://zappar.com) (category=2842 version=2 eclevel=M fixedeclevel dontdraw)
4141
[
42-
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
43-
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
42+
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
43+
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
4444
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
4545
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
4646
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 @@
8484
[
8585
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
8686
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
87-
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
88-
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
87+
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
88+
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
8989
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
9090
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
9191
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 @@
133133
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
134134
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
135135
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
136-
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
137-
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
136+
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
137+
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
138138
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
139139
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
140140
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 @@
186186
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
187187
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
188188
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
189-
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
190-
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
189+
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
190+
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
191191
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
192192
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
193193
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

0 commit comments

Comments
 (0)