X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fdata%2Fsys-file-reader.at;h=afe3bff3b5d87195ebad697c8d048706bcb0445c;hb=c70c924972443e3ec2713e421815cbf959af2582;hp=b8cd4a2650dbc1c2ec2b712a35353b822484cdfc;hpb=769186f0a30bc22fe6da1b2c4418689e43cfe55d;p=pspp

diff --git a/tests/data/sys-file-reader.at b/tests/data/sys-file-reader.at
index b8cd4a2650..afe3bff3b5 100644
--- a/tests/data/sys-file-reader.at
+++ b/tests/data/sys-file-reader.at
@@ -149,49 +149,29 @@ LIST.
   AT_CHECK([cat pspp.csv], [0], [dnl
 File label: PSPP synthetic test file: ôõöø
 
-Variable,Description,Position
-num1,Format: F8.0,1
-num2,"Label: Numeric variable 2's label (ùúû)
-Format: F8.0",2
-num3,"Format: F8.0
-Missing Values: 1",3
-num4,"Label: Another numeric variable label
-Format: F8.0
-Missing Values: 1",4
-num5,"Format: F8.0
-Missing Values: 1; 2",5
-num6,"Format: F8.0
-Missing Values: 1; 2; 3",6
-num7,"Format: F8.0
-Missing Values: 1 THRU 3",7
-num8,"Format: F8.0
-Missing Values: 1 THRU 3; 5",8
-num9,"Format: F8.0
-Missing Values: 1 THRU HIGHEST; -5",9
-numàèìñò,"Format: F8.0
-Missing Values: LOWEST THRU 1; 5",10
-str1,Format: A4,11
-str2,"Label: String variable 2's label
-Format: A4",12
-str3,"Format: A4
-Missing Values: ""MISS""",13
-str4,"Label: Another string variable label
-Format: A4
-Missing Values: ""OTHR""",14
-str5,"Format: A4
-Missing Values: ""MISS""; ""OTHR""",15
-str6,"Format: A4
-Missing Values: ""MISS""; ""OTHR""; ""MORE""",16
-str7,"Format: A11
-Missing Values: ""first8by""",17
-str8,"Format: A9
-Missing Values: ""abcdefgh""",18
-str9,"Format: A10
-Missing Values: ""abcdefgh""; ""01234567""",19
-str10,"Format: A11
-Missing Values: ""abcdefgh""; ""01234567""; ""0       """,20
-str11,"Label: 25-byte string
-Format: A25",21
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,Numeric variable 2's label (ùúû),Scale,Input,8,Right,F8.0,F8.0,
+num3,3,,Scale,Input,8,Right,F8.0,F8.0,1
+num4,4,Another numeric variable label,Scale,Input,8,Right,F8.0,F8.0,1
+num5,5,,Scale,Input,8,Right,F8.0,F8.0,1; 2
+num6,6,,Scale,Input,8,Right,F8.0,F8.0,1; 2; 3
+num7,7,,Scale,Input,8,Right,F8.0,F8.0,1 THRU 3
+num8,8,,Scale,Input,8,Right,F8.0,F8.0,1 THRU 3; 5
+num9,9,,Scale,Input,8,Right,F8.0,F8.0,1 THRU HIGHEST; -5
+numàèìñò,10,,Scale,Input,8,Right,F8.0,F8.0,LOWEST THRU 1; 5
+str1,11,,Nominal,Input,4,Left,A4,A4,
+str2,12,String variable 2's label,Nominal,Input,4,Left,A4,A4,
+str3,13,,Nominal,Input,4,Left,A4,A4,"""MISS"""
+str4,14,Another string variable label,Nominal,Input,4,Left,A4,A4,"""OTHR"""
+str5,15,,Nominal,Input,4,Left,A4,A4,"""MISS""; ""OTHR"""
+str6,16,,Nominal,Input,4,Left,A4,A4,"""MISS""; ""OTHR""; ""MORE"""
+str7,17,,Nominal,Input,11,Left,A11,A11,"""first8by"""
+str8,18,,Nominal,Input,9,Left,A9,A9,"""abcdefgh"""
+str9,19,,Nominal,Input,10,Left,A10,A10,"""abcdefgh""; ""01234567"""
+str10,20,,Nominal,Input,11,Left,A11,A11,"""abcdefgh""; ""01234567""; ""0       """
+str11,21,25-byte string,Nominal,Input,25,Left,A25,A25,
 
 Table: Data List
 num1,num2,num3,num4,num5,num6,num7,num8,num9,numàèìñò,str1,str2,str3,str4,str5,str6,str7,str8,str9,str10,str11
@@ -239,10 +219,10 @@ LIST.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-num1,Format: F8.0,1
-num2,"Label: Numeric variable 2's label
-Format: F8.0",2
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,Numeric variable 2's label,Scale,Input,8,Right,F8.0,F8.0,
 
 Table: Data List
 num1,num2
@@ -293,10 +273,10 @@ LIST.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-num1,Format: F8.0,1
-num2,"Label: Numeric variable 2's label
-Format: F8.0",2
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,Numeric variable 2's label,Scale,Input,8,Right,F8.0,F8.0,
 
 Table: Data List
 num1,num2
@@ -426,94 +406,64 @@ DISPLAY DICTIONARY.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-num1,"Format: F8.0
-
-Value,Label
-1,один (in Russian)",1
-num2,"Format: F8.0
-
-Value,Label
-1,one
-2,two",2
-num3,"Format: F8.0
-
-Value,Label
-3,three
-4,four",3
-num4,"Format: F8.0
-
-Value,Label
-5,five
-7,seven
-8,eight
-9,nine",4
-num5,"Format: F8.0
-
-Value,Label
-6,six
-7,seven
-8,eight
-10,ten",5
-str1,"Format: A1
-
-Value,Label
-a,value label for `a'",6
-str2,"Format: A2
-
-Value,Label
-bc,value label for `bc'
-de,value label for `de'",7
-str3,"Format: A3
-
-Value,Label
-fgh,value label for `fgh'
-ijk,value label for `ijk'",8
-str4,"Format: A4
-
-Value,Label
-BCDE,value label for `BCDE'
-lmno,value label for `lmno'
-tuvw,value label for `tuvw'
-xyzA,value label for `xyzA'",9
-str5,"Format: A4
-
-Value,Label
-FGHI,value label for `FGHI'
-pqrs,value label for `pqrs'
-tuvw,value label for `tuvw'
-xyzA,value label for `xyzA'",10
-str6,"Format: A6
-
-Value,Label
-JKLMNO,value label for `JKLMNO'",11
-str7,"Format: A7
-
-Value,Label
-JKLMNOP,value label for `JKLMNOP'",12
-str8,"Format: A8
-
-Value,Label
-JKLMNOPQ,value label for `JKLMNOPQ'",13
-str9ж,"Format: A9
-
-Value,Label
-RSTUVWXYZ,value label for `RSTUVWXYZ'",14
-str12,"Format: A12
-
-Value,Label
-0123456789ab,value label for `0123456789ab'
-cdefghijklmn,value label for `cdefghijklmn'",15
-str16,"Format: A16
-
-Value,Label
-EFGHIJKLMNOPQRST,value label for `EFGHIJKLMNOPQRST'
-UVWXYZ0123456789,value label for `UVWXYZ0123456789' with Cyrillic letters: `фхц'
-opqrstuvwxyzABCD,value label for `opqrstuvwxyzABCD'",16
-str17,"Format: A17
-
-Value,Label
-abcdefghijklmnopq,value label for `abcdefghijklmnopq'",17
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,,Scale,Input,8,Right,F8.0,F8.0,
+num3,3,,Scale,Input,8,Right,F8.0,F8.0,
+num4,4,,Scale,Input,8,Right,F8.0,F8.0,
+num5,5,,Scale,Input,8,Right,F8.0,F8.0,
+str1,6,,Nominal,Input,1,Left,A1,A1,
+str2,7,,Nominal,Input,2,Left,A2,A2,
+str3,8,,Nominal,Input,3,Left,A3,A3,
+str4,9,,Nominal,Input,4,Left,A4,A4,
+str5,10,,Nominal,Input,4,Left,A4,A4,
+str6,11,,Nominal,Input,6,Left,A6,A6,
+str7,12,,Nominal,Input,7,Left,A7,A7,
+str8,13,,Nominal,Input,8,Left,A8,A8,
+str9ж,14,,Nominal,Input,9,Left,A9,A9,
+str12,15,,Nominal,Input,12,Left,A12,A12,
+str16,16,,Nominal,Input,16,Left,A16,A16,
+str17,17,,Nominal,Input,17,Left,A17,A17,
+
+Table: Value Labels
+Variable,Value,Label
+num1,1,один (in Russian)
+num2,1,one
+,2,two
+num3,3,three
+,4,four
+num4,5,five
+,7,seven
+,8,eight
+,9,nine
+num5,6,six
+,7,seven
+,8,eight
+,10,ten
+str1,a,value label for `a'
+str2,bc,value label for `bc'
+,de,value label for `de'
+str3,fgh,value label for `fgh'
+,ijk,value label for `ijk'
+str4,BCDE,value label for `BCDE'
+,lmno,value label for `lmno'
+,tuvw,value label for `tuvw'
+,xyzA,value label for `xyzA'
+str5,FGHI,value label for `FGHI'
+,pqrs,value label for `pqrs'
+,tuvw,value label for `tuvw'
+,xyzA,value label for `xyzA'
+str6,JKLMNO,value label for `JKLMNO'
+str7,JKLMNOP,value label for `JKLMNOP'
+str8,JKLMNOPQ,value label for `JKLMNOPQ'
+str9ж,RSTUVWXYZ,value label for `RSTUVWXYZ'
+str12,0123456789ab,value label for `0123456789ab'
+,cdefghijklmn,value label for `cdefghijklmn'
+str16,EFGHIJKLMNOPQRST,value label for `EFGHIJKLMNOPQRST'
+,UVWXYZ0123456789,value label for `UVWXYZ0123456789' with Cyrillic letters: `фхц'
+,opqrstuvwxyzABCD,value label for `opqrstuvwxyzABCD'
+str17,abcdefghijklmnopq,value label for `abcdefghijklmnopq'
 ])
 done
 AT_CLEANUP
