lib/metanorma/itu/biblio.rng in metanorma-itu-2.4.6 vs lib/metanorma/itu/biblio.rng in metanorma-itu-2.4.7

- old
+ new

@@ -93,21 +93,25 @@ <attribute name="number"/> </optional> <text/> </element> </define> - <define name="LocalizedString1"> + <define name="LocalizedStringAttrs"> <optional> <!-- multiple languages and scripts possible: comma delimit them if so --> <attribute name="language"/> </optional> <optional> <attribute name="locale"/> </optional> <optional> <attribute name="script"/> </optional> + </define> + <define name="LocalizedString1"> + <!-- multiple languages and scripts possible: comma delimit them if so --> + <ref name="LocalizedStringAttrs"/> <text/> </define> <define name="LocalizedString"> <choice> <ref name="LocalizedString1"/> @@ -140,20 +144,12 @@ </attribute> </optional> <ref name="LocalizedStringOrXsAny"/> </define> <define name="LocalizedStringOrXsAny1"> - <optional> - <!-- multiple languages and scripts possible: comma delimit them if so --> - <attribute name="language"/> - </optional> - <optional> - <attribute name="locale"/> - </optional> - <optional> - <attribute name="script"/> - </optional> + <!-- multiple languages and scripts possible: comma delimit them if so --> + <ref name="LocalizedStringAttrs"/> <oneOrMore> <choice> <text/> <ref name="AnyElement"/> </choice> @@ -206,10 +202,11 @@ <ref name="organization"/> </choice> </define> <define name="roledescription"> <element name="description"> + <ref name="LocalizedStringAttrs"/> <oneOrMore> <ref name="TextElement"/> </oneOrMore> </element> </define> @@ -333,10 +330,11 @@ <ref name="LocalizedString"/> </element> </define> <define name="affiliationdescription"> <element name="description"> + <ref name="LocalizedStringAttrs"/> <oneOrMore> <ref name="TextElement"/> </oneOrMore> </element> </define> @@ -946,10 +944,11 @@ </define> <define name="TypedTitleString"> <optional> <attribute name="type"/> </optional> + <ref name="LocalizedStringAttrs"/> <zeroOrMore> <ref name="TextElement"/> </zeroOrMore> </define> <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) --> @@ -1039,19 +1038,11 @@ <optional> <attribute name="primary"> <data type="boolean"/> </attribute> </optional> - <optional> - <attribute name="language"/> - </optional> - <optional> - <attribute name="locale"/> - </optional> - <optional> - <attribute name="script"/> - </optional> + <ref name="LocalizedStringAttrs"/> <oneOrMore> <ref name="TextElement"/> </oneOrMore> </element> </define> @@ -1275,20 +1266,27 @@ <define name="biblionote"> <element name="note"> <optional> <attribute name="type"/> </optional> + <ref name="LocalizedStringAttrs"/> <oneOrMore> <ref name="TextElement"/> </oneOrMore> </element> </define> <define name="bibabstract"> <element name="abstract"> - <oneOrMore> - <ref name="TextElement"/> - </oneOrMore> + <ref name="LocalizedStringAttrs"/> + <choice> + <oneOrMore> + <ref name="BasicBlock"/> + </oneOrMore> + <oneOrMore> + <ref name="TextElement"/> + </oneOrMore> + </choice> </element> </define> <define name="copyright"> <element name="copyright"> <ref name="from"/> @@ -1389,9 +1387,10 @@ <attribute name="type"> <ref name="DocRelationType"/> </attribute> <optional> <element name="description"> + <ref name="LocalizedStringAttrs"/> <oneOrMore> <ref name="TextElement"/> </oneOrMore> </element> </optional>