* src/GrampsDb/_ReadXML.py (start_attribute): Support attributes
in event and eventref; (stop_cause): Create attribute on cause tag. * src/Editors/_EditEventRef.py (_create_tabbed_pages): Typos. * src/Editors/_EditEvent.py (_create_tabbed_pages): Typo. * data/grampsxml.rng: Document XML changes (xml 1.1.2). * data/grampsxml.dtd: Document XML changes (xml 1.1.2). * src/GrampsDb/_WriteXML.py (dump_event_ref): Write attributes; (write_event): write attributes, remove cause. svn: r7182
This commit is contained in:
+7
-7
@@ -24,15 +24,15 @@
|
||||
-->
|
||||
|
||||
<!--
|
||||
This is the Document Type Definition file for v1.1.1
|
||||
This is the Document Type Definition file for v1.1.2
|
||||
of the GRAMPS XML genealogy data format.
|
||||
Please use the following formal public identifier to identify it:
|
||||
|
||||
"-//GRAMPS//DTD GRAMPS XML V1.1.1//EN"
|
||||
"-//GRAMPS//DTD GRAMPS XML V1.1.2//EN"
|
||||
|
||||
For example:
|
||||
<!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.1.1//EN"
|
||||
"http://gramps-project.org/xml/1.1.1/grampsxml.dtd"
|
||||
<!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.1.2//EN"
|
||||
"http://gramps-project.org/xml/1.1.2/grampsxml.dtd"
|
||||
[...]>
|
||||
-->
|
||||
|
||||
@@ -53,7 +53,7 @@ DATABASE
|
||||
|
||||
<!ELEMENT database (header, name-formats?, events?, people?, families?,
|
||||
sources?, places?, objects?, repositories?, bookmark?)>
|
||||
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.1/">
|
||||
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.2/">
|
||||
|
||||
<!-- ************************************************************
|
||||
HEADER
|
||||
@@ -198,7 +198,7 @@ EVENT
|
||||
<!ELEMENT events (event)*>
|
||||
|
||||
<!ELEMENT event (type?,(daterange|dateval|datestr)?,place?,cause?,
|
||||
description?,note?,sourceref*,objref*)>
|
||||
description?,attribute*,note?,sourceref*,objref*)>
|
||||
<!ATTLIST event
|
||||
id CDATA #REQUIRED
|
||||
handle ID #REQUIRED
|
||||
@@ -356,7 +356,7 @@ SHARED ELEMENTS
|
||||
conf CDATA #IMPLIED
|
||||
>
|
||||
|
||||
<!ELEMENT eventref (note?)>
|
||||
<!ELEMENT eventref (attribute*,note?)>
|
||||
<!ATTLIST eventref
|
||||
hlink IDREF #REQUIRED
|
||||
priv (0|1) #IMPLIED
|
||||
|
||||
+7
-2
@@ -31,7 +31,7 @@
|
||||
|
||||
<grammar
|
||||
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
|
||||
ns="http://gramps-project.org/xml/1.1.1/"
|
||||
ns="http://gramps-project.org/xml/1.1.2/"
|
||||
xmlns="http://relaxng.org/ns/structure/1.0">
|
||||
|
||||
<start><element name="database">
|
||||
@@ -325,8 +325,10 @@
|
||||
<optional><element name="place">
|
||||
<attribute name="hlink"><data type="IDREF"/></attribute>
|
||||
</element></optional>
|
||||
<optional><element name="cause"><text/></element></optional>
|
||||
<optional><element name="description"><text/></element></optional>
|
||||
<zeroOrMore><element name="attribute">
|
||||
<ref name="attribute-content"/>
|
||||
</element></zeroOrMore>
|
||||
<optional><element name="note">
|
||||
<ref name="note-content"/>
|
||||
</element></optional>
|
||||
@@ -470,6 +472,9 @@
|
||||
<ref name="priv-content"/>
|
||||
</attribute></optional>
|
||||
<optional><attribute name="role"><text/></attribute></optional>
|
||||
<zeroOrMore><element name="attribute">
|
||||
<ref name="attribute-content"/>
|
||||
</element></zeroOrMore>
|
||||
<optional><element name="note">
|
||||
<ref name="note-content"/>
|
||||
</element></optional>
|
||||
|
||||
Reference in New Issue
Block a user