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 df53be817..365928525 100644 Binary files a/testdata/oasis/t1.1.oas and b/testdata/oasis/t1.1.oas differ 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.oas b/testdata/oasis/t1.2.oas index f6b2eaa72..d7a719bde 100644 Binary files a/testdata/oasis/t1.2.oas and b/testdata/oasis/t1.2.oas differ 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.oas b/testdata/oasis/t1.3.oas index 4cf184eee..c9400e471 100644 Binary files a/testdata/oasis/t1.3.oas and b/testdata/oasis/t1.3.oas differ 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.oas b/testdata/oasis/t1.4.oas index 2af35cd0f..4cb9ffd6b 100644 Binary files a/testdata/oasis/t1.4.oas and b/testdata/oasis/t1.4.oas differ 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.oas b/testdata/oasis/t1.5.oas index 0175407c1..cfc4f5e09 100644 Binary files a/testdata/oasis/t1.5.oas and b/testdata/oasis/t1.5.oas differ 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.oas b/testdata/oasis/t10.1.oas index 7516f2ffa..ddf44159e 100644 Binary files a/testdata/oasis/t10.1.oas and b/testdata/oasis/t10.1.oas differ diff --git a/testdata/oasis/t10.1.ot b/testdata/oasis/t10.1.ot index e5cee5fa3..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 @@ -146,12 +146,12 @@ 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 - str TOP + str TOP uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 10000000 ;# CNXYRAAF diff --git a/testdata/oasis/t11.1.oas b/testdata/oasis/t11.1.oas index a2b85958e..0e78f05c7 100644 Binary files a/testdata/oasis/t11.1.oas and b/testdata/oasis/t11.1.oas differ diff --git a/testdata/oasis/t11.1.ot b/testdata/oasis/t11.1.ot index ef46b9de4..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 @@ -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 +record PROPERTY bits 00010110 ;# property info byte UUUUVCNS - uint 0 + uint 0 ;# propname-id real 1 -5 ;# prop value #0 record RECTANGLE @@ -69,14 +69,14 @@ 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 +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) @@ -90,14 +90,14 @@ 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 +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) @@ -109,10 +109,10 @@ 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 +record PROPERTY bits 00001000 ;# property info byte UUUUVCNS record XYABSOLUTE @@ -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 @@ -133,15 +133,15 @@ 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 - int 2000 ;# geometry-x - int 0 ;# geometry-y + int 2000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) record PROPERTY_REP @@ -150,17 +150,17 @@ 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 int 50 - int 3000 ;# geometry-x - int 0 ;# geometry-y + int 3000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) record PROPERTY_REP -record PROPERTY +record PROPERTY bits 00000110 ;# property info byte UUUUVCNS uint 1 ;# propname-id diff --git a/testdata/oasis/t11.2.oas b/testdata/oasis/t11.2.oas index 85fd6da81..9da427943 100644 Binary files a/testdata/oasis/t11.2.oas and b/testdata/oasis/t11.2.oas differ diff --git a/testdata/oasis/t11.2.ot b/testdata/oasis/t11.2.ot index 97647daa4..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 @@ -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 +record PROPERTY bits 00010110 ;# property info byte UUUUVCNS - uint 0 + uint 0 ;# propname-id real 1 -5 ;# prop value #0 record RECTANGLE @@ -75,15 +75,15 @@ 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 +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) @@ -97,15 +97,15 @@ 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 +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) @@ -117,11 +117,11 @@ 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 +record PROPERTY bits 00001000 ;# property info byte UUUUVCNS record XYABSOLUTE @@ -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 @@ -143,15 +143,15 @@ 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 - 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 @@ -161,18 +161,18 @@ 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 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 -record PROPERTY +record PROPERTY bits 00000110 ;# property info byte UUUUVCNS uint 1 ;# propname-id diff --git a/testdata/oasis/t11.3.oas b/testdata/oasis/t11.3.oas index a0c6ca6b9..7ee0ec6f2 100644 Binary files a/testdata/oasis/t11.3.oas and b/testdata/oasis/t11.3.oas differ diff --git a/testdata/oasis/t11.3.ot b/testdata/oasis/t11.3.ot index af7e4673a..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 @@ -41,14 +41,14 @@ 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 +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 @@ -58,14 +58,14 @@ 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 +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 @@ -75,10 +75,10 @@ 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 +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS record RECTANGLE @@ -87,10 +87,10 @@ 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 +record PROPERTY_REP record RECTANGLE bits 01111011 ;# SWHXYRDL @@ -98,17 +98,17 @@ 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 +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 @@ -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 @@ -130,15 +130,15 @@ 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 - int 2000 ;# geometry-x - int 0 ;# geometry-y + int 2000 ;# geometry-x (absolute) + int 0 ;# geometry-y (absolute) record PROPERTY_REP @@ -147,13 +147,13 @@ 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 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.oas b/testdata/oasis/t11.4.oas index fc374952e..9452fb0b1 100644 Binary files a/testdata/oasis/t11.4.oas and b/testdata/oasis/t11.4.oas differ diff --git a/testdata/oasis/t11.4.ot b/testdata/oasis/t11.4.ot index d0059d407..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,75 +44,75 @@ record RECTANGLE # Cell TOP record CELL_STR - str TOP + str TOP 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 +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 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 +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 uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + 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 + int 300 ;# placement-x (absolute) -record PROPERTY_REP +record PROPERTY_REP 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 +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + 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 uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) record PROPERTY_REP @@ -120,10 +120,10 @@ 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 1 uint 2 uint 300 uint 300 @@ -134,38 +134,38 @@ 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 1 uint 320 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 2 uint 310 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 2 uint 320 uint 330 uint 340 @@ -174,12 +174,12 @@ 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 - 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.oas b/testdata/oasis/t11.5.oas index f30270648..f0db3e20e 100644 Binary files a/testdata/oasis/t11.5.oas and b/testdata/oasis/t11.5.oas differ diff --git a/testdata/oasis/t11.5.ot b/testdata/oasis/t11.5.ot index 065ab392f..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 @@ -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 +record PROPERTY bits 00010110 ;# property info byte UUUUVCNS - uint 0 + uint 0 ;# propname-id real 1 -5 ;# prop value #0 record RECTANGLE @@ -58,15 +58,15 @@ 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 +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) @@ -80,15 +80,15 @@ 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 +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) @@ -100,11 +100,11 @@ 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 +record PROPERTY bits 00001000 ;# property info byte UUUUVCNS record XYABSOLUTE @@ -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 @@ -126,15 +126,15 @@ 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 - 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 @@ -144,18 +144,18 @@ 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 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 -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.oas b/testdata/oasis/t11.6.oas index b8ecdf9c3..8b54fc183 100644 Binary files a/testdata/oasis/t11.6.oas and b/testdata/oasis/t11.6.oas differ diff --git a/testdata/oasis/t11.6.ot b/testdata/oasis/t11.6.ot index acae7b02a..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,83 +40,83 @@ record RECTANGLE # Cell TOP record CELL_STR - str TOP + str TOP 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 +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 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 +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 uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010000 ;# CNXYRAAF - int 400 ;# placement-y + 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 + int 300 ;# placement-x (absolute) -record PROPERTY_REP +record PROPERTY_REP 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 +record PROPERTY bits 00001001 ;# property info byte UUUUVCNS record XYRELATIVE uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010010 ;# CNXYRAAF - int 1000 ;# placement-y + 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 uint 17 ;# PLACEMENT (no mag, manhattan angles) bits 00010011 ;# CNXYRAAF - int 1000 ;# placement-y + int 1000 ;# placement-y (relative) record PROPERTY_REP @@ -124,10 +124,10 @@ 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 1 uint 2 uint 300 uint 300 @@ -138,38 +138,38 @@ 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 1 uint 320 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 2 uint 310 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 2 uint 320 uint 330 uint 340 @@ -178,12 +178,12 @@ 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 - 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.oas b/testdata/oasis/t11.7.oas index 3efe75cfd..a17cbf9b4 100644 Binary files a/testdata/oasis/t11.7.oas and b/testdata/oasis/t11.7.oas differ 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.oas b/testdata/oasis/t11.8.oas index db8fdf25a..4d8c00585 100644 Binary files a/testdata/oasis/t11.8.oas and b/testdata/oasis/t11.8.oas differ 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.oas b/testdata/oasis/t11.9.oas index 06440274e..7049c2997 100644 Binary files a/testdata/oasis/t11.9.oas and b/testdata/oasis/t11.9.oas differ 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.oas b/testdata/oasis/t12.1.oas index ddf746e24..8e6d7ab5d 100644 Binary files a/testdata/oasis/t12.1.oas and b/testdata/oasis/t12.1.oas differ 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.oas b/testdata/oasis/t13.1.oas index 6142940af..1c2300123 100644 Binary files a/testdata/oasis/t13.1.oas and b/testdata/oasis/t13.1.oas differ 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.oas b/testdata/oasis/t13.2.oas index fcd14c123..1d41d33af 100644 Binary files a/testdata/oasis/t13.2.oas and b/testdata/oasis/t13.2.oas differ 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.oas b/testdata/oasis/t13.3.oas index a221be0a4..8e990eb61 100644 Binary files a/testdata/oasis/t13.3.oas and b/testdata/oasis/t13.3.oas differ 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.oas b/testdata/oasis/t13.4.oas index f8eb48749..0b7ce1d35 100644 Binary files a/testdata/oasis/t13.4.oas and b/testdata/oasis/t13.4.oas differ 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.oas b/testdata/oasis/t14.1.oas index 4971c1912..d7c7d8731 100644 Binary files a/testdata/oasis/t14.1.oas and b/testdata/oasis/t14.1.oas differ 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.oas b/testdata/oasis/t2.1.oas index 44cf6d0c5..4b8d0a364 100644 Binary files a/testdata/oasis/t2.1.oas and b/testdata/oasis/t2.1.oas differ 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.oas b/testdata/oasis/t2.2.oas index c01fb3165..9c1a2bc80 100644 Binary files a/testdata/oasis/t2.2.oas and b/testdata/oasis/t2.2.oas differ 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.oas b/testdata/oasis/t2.3.oas index 03123f0d8..36543720e 100644 Binary files a/testdata/oasis/t2.3.oas and b/testdata/oasis/t2.3.oas differ 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.oas b/testdata/oasis/t2.4.oas index 962b8d916..3cfffb67d 100644 Binary files a/testdata/oasis/t2.4.oas and b/testdata/oasis/t2.4.oas differ 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.oas b/testdata/oasis/t2.5.oas index f50136703..b4199c9d4 100644 Binary files a/testdata/oasis/t2.5.oas and b/testdata/oasis/t2.5.oas differ 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.oas b/testdata/oasis/t2.6.oas index 09c9ab0dc..a1225faeb 100644 Binary files a/testdata/oasis/t2.6.oas and b/testdata/oasis/t2.6.oas differ 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.oas b/testdata/oasis/t2.7.oas index 9d33c53d9..c6d6ee090 100644 Binary files a/testdata/oasis/t2.7.oas and b/testdata/oasis/t2.7.oas differ 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.oas b/testdata/oasis/t3.1.oas index c78646d3d..6418cede0 100644 Binary files a/testdata/oasis/t3.1.oas and b/testdata/oasis/t3.1.oas differ 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.oas b/testdata/oasis/t3.10.oas index 5125a95fc..99dac2b49 100644 Binary files a/testdata/oasis/t3.10.oas and b/testdata/oasis/t3.10.oas differ 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.oas b/testdata/oasis/t3.11.oas index 390ea0959..51fe5f7bc 100644 Binary files a/testdata/oasis/t3.11.oas and b/testdata/oasis/t3.11.oas differ 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.oas b/testdata/oasis/t3.12.oas index ada525012..946282525 100644 Binary files a/testdata/oasis/t3.12.oas and b/testdata/oasis/t3.12.oas differ 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.oas b/testdata/oasis/t3.2.oas index e73bc2170..e4408653f 100644 Binary files a/testdata/oasis/t3.2.oas and b/testdata/oasis/t3.2.oas differ 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.oas b/testdata/oasis/t3.3.oas index b9cb1a1fa..185a136cf 100644 Binary files a/testdata/oasis/t3.3.oas and b/testdata/oasis/t3.3.oas differ 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.oas b/testdata/oasis/t3.4.oas index 837cf31f5..eec61e5c7 100644 Binary files a/testdata/oasis/t3.4.oas and b/testdata/oasis/t3.4.oas differ 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.oas b/testdata/oasis/t3.5.oas index 60fc266a5..b6dcc1012 100644 Binary files a/testdata/oasis/t3.5.oas and b/testdata/oasis/t3.5.oas differ 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.oas b/testdata/oasis/t3.6.oas index 323d8c212..d5a9b8cb8 100644 Binary files a/testdata/oasis/t3.6.oas and b/testdata/oasis/t3.6.oas differ 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.oas b/testdata/oasis/t3.7.oas index cf1fcfa29..5f1bcc9a1 100644 Binary files a/testdata/oasis/t3.7.oas and b/testdata/oasis/t3.7.oas differ 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.oas b/testdata/oasis/t3.8.oas index dbceaeae9..2cffc379d 100644 Binary files a/testdata/oasis/t3.8.oas and b/testdata/oasis/t3.8.oas differ 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.oas b/testdata/oasis/t3.9.oas index f54073b89..553588446 100644 Binary files a/testdata/oasis/t3.9.oas and b/testdata/oasis/t3.9.oas differ 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.oas b/testdata/oasis/t4.1.oas index 1fdcea834..53dd46eb3 100644 Binary files a/testdata/oasis/t4.1.oas and b/testdata/oasis/t4.1.oas differ 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.oas b/testdata/oasis/t4.2.oas index 9aa3062ef..d300cc303 100644 Binary files a/testdata/oasis/t4.2.oas and b/testdata/oasis/t4.2.oas differ 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.oas b/testdata/oasis/t5.1.oas index f20134610..fb45ae128 100644 Binary files a/testdata/oasis/t5.1.oas and b/testdata/oasis/t5.1.oas differ 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.oas b/testdata/oasis/t5.2.oas index d381d6092..64a617849 100644 Binary files a/testdata/oasis/t5.2.oas and b/testdata/oasis/t5.2.oas differ 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.oas b/testdata/oasis/t5.3.oas index d4d787a1d..3735c7c73 100644 Binary files a/testdata/oasis/t5.3.oas and b/testdata/oasis/t5.3.oas differ 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.oas b/testdata/oasis/t6.1.oas index c5d908db6..3dfe6f619 100644 Binary files a/testdata/oasis/t6.1.oas and b/testdata/oasis/t6.1.oas differ diff --git a/testdata/oasis/t6.1.ot b/testdata/oasis/t6.1.ot index 8de01f59d..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 @@ -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.oas b/testdata/oasis/t7.1.oas index a12341865..ff08c5755 100644 Binary files a/testdata/oasis/t7.1.oas and b/testdata/oasis/t7.1.oas differ diff --git a/testdata/oasis/t7.1.ot b/testdata/oasis/t7.1.ot index ef5ddc68e..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 @@ -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,9 +103,9 @@ 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 1 uint 2 uint 200 uint 300 @@ -130,23 +130,23 @@ 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 1 uint 2 uint 200 uint 300 @@ -171,23 +171,23 @@ 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 1 uint 2 uint 200 uint 300 diff --git a/testdata/oasis/t8.1.oas b/testdata/oasis/t8.1.oas index 6c2d8ce18..48fc3c49d 100644 Binary files a/testdata/oasis/t8.1.oas and b/testdata/oasis/t8.1.oas differ diff --git a/testdata/oasis/t8.1.ot b/testdata/oasis/t8.1.ot index bc90f7ec5..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,54 +53,54 @@ record RECTANGLE # Cell TOP record CELL_STR - str TOP + str TOP 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 1 uint 2 uint 300 uint 300 @@ -109,44 +109,44 @@ 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 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 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 2 uint 320 uint 330 uint 340 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 - 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.oas b/testdata/oasis/t8.2.oas index 4478874d6..a5c4d21d6 100644 Binary files a/testdata/oasis/t8.2.oas and b/testdata/oasis/t8.2.oas differ diff --git a/testdata/oasis/t8.2.ot b/testdata/oasis/t8.2.ot index 2526c1077..3127e7c24 100644 --- a/testdata/oasis/t8.2.ot +++ b/testdata/oasis/t8.2.ot @@ -23,56 +23,56 @@ # # -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 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 - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL diff --git a/testdata/oasis/t8.3.oas b/testdata/oasis/t8.3.oas index 9bfe3f69f..792af30c8 100644 Binary files a/testdata/oasis/t8.3.oas and b/testdata/oasis/t8.3.oas differ diff --git a/testdata/oasis/t8.3.ot b/testdata/oasis/t8.3.ot index bee7190a5..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 @@ -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.oas b/testdata/oasis/t8.4.oas index bb6bfac4b..82238b2eb 100644 Binary files a/testdata/oasis/t8.4.oas and b/testdata/oasis/t8.4.oas differ diff --git a/testdata/oasis/t8.4.ot b/testdata/oasis/t8.4.ot index fe86e7b8b..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 @@ -43,48 +43,48 @@ 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 1 uint 2 uint 20 uint 30 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.oas b/testdata/oasis/t8.5.oas index 3809e55e7..a283dc274 100644 Binary files a/testdata/oasis/t8.5.oas and b/testdata/oasis/t8.5.oas differ diff --git a/testdata/oasis/t8.5.ot b/testdata/oasis/t8.5.ot index 5ce3b5a0a..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 @@ -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.oas b/testdata/oasis/t8.6.oas index 6fce78a40..48d2f4c67 100644 Binary files a/testdata/oasis/t8.6.oas and b/testdata/oasis/t8.6.oas differ diff --git a/testdata/oasis/t8.6.ot b/testdata/oasis/t8.6.ot index cc55ed890..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 } @@ -44,17 +44,17 @@ 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 - str TOP + str TOP record XYRELATIVE @@ -63,44 +63,44 @@ 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 - str A + str A record RECTANGLE bits 01111011 ;# SWHXYRDL diff --git a/testdata/oasis/t8.7.oas b/testdata/oasis/t8.7.oas index c66110f11..23373da96 100644 Binary files a/testdata/oasis/t8.7.oas and b/testdata/oasis/t8.7.oas differ diff --git a/testdata/oasis/t8.7.ot b/testdata/oasis/t8.7.ot index bccd1f1ef..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 } @@ -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 @@ -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.oas b/testdata/oasis/t8.8.oas index 019484076..aea5b4664 100644 Binary files a/testdata/oasis/t8.8.oas and b/testdata/oasis/t8.8.oas differ diff --git a/testdata/oasis/t8.8.ot b/testdata/oasis/t8.8.ot index fd336534a..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 } @@ -45,44 +45,44 @@ 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 - str TOP + str TOP uint 18 ;# PLACEMENT (mag 0.5, manhattan angles) bits 10110110 ;# CNXYRMAF 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 @@ -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.oas b/testdata/oasis/t9.1.oas index 88b3512b7..7b22139d5 100644 Binary files a/testdata/oasis/t9.1.oas and b/testdata/oasis/t9.1.oas differ 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.oas b/testdata/oasis/t9.2.oas index b120c87bf..e7b07d11e 100644 Binary files a/testdata/oasis/t9.2.oas and b/testdata/oasis/t9.2.oas differ 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.