work on configurable summaries for totals

[pspp] / src / output / spv / structure-xml.grammar

diff --git a/src/output/spv/structure-xml.grammar b/src/output/spv/structure-xml.grammar
index 67e83a1be1230ef272cd35de06a58cfc0e9b3453..1ed0b1b9fec176b8f90c441c93be26593189ced4 100644 (file)
--- a/src/output/spv/structure-xml.grammar
+++ b/src/output/spv/structure-xml.grammar
@@ -96,6 +96,7 @@ style
    :font-size?
    :font-style=(regular | italic)?
    :font-weight=(regular | bold)?
+   :font-underline=(none | underline)?
    :labelLocationVertical=(positive | negative | center)?
    :margin-bottom=dimension?
    :margin-left=dimension?
@@ -190,6 +191,13 @@ pageParagraph => pageParagraph_text
 
 text[pageParagraph_text] :type=(title | text) => TEXT
 
-object :type :uri => EMPTY
+object
+   :commandName?
+   :type[object_type]=(unknown)?
+   :uri
+=> EMPTY
 
-image :VDPId :commandName => dataPath
+image
+   :commandName?
+   :VDPId
+=> dataPath