From 3ad5248af0349459e5322b51212b94ac7dff741d Mon Sep 17 00:00:00 2001
From: romjerome <romjerome@yahoo.fr>
Date: Fri, 4 Feb 2022 19:55:09 +0100
Subject: [PATCH] Fix place object element order in DTD and RNG schemas

Element placeobj content does not follow the DTD and RNG,
expecting (ptitle? , pname+)

Fixes #12500
---
 data/grampsxml.dtd | 2 +-
 data/grampsxml.rng | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 160d4add5..6bd622d3e 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -251,7 +251,7 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
+<!ELEMENT placeobj (ptitle?, code?, pname+, coord?, placeref*, location*,
                     objref*, url*, noteref*, citationref*, tagref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 4888d331f..9f84a8ebf 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -453,10 +453,10 @@
     <ref name="primary-object"/>
     <attribute name="type"><text/></attribute>
     <optional><element name="ptitle"><text/></element></optional>
+    <optional><element name="code"><text/></element></optional>
     <oneOrMore><element name="pname">
         <ref name="placename-content"/>
     </element></oneOrMore>
-    <optional><element name="code"><text/></element></optional>
     <optional><element name="coord">
         <attribute name="long"><text/></attribute>
         <attribute name="lat"><text/></attribute>