@@ -860,43 +810,20 @@ DISPLAY DICTIONARY.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-a,"Format: F8.0
-Measure: Nominal
-Display Alignment: Left",1
-b,"Format: F8.0
-Measure: Ordinal
-Display Alignment: Left",2
-c,"Format: F8.0
-Measure: Scale
-Display Alignment: Left",3
-d,"Format: F8.0
-Measure: Nominal
-Display Alignment: Right",4
-h,"Format: A3
-Measure: Ordinal
-Display Alignment: Right",5
-i,"Format: A3
-Measure: Scale
-Display Alignment: Right",6
-j,"Format: A3
-Measure: Nominal
-Display Alignment: Center",7
-k,"Format: A3
-Measure: Ordinal
-Display Alignment: Center",8
-l,"Format: A9
-Measure: Scale
-Display Alignment: Center",9
-m,"Format: A10
-Measure: Nominal
-Display Alignment: Left",10
-n,"Format: A17
-Measure: Nominal
-Display Alignment: Right",11
-o,"Format: A25
-Measure: Nominal
-Display Alignment: Center",12
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+a,1,,Nominal,Input,8,Left,F8.0,F8.0,
+b,2,,Ordinal,Input,8,Left,F8.0,F8.0,
+c,3,,Scale,Input,8,Left,F8.0,F8.0,
+d,4,,Nominal,Input,8,Right,F8.0,F8.0,
+h,5,,Ordinal,Input,3,Right,A3,A3,
+i,6,,Scale,Input,3,Right,A3,A3,
+j,7,,Nominal,Input,3,Center,A3,A3,
+k,8,,Ordinal,Input,3,Center,A3,A3,
+l,9,,Scale,Input,9,Center,A9,A9,
+m,10,,Nominal,Input,10,Left,A10,A10,
+n,11,,Nominal,Input,17,Right,A17,A17,
+o,12,,Nominal,Input,25,Center,A25,A25,
 ])
 done
 AT_CLEANUP
