lib/metanorma/iec/basicdoc.rng in metanorma-iec-2.3.8 vs lib/metanorma/iec/basicdoc.rng in metanorma-iec-2.4.0

- old
+ new

@@ -93,12 +93,93 @@ <ref name="pre"/> <ref name="note"/> <ref name="pagebreak"/> <ref name="hr"/> <ref name="bookmark"/> + <ref name="amend"/> </choice> </define> + <define name="amend"> + <element name="amend"> + <ref name="AmendType"/> + </element> + </define> + <define name="AmendType"> + <optional> + <attribute name="id"> + <data type="ID"/> + </attribute> + </optional> + <attribute name="change"> + <choice> + <value>add</value> + <value>modify</value> + <value>delete</value> + <value>replace</value> + </choice> + </attribute> + <optional> + <attribute name="path"/> + </optional> + <optional> + <attribute name="path_end"/> + </optional> + <optional> + <attribute name="title"/> + </optional> + <optional> + <element name="location"> + <zeroOrMore> + <choice> + <ref name="locality"/> + <ref name="localityStack"/> + </choice> + </zeroOrMore> + </element> + </optional> + <optional> + <element name="description"> + <zeroOrMore> + <ref name="BasicBlock"/> + </zeroOrMore> + </element> + </optional> + <optional> + <element name="newcontent"> + <optional> + <attribute name="id"> + <data type="ID"/> + </attribute> + </optional> + <zeroOrMore> + <ref name="BasicBlock"/> + </zeroOrMore> + </element> + </optional> + <zeroOrMore> + <ref name="classification"/> + </zeroOrMore> + <zeroOrMore> + <ref name="contributor"/> + </zeroOrMore> + </define> + <define name="classification"> + <element name="classification"> + <ref name="classification_tag"/> + <ref name="classification_value"/> + </element> + </define> + <define name="classification_tag"> + <element name="tag"> + <text/> + </element> + </define> + <define name="classification_value"> + <element name="value"> + <text/> + </element> + </define> <define name="paragraph"> <element name="p"> <ref name="ParagraphType"/> </element> </define> @@ -937,22 +1018,16 @@ <optional> <attribute name="filename"/> </optional> <optional> <attribute name="width"> - <choice> - <data type="int"/> - <value>auto</value> - </choice> + <ref name="ImageSize"/> </attribute> </optional> <optional> <attribute name="height"> - <choice> - <data type="int"/> - <value>auto</value> - </choice> + <ref name="ImageSize"/> </attribute> </optional> <optional> <attribute name="alt"/> </optional> @@ -962,9 +1037,17 @@ <optional> <attribute name="longdesc"> <data type="anyURI"/> </attribute> </optional> + </define> + <define name="ImageSize"> + <choice> + <data type="string"> + <param name="pattern">\d+([.]\d+)?(%?)</param> + </data> + <value>auto</value> + </choice> </define> <define name="video"> <element name="video"> <attribute name="id"> <data type="ID"/>