Add support for PNG images in .spv files.

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

diff --git a/src/output/spv/structure-xml.grammar b/src/output/spv/structure-xml.grammar
index 61dc5d48f4b6d0837fe4df837e433f06bb6c8f07..d185316536d88802bfdae4766afde5dcd633d548 100644 (file)
--- a/src/output/spv/structure-xml.grammar
+++ b/src/output/spv/structure-xml.grammar
@@ -64,6 +64,8 @@ table
 => tableProperties? tableStructure
 
 tableProperties
+   :schemaLocation?            # Just for standalone .stt files.
+   :name?                      # Just for standalone .stt files.
 => generalProperties footnoteProperties cellFormatProperties borderProperties printingProperties
 
 generalProperties
@@ -94,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?
@@ -188,6 +191,6 @@ pageParagraph => pageParagraph_text
 
 text[pageParagraph_text] :type=(title | text) => TEXT
 
-object :type :uri => EMPTY
+object :type[object_type]=(unknown)? :uri => EMPTY
 
 image :VDPId :commandName => dataPath