@@ -966,55 +893,20 @@ DISPLAY DICTIONARY.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-a,"Format: F8.0
-Measure: Nominal
-Display Alignment: Left
-Display Width: 1",1
-b,"Format: F8.0
-Measure: Ordinal
-Display Alignment: Left
-Display Width: 2",2
-c,"Format: F8.0
-Measure: Scale
-Display Alignment: Left
-Display Width: 3",3
-d,"Format: F8.0
-Measure: Nominal
-Display Alignment: Right
-Display Width: 4",4
-h,"Format: A3
-Measure: Ordinal
-Display Alignment: Right
-Display Width: 5",5
-i,"Format: A3
-Measure: Scale
-Display Alignment: Right
-Display Width: 6",6
-j,"Format: A3
-Measure: Nominal
-Display Alignment: Center
-Display Width: 7",7
-k,"Format: A3
-Measure: Ordinal
-Display Alignment: Center
-Display Width: 8",8
-l,"Format: A9
-Measure: Scale
-Display Alignment: Center
-Display Width: 9",9
-m,"Format: A10
-Measure: Nominal
-Display Alignment: Left
-Display Width: 10",10
-n,"Format: A17
-Measure: Nominal
-Display Alignment: Right
-Display Width: 11",11
-o,"Format: A25
-Measure: Nominal
-Display Alignment: Center
-Display Width: 12",12
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+a,1,,Nominal,Input,1,Left,F8.0,F8.0,
+b,2,,Ordinal,Input,2,Left,F8.0,F8.0,
+c,3,,Scale,Input,3,Left,F8.0,F8.0,
+d,4,,Nominal,Input,4,Right,F8.0,F8.0,
+h,5,,Ordinal,Input,5,Right,A3,A3,
+i,6,,Scale,Input,6,Right,A3,A3,
+j,7,,Nominal,Input,7,Center,A3,A3,
+k,8,,Ordinal,Input,8,Center,A3,A3,
+l,9,,Scale,Input,9,Center,A9,A9,
+m,10,,Nominal,Input,10,Left,A10,A10,
+n,11,,Nominal,Input,11,Right,A17,A17,
+o,12,,Nominal,Input,12,Center,A25,A25,
 ])
 done
 AT_CLEANUP
