lib/asciidoctor/gb/isostandard.rng in asciidoctor-gb-0.2.4 vs lib/asciidoctor/gb/isostandard.rng in asciidoctor-gb-0.2.5

- old
+ new

@@ -70,13 +70,13 @@ <oneOrMore> <ref name="btitle"/> </oneOrMore> <ref name="formattedref"/> </choice> - <optional> + <zeroOrMore> <ref name="bsource"/> - </optional> + </zeroOrMore> <zeroOrMore> <ref name="docidentifier"/> </zeroOrMore> <zeroOrMore> <ref name="bdate"/> @@ -94,13 +94,13 @@ <ref name="language"/> </zeroOrMore> <zeroOrMore> <ref name="script"/> </zeroOrMore> - <optional> + <zeroOrMore> <ref name="abstract"/> - </optional> + </zeroOrMore> <optional> <ref name="status"/> </optional> <optional> <ref name="copyright"/> @@ -112,10 +112,13 @@ <ref name="editorialgroup"/> </optional> <zeroOrMore> <ref name="ics"/> </zeroOrMore> + <optional> + <ref name="allParts"/> + </optional> </define> <define name="BibData"> <optional> <attribute name="type"> <ref name="BibItemType"/> @@ -125,13 +128,13 @@ <ref name="btitle"/> </oneOrMore> <optional> <ref name="formattedref"/> </optional> - <optional> + <zeroOrMore> <ref name="bsource"/> - </optional> + </zeroOrMore> <zeroOrMore> <ref name="docidentifier"/> </zeroOrMore> <zeroOrMore> <ref name="bdate"/> @@ -149,13 +152,13 @@ <ref name="language"/> </zeroOrMore> <zeroOrMore> <ref name="script"/> </zeroOrMore> - <optional> + <zeroOrMore> <ref name="abstract"/> - </optional> + </zeroOrMore> <optional> <ref name="status"/> </optional> <ref name="copyright"/> <zeroOrMore> @@ -163,17 +166,53 @@ </zeroOrMore> <ref name="editorialgroup"/> <zeroOrMore> <ref name="ics"/> </zeroOrMore> + <optional> + <ref name="allParts"/> + </optional> </define> - <define name="date_on"> - <element name="from"> + <define name="bdate"> + <element name="date"> + <attribute name="type"> + <choice> + <value>published</value> + <value>accessed</value> + <value>created</value> + <value>implemented</value> + <value>obsoleted</value> + <value>confirmed</value> + <value>updated</value> + <value>issued</value> + </choice> + </attribute> + <!-- ( ( bfrom, bto? ) | date_on ) --> <choice> - <data type="gYear"/> - <data type="date"/> - <value>--</value> + <group> + <element name="from"> + <choice> + <data type="gYear"/> + <data type="date"/> + </choice> + </element> + <optional> + <element name="to"> + <choice> + <data type="gYear"/> + <data type="date"/> + </choice> + </element> + </optional> + </group> + <element name="on"> + <choice> + <data type="gYear"/> + <data type="date"/> + <value>--</value> + </choice> + </element> </choice> </element> </define> <define name="biblionote"> <element name="note"> @@ -817,10 +856,15 @@ <define name="title-part"> <element name="title-part"> <ref name="FormattedString"/> </element> </define> + <define name="allParts"> + <element name="allParts"> + <data type="boolean"/> + </element> + </define> <define name="clause-hanging-paragraph-with-footnote"> <element name="clause"> <optional> <attribute name="id"> <data type="ID"/> @@ -870,10 +914,15 @@ <ref name="CitationType"/> </element> </define> <define name="ics"> <element name="ics"> - <text/> + <element name="code"> + <text/> + </element> + <element name="text"> + <text/> + </element> </element> </define> <define name="term-clause"> <element name="clause"> <optional>