start moving beyond PMModelItemInfo

[pspp] / detail-xml

diff --git a/detail-xml b/detail-xml
index 1684915bf54c9f3034f6f68f75dd7fd352515940..cae148b68877ea8ce5ab3c46556657db64107f9d 100644 (file)
--- a/detail-xml
+++ b/detail-xml
@@ -66,7 +66,7 @@ formatMapping := [id? from] format
 footnotes := [id? superscript variable] footnoteMapping+
 footnoteMapping := [id? from to definesReference]
 
-cross := [id?] nest+
+cross := [id?] nest nest
 nest := [id?] variableReference+
 variableReference := [ref]
 
@@ -88,8 +88,8 @@ paragraph := [id? hangingIndent]
 
 setCellProperties :=
     [id? applyToConverse]
-    setMetadata setStyle* setFormat+ union?
-setMetadata := [id? key target value]
+    setMetaData setStyle* setFormat+ union?
+setMetaData := [id? key target value]
 setStyle := [id? style target]
 setFormat :=
     [id? target reset?]
@@ -119,9 +119,8 @@ style :=
       textAlignment
       size?)?
      visible?
-     color? color2?
+     color? color2?]
      
-
 layer := [id? value variable method? visible?]
 layerController := [id? source target]