@@ -1073,14 +965,15 @@ DISPLAY DICTIONARY.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-LongVariableName1,Format: F8.0,1
-LongVariableName2,Format: F8.0,2
-LongVariableName3,Format: F8.0,3
-LongVariableName4,Format: F8.0,4
-Coördinate_X,Format: F8.0,5
-Coördinate_Y,Format: F8.0,6
-Coördinate_Z,Format: F8.0,7
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+LongVariableName1,1,,Scale,Input,8,Right,F8.0,F8.0,
+LongVariableName2,2,,Scale,Input,8,Right,F8.0,F8.0,
+LongVariableName3,3,,Scale,Input,8,Right,F8.0,F8.0,
+LongVariableName4,4,,Scale,Input,8,Right,F8.0,F8.0,
+Coördinate_X,5,,Scale,Input,8,Right,F8.0,F8.0,
+Coördinate_Y,6,,Scale,Input,8,Right,F8.0,F8.0,
+Coördinate_Z,7,,Scale,Input,8,Right,F8.0,F8.0,
 ])
 done
 AT_CLEANUP
@@ -1142,9 +1035,10 @@ LIST.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-séq256,Format: A256,1
-str600,Format: A600,2
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+séq256,1,,Nominal,Input,32,Left,A256,A256,
+str600,2,,Nominal,Input,32,Left,A600,A600,
 
 Table: Data List
 séq256,str600
