From 565eed877f84f12fa94d28a795741b964f96dbcc Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Tue, 10 Aug 2021 22:25:06 -0700 Subject: [PATCH] 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