2007-12-09 Alex Roitman <shura@gramps-project.org>

* data/grampsxml.rng: Add namemaps and mediapath.
	* data/grampsxml.dtd: Add namemaps and mediapath.



svn: r9470
This commit is contained in:
Alex Roitman 2007-12-09 20:06:18 +00:00
parent 7deb79b6f3
commit 35de3a3e53
3 changed files with 30 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2007-12-09 Alex Roitman <shura@gramps-project.org>
* data/grampsxml.rng: Add namemaps and mediapath.
* data/grampsxml.dtd: Add namemaps and mediapath.
2007-12-09 Benny Malengier <benny.malengier@gramps-project.org>
* src/Selectors/_SelectRepository.py: handle column changed, bug #1427

View File

@ -54,7 +54,7 @@ DATABASE
<!ELEMENT database (header, name-formats?, events?, people?, families?,
sources?, places?, objects?, repositories?, notes?,
bookmark?)>
bookmarks?,namemaps?)>
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.2.0/">
<!-- ************************************************************
@ -65,7 +65,7 @@ HEADER
person who created this genealogical database)
-->
<!ELEMENT header (created, researcher?)>
<!ELEMENT header (created, researcher?, mediapath?)>
<!ELEMENT created EMPTY>
<!ATTLIST created
@ -84,6 +84,8 @@ HEADER
<!ELEMENT resphone (#PCDATA)>
<!ELEMENT resemail (#PCDATA)>
<!ELEMENT mediapath (#PCDATA)>
<!-- ************************************************************
PEOPLE
-->
@ -334,6 +336,14 @@ BOOKMARKS
hlink IDREF #REQUIRED
>
<!ELEMENT namemaps (map)*>
<!ELEMENT map EMPTY>
<!ATTLIST map
type CDATA #REUIRED
key CDATA #REQUIRED
value CDATA #REQUIRED
>
<!-- ************************************************************
NAME FORMATS
-->

View File

@ -44,6 +44,7 @@
<optional><element name="researcher">
<ref name="researcher-content"/>
</element></optional>
<optional><element name="mediapath"><text/></element></optional>
</element>
<optional><element name="name-formats">
@ -110,6 +111,11 @@
</element></zeroOrMore>
</element></optional>
<optional><element name="namemaps">
<zeroOrMore><element name="map">
<ref name="map-content"/>
</element></zeroOrMore>
</element></optional>
</element></start>
<define name="researcher-content">
@ -457,6 +463,14 @@
<attribute name="hlink"><data type="IDREF"/></attribute>
</define>
<define name="map-content">
<attribute name="type"><choice>
<value>group_as</value>
</choice></attribute>
<attribute name="key"><text/></attribute>
<attribute name="value"><text/></attribute>
</define>
<define name="format-content">
<attribute name="number"><text/></attribute>
<attribute name="name"><text/></attribute>