some more vizml work

diff --git a/src/output/spv/automake.mk b/src/output/spv/automake.mk
index 6a2b3e1ad2247ce87c2c5b06f69cc9fa88970128..ed952f254c42b76a92526e2a0ddfe63bbb305bea 100644 (file)
--- a/src/output/spv/automake.mk
+++ b/src/output/spv/automake.mk
@@ -117,5 +117,5 @@ src/output/spv/vizml-parser.h: $(vizml_in)
 nodist_src_output_liboutput_la_SOURCES += $(vizml_out)
 BUILT_SOURCES += $(vizml_out)
 CLEANFILES += $(vizml_out)
-EXTRA_DIST += $(vizmlb_in)
+EXTRA_DIST += $(vizml_in)
 

diff --git a/src/output/spv/vizml.grammar b/src/output/spv/vizml.grammar
index 31b9d95835da62dcbd46dab26e5e488fc997965a..ceedc666d4b418bd1ff37b435e6d830f7cbf769c 100644 (file)
--- a/src/output/spv/vizml.grammar
+++ b/src/output/spv/vizml.grammar
@@ -480,6 +480,8 @@ interval
 labeling
    :style=ref style?
    :variable=ref (sourceVariable | derivedVariable)
+   :connectingLines=bool?
+   :textFrameStyle=ref style?
 => (formatting | format | footnotes)*
 
 formatting :variable=ref (sourceVariable | derivedVariable) => formatMapping*