Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* src/DisplayState.py (DisplayState.__signals__): Port fixes from
	2.2 tree. 
	* src/FilterEditor/_EditFilter.py: Port fixes from 2.2 tree.
	* src/FilterEditor/_FilterEditor.py: Port fixes from 2.2 tree.
	* data/grampsxml.rng: Port fixes from 2.2 tree.
	* data/grampsxml.dtd: Port fixes from 2.2 tree.
	* src/GrampsDb/_GrampsDbWriteXML.py (_xml_version): Bump up version.



svn: r8536
This commit is contained in:
Alex Roitman
2007-06-07 05:06:14 +00:00
parent b7c0109e5e
commit 6bf09da13d
7 changed files with 103 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
data/grampsxml.dtd
View File

@@ -24,15 +24,15 @@
-->
<!--
This is the Document Type Definition file for v1.1.4
This is the Document Type Definition file for v1.2.0
of the GRAMPS XML genealogy data format.
Please use the following formal public identifier to identify it:
"-//GRAMPS//DTD GRAMPS XML V1.1.4//EN"
"-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
For example:
<!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.1.4//EN"
"http://gramps-project.org/xml/1.1.4/grampsxml.dtd"
<!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
"http://gramps-project.org/xml/1.2.0/grampsxml.dtd"
[...]>
-->
@@ -55,7 +55,7 @@ DATABASE
<!ELEMENT database (header, name-formats?, events?, people?, families?,
sources?, places?, objects?, repositories?, notes?,
bookmark?)>
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.4/">
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.2.0/">
<!-- ************************************************************
HEADER
@@ -110,7 +110,7 @@ GENDER has values of M, F, or U.
-->
<!ELEMENT gender (#PCDATA)>
<!ELEMENT name (first?,last?,suffix?,patronymic?,title?,
<!ELEMENT name (first?,call?last?,suffix?,patronymic?,title?,
(daterange|dateval|datestr)?,noteref*,sourceref*)>
<!ATTLIST name
alt (0|1) #IMPLIED
@@ -121,6 +121,7 @@ GENDER has values of M, F, or U.
>
<!ELEMENT first (#PCDATA)>
<!ELEMENT call (#PCDATA)>
<!ELEMENT last (#PCDATA)>
<!ATTLIST last
prefix CDATA #IMPLIED
@@ -371,6 +372,7 @@ SHARED ELEMENTS
<!ELEMENT sourceref (spage?,noteref*,stext?,(daterange|dateval|datestr)?)>
<!ATTLIST sourceref
hlink IDREF #REQUIRED
priv (0|1) #IMPLIED
conf CDATA #IMPLIED
>
@@ -433,6 +435,7 @@ SHARED ELEMENTS
<!ELEMENT lds_ord ((daterange|dateval|datestr)?,temple?,place?,status?,
sealed_to?,noteref*,sourceref*)>
<!ATTLIST lds_ord
priv (0|1) #IMPLIED
type CDATA #REQUIRED
>

9
data/grampsxml.rng
View File

@@ -31,7 +31,7 @@
<grammar
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://gramps-project.org/xml/1.1.4/"
ns="http://gramps-project.org/xml/1.2.0/"
xmlns="http://relaxng.org/ns/structure/1.0">
<start><element name="database">
@@ -214,6 +214,7 @@
<optional><attribute name="sort"><text/></attribute></optional>
<optional><attribute name="display"><text/></attribute></optional>
<optional><element name="first"><text/></element></optional>
<optional><element name="call"><text/></element></optional>
<optional><element name="last">
<text/>
<optional><attribute name="prefix"><text/></attribute></optional>
@@ -469,6 +470,9 @@
<define name="sourceref-content">
<attribute name="hlink"><data type="IDREF"/></attribute>
<optional><attribute name="priv">
<ref name="priv-content"/>
</attribute></optional>
<optional><attribute name="conf"><text/></attribute></optional>
<optional><element name="spage"><text/></element></optional>
<zeroOrMore><element name="noteref">
@@ -552,6 +556,9 @@
</define>
<define name="lds-content">
<optional><attribute name="priv">
<ref name="priv-content"/>
</attribute></optional>
<attribute name="type"><text/></attribute>
<optional><ref name="date-content"/></optional>
<optional><element name="temple">