From d214b2dd1e860ddad209ada72aa3d41d02b64b1c Mon Sep 17 00:00:00 2001
From: Martin de la Iglesia <iglesia@hab.de>
Date: Thu, 3 Jun 2021 18:59:13 +0000
Subject: [PATCH] =?UTF-8?q?Vorkommen=20von=20birth,=20death,=20floruit=20u?=
=?UTF-8?q?nd=20linkGrp=20auf=20je=201=20pro=20Registereintrag=20beschr?=
=?UTF-8?q?=C3=A4nkt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
personenregister.odd | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/personenregister.odd b/personenregister.odd
index 4df82d5..1ec768a 100644
--- a/personenregister.odd
+++ b/personenregister.odd
@@ -685,9 +685,8 @@ document('../Register/register-org/register-org-xyz.xml')//*[@xml:id eq $orgid]
</rng:oneOrMore>
<rng:oneOrMore>
<rng:ref name="listBibl"/>
- </rng:oneOrMore>
- <rng:zeroOrMore>
- <rng:choice>
+ </rng:oneOrMore>
+ <rng:interleave>
<rng:group>
<rng:optional>
<rng:ref name="birth"/>
@@ -696,13 +695,12 @@ document('../Register/register-org/register-org-xyz.xml')//*[@xml:id eq $orgid]
<rng:ref name="death"/>
</rng:optional>
</rng:group>
- <rng:ref name="floruit"/>
- <rng:ref name="linkGrp"/>
- <rng:ref name="note"/>
- <rng:ref name="occupation"/>
- <rng:ref name="faith"/>
- </rng:choice>
- </rng:zeroOrMore>
+ <rng:optional><rng:ref name="floruit"/></rng:optional>
+ <rng:optional><rng:ref name="linkGrp"/></rng:optional>
+ <rng:zeroOrMore><rng:ref name="note"/></rng:zeroOrMore>
+ <rng:zeroOrMore><rng:ref name="occupation"/></rng:zeroOrMore>
+ <rng:zeroOrMore><rng:ref name="faith"/></rng:zeroOrMore>
+ </rng:interleave>
<rng:optional>
<rng:ref name="listBibl"/>
--
GitLab