From 105bd7912c89dc6807d5c9087cb25b188db9b66b Mon Sep 17 00:00:00 2001
From: Max-Ferdinand Zeterberg <zeterberg@sub.uni-goettingen.de>
Date: Fri, 19 Apr 2024 15:48:03 +0200
Subject: [PATCH] fix(elem.quote): do not allow textBlock in quote
---
schema/edxml.rng | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/schema/edxml.rng b/schema/edxml.rng
index ad78678..93388a0 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>
--
GitLab