@@ -1217,23 +1111,18 @@ DISPLAY @ATTRIBUTES.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0],
-[[Variable,Description
-FirstVariable,"Attribute,Value
-$@Role,1
-adèle[1],23
-adèle[2],34
-bert,123"
-SécondVariable,"Attribute,Value
-xyzzy,quux"
-ThirdVariable,"Attribute,Value
-fizz,buzz"
-
-Table: Custom data file attributes.
-Attribute,Value
-Attr1[1],Value1
-Attr1[2],'déclaration'
-SécondAttr[1],123
-SécondAttr[2],456
+[[Table: Variable and Dataset Attributes
+Variable,Name,Value
+(dataset),Attr1[1],Value1
+,Attr1[2],'déclaration'
+,SécondAttr[1],123
+,SécondAttr[2],456
+FirstVariable,$@Role,1
+,adèle[1],23
+,adèle[2],34
+,bert,123
+SécondVariable,xyzzy,quux
+ThirdVariable,fizz,buzz
 ]])
   AT_DATA([sys-file.sps], [dnl
 GET FILE='sys-file.sav'.
@@ -1241,31 +1130,11 @@ DISPLAY DICTIONARY.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0],
-[[Variable,Description,Position
-FirstVariable,"Format: F8.0
-Role: Output
-
-Attribute,Value
-adèle[1],23
-adèle[2],34
-bert,123",1
-SécondVariable,"Format: F8.0
-Role: Input
-
-Attribute,Value
-xyzzy,quux",2
-ThirdVariable,"Format: F8.0
-Role: Input
-
-Attribute,Value
-fizz,buzz",3
-
-Table: Custom data file attributes.
-Attribute,Value
-Attr1[1],Value1
-Attr1[2],'déclaration'
-SécondAttr[1],123
-SécondAttr[2],456
+[[Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+FirstVariable,1,,Scale,Output,8,Right,F8.0,F8.0,
+SécondVariable,2,,Scale,Input,8,Right,F8.0,F8.0,
+ThirdVariable,3,,Scale,Input,8,Right,F8.0,F8.0,
 ]])
 done
 AT_CLEANUP
@@ -1325,21 +1194,15 @@ warning: `sys-file.sav': Invalid role for variable x.
   AT_CHECK([cat pspp.csv], [0], [dnl
 warning: `sys-file.sav': Invalid role for variable x.
 
-Variable,Description,Position
-i,"Format: F8.0
-Role: Input",1
-o,"Format: F8.0
-Role: Output",2
-b,"Format: F8.0
-Role: Both",3
-n,"Format: F8.0
-Role: None",4
-p,"Format: F8.0
-Role: Partition",5
-s,"Format: F8.0
-Role: Split",6
-x,"Format: F8.0
-Role: Input",7
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+i,1,,Scale,Input,8,Right,F8.0,F8.0,
+o,2,,Scale,Output,8,Right,F8.0,F8.0,
+b,3,,Scale,Both,8,Right,F8.0,F8.0,
+n,4,,Scale,None,8,Right,F8.0,F8.0,
+p,5,,Scale,Partition,8,Right,F8.0,F8.0,
+s,6,,Scale,Split,8,Right,F8.0,F8.0,
+x,7,,Scale,Input,8,Right,F8.0,F8.0,
 ])
 done
 AT_CLEANUP
@@ -1390,12 +1253,13 @@ LIST.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-num1,Format: F8.0,1
-num2,Format: F8.0,2
-str4,Format: A4,3
-str8,Format: A8,4
-str15,Format: A15,5
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,,Scale,Input,8,Right,F8.0,F8.0,
+str4,3,,Nominal,Input,4,Left,A4,A4,
+str8,4,,Nominal,Input,8,Left,A8,A8,
+str15,5,,Nominal,Input,15,Left,A15,A15,
 
 Table: Data List
 num1,num2,str4,str8,str15
@@ -1452,12 +1316,13 @@ LIST.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps], [0])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-num1,Format: F8.0,1
-num2,Format: F8.0,2
-str4,Format: A4,3
-str8,Format: A8,4
-str15,Format: A15,5
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,,Scale,Input,8,Right,F8.0,F8.0,
+str4,3,,Nominal,Input,4,Left,A4,A4,
+str8,4,,Nominal,Input,8,Left,A8,A8,
+str15,5,,Nominal,Input,15,Left,A15,A15,
 
 Table: Data List
 num1,num2,str4,str8,str15
