X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fspv%2Fstructure-xml.grammar;h=1ed0b1b9fec176b8f90c441c93be26593189ced4;hb=fb429d05d61e959fcd4a0116e9b4327967845f9d;hp=61dc5d48f4b6d0837fe4df837e433f06bb6c8f07;hpb=50f6ea7d66d03895020891215fb4f55bbf061003;p=pspp

diff --git a/src/output/spv/structure-xml.grammar b/src/output/spv/structure-xml.grammar
index 61dc5d48f4..1ed0b1b9fe 100644
--- 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,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