Merge branch 'gramps51'
| 
		 Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB  | 
| 
		 Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB  | 
| 
		 Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB  | 
| 
		 Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB  | 
| 
		 Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB  | 
| 
		 Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB  | 
| 
		 Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB  | 
| 
		 Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB  | 
| 
		 Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB  | 
| 
		 Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB  | 
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||