@@ -1518,12 +1383,13 @@ LIST.
   AT_CHECK([cat pspp.csv], [0], [dnl
 "warning: `sys-file.sav' near offset 0x54: Compression bias is not the usual value of 100, or system file uses unrecognized floating-point format."
 
-Variable,Description,Position
-num1,Format: F8.0,1
-num2,Format: F8.0,2
-str4,Format: A4,3
-str8,Format: A8,4
-str15,Format: A15,5
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,,Scale,Input,8,Right,F8.0,F8.0,
+str4,3,,Nominal,Input,4,Left,A4,A4,
+str8,4,,Nominal,Input,8,Left,A8,A8,
+str15,5,,Nominal,Input,15,Left,A15,A15,
 
 Table: Data List
 num1,num2,str4,str8,str15
@@ -1615,12 +1481,13 @@ LIST.
 ])
   AT_CHECK([pspp -o pspp.csv sys-file.sps])
   AT_CHECK([cat pspp.csv], [0], [dnl
-Variable,Description,Position
-num1,Format: F8.0,1
-num2,Format: F8.0,2
-str4,Format: A4,3
-str8,Format: A8,4
-str15,Format: A15,5
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+num2,2,,Scale,Input,8,Right,F8.0,F8.0,
+str4,3,,Nominal,Input,4,Left,A4,A4,
+str8,4,,Nominal,Input,8,Left,A8,A8,
+str15,5,,Nominal,Input,15,Left,A15,A15,
 
 Table: Data List
 num1,num2,str4,str8,str15
@@ -1883,9 +1750,10 @@ DISPLAY DICTIONARY.
   AT_CHECK([pspp -O format=csv sys-file.sps], [0],
    [warning: `sys-file.sav' near offset 0xd4: Renaming variable with duplicate name `VAR1' to `VAR001'.
 
-Variable,Description,Position
-var1,Format: F8.0,1
-var001,Format: F8.0,2
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+var1,1,,Scale,Input,8,Right,F8.0,F8.0,
+var001,2,,Scale,Input,8,Right,F8.0,F8.0,
 ])
 done
 AT_CLEANUP
@@ -2123,12 +1991,12 @@ warning: `sys-file.sav' near offset 0x257: Ignoring long string missing value re
 
 "warning: `sys-file.sav' near offset 0x270: Ignoring long string missing value 0 for variable str3, with width 11, that has bad value width 12."
 
-Variable,Description,Position
-num1,Format: F8.0,1
-str1,Format: A9,2
-str2,"Format: A10
-Missing Values: ""abcdefgh""; ""ijklmnop""; ""qrstuvwx""",3
-str3,Format: A11,4
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+str1,2,,Nominal,Input,9,Left,A9,A9,
+str2,3,,Nominal,Input,10,Left,A10,A10,"""abcdefgh""; ""ijklmnop""; ""qrstuvwx"""
+str3,4,,Nominal,Input,11,Left,A11,A11,
 ])
 done
 AT_CLEANUP
@@ -2160,9 +2028,10 @@ DISPLAY DICTIONARY.
   AT_CHECK([pspp -O format=csv sys-file.sps], [0],
    [warning: `sys-file.sav': Ignoring string variable `STR1' set as weighting variable.
 
-Variable,Description,Position
-num1,Format: F8.0,1
-str1,Format: A4,2
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
+str1,2,,Nominal,Input,4,Left,A4,A4,
 ])
 done
 AT_CLEANUP
@@ -2403,8 +2272,9 @@ DISPLAY DICTIONARY.
   AT_CHECK_UNQUOTED([pspp -O format=csv sys-file.sps], [0], [dnl
 warning: \`sys-file.sav' near offset 0xd8: Integer format indicated by system file (3) differs from expected ($[2]).
 
-Variable,Description,Position
-num1,Format: F8.0,1
+Table: Variables
+Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
+num1,1,,Scale,Input,8,Right,F8.0,F8.0,
 ])
 done
 AT_CLEANUP