lib/metanorma/itu/basicdoc.rng in metanorma-itu-2.5.1 vs lib/metanorma/itu/basicdoc.rng in metanorma-itu-2.5.2

- old
+ new

@@ -998,18 +998,18 @@ </choice> </define> <define name="PureTextElement"> <choice> <text/> - <ref name="em"/> - <ref name="strong"/> + <ref name="pure_em"/> + <ref name="pure_strong"/> <ref name="sub"/> <ref name="sup"/> - <ref name="tt"/> - <ref name="underline"/> - <ref name="strike"/> - <ref name="smallcap"/> + <ref name="pure_tt"/> + <ref name="pure_underline"/> + <ref name="pure_strike"/> + <ref name="pure_smallcap"/> <ref name="br"/> </choice> </define> <define name="source"> <element name="source"> @@ -1029,10 +1029,17 @@ <ref name="index-xref"/> </choice> </zeroOrMore> </element> </define> + <define name="pure_em"> + <element name="em"> + <zeroOrMore> + <ref name="PureTextElement"/> + </zeroOrMore> + </element> + </define> <define name="strong"> <element name="strong"> <zeroOrMore> <choice> <ref name="PureTextElement"/> @@ -1044,10 +1051,17 @@ <ref name="index-xref"/> </choice> </zeroOrMore> </element> </define> + <define name="pure_strong"> + <element name="strong"> + <zeroOrMore> + <ref name="PureTextElement"/> + </zeroOrMore> + </element> + </define> <define name="tt"> <element name="tt"> <zeroOrMore> <choice> <ref name="PureTextElement"/> @@ -1058,10 +1072,17 @@ <ref name="index-xref"/> </choice> </zeroOrMore> </element> </define> + <define name="pure_tt"> + <element name="tt"> + <zeroOrMore> + <ref name="PureTextElement"/> + </zeroOrMore> + </element> + </define> <define name="keyword"> <element name="keyword"> <zeroOrMore> <choice> <ref name="PureTextElement"/> @@ -1088,26 +1109,70 @@ <define name="strike"> <element name="strike"> <zeroOrMore> <choice> <ref name="PureTextElement"/> + <ref name="stem"/> + <ref name="eref"/> + <ref name="xref"/> + <ref name="hyperlink"/> <ref name="index"/> <ref name="index-xref"/> </choice> </zeroOrMore> </element> </define> + <define name="pure_strike"> + <element name="strike"> + <zeroOrMore> + <ref name="PureTextElement"/> + </zeroOrMore> + </element> + </define> <define name="underline"> <element name="underline"> <optional> <attribute name="style"/> </optional> <zeroOrMore> + <choice> + <ref name="PureTextElement"/> + <ref name="stem"/> + <ref name="eref"/> + <ref name="xref"/> + <ref name="hyperlink"/> + <ref name="index"/> + <ref name="index-xref"/> + </choice> + </zeroOrMore> + </element> + </define> + <define name="pure_underline"> + <element name="underline"> + <optional> + <attribute name="style"/> + </optional> + <zeroOrMore> <ref name="PureTextElement"/> </zeroOrMore> </element> </define> <define name="smallcap"> + <element name="smallcap"> + <zeroOrMore> + <choice> + <ref name="PureTextElement"/> + <ref name="stem"/> + <ref name="eref"/> + <ref name="xref"/> + <ref name="hyperlink"/> + <ref name="index"/> + <ref name="index-xref"/> + </choice> + </zeroOrMore> + </element> + </define> + <define name="pure_smallcap"> <element name="smallcap"> <zeroOrMore> <ref name="PureTextElement"/> </zeroOrMore> </element>