lib/asciidoctor/vg/isodoc.rng in metanorma-vg-1.2.0 vs lib/asciidoctor/vg/isodoc.rng in metanorma-vg-1.2.1

- old
+ new

@@ -40,12 +40,15 @@ <text/> </element> </define> <define name="xref"> <element name="xref"> + <!-- attribute target { xsd:IDREF }, --> <attribute name="target"> - <data type="IDREF"/> + <data type="string"> + <param name="pattern">\i\c*|\c+#\c+</param> + </data> </attribute> <optional> <attribute name="type"> <ref name="ReferenceFormat"/> </attribute> @@ -576,10 +579,12 @@ <ref name="paragraph"/> <ref name="ul"/> <ref name="ol"/> <ref name="dl"/> <ref name="formula"/> + <ref name="quote"/> + <ref name="sourcecode"/> </choice> </oneOrMore> </element> </define> <define name="Basic-Section"> @@ -659,10 +664,20 @@ <value>right</value> <value>center</value> </choice> </attribute> </optional> + <optional> + <attribute name="valign"> + <choice> + <value>top</value> + <value>middle</value> + <value>bottom</value> + <value>baseline</value> + </choice> + </attribute> + </optional> <choice> <zeroOrMore> <choice> <ref name="TextElement"/> <ref name="fn"/> @@ -695,10 +710,20 @@ <value>right</value> <value>center</value> </choice> </attribute> </optional> + <optional> + <attribute name="valign"> + <choice> + <value>top</value> + <value>middle</value> + <value>bottom</value> + <value>baseline</value> + </choice> + </attribute> + </optional> <choice> <zeroOrMore> <choice> <ref name="TextElement"/> <ref name="fn"/> @@ -1047,18 +1072,21 @@ </optional> <optional> <ref name="section-title"/> </optional> <group> - <group> - <zeroOrMore> - <ref name="BasicBlock"/> - </zeroOrMore> - <zeroOrMore> - <ref name="note"/> - </zeroOrMore> - </group> + <choice> + <group> + <zeroOrMore> + <ref name="BasicBlock"/> + </zeroOrMore> + <zeroOrMore> + <ref name="note"/> + </zeroOrMore> + </group> + <ref name="amend"/> + </choice> <zeroOrMore> <choice> <ref name="clause-subsection"/> <ref name="terms"/> <ref name="definitions"/> @@ -1503,8 +1531,83 @@ </element> </define> <define name="termdocsource"> <element name="termdocsource"> <ref name="CitationType"/> + </element> + </define> + <define name="amend"> + <element name="amend"> + <optional> + <attribute name="id"> + <data type="ID"/> + </attribute> + </optional> + <attribute name="change"> + <choice> + <value>add</value> + <value>modify</value> + <value>delete</value> + </choice> + </attribute> + <optional> + <attribute name="path"/> + </optional> + <optional> + <attribute name="path_end"/> + </optional> + <optional> + <attribute name="title"/> + </optional> + <optional> + <element name="location"> + <zeroOrMore> + <ref name="locality"/> + </zeroOrMore> + </element> + </optional> + <zeroOrMore> + <ref name="autonumber"/> + </zeroOrMore> + <optional> + <element name="description"> + <zeroOrMore> + <ref name="BasicBlock"/> + </zeroOrMore> + </element> + </optional> + <optional> + <element name="newcontent"> + <zeroOrMore> + <ref name="BasicBlock"/> + </zeroOrMore> + </element> + </optional> + <optional> + <element name="description"> + <zeroOrMore> + <ref name="BasicBlock"/> + </zeroOrMore> + </element> + </optional> + </element> + </define> + <define name="autonumber"> + <element name="autonumber"> + <attribute name="type"> + <choice> + <value>requirement</value> + <value>recommendation</value> + <value>permission</value> + <value>table</value> + <value>figure</value> + <value>admonition</value> + <value>formula</value> + <value>sourcecode</value> + <value>example</value> + <value>note</value> + </choice> + </attribute> + <text/> </element> </define> </grammar>