lib/metanorma/itu/biblio.rng in metanorma-itu-2.1.1 vs lib/metanorma/itu/biblio.rng in metanorma-itu-2.1.2

- old
+ new

@@ -612,16 +612,16 @@ </attribute> </optional> <optional> <ref name="fetched"/> </optional> - <choice> - <oneOrMore> - <ref name="btitle"/> - </oneOrMore> + <optional> <ref name="formattedref"/> - </choice> + </optional> + <oneOrMore> + <ref name="btitle"/> + </oneOrMore> <zeroOrMore> <ref name="bsource"/> </zeroOrMore> <zeroOrMore> <ref name="docidentifier"/> @@ -984,39 +984,37 @@ <optional> <attribute name="type"> <ref name="SeriesType"/> </attribute> </optional> - <choice> + <optional> <ref name="formattedref"/> - <group> - <ref name="btitle"/> - <optional> - <ref name="bplace"/> - </optional> - <optional> - <ref name="seriesorganization"/> - </optional> - <optional> - <ref name="abbreviation"/> - </optional> - <optional> - <ref name="seriesfrom"/> - </optional> - <optional> - <ref name="seriesto"/> - </optional> - <optional> - <ref name="seriesnumber"/> - </optional> - <optional> - <ref name="seriespartnumber"/> - </optional> - <optional> - <ref name="seriesrun"/> - </optional> - </group> - </choice> + </optional> + <ref name="btitle"/> + <optional> + <ref name="bplace"/> + </optional> + <optional> + <ref name="seriesorganization"/> + </optional> + <optional> + <ref name="abbreviation"/> + </optional> + <optional> + <ref name="seriesfrom"/> + </optional> + <optional> + <ref name="seriesto"/> + </optional> + <optional> + <ref name="seriesnumber"/> + </optional> + <optional> + <ref name="seriespartnumber"/> + </optional> + <optional> + <ref name="seriesrun"/> + </optional> </element> </define> <define name="SeriesType"> <choice> <value>main</value>