From 9c59ad7902b46e9b1c475463d79c1cdbaeecd7bc Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Tue, 10 Aug 2021 21:47:49 -0700 Subject: [PATCH 1/3] Write "long zero" b-string for END record padding in mkoasis.tcl 0x80 ... 0x80 0x00 instead of 0x00 ... 0x00 0x00 which wasn't a valid b-string --- testdata/oasis/mkoasis.tcl | 5 ++++- testdata/oasis/t1.1.oas | Bin 291 -> 291 bytes testdata/oasis/t1.2.oas | Bin 289 -> 289 bytes testdata/oasis/t1.3.oas | Bin 290 -> 290 bytes testdata/oasis/t1.4.oas | Bin 292 -> 292 bytes testdata/oasis/t1.5.oas | Bin 296 -> 296 bytes testdata/oasis/t10.1.oas | Bin 425 -> 425 bytes testdata/oasis/t11.1.oas | Bin 501 -> 501 bytes testdata/oasis/t11.2.oas | Bin 515 -> 515 bytes testdata/oasis/t11.3.oas | Bin 503 -> 503 bytes testdata/oasis/t11.4.oas | Bin 533 -> 533 bytes testdata/oasis/t11.5.oas | Bin 515 -> 515 bytes testdata/oasis/t11.6.oas | Bin 552 -> 552 bytes testdata/oasis/t11.7.oas | Bin 447 -> 447 bytes testdata/oasis/t11.8.oas | Bin 445 -> 445 bytes testdata/oasis/t11.9.oas | Bin 445 -> 445 bytes testdata/oasis/t12.1.oas | Bin 340 -> 340 bytes testdata/oasis/t13.1.oas | Bin 535 -> 535 bytes testdata/oasis/t13.2.oas | Bin 493 -> 493 bytes testdata/oasis/t13.3.oas | Bin 698 -> 698 bytes testdata/oasis/t13.4.oas | Bin 698 -> 698 bytes testdata/oasis/t14.1.oas | Bin 609 -> 609 bytes testdata/oasis/t2.1.oas | Bin 295 -> 295 bytes testdata/oasis/t2.2.oas | Bin 304 -> 304 bytes testdata/oasis/t2.3.oas | Bin 305 -> 305 bytes testdata/oasis/t2.4.oas | Bin 306 -> 306 bytes testdata/oasis/t2.5.oas | Bin 306 -> 306 bytes testdata/oasis/t2.6.oas | Bin 307 -> 307 bytes testdata/oasis/t2.7.oas | Bin 304 -> 304 bytes testdata/oasis/t3.1.oas | Bin 501 -> 501 bytes testdata/oasis/t3.10.oas | Bin 305 -> 305 bytes testdata/oasis/t3.11.oas | Bin 306 -> 306 bytes testdata/oasis/t3.12.oas | Bin 492 -> 492 bytes testdata/oasis/t3.2.oas | Bin 494 -> 494 bytes testdata/oasis/t3.3.oas | Bin 311 -> 311 bytes testdata/oasis/t3.4.oas | Bin 310 -> 310 bytes testdata/oasis/t3.5.oas | Bin 492 -> 492 bytes testdata/oasis/t3.6.oas | Bin 308 -> 308 bytes testdata/oasis/t3.7.oas | Bin 306 -> 306 bytes testdata/oasis/t3.8.oas | Bin 306 -> 306 bytes testdata/oasis/t3.9.oas | Bin 305 -> 305 bytes testdata/oasis/t4.1.oas | Bin 390 -> 390 bytes testdata/oasis/t4.2.oas | Bin 412 -> 412 bytes testdata/oasis/t5.1.oas | Bin 506 -> 506 bytes testdata/oasis/t5.2.oas | Bin 16310 -> 16310 bytes testdata/oasis/t5.3.oas | Bin 529 -> 529 bytes testdata/oasis/t6.1.oas | Bin 392 -> 392 bytes testdata/oasis/t7.1.oas | Bin 429 -> 429 bytes testdata/oasis/t8.1.oas | Bin 412 -> 412 bytes testdata/oasis/t8.2.oas | Bin 347 -> 347 bytes testdata/oasis/t8.3.oas | Bin 350 -> 350 bytes testdata/oasis/t8.4.oas | Bin 361 -> 361 bytes testdata/oasis/t8.5.oas | Bin 350 -> 350 bytes testdata/oasis/t8.6.oas | Bin 404 -> 404 bytes testdata/oasis/t8.7.oas | Bin 350 -> 350 bytes testdata/oasis/t8.8.oas | Bin 435 -> 435 bytes testdata/oasis/t9.1.oas | Bin 676 -> 676 bytes testdata/oasis/t9.2.oas | Bin 328 -> 328 bytes 58 files changed, 4 insertions(+), 1 deletion(-) diff --git a/testdata/oasis/mkoasis.tcl b/testdata/oasis/mkoasis.tcl index 235c92389..d621be01b 100755 --- a/testdata/oasis/mkoasis.tcl +++ b/testdata/oasis/mkoasis.tcl @@ -167,7 +167,10 @@ proc header { } { proc tail {} { global output record END - puts -nonewline $output [ binary format {x255} ] + # 254-byte padding string (uint 0 written as 0x80 0x80 ... 0x80 0x00) + for { set i 0 } { $i < 253 } { incr i } { byte 128 } + byte 0; + uint 0; # Validation scheme: No validation } diff --git a/testdata/oasis/t1.1.oas b/testdata/oasis/t1.1.oas index df53be8171fd203ad93988ba70e19df35dd2ae9f..365928525bd0b7102a2afe8cc6cf2ad4b306456d 100644 GIT binary patch literal 291 lcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfC88rMlxVv007dZgBt(< literal 291 kcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfC89Mcq5Mk01$Kpn*aa+ diff --git a/testdata/oasis/t1.2.oas b/testdata/oasis/t1.2.oas index f6b2eaa72e7b1fb63a2371bfc2aa6f23dc4827cf..d7a719bde29bba19e31506ffcdbe41bab4ebfbd9 100644 GIT binary patch literal 289 kcmY!lcJ=kt^>+;R4CduxWH!_@U}9oG222ej889#a0MV0zFaQ7m literal 289 kcmY!lcJ=kt^>+;R4CduxWH!_@U}9oG2B+;R4CduxWH!_@VBun6Kn6?=BN;F-0086>f<6EM literal 290 kcmY!lcJ=kt^>+;R4CduxWH!_@VBun6Kn6_6oDs+d03qN5z5oCK diff --git a/testdata/oasis/t1.4.oas b/testdata/oasis/t1.4.oas index 2af35cd0f8953f3bb3cd751c8041bb3c697fbae1..4cb9ffd6bb833280755ab6e4d4be1442eaeb042e 100644 GIT binary patch literal 292 ncmY!lcJ=kt^>+;R4CduxWH!_@U}IqLaAZIRObsI$FfafBZ+;R4CduxWH!_@U}IqLaAZIROvs!O$OZtdSOhx& diff --git a/testdata/oasis/t1.5.oas b/testdata/oasis/t1.5.oas index 0175407c1ebe5c8e8adf3a46bc096dd05398af5c..cfc4f5e097439b69413b57804b45cfd286993dee 100644 GIT binary patch literal 296 ocmY!lcJ=kt^>+;R4CduxWH!_@U}pdWO$P`KC7BvVGGJf;09}uQoB#j- literal 296 ncmY!lcJ=kt^>+;R4CduxWH!_@U}pdWO$P`KC7DooBaZ_Bn@+;R4CduxWH!_@V0gjKfDHH;9YvBEnYcuRof#dO7)2ybFrH)-29qKZ z6PPD53xi1kWC=b-Cy*WyE}$MKh@KN*Jtu(rCooR{>zTj|)&r9eY+!U0G)PI|V-E2T X0CK=47_kaFgZNC0ObsI$FfafBrf8op literal 425 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHH;9YvBEnYcuRof#dO7)2ybFrH)-29qKZ z6PPD53xi1kWC=b-Cy*WyE}$MKh@KN*Jtu(rCooR{>zTj|)&r9eY+!U0G)PI|V-E2T W0CK=47_kaFgZNC0Ovr8;fouTeC?Kx@ diff --git a/testdata/oasis/t11.1.oas b/testdata/oasis/t11.1.oas index a2b85958e22ec41234cbc5156e0188b7759d1b4f..0e78f05c726254e3915490af1bc59c95547d4b85 100644 GIT binary patch literal 501 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iWpw7{$%9h2AL2a=I9gZYQ)Qfq~HTH14scMFOnDszi>38BNO8Veg;{w s-;7LL{9N1&%xjoZQWwZG$ckDsGBL1#cqt$B7-VJG7?~PIGGJf;0DtJUQ2+n{ literal 501 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iWpw7{$%9h2AL2a=I9gZYQ)Qfq~HTH14scMFOnDszi>38BNO8Veg;{w o-;7LL{9N1&%xjoZQWwZG$ckDsGBL1#cqt$B7-VJGfZUM{0KKR-(EtDd diff --git a/testdata/oasis/t11.2.oas b/testdata/oasis/t11.2.oas index 85fd6da818de674ddbb663387530c97b33f26b34..9da427943da716aaa03472c145c3371b51f55775 100644 GIT binary patch literal 515 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iW+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iW+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iW*PxI{K1N3Yk!nV!loN~$7x-n= z88{@lxIvQfVU9kbu0}|5ADK9~_;`^7I1y}F1XG3+(-eN;XhugS#tZxmvSPm(nYj45 jxEYw&Fr}m}kY|t;wPs{uU;*(`KIk#XGBu23z`y_i@I<$R literal 503 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iW*PxI{K1N3Yk!nV!loN~$7x-n= z88{@lxIvQfVU9kbu0}|5ADK9~_;`^7I1y}F1XG3+(-eN;XhugS#tZxmvSPm(nYj45 ixEYw&Fr}m}kY|t;wPs{uU;*(`KIk#XG9mkL1hN4x6FCC_ diff --git a/testdata/oasis/t11.4.oas b/testdata/oasis/t11.4.oas index fc374952eb26d91b56e99303da9eb0ce3453ee80..9452fb0b15c9dd5c39f1a1bcc693d399d4c327d3 100644 GIT binary patch literal 533 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iW*PxI{K1N58YDT7%6O1=l7P9d% zhxi8wZeVo0$+Cb=MxB8}l8YOpGCs`FC)CwQ(12kAv&=^(4lX`kK>?r&PCNg X1+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iW*PxI{K1N58YDT7%6O1=l7P9d% zhxi8wZeVo0$+Cb=MxB8}l8YOpGCs`FC)CwQ(12kAv&=^(4lX`kK>?r&PCNg X1MaBajUM$8+;R4CduxWH!_@V0gjKfDHH;9R)RG zBNHRgNCsK4|BOsr{9N1&%xjoZQWwYrg+%QcnHX3=+>{S`K)wtcBNtylQGP*iNl|8A zx@U@^5f7I+;R4CduxWH!_@V0gjKfDHH;9R)RG zBNHRgNCsK4|BOsr{9N1&%xjoZQWwYrg+%QcnHX3=+>{S`K)wtcBNtylQGP*iNl|8A zx@U@^5f7I+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iWh4o0S% foDHn2G-cWOg5%v?g5yEXat#WJWNH}6fPn!3vR1+b literal 552 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDE|!0*dkrf=h}r^U^(242^iWh4o0S% foDHn2G-cWOg5%v?g5yEXat#WJWI_&-5y%Dr@D@Xa diff --git a/testdata/oasis/t11.7.oas b/testdata/oasis/t11.7.oas index 3efe75cfd684f1e3dc51642cde5538fc1ddbc1b8..a17cbf9b4df6f26f85b5168d3670ed434591981a 100644 GIT binary patch literal 447 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rINdUHQUi+e3k5ooY;YEBNwU;{1==K!#*0WSlRxFHuiR9r>|uGmPV Vnvp5x1mg{sg=|a>BN;F-001+_uMq$M literal 447 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rINdUHQUi+e3k5ooY;YEBNwU;{1==K!#*0WSlRxFHuiR9r>|uGmPV Unvp5x1mg{sg=|d7E**hv0C9#ekpKVy diff --git a/testdata/oasis/t11.8.oas b/testdata/oasis/t11.8.oas index db8fdf25ac44d82153674164ecc8c5ec372ad693..4d8c005857c1c12170e5c917157eb504c5bff4dc 100644 GIT binary patch literal 445 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rINdUHQUi+e3k9-tNuEoMeXps~)WIXNI>4Y)X*1HiHdybMU+;R4CduxWH!_@V0gjKfDB|rINdUHQUi+e3k9-tNuEoMeXps~)WIXNI>4Y)X*1HiHdybMU+;R4CduxWH!_@V0gjKfDB|rINdUHQUi+e3k+;R4CduxWH!_@V0gjKfDB|rINdUHQUi+e3k+;R4CduxWH!_@V0gjKfDHH;9i^=qnWizGWSqb(AkDFWO_1urV?+O<-Qb#MCg70Rsa7Z!L`G literal 340 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHH;9i^=qnWizGWSqb(AkDFWO_1urV?+O<-Qb#DuJU1hN6F?G9!D diff --git a/testdata/oasis/t13.1.oas b/testdata/oasis/t13.1.oas index 6142940af154d79db82abf02e71898ecd73b725d..1c2300123a4e6edee901f3ec47a48da303e2c41d 100644 GIT binary patch literal 535 zcmd_gy=?+97{+mby*A>MWB`g(lprEuQc$_DbSE87akWSA2uL@AE9#7JqcDO?#^8CW zvO}Kc`4_+K6feW>CrrciwwC&9e-IBR{;pFY2+`@$2TAze2gM(K(0DWWQ!r#v(T_(> z(s1=C^{R-{rlaVGE|M>kx5m!wp%hfV!#Wi0yXM(GV9l_Paj^Juy uM{qTy@m|$CLPI@w-M53DHz{M-ryLIa2dq9aYoUt-DYSC^nL|FG*63 z_PtvQMw|RnINB1HGNT>(xj-e)4j_4UfXTB1lRP_AC9p#%fgNHA?9i0JPOBW*X~>bC Q#vIvcljG2<;h!hO7hOTJV_U?cb85 zO7-Wk6r?)3r7+dmFJ)3a^mBoVjvYXB>;R)<2PQgpsIq5=kUcxZ?Af8oo}E@>V5eaW S>@<#noi<|_dbR%R5Bmq30W@R) diff --git a/testdata/oasis/t13.3.oas b/testdata/oasis/t13.3.oas index a221be0a4108f6afc7bab13a6fd6585b2543c4c1..8e990eb618927e97a0e8567f9f84e1e7da214ff2 100644 GIT binary patch literal 698 zcmd_kEl$Ni6vgrR=$&ckg9>B?3JC#GOx1{&@Dko2T1RFHUBXMcgi&ag(4}+qu^wtMW9It&admQ^<5j36p zmr#*YjbYnZp^X*USbuz+o{m?<1t^K;&i?%k$z1-H8v{${g%Y})i)>nzUK>%3gLL7Pv_|4_u0Bg%1=gsQpN z5gh+R!SO#79REYX@xN|xaQqJi$Nx}p{0{}k|GL4$@jnzC|3ks?KNKAQGs}OTQa`q4 B=g|NF literal 698 zcmd_nF;2uV5QX8`&e#@NNI{u`iV_4xXi~XYiAZ3Iq(eSJj@bKJ{rZAp9itv#Q(NarYyC`WN* za}-BDM{!n{B+gPv;;b!6ob@G%b9!CGIa(KS&aR6%=hx+Y>IS916z@Y3SB@ylRT9c` zu_HL%hl1mMC^+7Sg5!PNVBvTl3Xb=o;CLSjj`wwggX4WDINpbX<9#SN-ls30^bh+N D^d@Oh diff --git a/testdata/oasis/t13.4.oas b/testdata/oasis/t13.4.oas index f8eb48749e32da1fe5c495fa16103c12fdbae66e..0b7ce1d352bdd186c8ec4a80101bb2b6e3445e9c 100644 GIT binary patch literal 698 zcmd_kEl$Ni6vgrR=$&ckg9>B?3JC#GOx1{&@Dko2T1RFHUBXMcgi&ag(4}+@bKJ{rZAp9i ztv#Q(NarYyC`WN*a}-BDM{!n{B+gPv;;b!6ob@G%b9!CGIa(KS&aR6%=hx+Y>IS91 z6z@Y3SB@ylRT9c`u_HL%hl1mMC^+7Sg5!PNVBvTl3Xb=o;CLSjj`wwggX4WDINpbX z<9#SN-ghu_2vv2c=eIs6;&|t<8 delta 265 XcmaFJ@{nai5@S8Xz=DCcpOFCovG)Vr diff --git a/testdata/oasis/t2.1.oas b/testdata/oasis/t2.1.oas index 44cf6d0c544e527a65920b7bf01853140157147d..4b8d0a364f4dccdb02978c8c26d6d6937270f2e6 100644 GIT binary patch literal 295 qcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJUBO;@i8b&f;U;qFEjf6J< literal 295 pcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJUBO;@ikVQry8vsE~1-AeI diff --git a/testdata/oasis/t2.2.oas b/testdata/oasis/t2.2.oas index c01fb3165ae399c88b710d519398b8e70ff42d1e..9c1a2bc808f1f3ecf2424e4ae18d5cd2e07b7b1f 100644 GIT binary patch literal 304 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD+KBO;@inH`;+c^P;anHokiU|;|M7lVZp literal 304 ycmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD+KBO;@inH`;+c^P;anUJMMAR7QxLk5!o diff --git a/testdata/oasis/t2.3.oas b/testdata/oasis/t2.3.oas index 03123f0d83af5b25ea00e28552c70e7f8057b3cc..36543720e2277712d6f5f25ce169d7799a735238 100644 GIT binary patch literal 305 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRnVBOZqj(v38JQYJGGJf;03E1> A6#xJL literal 305 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRnVBOZqj(v38JUpfMj#siTWAKA diff --git a/testdata/oasis/t2.4.oas b/testdata/oasis/t2.4.oas index 962b8d9165766e3d5091111e7312b335ca480a65..3cfffb67df16d8ff05ba15607f37355f003da4de 100644 GIT binary patch literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRS(qatqZoJ@co~@*MlxVv001Q_ Bg%$t+ literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRS(qatqZoJ@co~_HB}X6|0AlI} AmH+?% diff --git a/testdata/oasis/t2.5.oas b/testdata/oasis/t2.5.oas index f50136703c1630597a6c7ccd54d636d5a46a5f91..b4199c9d4ce82192ef4d8ae7f14f2cb7a26921b6 100644 GIT binary patch literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRS(qatqZoJ@c$t_QMlxVv001T{ Bg%+;R4CduxWH!_@V0gjKfDBle9i5yRS(qatqZoJ@c$t`xB}X6|0AuS0 AmjD0& diff --git a/testdata/oasis/t2.6.oas b/testdata/oasis/t2.6.oas index 09c9ab0dceca0dc434f2e575bc873c686451daae..a1225faeb61a5bdfa8c355d6e0968fe594f7db80 100644 GIT binary patch literal 307 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRSy&VzBBL018F(3)8b&f;U;qG2 C!i6^g literal 307 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRSy&VzBBL018F(3)kYz_88vu%e B2DbnJ diff --git a/testdata/oasis/t2.7.oas b/testdata/oasis/t2.7.oas index 9d33c53d9a01fa9d84771799ecb8f2fd818b8b6b..c6d6ee09051eb6ca5a1e23764ad86a3ad6253d63 100644 GIT binary patch literal 304 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRS(qatqZoJ@m>NbhU|;|M3Il}* literal 304 ycmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBle9i5yRS(qatqZoJ@n2@DLAR7Qj!v=@| diff --git a/testdata/oasis/t3.1.oas b/testdata/oasis/t3.1.oas index c78646d3de3c040eeed606ddce9c74a1bc4a40e5..6418cede0fad446ec4be2ab68af50d07c202761f 100644 GIT binary patch literal 501 zcmd^#K@P!C5Qg7Buhr+NYVtO90Lv;DkRTQoLbQtpiK|%I_XdqvNF$CRR@U6WF_^OG z9n50>@Bd~x@nkj)=fij!H#KCx+Y>KGRL7IU(b%k2GD(x|2SGPv(ytf-o0jn(mQhd3 zH*O{Y(k_GGMbI3QN@bDT^tjt3ExX24gKls-_&5dy$`Q4H7zPCx>j;A~>D#rFpLIiRI4RMA5N4W_}VkUItq$`Ex*41)_8>j;A)={Fmd;fNFV i?im+c@g&|FM8U1NZzx(U(>tx!+fqPSJ*4V?f5=~L-YGT! diff --git a/testdata/oasis/t3.10.oas b/testdata/oasis/t3.10.oas index 5125a95fc7f11234b34e894173b5b1b9af143db0..99dac2b4966feb6dc706113969e24058bac590ac 100644 GIT binary patch literal 305 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%Y>85o&PFfuiaWWc}x0Fz~f AivR!s literal 305 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%Y>85o&PFft*_jX*X4(Ip29 diff --git a/testdata/oasis/t3.11.oas b/testdata/oasis/t3.11.oas index 390ea095902f731ba34f8ed808fc75f000b08a45..51fe5f7bcfd88331592bc6614285e582c8a04450 100644 GIT binary patch literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%ZG8JSKnPGn|k7|DQv0RYwa Bg~tE@ literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%ZG8JSKnPGn|6mK=d>029Us AM*si- diff --git a/testdata/oasis/t3.12.oas b/testdata/oasis/t3.12.oas index ada525012d7009f9a063353845a2d402c8093a74..946282525d8ab249cab34b67dda86a0ccc822380 100644 GIT binary patch literal 492 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5zos~H)YPB2bn77(sxVqyfb_=N>- zun2S9WDyX~0dj%zTs*=&6PX!61QR0{h+<{}3$ZZq@bZE9tW3--tZX0_8zUDth-PO5 zih&p$j7$p{^(CQ9U5QnUASNfHt^}B7g7CT67ceejT*A1FaRuWl#x;!Vz^b?y^(7!I lZg!@CppdYLsF*mAHf}~{VGcVsMn^_AMkgkwhLH>y7y$OHqe1`x literal 492 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5zos~H)YPB2bn77(sxVqyfb_=N>- zun2S9WDyX~0dj%zTs*=&6PX!61QR0{h+<{}3$ZZq@bZE9tW3--tZX0_8zUDth-PO5 zih&p$j7$p{^(CQ9U5QnUASNfHt^}B7g7CT67ceejT*A1FaRuWl#x;!Vz^b?y^(7!I lZg!@CppdYLsF*mAHf}~{VGcVsMn^_AMkgjFWN(c?HUKnxB*Fjy diff --git a/testdata/oasis/t3.2.oas b/testdata/oasis/t3.2.oas index e73bc2170151cf56c05de6d11ce3482c41e7561f..e4408653f01f98e774b29bd08409d24dd30c85fa 100644 GIT binary patch literal 494 zcmd^#O%B0O6oucpuYX=!n!HIZz_7{&B&`@22vGwOOR$4ZjLf@(Mhry6GQ`N39ax6m zGO!0{aL;$nxt(k@8AsD38)v?P?00+OWs6@~NMIqQrcBbI&H=iikb%yLz|_*g!_dyt z2=u0k)vi446;kjaC^kuTWsv7LIh!O6(_*rqTy`5($KZfU#O*Ie;R%clL}Bgp$;vLV l#{oO@h!f7Z6R!$!c&Yzgn`ZOHm6ogZw}8~nfVTfEA>M;xqzV84 literal 494 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDG6e9U0jeotXHT9i5zos~H)YPB2bn77(sx zVqyfb_=N>-un2S9WDyX~0dj%zTs*=&6PX!61QR0{h+<{}3$ZZq@bZE9tW3--tZX0_ z8zUDth-PO5ih&p$j7$p{^(CQ9U5QnUASNfHt^}B7g7CT67ceejT*BDKx`J^P;~K_u mOdwe+;R4CduxWH!_@V0gjKfDG6e9T`~}o%om?ot%ZM85x;QFivD+;R4CduxWH!_@V0gjKfDG6e9T`~}o%om?ot%ZM85x;QFivD+;R4CduxWH!_@V0gjKfDBj}9a$Nj_?R7?oQ12I7@1BmPGn|k7|DQv F0RWrahH(G@ literal 310 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9a$Nj_?R7?oQ12I7@1BmPGn|6RxkqD E0NI=e@c;k- diff --git a/testdata/oasis/t3.5.oas b/testdata/oasis/t3.5.oas index 60fc266a51206fcadef9e5fab16869d803329f7e..b6dcc10122279d9a1d1dc68256c958bcbad0f1b8 100644 GIT binary patch literal 492 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9a$Nj_?R7?oQ10y8JSKnPGlAku4Z6j z1hM#q1#YkibKGPR5Y7Q|f%05D!aNh189)RRBNvEbW&#VbF!Av6f%vRU%q*;IAQl@V z7dMDzX9S9Y7#xgD3mEk!p-f$gRg54eC!?+em}Y|Tx!4ylE@E85*v7hoaTVhl#&b*{ lSuRF>iFIK0-0VyNK_SPOBBElT0*uVU9Cl0%BN;F-003+;R4CduxWH!_@V0gjKfDBj}9a$Nj_?R7?oQ10y8JSKnPGlAku4Z6j z1hM#q1#YkibKGPR5Y7Q|f%05D!aNh189)RRBNvEbW&#VbF!Av6f%vRU%q*;IAQl@V z7dMDzX9S9Y7#xgD3mEk!p-f$gRg54eC!?+em}Y|Tx!4ylE@E85*v7hoaTVhl#&b*{ kSuRF>iFIK0-0VyNK_SPOBBElT0*uVU9Cl2|-Wq{y0IJO;g8%>k diff --git a/testdata/oasis/t3.6.oas b/testdata/oasis/t3.6.oas index 323d8c212a1d70de4c09bffbd51089e3928f0f96..d5a9b8cb860290c82c7278cee91f60c00c72ae52 100644 GIT binary patch literal 308 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%a185o&PFivD+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%a185o&PFivD+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%ZM7?@5lPGn|k7|DQv0RT3c Bh9v+1 literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%ZM7?@5lPGn|6mK=d>0CZUg Ar2qf` diff --git a/testdata/oasis/t3.8.oas b/testdata/oasis/t3.8.oas index dbceaeae9a4e13e9c9372457c0e94d1bdcecc003..2cffc379d31fcf3e70ce25c840fd917aee3640c8 100644 GIT binary patch literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%X$85mD6PGn|k7|DQv0RS|O Bh9dv~ literal 306 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%X$85mD6PGn|6mK=d>0CG(S AqW}N^ diff --git a/testdata/oasis/t3.9.oas b/testdata/oasis/t3.9.oas index f54073b89d5712fa2403239b6a550a8996a2273a..553588446507e31002bcdf94f8d1274b77eb1a34 100644 GIT binary patch literal 305 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%ZU85o%+GBY)dWWc}x09DC_ AP5=M^ literal 305 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDBj}9r>6Yot%ZU85o%+GBY8|jX*X4lZgh- diff --git a/testdata/oasis/t4.1.oas b/testdata/oasis/t4.1.oas index 1fdcea83448166083dc3b54e0e684ca1249a897a..53dd46eb3db9a9730d6c886ec49a679f7d6cc4f1 100644 GIT binary patch literal 390 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5y-su`J5PB7kJS;!^;WuIU?$;c07 zZ{WPiB2o-ia)3u9n~52yb|a@q29WCH6XAF$BywUJ<4$oAj)^iNJTKT88JSKnu3-}4 RSs>5C2x2icjAX#T0092No+tnS literal 390 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5y-su`J5PB7kJS;!^;WuIU?$;c07 zZ{WPiB2o-ia)3u9n~52yb|a@q29WCH6XAF$BywUJ<4$oAj)^iNJTKT88JSKnu3-}4 QSs>5C2x2iITQ~yQ06dW&r~m)} diff --git a/testdata/oasis/t4.2.oas b/testdata/oasis/t4.2.oas index 9aa3062ef4f609191ca293b9cbc40e9c5b68222a..d300cc303f59cd196a388f83883a56bb32024a19 100644 GIT binary patch literal 412 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDG7K1A_bm4EUHGot#Cg8JSW}Fy3HU$R;Dk zz{Dy56*$3ol2Mi)%GtnqlSNjf7_9ODkE}>G6EjfHMow9g3?SXfCo977P)Jtf#5Bg8 j;z0I98CemY7wn9TOeYxEFag;MX*y_!yx8 literal 412 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDG7K1A_bm4EUHGot#Cg8JSW}Fy3HU$R;Dk zz{Dy56*$3ol2Mi)%GtnqlSNjf7_9ODkE}>G6EjfHMow9g3?SXfCo977P)Jtf#5Bg8 j;z0I98CemY7wn9TOeYxEFag;M+;R4CduxWH!_@V0gjKfDHJU9i5y-tr?jZSk^G5q^2;OU=%>&PGr8p z!Y^vf#0--b<+uRmGeVS4UU`VGo~zITf?R~opBy>2Omg=6^qOaK~Z}qW~g-x3*;FYnNBdS bVG+;R4CduxWH!_@V0gjKfDHJU9i5y-tr?jZSk^G5q^2;OU=%>&PGr8p z!Y^vf#0--b<+uRmGeVS4UU`VGo~zITf?R~opBy>2Omg=6^qOaK~Z}qW~g-x3*;FYnNBdS aVG0@(mcm^i8c diff --git a/testdata/oasis/t5.2.oas b/testdata/oasis/t5.2.oas index d381d609273abff30d6a98b93ca096f59bf89632..64a6178495b381b94d9c9120f3ef7ba4ae6eaa58 100644 GIT binary patch literal 16310 zcmeIwu?fOZ7=_W_JV6kWRMx2i5iuCj3sEdmh{apTRm4r4CS%yTgXe?0z~!|0cAt-r zDbKmwuF}w-V%fxRRhll>dN&qn{W-sz*msA{e82z$3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# M@Mty!>Hq)$ literal 16310 zcmeI(F$%&^5CqUoz7P*jI_CfZ((5S;kA3rkLP@O zjd{-Xwn%++;R4CduxWH!_@V0gjKfDG7K1A_bm4EUHGot#Cj8JQSZ)-a`{rZAjf zlo4ZKViiCVo5*~FMV4RGn28ytNLG~N0>3Osgb|``0yCJ$#D0V2B;zSY5IzmW3)sNI z%p4~er!Y@sp2|Flc^dO%=IP8oxWE!D921yVuq|Rc&6u);Z4H~|bjEqi9eiLZRxDC8 s1Z73-;dU}CkY{9MI>ESxNmfAAj1lUR3;YbS$UHViunMMzkqj6Z0KY-H9{>OV literal 529 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDG7K1A_bm4EUHGot#Cj8JQSZ)-a`{rZAjf zlo4ZKViiCVo5*~FMV4RGn28ytNLG~N0>3Osgb|``0yCJ$#D0V2B;zSY5IzmW3)sNI z%p4~er!Y@sp2|Flc^dO%=IP8oxWE!D921yVuq|Rc&6u);Z4H~|bjEqi9eiLZRxDC8 s1Z73-;dU}CkY{9MI>ESxNmfAAj1lUR3;YbS$UHViunHz*zmGsR0Q~_wp8x;= diff --git a/testdata/oasis/t6.1.oas b/testdata/oasis/t6.1.oas index c5d908db6501e11eaae99b21f577050cb3c660da..3dfe6f6196cf212abd9b1c35ff48256838bbebd6 100644 GIT binary patch literal 392 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5!Tels$0@pExAFt1@sNo6>}C?NJ4 zD8c~YPhb{%$;ib5=e%O#VTE&6gVcew0hMtxF#}0{5Xs2Mbb@gWlYp2g;{|>OriPIW G7#IMIwU@*I literal 392 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5!Tels$0@pExAFt1@sNo6>}C?NJ4 zD8c~YPhb{%$;ib5=e%O#VTE&6gVcew0hMtxF#}0{5Xs2Mbb@gWlYp2g;{|>OCS)r| GAR7S6bs0ne diff --git a/testdata/oasis/t7.1.oas b/testdata/oasis/t7.1.oas index a123418655d2c80a0171a0972a67ee57708f6447..ff08c57552929eb7958fbca35670bffd2e3a56a4 100644 GIT binary patch literal 429 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5!Ts~MS6j5GrnPB03HuV!R2(g?W0 zB7Tx_8l#3Lkl_nuFfuZoU|hq*F9A`0fgh+`0<8Q7iv(CTkOnKh!2(k&3051hKpv=8 b5~LPrvLr|?&|pcBS|ANo%hWKE0Rsa7qkE-V literal 429 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJU9i5!Ts~MS6j5GrnPB03HuV!R2(g?W0 zB7Tx_8l#3Lkl_nuFfuZoU|hq*F9A`0fgh+`0<8Q7iv(CTkOnKh!2(k&3051hKpv=8 b5~LPrvLr|?&|pcBS|ANo%Y^K%5y%Dr;X5YU diff --git a/testdata/oasis/t8.1.oas b/testdata/oasis/t8.1.oas index 6c2d8ce189d457d87f620c7b56906acacb6732d7..48fc3c49d95eeab46c22d3447f85714494efb801 100644 GIT binary patch literal 412 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHH;9Yv}cnNm(L-e6hC#>X7uA0QyOfzk0M z%K|n*0|p==0K^J6Soj4Ee{d~e6A%=-z%M9#fuCQ{et|p#BO}uqAQS*|7{DYG;{hfx igPCa?gu%jefaw&|6$poek?AI91M4bHriPIW7#IM;EuR_y literal 412 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHH;9Yv}cnNm(L-e6hC#>X7uA0QyOfzk0M z%K|n*0|p==0K^J6Soj4Ee{d~e6A%=-z%M9#fuCQ{et|p#BO}uqAQS*|7{DYG;{hfx igPCa?gu%jefaw&|6$poek?AI91M4bHCS+%fKsEsX?I4-} diff --git a/testdata/oasis/t8.2.oas b/testdata/oasis/t8.2.oas index 4478874d694839914818e2d7e3e1c1faad131683..a5c4d21d6b4178aaee3c4190401411d979989608 100644 GIT binary patch literal 347 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJUL;M2-1UE1`-eg(8CTPF_Bm{t1;RXx8 opy3a$1#AL>LKpZ2g)i{)F*=G=Gcu)|V7$Sykd3KfBm)Kp08cHE5C8xG literal 347 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHJUL;M2-1UE1`-eg(8CTPF_Bm{t1;RXx8 opy3a$1#AL>LKpZ2g)i{)F*=G=Gcu)|V7$Sykc|o1lo7}V0F3PtkN^Mx diff --git a/testdata/oasis/t8.3.oas b/testdata/oasis/t8.3.oas index 9bfe3f69f288991ee06b1260ac0ce143240cd0b3..792af30c8c5e324b5f95efa4b2fdf46a35a06454 100644 GIT binary patch literal 350 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD)!9hsR!`~!FyM5-B?Qcf`5U|Gn<%P1iD rf#D|00yaSd1|T5-#0oc9_yrAra4ldH5EQz=FDQJ0pQ&La0|o{FX&jLg literal 350 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD)!9hsR!`~!FyM5-B?Qcf`5U|Gn<%P1iD rf#D|00yaSd1|T5-#0oc9_yrAra4ldH5EQz=FDQJ0p9$HZ5y%DrrrZ*f diff --git a/testdata/oasis/t8.4.oas b/testdata/oasis/t8.4.oas index bb6bfac4b8ac11906d006210ed86f96927033652..82238b2eb3f59ee41e94f163307ffb2ac85762e1 100644 GIT binary patch literal 361 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD)!9hsR!`~!Fy1q6RE++mJdA}46U zuz-z0Py$3~++bng7qtAr1>^__N?qV*5R?WIybL1Mj7%vf7;msFWMgU=$$)_Y09LG# AfdBvi literal 361 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD)!9hsR!`~!Fy1q6RE++mJdA}46U zuz-z0Py$3~++bng7qtAr1>^__N?qV*5R?WIybL1Mj7%vf7;msFWMe`$a|E&hlx!0L diff --git a/testdata/oasis/t8.5.oas b/testdata/oasis/t8.5.oas index 3809e55e7015550d3d9c22914086cec05a65c909..a283dc274317c96101f974eaf81f20dc5051b044 100644 GIT binary patch literal 350 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD)!9hsR!`~!Fy1q44Z++LKpZ2g)i{)GKf?&GNqhgyuq@Njj3TI0|o{FVuFzq literal 350 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDD)!9hsR!`~!Fy1q44Z++LKpZ2g)i{)GKf?&GNqhgyuq@NjS1PH5y%Drph6Op diff --git a/testdata/oasis/t8.6.oas b/testdata/oasis/t8.6.oas index 6fce78a40db552759823bee3062d0ba82360c84e..48d2f4c67dbaed848d1ceb7cf9cdb6be32c8c709 100644 GIT binary patch literal 404 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHK9Li_`ONI+;CGmv5f%GpCyG=w>vU}O+7 zIKg;+;R4CduxWH!_@V0gjKfDHK9Li_`ONI+;CGmv5f%GpCyG=w>vU}O+7 zIKg;+;R4CduxWH!_@V0gjKfDCvU1q44Z++LKpZ2g)i{)GKf?&GNqhgyuq@NjhWGrnK{HifT>|50|o{Fhq{py literal 350 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDCvU1q44Z++LKpZ2g)i{)GKf?&GNqhgyuq@NjhWGrnK{HifC<^45y%Dr#d;Ex diff --git a/testdata/oasis/t8.8.oas b/testdata/oasis/t8.8.oas index 01948407658fe7ca281511988c02a70697d2ca57..aea5b4664b589587e408ccb5d39818b8885c346d 100644 GIT binary patch literal 435 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHK9Li_`Oh+k+MGmv5f%GpCyG?+P@U}S&` zH$a7f3T6m0@PQNyZDVufoWd6Mx2BUBWozQN65Ez=A^q5TlGP*WZxI80=Ip}@$< bbb@gW6Cb0aNHrr<$_YlBK&FO~3>X*y6qKCQ literal 435 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHK9Li_`Oh+k+MGmv5f%GpCyG?+P@U}S&` zH$a7f3T6m0@PQNyZDVufoWd6Mx2BUBWozQN65Ez=A^q5TlGP*WZxI80=Ip}@$< bbb@gW6Cb0aNHrr<$_YlBKqh3@jX*X4QdAyP diff --git a/testdata/oasis/t9.1.oas b/testdata/oasis/t9.1.oas index 88b3512b7c3c4a92e9e574ff738e31f85192e946..7b22139d5ca3613b928e823bfbabfbd8b43dd034 100644 GIT binary patch literal 676 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHH;9i@IVGD)PIU_8kSzfB1_X`)El?08kZU12HsTB&VB#fk_iFH>_s!hi z&h75Y%e6S%^0FwS0P1`^IUmolPmDbKLblZtFVrf@{Kid{sH}xJ9V#P`grrC#(wO9u zJd$5^F#RT^fHWnAq=*!gW=3yFGPKi}+gR9G4!A?oej+-r`mD>>R^Ifv)q^!Z)VFrS QQ(@x*QmcoEy^cT3KV$`0*#H0l diff --git a/testdata/oasis/t9.2.oas b/testdata/oasis/t9.2.oas index b120c87bf3d5ab34927aebb24b2194279f5810c3..e7b07d11ea24f383f4e83e78e105c734bdffc22e 100644 GIT binary patch literal 328 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDHH;9i?tFG6|euJjpnLSwM+;R4CduxWH!_@V0gjKfDHH;9i?tFG6|euJjpnLSwM Date: Tue, 10 Aug 2021 22:25:06 -0700 Subject: [PATCH 2/3] Make some minor documentation fixes and improvements in the .ot templates --- testdata/oasis/t10.1.ot | 4 ++-- testdata/oasis/t11.1.ot | 30 ++++++++++++++-------------- testdata/oasis/t11.2.ot | 30 ++++++++++++++-------------- testdata/oasis/t11.3.ot | 32 +++++++++++++++--------------- testdata/oasis/t11.4.ot | 44 ++++++++++++++++++++--------------------- testdata/oasis/t11.5.ot | 30 ++++++++++++++-------------- testdata/oasis/t11.6.ot | 44 ++++++++++++++++++++--------------------- testdata/oasis/t6.1.ot | 2 +- testdata/oasis/t7.1.ot | 18 ++++++++--------- testdata/oasis/t8.1.ot | 44 ++++++++++++++++++++--------------------- testdata/oasis/t8.2.ot | 20 +++++++++---------- testdata/oasis/t8.3.ot | 20 +++++++++---------- testdata/oasis/t8.4.ot | 20 +++++++++---------- testdata/oasis/t8.5.ot | 20 +++++++++---------- testdata/oasis/t8.6.ot | 28 +++++++++++++------------- testdata/oasis/t8.7.ot | 20 +++++++++---------- testdata/oasis/t8.8.ot | 20 +++++++++---------- 17 files changed, 213 insertions(+), 213 deletions(-) diff --git a/testdata/oasis/t10.1.ot b/testdata/oasis/t10.1.ot index e5cee5fa3..2ddeaee8a 100644 --- a/testdata/oasis/t10.1.ot +++ b/testdata/oasis/t10.1.ot @@ -146,8 +146,8 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 50 ;# placement-x - int 50 ;# placement-y + int 50 ;# placement-x (rel.) + int 50 ;# placement-y (rel.) # Cell TOP record CELL_STR diff --git a/testdata/oasis/t11.1.ot b/testdata/oasis/t11.1.ot index ef46b9de4..1d6e6f263 100644 --- a/testdata/oasis/t11.1.ot +++ b/testdata/oasis/t11.1.ot @@ -55,12 +55,12 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 00010110 ;# property info byte UUUUVCNS - uint 0 + uint 0 ;# propname-id real 1 -5 ;# prop value #0 record RECTANGLE @@ -69,8 +69,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 01000110 ;# property info byte UUUUVCNS @@ -90,8 +90,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 11110000 ;# property info byte UUUUVCNS @@ -109,8 +109,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 00001000 ;# property info byte UUUUVCNS @@ -122,8 +122,8 @@ record TEXT str A ;# text-string uint 2 ;# text-layer uint 1 ;# text-datatype - int 1000 - int 0 + int 1000 ;# text-x (absolute) + int 0 ;# text-y (absolute) record PROPERTY_REP @@ -140,8 +140,8 @@ record PATH int 150 int 50 int -50 - int 2000 ;# geometry-x - int 0 ;# geometry-y + int 2000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) record PROPERTY_REP @@ -155,8 +155,8 @@ record POLYGON int 50 int -50 int 50 - int 3000 ;# geometry-x - int 0 ;# geometry-y + int 3000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) record PROPERTY_REP diff --git a/testdata/oasis/t11.2.ot b/testdata/oasis/t11.2.ot index 97647daa4..40fd6f119 100644 --- a/testdata/oasis/t11.2.ot +++ b/testdata/oasis/t11.2.ot @@ -60,13 +60,13 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY bits 00010110 ;# property info byte UUUUVCNS - uint 0 + uint 0 ;# propname-id real 1 -5 ;# prop value #0 record RECTANGLE @@ -75,8 +75,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY @@ -97,8 +97,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY @@ -117,8 +117,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY @@ -131,8 +131,8 @@ record TEXT str A ;# text-string uint 2 ;# text-layer uint 1 ;# text-datatype - int 1000 - int 0 + int 1000 ;# text-x (absolute) + int 0 ;# text-y (absolute) uint 0 ;# repetition (reuse) record PROPERTY_REP @@ -150,8 +150,8 @@ record PATH int 150 int 50 int -50 - int 2000 ;# geometry-x - int 0 ;# geometry-y + int 2000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) uint 0 ;# repetition (reuse) record PROPERTY_REP @@ -166,8 +166,8 @@ record POLYGON int 50 int -50 int 50 - int 3000 ;# geometry-x - int 0 ;# geometry-y + int 3000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) uint 0 ;# repetition (reuse) record PROPERTY_REP diff --git a/testdata/oasis/t11.3.ot b/testdata/oasis/t11.3.ot index af7e4673a..c870a60df 100644 --- a/testdata/oasis/t11.3.ot +++ b/testdata/oasis/t11.3.ot @@ -41,8 +41,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 00100111 ;# property info byte UUUUVCNS @@ -58,8 +58,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 11110001 ;# property info byte UUUUVCNS @@ -75,8 +75,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 00001001 ;# property info byte UUUUVCNS @@ -87,8 +87,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY_REP @@ -98,8 +98,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) record PROPERTY bits 00001001 ;# property info byte UUUUVCNS @@ -119,8 +119,8 @@ record TEXT str A ;# text-string uint 2 ;# text-layer uint 1 ;# text-datatype - int 1000 - int 0 + int 1000 ;# text-x (absolute) + int 0 ;# text-y (absolute) record PROPERTY_REP @@ -137,8 +137,8 @@ record PATH int 150 int 50 int -50 - int 2000 ;# geometry-x - int 0 ;# geometry-y + int 2000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) record PROPERTY_REP @@ -152,8 +152,8 @@ record POLYGON int 50 int -50 int 50 - int 3000 ;# geometry-x - int 0 ;# geometry-y + int 3000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) record PROPERTY_REP diff --git a/testdata/oasis/t11.4.ot b/testdata/oasis/t11.4.ot index d0059d407..844832624 100644 --- a/testdata/oasis/t11.4.ot +++ b/testdata/oasis/t11.4.ot @@ -49,8 +49,8 @@ record CELL_STR uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10110000 ;# CNXYRAAF str A - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record PROPERTY bits 00100111 ;# property info byte UUUUVCNS @@ -62,8 +62,8 @@ record PROPERTY uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 0 ;# placement-x - int 200 ;# placement-y + int 0 ;# placement-x (absolute) + int 200 ;# placement-y (absolute) record PROPERTY bits 11110001 ;# property info byte UUUUVCNS @@ -75,14 +75,14 @@ record PROPERTY uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (absolute) record PROPERTY bits 00001001 ;# property info byte UUUUVCNS uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (absolute) record PROPERTY_REP @@ -90,8 +90,8 @@ record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record PROPERTY bits 00001001 ;# property info byte UUUUVCNS @@ -100,7 +100,7 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) record PROPERTY bits 00100111 ;# property info byte UUUUVCNS @@ -112,7 +112,7 @@ record PROPERTY uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) record PROPERTY_REP @@ -120,8 +120,8 @@ record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (absolute) + int 0 ;# placement-y (absolute) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 @@ -134,16 +134,16 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 0 ;# repetition (reuse) record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 2 ;# repetition (3 columns) uint 1 uint 320 @@ -152,8 +152,8 @@ record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 3 ;# repetition (4 columns) uint 2 uint 310 @@ -162,8 +162,8 @@ record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) uint 2 uint 320 @@ -174,8 +174,8 @@ record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) uint 1 ;# n-dimension uint 2 ;# m-dimension diff --git a/testdata/oasis/t11.5.ot b/testdata/oasis/t11.5.ot index 065ab392f..516f498e3 100644 --- a/testdata/oasis/t11.5.ot +++ b/testdata/oasis/t11.5.ot @@ -43,13 +43,13 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY bits 00010110 ;# property info byte UUUUVCNS - uint 0 + uint 0 ;# propname-id real 1 -5 ;# prop value #0 record RECTANGLE @@ -58,8 +58,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY @@ -80,8 +80,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY @@ -100,8 +100,8 @@ record RECTANGLE uint 2 ;# datatype uint 100 ;# width uint 200 ;# height - int 0 - int 1000 + int 0 ;# geometry-x (relative) + int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) record PROPERTY @@ -114,8 +114,8 @@ record TEXT str A ;# text-string uint 2 ;# text-layer uint 1 ;# text-datatype - int 1000 - int 0 + int 1000 ;# text-x (absolute) + int 0 ;# text-y (absolute) uint 0 ;# repetition (reuse) record PROPERTY_REP @@ -133,8 +133,8 @@ record PATH int 150 int 50 int -50 - int 2000 ;# geometry-x - int 0 ;# geometry-y + int 2000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) uint 0 ;# repetition (reuse) record PROPERTY_REP @@ -149,8 +149,8 @@ record POLYGON int 50 int -50 int 50 - int 3000 ;# geometry-x - int 0 ;# geometry-y + int 3000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) uint 0 ;# repetition (reuse) record PROPERTY_REP diff --git a/testdata/oasis/t11.6.ot b/testdata/oasis/t11.6.ot index acae7b02a..d0cc40119 100644 --- a/testdata/oasis/t11.6.ot +++ b/testdata/oasis/t11.6.ot @@ -45,8 +45,8 @@ record CELL_STR uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10110000 ;# CNXYRAAF str A - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record PROPERTY bits 00100111 ;# property info byte UUUUVCNS @@ -66,8 +66,8 @@ record PROPERTY uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 0 ;# placement-x - int 400 ;# placement-y + int 0 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record PROPERTY bits 11110001 ;# property info byte UUUUVCNS @@ -79,14 +79,14 @@ record PROPERTY uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (absolute) record PROPERTY bits 00001001 ;# property info byte UUUUVCNS uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (absolute) record PROPERTY_REP @@ -94,8 +94,8 @@ record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record PROPERTY bits 00001001 ;# property info byte UUUUVCNS @@ -104,7 +104,7 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) record PROPERTY bits 00100111 ;# property info byte UUUUVCNS @@ -116,7 +116,7 @@ record PROPERTY uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) record PROPERTY_REP @@ -124,8 +124,8 @@ record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (absolute) + int 0 ;# placement-y (absolute) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 @@ -138,16 +138,16 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 0 ;# repetition (reuse) record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 2 ;# repetition (3 columns) uint 1 uint 320 @@ -156,8 +156,8 @@ record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 3 ;# repetition (4 columns) uint 2 uint 310 @@ -166,8 +166,8 @@ record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) uint 2 uint 320 @@ -178,8 +178,8 @@ record PROPERTY_REP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) uint 1 ;# n-dimension uint 2 ;# m-dimension diff --git a/testdata/oasis/t6.1.ot b/testdata/oasis/t6.1.ot index 8de01f59d..7992fdb3b 100644 --- a/testdata/oasis/t6.1.ot +++ b/testdata/oasis/t6.1.ot @@ -140,7 +140,7 @@ record XYRELATIVE record PATH bits 00010101 ;# EWPXYRDL - uint 1 ;# datatype + uint 1 ;# layer int 1000 ;# geometry-x (relative) uint 0 ;# repetition (reuse) diff --git a/testdata/oasis/t7.1.ot b/testdata/oasis/t7.1.ot index ef5ddc68e..02fb363fb 100644 --- a/testdata/oasis/t7.1.ot +++ b/testdata/oasis/t7.1.ot @@ -87,7 +87,7 @@ uint 23 uint 50 ;# height int 20 ;# delta-a int 40 ;# delta-b - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 23 bits 11001001 ;# OWHXYRDL @@ -95,7 +95,7 @@ uint 23 uint 150 ;# width int 20 ;# delta-a int -20 ;# delta-b - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 23 bits 01001101 ;# OWHXYRDL @@ -103,7 +103,7 @@ uint 23 uint 150 ;# width int 20 ;# delta-a int -20 ;# delta-b - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 @@ -130,21 +130,21 @@ uint 24 uint 2 ;# datatype uint 50 ;# height int 20 ;# delta-a - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 24 bits 11001001 ;# OWHXYRDL uint 1 ;# layer uint 150 ;# width int 20 ;# delta-a - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 24 bits 01001101 ;# OWHXYRDL uint 1 ;# layer uint 150 ;# width int 20 ;# delta-a - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 @@ -171,21 +171,21 @@ uint 25 uint 2 ;# datatype uint 50 ;# height int 40 ;# delta-b - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 25 bits 11001001 ;# OWHXYRDL uint 1 ;# layer uint 150 ;# width int -20 ;# delta-b - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 25 bits 01001101 ;# OWHXYRDL uint 1 ;# layer uint 150 ;# width int -20 ;# delta-b - int 300 ;# geometry-y (absolute) + int 300 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 diff --git a/testdata/oasis/t8.1.ot b/testdata/oasis/t8.1.ot index bc90f7ec5..f69636c82 100644 --- a/testdata/oasis/t8.1.ot +++ b/testdata/oasis/t8.1.ot @@ -60,45 +60,45 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10110000 ;# CNXYRAAF str A - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 0 ;# placement-x - int 400 ;# placement-y + int 0 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (relative) record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (absolute) + int 0 ;# placement-y (absolute) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 @@ -109,30 +109,30 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 0 ;# repetition (reuse) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 2 ;# repetition (3 columns) uint 1 uint 320 uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 3 ;# repetition (4 columns) uint 2 uint 310 uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) uint 2 uint 320 @@ -141,8 +141,8 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111111 ;# CNXYRAAF - int 2000 ;# placement-x - int 0 ;# placement-y + int 2000 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) uint 1 ;# n-dimension uint 2 ;# m-dimension diff --git a/testdata/oasis/t8.2.ot b/testdata/oasis/t8.2.ot index 2526c1077..c68ca7096 100644 --- a/testdata/oasis/t8.2.ot +++ b/testdata/oasis/t8.2.ot @@ -37,38 +37,38 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10110000 ;# CNXYRAAF str A - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 0 ;# placement-x - int 400 ;# placement-y + int 0 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (relative) record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) # Cell A record CELL_STR diff --git a/testdata/oasis/t8.3.ot b/testdata/oasis/t8.3.ot index bee7190a5..9ce4cdf17 100644 --- a/testdata/oasis/t8.3.ot +++ b/testdata/oasis/t8.3.ot @@ -55,38 +55,38 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 11110000 ;# CNXYRAAF uint 0 - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 0 ;# placement-x - int 400 ;# placement-y + int 0 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (relative) record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) tail diff --git a/testdata/oasis/t8.4.ot b/testdata/oasis/t8.4.ot index fe86e7b8b..2b82e71ac 100644 --- a/testdata/oasis/t8.4.ot +++ b/testdata/oasis/t8.4.ot @@ -43,8 +43,8 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 11111000 ;# CNXYRAAF uint 0 - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 @@ -53,38 +53,38 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111000 ;# CNXYRAAF - int 0 ;# placement-x - int 400 ;# placement-y + int 0 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 0 ;# repetition (reuse) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00011000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (relative) uint 0 ;# repetition (reuse) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00101000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (relative) uint 0 ;# repetition (reuse) record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00111001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) uint 0 ;# repetition (reuse) record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00011010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 0 ;# repetition (reuse) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00011011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 0 ;# repetition (reuse) # Cell A diff --git a/testdata/oasis/t8.5.ot b/testdata/oasis/t8.5.ot index 5ce3b5a0a..8788abc39 100644 --- a/testdata/oasis/t8.5.ot +++ b/testdata/oasis/t8.5.ot @@ -42,38 +42,38 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 11110000 ;# CNXYRAAF uint 0 - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 0 ;# placement-x - int 400 ;# placement-y + int 0 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (relative) record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) # Cell A record CELL_ID diff --git a/testdata/oasis/t8.6.ot b/testdata/oasis/t8.6.ot index cc55ed890..605a7f902 100644 --- a/testdata/oasis/t8.6.ot +++ b/testdata/oasis/t8.6.ot @@ -44,13 +44,13 @@ uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) str TOP real 6 0.5 real 7 90.0 - int 100 ;# placement-x - int 0 ;# placement-y + int 100 ;# placement-x (relative) + int 0 ;# placement-y (relative) uint 18 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRMAF - int 100 ;# placement-x - int 1000 ;# placement-y + int 100 ;# placement-x (relative) + int 1000 ;# placement-y (relative) # Cell TOP record CELL_STR @@ -63,40 +63,40 @@ uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) str A real 6 0.5 real 7 0.0 - int -150 ;# placement-x - int 200 ;# placement-y + int -150 ;# placement-x (relative) + int 200 ;# placement-y (relative) uint 18 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRMAF - int -150 ;# placement-x - int 600 ;# placement-y + int -150 ;# placement-x (relative) + int 600 ;# placement-y (relative) uint 18 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRMAF - int 400 ;# placement-y + int 400 ;# placement-y (relative) uint 18 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRMAF - int 300 ;# placement-x + int 300 ;# placement-x (relative) record XYABSOLUTE uint 18 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRMAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record XYRELATIVE uint 18 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRMAF real 0 90.0 - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 18 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRMAF real 1 -90.0 - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) # Cell A record CELL_STR diff --git a/testdata/oasis/t8.7.ot b/testdata/oasis/t8.7.ot index bccd1f1ef..db6c3eb2f 100644 --- a/testdata/oasis/t8.7.ot +++ b/testdata/oasis/t8.7.ot @@ -38,38 +38,38 @@ record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 11110000 ;# CNXYRAAF uint 0 - int -300 ;# placement-x - int 400 ;# placement-y + int -300 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110000 ;# CNXYRAAF - int 0 ;# placement-x - int 400 ;# placement-y + int 0 ;# placement-x (relative) + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + int 400 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF - int 300 ;# placement-x + int 300 ;# placement-x (relative) record XYABSOLUTE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00110001 ;# CNXYRAAF - int 700 ;# placement-x - int 400 ;# placement-y + int 700 ;# placement-x (absolute) + int 400 ;# placement-y (absolute) record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) # Cell A record CELL_ID diff --git a/testdata/oasis/t8.8.ot b/testdata/oasis/t8.8.ot index fd336534a..c6dafc105 100644 --- a/testdata/oasis/t8.8.ot +++ b/testdata/oasis/t8.8.ot @@ -45,16 +45,16 @@ uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) str TOP real 6 0.5 real 7 22.5 - int 100 ;# placement-x - int 0 ;# placement-y + int 100 ;# placement-x (absolute) + int 0 ;# placement-y (absolute) uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) bits 10110110 ;# CNXYRMAF str TOP real 6 1.0 real 7 0.0 - int 1100 ;# placement-x - int 0 ;# placement-y + int 1100 ;# placement-x (absolute) + int 0 ;# placement-y (absolute) # Cell TOP record CELL_STR @@ -65,24 +65,24 @@ uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) str A real 6 2.0 real 7 0.0 - int -100 ;# placement-x - int 100 ;# placement-y + int -100 ;# placement-x (absolute) + int 100 ;# placement-y (absolute) uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) bits 10110110 ;# CNXYRMAF str A real 6 1.0 real 7 45.0 - int -150 ;# placement-x - int 1100 ;# placement-y + int -150 ;# placement-x (absolute) + int 1100 ;# placement-y (absolute) uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) bits 10111111 ;# CNXYRMAF str A real 6 0.5 real 7 135.0 - int -200 ;# placement-x - int 2100 ;# placement-y + int -200 ;# placement-x (absolute) + int 2100 ;# placement-y (absolute) uint 1 ;# repetition (3x4 matrix) uint 1 uint 2 From 7d772f8884bd20a5319b63d0d26a8a006f5fb3bb Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Tue, 10 Aug 2021 22:33:43 -0700 Subject: [PATCH 3/3] Clean up trailing whitespace in .ot files --- testdata/oasis/t1.1.ot | 2 +- testdata/oasis/t1.2.ot | 2 +- testdata/oasis/t1.3.ot | 2 +- testdata/oasis/t1.4.ot | 2 +- testdata/oasis/t1.5.ot | 2 +- testdata/oasis/t10.1.ot | 10 ++++----- testdata/oasis/t11.1.ot | 30 +++++++++++++------------- testdata/oasis/t11.2.ot | 32 +++++++++++++-------------- testdata/oasis/t11.3.ot | 30 +++++++++++++------------- testdata/oasis/t11.4.ot | 40 +++++++++++++++++----------------- testdata/oasis/t11.5.ot | 32 +++++++++++++-------------- testdata/oasis/t11.6.ot | 44 ++++++++++++++++++------------------- testdata/oasis/t11.7.ot | 10 ++++----- testdata/oasis/t11.8.ot | 8 +++---- testdata/oasis/t11.9.ot | 8 +++---- testdata/oasis/t12.1.ot | 6 +++--- testdata/oasis/t13.1.ot | 8 +++---- testdata/oasis/t13.2.ot | 6 +++--- testdata/oasis/t13.3.ot | 8 +++---- testdata/oasis/t13.4.ot | 8 +++---- testdata/oasis/t14.1.ot | 8 +++---- testdata/oasis/t2.1.ot | 2 +- testdata/oasis/t2.2.ot | 4 ++-- testdata/oasis/t2.3.ot | 6 +++--- testdata/oasis/t2.4.ot | 8 +++---- testdata/oasis/t2.5.ot | 8 +++---- testdata/oasis/t2.6.ot | 8 +++---- testdata/oasis/t2.7.ot | 8 +++---- testdata/oasis/t3.1.ot | 46 +++++++++++++++++++-------------------- testdata/oasis/t3.10.ot | 8 +++---- testdata/oasis/t3.11.ot | 8 +++---- testdata/oasis/t3.12.ot | 48 ++++++++++++++++++++--------------------- testdata/oasis/t3.2.ot | 48 ++++++++++++++++++++--------------------- testdata/oasis/t3.3.ot | 6 +++--- testdata/oasis/t3.4.ot | 8 +++---- testdata/oasis/t3.5.ot | 48 ++++++++++++++++++++--------------------- testdata/oasis/t3.6.ot | 8 +++---- testdata/oasis/t3.7.ot | 8 +++---- testdata/oasis/t3.8.ot | 8 +++---- testdata/oasis/t3.9.ot | 8 +++---- testdata/oasis/t4.1.ot | 8 +++---- testdata/oasis/t4.2.ot | 8 +++---- testdata/oasis/t5.1.ot | 36 +++++++++++++++---------------- testdata/oasis/t5.2.ot | 8 +++---- testdata/oasis/t5.3.ot | 36 +++++++++++++++---------------- testdata/oasis/t6.1.ot | 18 ++++++++-------- testdata/oasis/t7.1.ot | 10 ++++----- testdata/oasis/t8.1.ot | 20 ++++++++--------- testdata/oasis/t8.2.ot | 6 +++--- testdata/oasis/t8.3.ot | 6 +++--- testdata/oasis/t8.4.ot | 8 +++---- testdata/oasis/t8.5.ot | 6 +++--- testdata/oasis/t8.6.ot | 6 +++--- testdata/oasis/t8.7.ot | 6 +++--- testdata/oasis/t8.8.ot | 6 +++--- testdata/oasis/t9.1.ot | 6 +++--- testdata/oasis/t9.2.ot | 6 +++--- 57 files changed, 397 insertions(+), 397 deletions(-) diff --git a/testdata/oasis/t1.1.ot b/testdata/oasis/t1.1.ot index 688b90088..10f5bc3dc 100644 --- a/testdata/oasis/t1.1.ot +++ b/testdata/oasis/t1.1.ot @@ -11,7 +11,7 @@ # # -header +header # parts of START record real 0 1000.0 uint 0 ;# offset table is in start record diff --git a/testdata/oasis/t1.2.ot b/testdata/oasis/t1.2.ot index 40948d801..210f74268 100644 --- a/testdata/oasis/t1.2.ot +++ b/testdata/oasis/t1.2.ot @@ -10,7 +10,7 @@ # # -header +header # parts of START record real 2 0.5 uint 0 ;# offset table is in start record diff --git a/testdata/oasis/t1.3.ot b/testdata/oasis/t1.3.ot index e96d8a810..fba1f0754 100644 --- a/testdata/oasis/t1.3.ot +++ b/testdata/oasis/t1.3.ot @@ -10,7 +10,7 @@ # # -header +header # parts of START record real 4 10.0 4.0 uint 0 ;# offset table is in start record diff --git a/testdata/oasis/t1.4.ot b/testdata/oasis/t1.4.ot index 3edf26174..3bb5bc210 100644 --- a/testdata/oasis/t1.4.ot +++ b/testdata/oasis/t1.4.ot @@ -10,7 +10,7 @@ # # -header +header # parts of START record real 6 12.5 uint 0 ;# offset table is in start record diff --git a/testdata/oasis/t1.5.ot b/testdata/oasis/t1.5.ot index b13127ce6..f020ea83c 100644 --- a/testdata/oasis/t1.5.ot +++ b/testdata/oasis/t1.5.ot @@ -11,7 +11,7 @@ # -header +header # parts of START record real 7 12.5 uint 0 ;# offset table is in start record diff --git a/testdata/oasis/t10.1.ot b/testdata/oasis/t10.1.ot index 2ddeaee8a..e484511e7 100644 --- a/testdata/oasis/t10.1.ot +++ b/testdata/oasis/t10.1.ot @@ -37,14 +37,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str A + str A record RECTANGLE bits 01100011 ;# SWHXYRDL @@ -93,7 +93,7 @@ record TEXT # Cell B record CELL_STR - str B + str B record RECTANGLE bits 01100011 ;# SWHXYRDL @@ -128,7 +128,7 @@ record TEXT int 200 ;# text-x (abs) int 200 ;# text-y (abs) -record XYRELATIVE +record XYRELATIVE record RECTANGLE bits 00011000 ;# SWHXYRDL @@ -151,7 +151,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) # Cell TOP record CELL_STR - str TOP + str TOP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10000000 ;# CNXYRAAF diff --git a/testdata/oasis/t11.1.ot b/testdata/oasis/t11.1.ot index 1d6e6f263..864bd658b 100644 --- a/testdata/oasis/t11.1.ot +++ b/testdata/oasis/t11.1.ot @@ -9,7 +9,7 @@ # Property name references by ID # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -26,15 +26,15 @@ record PROPSTRING_ID # property name 0 record PROPNAME - str PROP0 + str PROP0 # property name 1 record PROPNAME - str PROP1 + str PROP1 # Cell A record CELL_STR - str A + str A record XYRELATIVE @@ -45,7 +45,7 @@ record RECTANGLE uint 100 ;# width uint 200 ;# height -record PROPERTY +record PROPERTY bits 00000100 ;# property info byte UUUUVCNS str PROPX @@ -58,7 +58,7 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 00010110 ;# property info byte UUUUVCNS uint 0 ;# propname-id real 1 -5 ;# prop value #0 @@ -72,11 +72,11 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 01000110 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 9 ;# prop-value #1 (signed int) int -124 uint 10 ;# prop-value #2 (a-string) @@ -93,11 +93,11 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 11110000 ;# property info byte UUUUVCNS uint 3 ;# number of values uint 0 ;# prop-value #0 (real as unsigned int) - uint 25 + uint 25 uint 9 ;# prop-value #1 (signed int) int -124 uint 14 ;# prop-value #2 (prop-string reference number) @@ -112,7 +112,7 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 00001000 ;# property info byte UUUUVCNS record XYABSOLUTE @@ -133,10 +133,10 @@ record PATH uint 2 ;# datatype uint 10 ;# half-width bits 00001111 ;# extension-scheme SSEE - int 5 + int 5 int -5 uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -150,7 +150,7 @@ record POLYGON uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -160,7 +160,7 @@ record POLYGON record PROPERTY_REP -record PROPERTY +record PROPERTY bits 00000110 ;# property info byte UUUUVCNS uint 1 ;# propname-id diff --git a/testdata/oasis/t11.2.ot b/testdata/oasis/t11.2.ot index 40fd6f119..9d142cb47 100644 --- a/testdata/oasis/t11.2.ot +++ b/testdata/oasis/t11.2.ot @@ -9,7 +9,7 @@ # Property name references by ID # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -26,15 +26,15 @@ record PROPSTRING_ID # property name 0 record PROPNAME - str PROP0 + str PROP0 # property name 1 record PROPNAME - str PROP1 + str PROP1 # Cell A record CELL_STR - str A + str A record XYRELATIVE @@ -45,12 +45,12 @@ record RECTANGLE uint 100 ;# width uint 200 ;# height uint 1 ;# repetition (3x2 matrix) - uint 1 + uint 1 uint 0 uint 300 uint 320 -record PROPERTY +record PROPERTY bits 00000100 ;# property info byte UUUUVCNS str PROPX @@ -64,7 +64,7 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 00010110 ;# property info byte UUUUVCNS uint 0 ;# propname-id real 1 -5 ;# prop value #0 @@ -79,11 +79,11 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 01000110 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 9 ;# prop-value #1 (signed int) int -124 uint 10 ;# prop-value #2 (a-string) @@ -101,11 +101,11 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 11110000 ;# property info byte UUUUVCNS uint 3 ;# number of values uint 0 ;# prop-value #0 (real as unsigned int) - uint 25 + uint 25 uint 9 ;# prop-value #1 (signed int) int -124 uint 14 ;# prop-value #2 (prop-string reference number) @@ -121,7 +121,7 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 00001000 ;# property info byte UUUUVCNS record XYABSOLUTE @@ -143,10 +143,10 @@ record PATH uint 2 ;# datatype uint 10 ;# half-width bits 00001111 ;# extension-scheme SSEE - int 5 + int 5 int -5 uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -161,7 +161,7 @@ record POLYGON uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -172,7 +172,7 @@ record POLYGON record PROPERTY_REP -record PROPERTY +record PROPERTY bits 00000110 ;# property info byte UUUUVCNS uint 1 ;# propname-id diff --git a/testdata/oasis/t11.3.ot b/testdata/oasis/t11.3.ot index c870a60df..115090e3b 100644 --- a/testdata/oasis/t11.3.ot +++ b/testdata/oasis/t11.3.ot @@ -10,7 +10,7 @@ # Property name references by ID # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -27,11 +27,11 @@ record PROPSTRING_ID # property name 0 record PROPNAME - str S_GDS_PROPERTY + str S_GDS_PROPERTY # Cell A record CELL_STR - str A + str A record XYRELATIVE @@ -44,11 +44,11 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 00100111 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 10 ;# prop-value #2 (a-string) str PROP_VALUE2 @@ -61,11 +61,11 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 11110001 ;# property info byte UUUUVCNS uint 2 ;# number of values uint 8 ;# prop-value #0 (unsigned int) - uint 10 + uint 10 uint 14 ;# prop-value #2 (prop-string reference number) uint 13 @@ -78,7 +78,7 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS record RECTANGLE @@ -90,7 +90,7 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY_REP +record PROPERTY_REP record RECTANGLE bits 01111011 ;# SWHXYRDL @@ -101,14 +101,14 @@ record RECTANGLE int 0 ;# geometry-x (relative) int 1000 ;# geometry-y (relative) -record PROPERTY +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS -record PROPERTY +record PROPERTY bits 00100111 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 10 ;# prop-value #2 (a-string) str PROP_VALUE2 @@ -130,10 +130,10 @@ record PATH uint 2 ;# datatype uint 10 ;# half-width bits 00001111 ;# extension-scheme SSEE - int 5 + int 5 int -5 uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -147,7 +147,7 @@ record POLYGON uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 diff --git a/testdata/oasis/t11.4.ot b/testdata/oasis/t11.4.ot index 844832624..915453904 100644 --- a/testdata/oasis/t11.4.ot +++ b/testdata/oasis/t11.4.ot @@ -10,7 +10,7 @@ # Instances with properties # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -27,11 +27,11 @@ record PROPSTRING_ID # property name 0 record PROPNAME - str S_GDS_PROPERTY + str S_GDS_PROPERTY # Cell A record CELL_STR - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL @@ -44,7 +44,7 @@ record RECTANGLE # Cell TOP record CELL_STR - str TOP + str TOP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10110000 ;# CNXYRAAF @@ -52,11 +52,11 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int -300 ;# placement-x (absolute) int 400 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 00100111 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 10 ;# prop-value #2 (a-string) str PROP_VALUE2 @@ -65,11 +65,11 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 0 ;# placement-x (absolute) int 200 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 11110001 ;# property info byte UUUUVCNS uint 2 ;# number of values uint 8 ;# prop-value #0 (unsigned int) - uint 10 + uint 10 uint 14 ;# prop-value #2 (prop-string reference number) uint 13 @@ -77,14 +77,14 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF int 400 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF int 300 ;# placement-x (absolute) -record PROPERTY_REP +record PROPERTY_REP record XYABSOLUTE @@ -93,7 +93,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 700 ;# placement-x (absolute) int 400 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS record XYRELATIVE @@ -102,11 +102,11 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF int 1000 ;# placement-y (relative) -record PROPERTY +record PROPERTY bits 00100111 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 10 ;# prop-value #2 (a-string) str PROP_VALUE2 @@ -123,7 +123,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (absolute) int 0 ;# placement-y (absolute) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 300 uint 300 @@ -145,7 +145,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 2 ;# repetition (3 columns) - uint 1 + uint 1 uint 320 record PROPERTY_REP @@ -155,7 +155,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 3 ;# repetition (4 columns) - uint 2 + uint 2 uint 310 record PROPERTY_REP @@ -165,7 +165,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) - uint 2 + uint 2 uint 320 uint 330 uint 340 @@ -177,9 +177,9 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension - uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320) + uint 1 ;# n-dimension + uint 2 ;# m-dimension + uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320) int 320 uint [ expr 16*330+10 ] ;# n-displacement (g-delta: 330-northwest=-330,330) diff --git a/testdata/oasis/t11.5.ot b/testdata/oasis/t11.5.ot index 516f498e3..897ca996e 100644 --- a/testdata/oasis/t11.5.ot +++ b/testdata/oasis/t11.5.ot @@ -10,14 +10,14 @@ # Forward references # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str A + str A record XYRELATIVE @@ -28,12 +28,12 @@ record RECTANGLE uint 100 ;# width uint 200 ;# height uint 1 ;# repetition (3x2 matrix) - uint 1 + uint 1 uint 0 uint 300 uint 320 -record PROPERTY +record PROPERTY bits 00000100 ;# property info byte UUUUVCNS str PROPX @@ -47,7 +47,7 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 00010110 ;# property info byte UUUUVCNS uint 0 ;# propname-id real 1 -5 ;# prop value #0 @@ -62,11 +62,11 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 01000110 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 9 ;# prop-value #1 (signed int) int -124 uint 10 ;# prop-value #2 (a-string) @@ -84,11 +84,11 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 11110000 ;# property info byte UUUUVCNS uint 3 ;# number of values uint 0 ;# prop-value #0 (real as unsigned int) - uint 25 + uint 25 uint 9 ;# prop-value #1 (signed int) int -124 uint 14 ;# prop-value #2 (prop-string reference number) @@ -104,7 +104,7 @@ record RECTANGLE int 1000 ;# geometry-y (relative) uint 0 ;# repetition (reuse) -record PROPERTY +record PROPERTY bits 00001000 ;# property info byte UUUUVCNS record XYABSOLUTE @@ -126,10 +126,10 @@ record PATH uint 2 ;# datatype uint 10 ;# half-width bits 00001111 ;# extension-scheme SSEE - int 5 + int 5 int -5 uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -144,7 +144,7 @@ record POLYGON uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -155,7 +155,7 @@ record POLYGON record PROPERTY_REP -record PROPERTY +record PROPERTY bits 00000110 ;# property info byte UUUUVCNS uint 1 ;# propname-id @@ -171,11 +171,11 @@ record PROPSTRING_ID # property name 0 record PROPNAME - str PROP0 + str PROP0 # property name 1 record PROPNAME - str PROP1 + str PROP1 tail diff --git a/testdata/oasis/t11.6.ot b/testdata/oasis/t11.6.ot index d0cc40119..0c6334729 100644 --- a/testdata/oasis/t11.6.ot +++ b/testdata/oasis/t11.6.ot @@ -10,7 +10,7 @@ # Instances with properties # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -27,7 +27,7 @@ record PROPSTRING_ID # Cell A record CELL_STR - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL @@ -40,7 +40,7 @@ record RECTANGLE # Cell TOP record CELL_STR - str TOP + str TOP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10110000 ;# CNXYRAAF @@ -48,19 +48,19 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int -300 ;# placement-x (absolute) int 400 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 00100111 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 10 ;# prop-value #2 (a-string) str PROP_VALUE2 -record PROPERTY +record PROPERTY bits 00100111 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 26 + uint 26 uint 10 ;# prop-value #2 (a-string) str PROP_VALUE26 @@ -69,11 +69,11 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 0 ;# placement-x (absolute) int 400 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 11110001 ;# property info byte UUUUVCNS uint 2 ;# number of values uint 8 ;# prop-value #0 (unsigned int) - uint 10 + uint 10 uint 14 ;# prop-value #2 (prop-string reference number) uint 13 @@ -81,14 +81,14 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF int 400 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00100000 ;# CNXYRAAF int 300 ;# placement-x (absolute) -record PROPERTY_REP +record PROPERTY_REP record XYABSOLUTE @@ -97,7 +97,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 700 ;# placement-x (absolute) int 400 ;# placement-y (absolute) -record PROPERTY +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS record XYRELATIVE @@ -106,11 +106,11 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF int 1000 ;# placement-y (relative) -record PROPERTY +record PROPERTY bits 00100111 ;# property info byte UUUUVCNS uint 0 ;# propname-id uint 8 ;# prop-value #0 (unsigned int) - uint 25 + uint 25 uint 10 ;# prop-value #2 (a-string) str PROP_VALUE2 @@ -127,7 +127,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (absolute) int 0 ;# placement-y (absolute) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 300 uint 300 @@ -149,7 +149,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 2 ;# repetition (3 columns) - uint 1 + uint 1 uint 320 record PROPERTY_REP @@ -159,7 +159,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 3 ;# repetition (4 columns) - uint 2 + uint 2 uint 310 record PROPERTY_REP @@ -169,7 +169,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) - uint 2 + uint 2 uint 320 uint 330 uint 340 @@ -181,9 +181,9 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension - uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320) + uint 1 ;# n-dimension + uint 2 ;# m-dimension + uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320) int 320 uint [ expr 16*330+10 ] ;# n-displacement (g-delta: 330-northwest=-330,330) @@ -191,7 +191,7 @@ record PROPERTY_REP # property name 0 record PROPNAME - str S_GDS_PROPERTY + str S_GDS_PROPERTY tail diff --git a/testdata/oasis/t11.7.ot b/testdata/oasis/t11.7.ot index e19ad45d5..3f3bc9226 100644 --- a/testdata/oasis/t11.7.ot +++ b/testdata/oasis/t11.7.ot @@ -3,7 +3,7 @@ # File-Level properties # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -30,7 +30,7 @@ record PROPERTY bits 00010110 ;# UUUUVCNS uint 13 uint 8 ;# prop-value #0 (unsigned int) - uint 17 + uint 17 # property string 12 record PROPSTRING_ID @@ -42,10 +42,10 @@ record PROPERTY bits 00010110 ;# UUUUVCNS uint 13 uint 8 ;# prop-value #0 (unsigned int) - uint 42 + uint 42 # A cellname records -record CELLNAME +record CELLNAME str A # property associated with cell A through CELLNAME @@ -64,7 +64,7 @@ record PROPERTY bits 00010100 ;# UUUUVCNS str CellProp1 uint 10 ;# prop-value #0 (string) - str CPValue + str CPValue # property associated with cell A record PROPERTY diff --git a/testdata/oasis/t11.8.ot b/testdata/oasis/t11.8.ot index 3fcfb5431..59446a35b 100644 --- a/testdata/oasis/t11.8.ot +++ b/testdata/oasis/t11.8.ot @@ -4,7 +4,7 @@ # Errors on unset modal variables # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -42,10 +42,10 @@ record PROPERTY bits 00010110 ;# UUUUVCNS uint 13 uint 8 ;# prop-value #0 (unsigned int) - uint 42 + uint 42 # A cellname records -record CELLNAME +record CELLNAME str A # property associated with cell A through CELLNAME @@ -64,7 +64,7 @@ record PROPERTY bits 00010100 ;# UUUUVCNS str CellProp1 uint 10 ;# prop-value #0 (string) - str CPValue + str CPValue # property associated with cell A record PROPERTY diff --git a/testdata/oasis/t11.9.ot b/testdata/oasis/t11.9.ot index 3921049c9..515ed188e 100644 --- a/testdata/oasis/t11.9.ot +++ b/testdata/oasis/t11.9.ot @@ -3,7 +3,7 @@ # File-Level properties # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -30,7 +30,7 @@ record PROPERTY bits 00010110 ;# UUUUVCNS uint 13 uint 8 ;# prop-value #0 (unsigned int) - uint 17 + uint 17 # property string 12 record PROPSTRING_ID @@ -44,7 +44,7 @@ record PROPERTY uint 13 # A cellname records -record CELLNAME +record CELLNAME str A # property associated with cell A through CELLNAME @@ -63,7 +63,7 @@ record PROPERTY bits 00010100 ;# UUUUVCNS str CellProp1 uint 10 ;# prop-value #0 (string) - str CPValue + str CPValue # property associated with cell A record PROPERTY diff --git a/testdata/oasis/t12.1.ot b/testdata/oasis/t12.1.ot index 3a5ac12ea..243879a4d 100644 --- a/testdata/oasis/t12.1.ot +++ b/testdata/oasis/t12.1.ot @@ -7,14 +7,14 @@ # Circle-related modal variables # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str A + str A record CIRCLE bits 00111011 ;# 00rXYRDL @@ -55,7 +55,7 @@ record CIRCLE uint 100 ;# radius int 400 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 400 uint 300 diff --git a/testdata/oasis/t13.1.ot b/testdata/oasis/t13.1.ot index 707a04087..7667e1c09 100644 --- a/testdata/oasis/t13.1.ot +++ b/testdata/oasis/t13.1.ot @@ -6,7 +6,7 @@ # Mapping of layer and datatype ranges to names # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -31,7 +31,7 @@ record LAYERNAME record LAYERNAME str E5A - uint 3 ;# layer 5 + uint 3 ;# layer 5 uint 5 uint 0 ;# all datatypes @@ -60,7 +60,7 @@ record LAYERNAME str E5E4 uint 3 ;# layer 5 to 5 uint 5 - uint 3 ;# datatype 4 + uint 3 ;# datatype 4 uint 4 record LAYERNAME @@ -73,7 +73,7 @@ record LAYERNAME # Cell A record CELL_STR - str A + str A record CIRCLE bits 00111011 ;# 00rXYRDL diff --git a/testdata/oasis/t13.2.ot b/testdata/oasis/t13.2.ot index 068950da3..66582493d 100644 --- a/testdata/oasis/t13.2.ot +++ b/testdata/oasis/t13.2.ot @@ -6,7 +6,7 @@ # Mapping of textlayer and texttype ranges to names # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -31,7 +31,7 @@ record LAYERNAME_TXT record LAYERNAME_TXT str E5A - uint 3 ;# layer 5 + uint 3 ;# layer 5 uint 5 uint 0 ;# all datatypes @@ -44,7 +44,7 @@ record LAYERNAME_TXT # Cell A record CELL_STR - str A + str A record TEXT bits 01011011 ;# 0CNXYRTL diff --git a/testdata/oasis/t13.3.ot b/testdata/oasis/t13.3.ot index 6707582f4..08c55512d 100644 --- a/testdata/oasis/t13.3.ot +++ b/testdata/oasis/t13.3.ot @@ -6,7 +6,7 @@ # Mapping of layer and datatype ranges to names, mapping of textlayer and texttype ranges to names in the same context but to different names # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -31,7 +31,7 @@ record LAYERNAME_TXT record LAYERNAME_TXT str TE5A - uint 3 ;# layer 5 + uint 3 ;# layer 5 uint 5 uint 0 ;# all datatypes @@ -62,7 +62,7 @@ record LAYERNAME record LAYERNAME str E5A - uint 3 ;# layer 5 + uint 3 ;# layer 5 uint 5 uint 0 ;# all datatypes @@ -75,7 +75,7 @@ record LAYERNAME # Cell A record CELL_STR - str A + str A record TEXT bits 01011011 ;# 0CNXYRTL diff --git a/testdata/oasis/t13.4.ot b/testdata/oasis/t13.4.ot index 2dd643922..abcd3aa96 100644 --- a/testdata/oasis/t13.4.ot +++ b/testdata/oasis/t13.4.ot @@ -7,14 +7,14 @@ # Mapping of layer and datatype ranges to names, mapping of textlayer and texttype ranges to names in the same context but to different names # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str A + str A record TEXT bits 01011011 ;# 0CNXYRTL @@ -292,7 +292,7 @@ record LAYERNAME_TXT record LAYERNAME_TXT str TE5A - uint 3 ;# layer 5 + uint 3 ;# layer 5 uint 5 uint 0 ;# all datatypes @@ -323,7 +323,7 @@ record LAYERNAME record LAYERNAME str E5A - uint 3 ;# layer 5 + uint 3 ;# layer 5 uint 5 uint 0 ;# all datatypes diff --git a/testdata/oasis/t14.1.ot b/testdata/oasis/t14.1.ot index 34d0a38e9..618145743 100644 --- a/testdata/oasis/t14.1.ot +++ b/testdata/oasis/t14.1.ot @@ -21,14 +21,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str ABCDH + str ABCDH set cblock_bytes { 22 00 b0 02 b2 02 13 @@ -40,8 +40,8 @@ set cblock_bytes { 04 ae 65 3f 12 04 24 36 0b 8b 2c f2 e9 14 16 3d c6 73 92 4d 64 21 e3 0b 9e cf 9a 15 4f 59 6f 08 83 cc 5d c8 f8 91 7b 25 7f ea 4e e6 03 3c 5b a4 - 66 88 01 85 d8 37 b2 fc 64 bd c8 25 5a 79 92 b1 - 99 4b a3 93 65 26 7b 33 bf e6 69 b6 39 7c a9 4b + 66 88 01 85 d8 37 b2 fc 64 bd c8 25 5a 79 92 b1 + 99 4b a3 93 65 26 7b 33 bf e6 69 b6 39 7c a9 4b 40 2e e1 3b 28 a6 79 82 69 41 98 f6 14 ae 60 9b d7 4c a2 9a 3d 8c 37 f9 6c 03 3f 32 b6 68 2c 64 5c cb f3 9a 49 f3 33 e3 0c a6 dd da 29 2f 98 76 diff --git a/testdata/oasis/t2.1.ot b/testdata/oasis/t2.1.ot index d51363e48..7f62b8673 100644 --- a/testdata/oasis/t2.1.ot +++ b/testdata/oasis/t2.1.ot @@ -12,7 +12,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } diff --git a/testdata/oasis/t2.2.ot b/testdata/oasis/t2.2.ot index ea4d08710..eb3fcedff 100644 --- a/testdata/oasis/t2.2.ot +++ b/testdata/oasis/t2.2.ot @@ -16,14 +16,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # XYZ gets assigned 0 implicitly record CELLNAME - str XYZ + str XYZ # ABC gets assigned 1 implicitly record CELLNAME diff --git a/testdata/oasis/t2.3.ot b/testdata/oasis/t2.3.ot index 8b08f014d..2f7fa7dd1 100644 --- a/testdata/oasis/t2.3.ot +++ b/testdata/oasis/t2.3.ot @@ -9,14 +9,14 @@ # Explicit and implicit CELLNAME modes cannot be mixed # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -# ABC gets assigned 1 +# ABC gets assigned 1 record CELLNAME_ID - str ABC + str ABC uint 1 # XYZ gets assigned 0 implicitly diff --git a/testdata/oasis/t2.4.ot b/testdata/oasis/t2.4.ot index a8848fea0..6ecab93db 100644 --- a/testdata/oasis/t2.4.ot +++ b/testdata/oasis/t2.4.ot @@ -15,17 +15,17 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -# ABC gets assigned 1 +# ABC gets assigned 1 record CELLNAME_ID - str ABC + str ABC uint 1 -# XYZ gets assigned 0 +# XYZ gets assigned 0 record CELLNAME_ID str XYZ uint 0 diff --git a/testdata/oasis/t2.5.ot b/testdata/oasis/t2.5.ot index e9b789051..e686829a1 100644 --- a/testdata/oasis/t2.5.ot +++ b/testdata/oasis/t2.5.ot @@ -9,17 +9,17 @@ # No cellname declared for cell id 2 # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -# ABC gets assigned 1 +# ABC gets assigned 1 record CELLNAME_ID - str ABC + str ABC uint 1 -# XYZ gets assigned 0 +# XYZ gets assigned 0 record CELLNAME_ID str XYZ uint 0 diff --git a/testdata/oasis/t2.6.ot b/testdata/oasis/t2.6.ot index 2e4c1c793..3c18ae192 100644 --- a/testdata/oasis/t2.6.ot +++ b/testdata/oasis/t2.6.ot @@ -9,17 +9,17 @@ # Invalid n-string # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -# ABC gets assigned 1 +# ABC gets assigned 1 record CELLNAME_ID - str ABC + str ABC uint 1 -# XYZ gets assigned 0 +# XYZ gets assigned 0 record CELLNAME_ID str " XYZ" ;# FAIL: invalid n-string uint 0 diff --git a/testdata/oasis/t2.7.ot b/testdata/oasis/t2.7.ot index 3f9326c79..b29304131 100644 --- a/testdata/oasis/t2.7.ot +++ b/testdata/oasis/t2.7.ot @@ -10,17 +10,17 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -# ABC gets assigned 1 +# ABC gets assigned 1 record CELLNAME_ID - str ABC + str ABC uint 1 -# XYZ gets assigned 0 +# XYZ gets assigned 0 record CELLNAME_ID str XYZ uint 0 diff --git a/testdata/oasis/t3.1.ot b/testdata/oasis/t3.1.ot index 0f8f11b37..29e4cc330 100644 --- a/testdata/oasis/t3.1.ot +++ b/testdata/oasis/t3.1.ot @@ -118,14 +118,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01011011 ;# 0CNXYRTL @@ -161,7 +161,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 10 uint 12 @@ -175,21 +175,21 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 2 ;# repetition (3 columns) - uint 1 + uint 1 uint 10 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 3 ;# repetition (4 columns) - uint 2 + uint 2 uint 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) - uint 2 + uint 2 uint 12 uint 13 uint 14 @@ -198,7 +198,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 5 ;# repetition (4 columns, arbitrary spacing, grid 3) - uint 2 + uint 2 uint 3 uint 4 uint 5 @@ -208,7 +208,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 6 ;# repetition (3 columns, arbitrary spacing) - uint 1 + uint 1 uint 10 uint 11 @@ -216,7 +216,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 7 ;# repetition (3 columns, arbitrary spacing, grid 5) - uint 1 + uint 1 uint 5 uint 2 uint 3 @@ -225,19 +225,19 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension + uint 1 ;# n-dimension + uint 2 ;# m-dimension uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0) - uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) + uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) int -12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# n-dimension + uint 2 ;# m-dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) @@ -245,22 +245,22 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (3 times, arbitrary displacement vectors) - uint 1 ;# dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (4 times, arbitrary displacement vectors) - uint 2 ;# dimension + uint 2 ;# dimension uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (9 times, once in the middle, others displaced) - uint 7 ;# dimension + uint 7 ;# dimension uint [ expr 16*10+0 ] ;# n-displacement (g-delta: 10-east=10,0) uint [ expr 16*10+2 ] ;# n-displacement (g-delta: 10-north=0,10) uint [ expr 16*10+4 ] ;# n-displacement (g-delta: 10-west=-10,0) @@ -274,8 +274,8 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension - uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) + uint 1 ;# dimension + uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) int 12 uint [ expr 16*10+14 ] ;# n-displacement (g-delta: 10-southeast=10,-10) @@ -298,9 +298,9 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 11 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension + uint 1 ;# dimension uint 3 ;# grid (3) - uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) + uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) int 4 uint [ expr 16*3+14 ] ;# n-displacement (g-delta: 9-southeast=9,-9) diff --git a/testdata/oasis/t3.10.ot b/testdata/oasis/t3.10.ot index 633ca8279..a12f5a2f3 100644 --- a/testdata/oasis/t3.10.ot +++ b/testdata/oasis/t3.10.ot @@ -15,7 +15,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -23,10 +23,10 @@ header # Text definition record TEXTSTRING str A - + # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01110011 ;# 0CNXYRTL @@ -35,5 +35,5 @@ record TEXT uint 2 ;# text-datatype int 100 ;# text-x (abs) -tail +tail diff --git a/testdata/oasis/t3.11.ot b/testdata/oasis/t3.11.ot index 01b323d4b..e0cdd7869 100644 --- a/testdata/oasis/t3.11.ot +++ b/testdata/oasis/t3.11.ot @@ -7,7 +7,7 @@ # Modal variable accessed before being defined: text-string # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -15,10 +15,10 @@ header # Text definition record TEXTSTRING str A - + # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 00011011 ;# 0CNXYRTL @@ -27,5 +27,5 @@ record TEXT int 100 ;# text-x (abs) int -200 ;# text-y (abs) -tail +tail diff --git a/testdata/oasis/t3.12.ot b/testdata/oasis/t3.12.ot index 6a613bceb..1cfa4725c 100644 --- a/testdata/oasis/t3.12.ot +++ b/testdata/oasis/t3.12.ot @@ -121,14 +121,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111011 ;# 0CNXYRTL @@ -165,7 +165,7 @@ record TEXT uint 1 ;# text-id int -200 ;# text-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 10 uint 12 @@ -179,21 +179,21 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 2 ;# repetition (3 columns) - uint 1 + uint 1 uint 10 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 3 ;# repetition (4 columns) - uint 2 + uint 2 uint 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) - uint 2 + uint 2 uint 12 uint 13 uint 14 @@ -202,7 +202,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 5 ;# repetition (4 columns, arbitrary spacing, grid 3) - uint 2 + uint 2 uint 3 uint 4 uint 5 @@ -212,7 +212,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 6 ;# repetition (3 columns, arbitrary spacing) - uint 1 + uint 1 uint 10 uint 11 @@ -220,7 +220,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 7 ;# repetition (3 columns, arbitrary spacing, grid 5) - uint 1 + uint 1 uint 5 uint 2 uint 3 @@ -229,19 +229,19 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension + uint 1 ;# n-dimension + uint 2 ;# m-dimension uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0) - uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) + uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) int -12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# n-dimension + uint 2 ;# m-dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) @@ -249,22 +249,22 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (3 times, arbitrary displacement vectors) - uint 1 ;# dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (4 times, arbitrary displacement vectors) - uint 2 ;# dimension + uint 2 ;# dimension uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (9 times, once in the middle, others displaced) - uint 7 ;# dimension + uint 7 ;# dimension uint [ expr 16*10+0 ] ;# n-displacement (g-delta: 10-east=10,0) uint [ expr 16*10+2 ] ;# n-displacement (g-delta: 10-north=0,10) uint [ expr 16*10+4 ] ;# n-displacement (g-delta: 10-west=-10,0) @@ -278,8 +278,8 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension - uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) + uint 1 ;# dimension + uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) int 12 uint [ expr 16*10+14 ] ;# n-displacement (g-delta: 10-southeast=10,-10) @@ -302,9 +302,9 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 11 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension + uint 1 ;# dimension uint 3 ;# grid (3) - uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) + uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) int 4 uint [ expr 16*3+14 ] ;# n-displacement (g-delta: 10-southeast=12,-12) @@ -312,7 +312,7 @@ record TEXT record TEXTSTRING_ID str A uint 1 - + # Text definition record TEXTSTRING_ID str B diff --git a/testdata/oasis/t3.2.ot b/testdata/oasis/t3.2.ot index 4160f20d0..4859dcee6 100644 --- a/testdata/oasis/t3.2.ot +++ b/testdata/oasis/t3.2.ot @@ -120,7 +120,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -129,7 +129,7 @@ header record TEXTSTRING_ID str A uint 1 - + # Text definition record TEXTSTRING_ID str B @@ -137,7 +137,7 @@ record TEXTSTRING_ID # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111011 ;# 0CNXYRTL @@ -174,7 +174,7 @@ record TEXT uint 1 ;# text-id int -200 ;# text-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 10 uint 12 @@ -188,21 +188,21 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 2 ;# repetition (3 columns) - uint 1 + uint 1 uint 10 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 3 ;# repetition (4 columns) - uint 2 + uint 2 uint 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) - uint 2 + uint 2 uint 12 uint 13 uint 14 @@ -211,7 +211,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 5 ;# repetition (4 columns, arbitrary spacing, grid 3) - uint 2 + uint 2 uint 3 uint 4 uint 5 @@ -221,7 +221,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 6 ;# repetition (3 columns, arbitrary spacing) - uint 1 + uint 1 uint 10 uint 11 @@ -229,7 +229,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 7 ;# repetition (3 columns, arbitrary spacing, grid 5) - uint 1 + uint 1 uint 5 uint 2 uint 3 @@ -238,19 +238,19 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension + uint 1 ;# n-dimension + uint 2 ;# m-dimension uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0) - uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) + uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) int -12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# n-dimension + uint 2 ;# m-dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) @@ -258,22 +258,22 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (3 times, arbitrary displacement vectors) - uint 1 ;# dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (4 times, arbitrary displacement vectors) - uint 2 ;# dimension + uint 2 ;# dimension uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (9 times, once in the middle, others displaced) - uint 7 ;# dimension + uint 7 ;# dimension uint [ expr 16*10+0 ] ;# n-displacement (g-delta: 10-east=10,0) uint [ expr 16*10+2 ] ;# n-displacement (g-delta: 10-north=0,10) uint [ expr 16*10+4 ] ;# n-displacement (g-delta: 10-west=-10,0) @@ -287,8 +287,8 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension - uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) + uint 1 ;# dimension + uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) int 12 uint [ expr 16*10+14 ] ;# n-displacement (g-delta: 10-southeast=10,-10) @@ -311,9 +311,9 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 11 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension + uint 1 ;# dimension uint 3 ;# grid (3) - uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) + uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) int 4 uint [ expr 16*3+14 ] ;# n-displacement (g-delta: 10-southeast=12,-12) diff --git a/testdata/oasis/t3.3.ot b/testdata/oasis/t3.3.ot index 60e3b0a05..e22e09e57 100644 --- a/testdata/oasis/t3.3.ot +++ b/testdata/oasis/t3.3.ot @@ -8,7 +8,7 @@ # Explicit and implicit TEXTSTRING modes cannot be mixed # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -17,14 +17,14 @@ header record TEXTSTRING_ID str A uint 1 - + # Text definition record TEXTSTRING str B ;# FAILS # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111011 ;# 0CNXYRTL diff --git a/testdata/oasis/t3.4.ot b/testdata/oasis/t3.4.ot index 07ac5973f..215b6015b 100644 --- a/testdata/oasis/t3.4.ot +++ b/testdata/oasis/t3.4.ot @@ -9,7 +9,7 @@ # No text string defined for id 2 # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -17,14 +17,14 @@ header # Text definition record TEXTSTRING str A - + # Text definition record TEXTSTRING - str B + str B # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111011 ;# 0CNXYRTL diff --git a/testdata/oasis/t3.5.ot b/testdata/oasis/t3.5.ot index 16d64d43a..b0db3e717 100644 --- a/testdata/oasis/t3.5.ot +++ b/testdata/oasis/t3.5.ot @@ -120,7 +120,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -128,14 +128,14 @@ header # Text definition record TEXTSTRING str A - + # Text definition record TEXTSTRING str B # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111011 ;# 0CNXYRTL @@ -172,7 +172,7 @@ record TEXT uint 1 ;# text-id int -200 ;# text-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 10 uint 12 @@ -186,21 +186,21 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 2 ;# repetition (3 columns) - uint 1 + uint 1 uint 10 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 3 ;# repetition (4 columns) - uint 2 + uint 2 uint 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) - uint 2 + uint 2 uint 12 uint 13 uint 14 @@ -209,7 +209,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 5 ;# repetition (4 columns, arbitrary spacing, grid 3) - uint 2 + uint 2 uint 3 uint 4 uint 5 @@ -219,7 +219,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 6 ;# repetition (3 columns, arbitrary spacing) - uint 1 + uint 1 uint 10 uint 11 @@ -227,7 +227,7 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 7 ;# repetition (3 columns, arbitrary spacing, grid 5) - uint 1 + uint 1 uint 5 uint 2 uint 3 @@ -236,19 +236,19 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension + uint 1 ;# n-dimension + uint 2 ;# m-dimension uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0) - uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) + uint [ expr 4*11+3 ] ;# m-displacement (g-delta: -11,-12) int -12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# n-dimension + uint 2 ;# m-dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) @@ -256,22 +256,22 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (3 times, arbitrary displacement vectors) - uint 1 ;# dimension - uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) + uint 1 ;# dimension + uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12) int 12 record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 9 ;# repetition (4 times, arbitrary displacement vectors) - uint 2 ;# dimension + uint 2 ;# dimension uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10) record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (9 times, once in the middle, others displaced) - uint 7 ;# dimension + uint 7 ;# dimension uint [ expr 16*10+0 ] ;# n-displacement (g-delta: 10-east=10,0) uint [ expr 16*10+2 ] ;# n-displacement (g-delta: 10-north=0,10) uint [ expr 16*10+4 ] ;# n-displacement (g-delta: 10-west=-10,0) @@ -285,8 +285,8 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 10 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension - uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) + uint 1 ;# dimension + uint [ expr 4*11+3 ] ;# n-displacement (g-delta: -11,12) int 12 uint [ expr 16*10+14 ] ;# n-displacement (g-delta: 10-southeast=10,-10) @@ -309,9 +309,9 @@ record TEXT bits 00001100 ;# 0CNXYRTL int -200 ;# text-y (relative) uint 11 ;# repetition (3 times, once in the middle, two displaced) - uint 1 ;# dimension + uint 1 ;# dimension uint 3 ;# grid (3) - uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) + uint [ expr 4*4+3 ] ;# n-displacement (g-delta: -12,12) int 4 uint [ expr 16*3+14 ] ;# n-displacement (g-delta: 10-southeast=12,-12) diff --git a/testdata/oasis/t3.6.ot b/testdata/oasis/t3.6.ot index d560158ee..95f3f6c3b 100644 --- a/testdata/oasis/t3.6.ot +++ b/testdata/oasis/t3.6.ot @@ -9,7 +9,7 @@ # Modal variable accessed before being defined: repetition # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -17,10 +17,10 @@ header # Text definition record TEXTSTRING str A - + # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111111 ;# 0CNXYRTL @@ -31,5 +31,5 @@ record TEXT int -200 ;# text-y (abs) uint 0 -tail +tail diff --git a/testdata/oasis/t3.7.ot b/testdata/oasis/t3.7.ot index edc232dfc..15e0a7d67 100644 --- a/testdata/oasis/t3.7.ot +++ b/testdata/oasis/t3.7.ot @@ -9,7 +9,7 @@ # Modal variable accessed before being defined: textlayer # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -17,10 +17,10 @@ header # Text definition record TEXTSTRING str A - + # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111010 ;# 0CNXYRTL @@ -29,5 +29,5 @@ record TEXT int 100 ;# text-x (abs) int -200 ;# text-y (abs) -tail +tail diff --git a/testdata/oasis/t3.8.ot b/testdata/oasis/t3.8.ot index fec213603..cc65187c7 100644 --- a/testdata/oasis/t3.8.ot +++ b/testdata/oasis/t3.8.ot @@ -9,7 +9,7 @@ # Modal variable accessed before being defined: texttype # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -17,10 +17,10 @@ header # Text definition record TEXTSTRING str A - + # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01111001 ;# 0CNXYRTL @@ -29,5 +29,5 @@ record TEXT int 100 ;# text-x (abs) int -200 ;# text-y (abs) -tail +tail diff --git a/testdata/oasis/t3.9.ot b/testdata/oasis/t3.9.ot index 56f8331fc..c9fcfa2fc 100644 --- a/testdata/oasis/t3.9.ot +++ b/testdata/oasis/t3.9.ot @@ -15,7 +15,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -23,10 +23,10 @@ header # Text definition record TEXTSTRING str A - + # Cell ABC record CELL_STR - str ABC + str ABC record TEXT bits 01101011 ;# 0CNXYRTL @@ -35,5 +35,5 @@ record TEXT uint 2 ;# text-datatype int -200 ;# text-y (abs) -tail +tail diff --git a/testdata/oasis/t4.1.ot b/testdata/oasis/t4.1.ot index f3580dcb5..c66eb9cac 100644 --- a/testdata/oasis/t4.1.ot +++ b/testdata/oasis/t4.1.ot @@ -37,14 +37,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell ABC record CELL_STR - str ABC + str ABC record RECTANGLE bits 01111011 ;# SWHXYRDL @@ -116,7 +116,7 @@ record RECTANGLE bits 00001100 ;# SWHXYRDL int 500 ;# geometry-y (absolute) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 @@ -125,7 +125,7 @@ record RECTANGLE bits 00001100 ;# SWHXYRDL int 2000 ;# geometry-y (absolute) uint 4 ;# non-regular repetition (3 placements with specified x-delta) - uint 1 + uint 1 uint 200 uint 300 diff --git a/testdata/oasis/t4.2.ot b/testdata/oasis/t4.2.ot index bc1e23aa3..014624056 100644 --- a/testdata/oasis/t4.2.ot +++ b/testdata/oasis/t4.2.ot @@ -8,7 +8,7 @@ # Property attachement to rectangles in various combinations # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -19,7 +19,7 @@ record PROPNAME # Cell ABC record CELL_STR - str ABC + str ABC record RECTANGLE bits 01111011 ;# SWHXYRDL @@ -112,7 +112,7 @@ record RECTANGLE bits 00001100 ;# SWHXYRDL int 500 ;# geometry-y (absolute) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 @@ -123,7 +123,7 @@ record RECTANGLE bits 00001100 ;# SWHXYRDL int 2000 ;# geometry-y (absolute) uint 4 ;# non-regular repetition (3 placements with specified x-delta) - uint 1 + uint 1 uint 200 uint 300 diff --git a/testdata/oasis/t5.1.ot b/testdata/oasis/t5.1.ot index c4729645f..5a766f29a 100644 --- a/testdata/oasis/t5.1.ot +++ b/testdata/oasis/t5.1.ot @@ -49,21 +49,21 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell ABC record CELL_STR - str ABC + str ABC record POLYGON bits 00111011 ;# 00PXYRDL uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -78,7 +78,7 @@ record POLYGON uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -93,7 +93,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -109,7 +109,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -120,8 +120,8 @@ record POLYGON bits 00110011 ;# 00PXYRDL uint 2 ;# layer uint 3 ;# datatype - uint 2 ;# pointlist: 2-delta - uint 7 + uint 2 ;# pointlist: 2-delta + uint 7 uint [ expr 150*4+0 ] uint [ expr 50*4+1 ] uint [ expr 50*4+2 ] @@ -135,8 +135,8 @@ record POLYGON bits 00110011 ;# 00PXYRDL uint 2 ;# layer uint 3 ;# datatype - uint 3 ;# pointlist: 3-delta - uint 8 + uint 3 ;# pointlist: 3-delta + uint 8 uint [ expr 25*8+0 ] uint [ expr 50*8+4 ] uint [ expr 50*8+1 ] @@ -151,8 +151,8 @@ record POLYGON bits 00110011 ;# 00PXYRDL uint 2 ;# layer uint 3 ;# datatype - uint 4 ;# pointlist: g-delta - uint 8 + uint 4 ;# pointlist: g-delta + uint 8 uint [ expr 25*16+0*2 ] uint [ expr 50*16+4*2 ] uint [ expr 50*16+1*2 ] @@ -168,7 +168,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 5 ;# pointlist: g-delta, double delta - uint 8 + uint 8 uint [ expr 25*16+0*2 ] uint [ expr 50*16+4*2 ] uint [ expr 50*16+1*2 ] @@ -184,7 +184,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -192,7 +192,7 @@ record POLYGON int 0 ;# geometry-x (absolute) int 2000 ;# geometry-y (absolute) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 @@ -203,7 +203,7 @@ record POLYGON bits 00110110 ;# 00PXYRDL uint 1 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -215,14 +215,14 @@ record POLYGON bits 00110110 ;# 00PXYRDL uint 1 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 int 50 int 1000 ;# geometry-x (relative) uint 6 ;# repetition (vertical 3 times) - uint 1 + uint 1 uint 200 uint 300 diff --git a/testdata/oasis/t5.2.ot b/testdata/oasis/t5.2.ot index 9c485f930..a6a489f81 100644 --- a/testdata/oasis/t5.2.ot +++ b/testdata/oasis/t5.2.ot @@ -13,14 +13,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell ABC record CELL_STR - str ABC + str ABC record XYABSOLUTE @@ -28,8 +28,8 @@ record POLYGON bits 00110011 ;# 00PXYRDL uint 2 ;# layer uint 3 ;# datatype - uint 4 ;# pointlist: g-delta - uint 8002 + uint 4 ;# pointlist: g-delta + uint 8002 uint 4003; int 0 for { set i 0 } { $i < 4000 } { incr i } { uint 41; int 20 diff --git a/testdata/oasis/t5.3.ot b/testdata/oasis/t5.3.ot index 7b337bc3b..d12911d6f 100644 --- a/testdata/oasis/t5.3.ot +++ b/testdata/oasis/t5.3.ot @@ -12,7 +12,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -23,14 +23,14 @@ record PROPNAME # Cell ABC record CELL_STR - str ABC + str ABC record POLYGON bits 00111011 ;# 00PXYRDL uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -50,7 +50,7 @@ record POLYGON uint 1 ;# layer uint 2 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -67,7 +67,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 0 ;# pointlist: 1-delta (hor. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -87,7 +87,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -100,8 +100,8 @@ record POLYGON bits 00110011 ;# 00PXYRDL uint 2 ;# layer uint 3 ;# datatype - uint 2 ;# pointlist: 2-delta - uint 7 + uint 2 ;# pointlist: 2-delta + uint 7 uint [ expr 150*4+0 ] uint [ expr 50*4+1 ] uint [ expr 50*4+2 ] @@ -117,8 +117,8 @@ record POLYGON bits 00110011 ;# 00PXYRDL uint 2 ;# layer uint 3 ;# datatype - uint 3 ;# pointlist: 3-delta - uint 8 + uint 3 ;# pointlist: 3-delta + uint 8 uint [ expr 25*8+0 ] uint [ expr 50*8+4 ] uint [ expr 50*8+1 ] @@ -135,8 +135,8 @@ record POLYGON bits 00110011 ;# 00PXYRDL uint 2 ;# layer uint 3 ;# datatype - uint 4 ;# pointlist: g-delta - uint 8 + uint 4 ;# pointlist: g-delta + uint 8 uint [ expr 25*16+0*2 ] uint [ expr 50*16+4*2 ] uint [ expr 50*16+1*2 ] @@ -154,7 +154,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 5 ;# pointlist: g-delta, double delta - uint 8 + uint 8 uint [ expr 25*16+0*2 ] uint [ expr 50*16+4*2 ] uint [ expr 50*16+1*2 ] @@ -172,7 +172,7 @@ record POLYGON uint 2 ;# layer uint 3 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -180,7 +180,7 @@ record POLYGON int 0 ;# geometry-x (absolute) int 2000 ;# geometry-y (absolute) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 @@ -193,7 +193,7 @@ record POLYGON bits 00110110 ;# 00PXYRDL uint 1 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 @@ -207,14 +207,14 @@ record POLYGON bits 00110110 ;# 00PXYRDL uint 1 ;# datatype uint 1 ;# pointlist: 1-delta (ver. first) - uint 4 + uint 4 int 150 int 50 int -50 int 50 int 1000 ;# geometry-x (relative) uint 6 ;# repetition (vertical 3 times) - uint 1 + uint 1 uint 200 uint 300 diff --git a/testdata/oasis/t6.1.ot b/testdata/oasis/t6.1.ot index 7992fdb3b..950f0f5e1 100644 --- a/testdata/oasis/t6.1.ot +++ b/testdata/oasis/t6.1.ot @@ -43,14 +43,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell ABC record CELL_STR - str ABC + str ABC record PATH bits 11111011 ;# EWPXYRDL @@ -58,10 +58,10 @@ record PATH uint 2 ;# datatype uint 10 ;# half-width bits 00001111 ;# extension-scheme SSEE - int 5 + int 5 int -5 uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -77,7 +77,7 @@ record PATH uint 10 ;# half-width bits 00000000 ;# extension-scheme SSEE uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -89,7 +89,7 @@ record PATH uint 10 ;# half-width bits 00000100 ;# extension-scheme SSEE uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -101,7 +101,7 @@ record PATH uint 12 ;# half-width bits 00000101 ;# extension-scheme SSEE uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -113,7 +113,7 @@ record PATH uint 2 ;# datatype bits 00001010 ;# extension-scheme SSEE uint 0 ;# pointlist: 1-delta (hor. first) - uint 3 + uint 3 int 150 int 50 int -50 @@ -131,7 +131,7 @@ record PATH uint 3 ;# datatype int 200 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 diff --git a/testdata/oasis/t7.1.ot b/testdata/oasis/t7.1.ot index 02fb363fb..fca6661e4 100644 --- a/testdata/oasis/t7.1.ot +++ b/testdata/oasis/t7.1.ot @@ -58,14 +58,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell ABC record CELL_STR - str ABC + str ABC uint 23 bits 01111011 ;# OWHXYRDL @@ -105,7 +105,7 @@ uint 23 int -20 ;# delta-b int 300 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 @@ -146,7 +146,7 @@ uint 24 int 20 ;# delta-a int 300 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 @@ -187,7 +187,7 @@ uint 25 int -20 ;# delta-b int 300 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 200 uint 300 diff --git a/testdata/oasis/t8.1.ot b/testdata/oasis/t8.1.ot index f69636c82..15ffab85e 100644 --- a/testdata/oasis/t8.1.ot +++ b/testdata/oasis/t8.1.ot @@ -33,14 +33,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL @@ -53,7 +53,7 @@ record RECTANGLE # Cell TOP record CELL_STR - str TOP + str TOP record XYRELATIVE @@ -100,7 +100,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (absolute) int 0 ;# placement-y (absolute) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 300 uint 300 @@ -118,7 +118,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 2 ;# repetition (3 columns) - uint 1 + uint 1 uint 320 uint 17 ;# PLACEMENT (no mag, manhattan angles) @@ -126,7 +126,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 3 ;# repetition (4 columns) - uint 2 + uint 2 uint 310 uint 17 ;# PLACEMENT (no mag, manhattan angles) @@ -134,7 +134,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 4 ;# repetition (4 columns, arbitrary spacing) - uint 2 + uint 2 uint 320 uint 330 uint 340 @@ -144,9 +144,9 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int 2000 ;# placement-x (relative) int 0 ;# placement-y (relative) uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors) - uint 1 ;# n-dimension - uint 2 ;# m-dimension - uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320) + uint 1 ;# n-dimension + uint 2 ;# m-dimension + uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320) int 320 uint [ expr 16*330+10 ] ;# n-displacement (g-delta: 330-northwest=-330,330) diff --git a/testdata/oasis/t8.2.ot b/testdata/oasis/t8.2.ot index c68ca7096..3127e7c24 100644 --- a/testdata/oasis/t8.2.ot +++ b/testdata/oasis/t8.2.ot @@ -23,14 +23,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell TOP record CELL_STR - str TOP + str TOP record XYRELATIVE @@ -72,7 +72,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) # Cell A record CELL_STR - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL diff --git a/testdata/oasis/t8.3.ot b/testdata/oasis/t8.3.ot index 9ce4cdf17..02a0dce71 100644 --- a/testdata/oasis/t8.3.ot +++ b/testdata/oasis/t8.3.ot @@ -23,14 +23,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -record CELLNAME +record CELLNAME str A -record CELLNAME +record CELLNAME str TOP # Cell A diff --git a/testdata/oasis/t8.4.ot b/testdata/oasis/t8.4.ot index 2b82e71ac..49c350bee 100644 --- a/testdata/oasis/t8.4.ot +++ b/testdata/oasis/t8.4.ot @@ -24,14 +24,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -record CELLNAME +record CELLNAME str A -record CELLNAME +record CELLNAME str TOP # Cell TOP @@ -46,7 +46,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles) int -300 ;# placement-x (relative) int 400 ;# placement-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 20 uint 30 diff --git a/testdata/oasis/t8.5.ot b/testdata/oasis/t8.5.ot index 8788abc39..28e1a249b 100644 --- a/testdata/oasis/t8.5.ot +++ b/testdata/oasis/t8.5.ot @@ -23,14 +23,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } -record CELLNAME +record CELLNAME str A -record CELLNAME +record CELLNAME str TOP # Cell TOP diff --git a/testdata/oasis/t8.6.ot b/testdata/oasis/t8.6.ot index 605a7f902..e868e8963 100644 --- a/testdata/oasis/t8.6.ot +++ b/testdata/oasis/t8.6.ot @@ -28,7 +28,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -54,7 +54,7 @@ uint 18 ;# PLACEMENT (no mag, manhattan angles) # Cell TOP record CELL_STR - str TOP + str TOP record XYRELATIVE @@ -100,7 +100,7 @@ uint 18 ;# PLACEMENT (no mag, manhattan angles) # Cell A record CELL_STR - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL diff --git a/testdata/oasis/t8.7.ot b/testdata/oasis/t8.7.ot index db6c3eb2f..17d589ae2 100644 --- a/testdata/oasis/t8.7.ot +++ b/testdata/oasis/t8.7.ot @@ -24,7 +24,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -84,9 +84,9 @@ record RECTANGLE int 300 ;# geometry-x (absolute) int -400 ;# geometry-y (absolute) -record CELLNAME +record CELLNAME str A -record CELLNAME +record CELLNAME str TOP tail diff --git a/testdata/oasis/t8.8.ot b/testdata/oasis/t8.8.ot index c6dafc105..0397f3dcb 100644 --- a/testdata/oasis/t8.8.ot +++ b/testdata/oasis/t8.8.ot @@ -29,7 +29,7 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } @@ -58,7 +58,7 @@ uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) # Cell TOP record CELL_STR - str TOP + str TOP uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) bits 10110110 ;# CNXYRMAF @@ -91,7 +91,7 @@ uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) # Cell A record CELL_STR - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL diff --git a/testdata/oasis/t9.1.ot b/testdata/oasis/t9.1.ot index 9b049409e..7655f1b5b 100644 --- a/testdata/oasis/t9.1.ot +++ b/testdata/oasis/t9.1.ot @@ -80,14 +80,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str A + str A record CTRAPEZOID bits 11111011 ;# TWHXYRDL @@ -152,7 +152,7 @@ record CTRAPEZOID bits 00001100 ;# TWHXYRDL int 400 ;# geometry-y (relative) uint 1 ;# repetition (3x4 matrix) - uint 1 + uint 1 uint 2 uint 400 uint 300 diff --git a/testdata/oasis/t9.2.ot b/testdata/oasis/t9.2.ot index de9a0f337..287c1a6c5 100644 --- a/testdata/oasis/t9.2.ot +++ b/testdata/oasis/t9.2.ot @@ -14,14 +14,14 @@ # # -header +header real 0 1000.0 uint 0 ;# offset table is in start record for { set i 0 } { $i < 12 } { incr i } { uint 0 } # Cell A record CELL_STR - str A + str A # This test is supposed to test, if the H modal variable is not tested # if the CTRAPEZOID does not need it. @@ -42,7 +42,7 @@ record CTRAPEZOID # Cell B record CELL_STR - str B + str B # This test is supposed to test, if the W modal variable is not tested # if the CTRAPEZOID does not need it.