diff --git a/schema/edxml.rng b/schema/edxml.rng index ad786787bc7c507504cb754f294c32ce4ad8b8ce..93388a091ce9648a45a8b090ed5bfa812755f6ec 100644 --- a/schema/edxml.rng +++ b/schema/edxml.rng @@ -557,7 +557,16 @@ <zeroOrMore> <ref name="elem.p"/> </zeroOrMore> - <ref name="model.pContentLike"/> + <group> + <interleave> + <zeroOrMore> + <ref name="model.pContentLike"/> + </zeroOrMore> + <zeroOrMore> + <ref name="elem.textBlock"/> + </zeroOrMore> + </interleave> + </group> </choice> <sch:pattern> <sch:rule @@ -586,7 +595,14 @@ <define name="elem.p"> <element name="p"> - <ref name="model.pContentLike"/> + <interleave> + <zeroOrMore> + <ref name="model.pContentLike"/> + </zeroOrMore> + <zeroOrMore> + <ref name="elem.textBlock"/> + </zeroOrMore> + </interleave> </element> </define> @@ -705,8 +721,12 @@ <define name="elem.quote"> <element name="quote"> <interleave> - <ref name="model.pContentLike"/> - <ref name="model.philological.translit"/> + <zeroOrMore> + <ref name="model.pContentLike"/> + </zeroOrMore> + <zeroOrMore> + <ref name="model.philological.translit"/> + </zeroOrMore> </interleave> </element> </define> @@ -1260,9 +1280,6 @@ <zeroOrMore> <ref name="elem.ref"/> </zeroOrMore> - <zeroOrMore> - <ref name="elem.textBlock"/> - </zeroOrMore> <zeroOrMore> <ref name="elem.meta.bibl"/> </zeroOrMore>