grammars/reqt.rng in relaton-ieee-1.9.4 vs grammars/reqt.rng in relaton-ieee-1.10.0
- old
+ new
@@ -57,18 +57,26 @@
</optional>
<optional>
<attribute name="type"/>
</optional>
<optional>
+ <attribute name="tag"/>
+ </optional>
+ <optional>
+ <attribute name="multilingual-rendering">
+ <ref name="MultilingualRenderingType"/>
+ </attribute>
+ </optional>
+ <optional>
<ref name="reqtitle"/>
</optional>
<optional>
<ref name="label"/>
</optional>
- <optional>
+ <zeroOrMore>
<ref name="subject"/>
- </optional>
+ </zeroOrMore>
<zeroOrMore>
<ref name="reqinherit"/>
</zeroOrMore>
<zeroOrMore>
<ref name="classification"/>
@@ -78,10 +86,11 @@
<ref name="measurementtarget"/>
<ref name="specification"/>
<ref name="verification"/>
<ref name="import"/>
<ref name="description"/>
+ <ref name="component"/>
</choice>
</zeroOrMore>
<optional>
<ref name="reqt_references"/>
</optional>
@@ -98,21 +107,27 @@
<ref name="FormattedString"/>
</element>
</define>
<define name="label">
<element name="label">
- <text/>
+ <oneOrMore>
+ <ref name="TextElement"/>
+ </oneOrMore>
</element>
</define>
<define name="subject">
<element name="subject">
- <text/>
+ <oneOrMore>
+ <ref name="TextElement"/>
+ </oneOrMore>
</element>
</define>
<define name="reqinherit">
<element name="inherit">
- <text/>
+ <oneOrMore>
+ <ref name="TextElement"/>
+ </oneOrMore>
</element>
</define>
<define name="measurementtarget">
<element name="measurement-target">
<ref name="RequirementSubpart"/>
@@ -136,10 +151,16 @@
<define name="description">
<element name="description">
<ref name="RequirementSubpart"/>
</element>
</define>
+ <define name="component">
+ <element name="component">
+ <attribute name="class"/>
+ <ref name="RequirementSubpart"/>
+ </element>
+ </define>
<define name="reqt_references">
<element name="references">
<oneOrMore>
<ref name="bibitem"/>
</oneOrMore>
@@ -160,9 +181,17 @@
</attribute>
</optional>
<optional>
<attribute name="keep-lines-together">
<data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="tag"/>
+ </optional>
+ <optional>
+ <attribute name="multilingual-rendering">
+ <ref name="MultilingualRenderingType"/>
</attribute>
</optional>
<oneOrMore>
<ref name="BasicBlock"/>
</oneOrMore>