* doc/grampsxml.rng: Update to reflect new XML.

svn: r5846
This commit is contained in:
Alex Roitman 2006-01-28 01:05:04 +00:00
parent d5c04162a2
commit 6104ff1053
3 changed files with 21 additions and 18 deletions

View File

@ -7,6 +7,7 @@
* src/GrampsDb/_ReadGedcom.py (parse_repo_ref_caln): Properly set * src/GrampsDb/_ReadGedcom.py (parse_repo_ref_caln): Properly set
media type. media type.
* src/GrampsDb/_WriteXML.py: More XML updates. * src/GrampsDb/_WriteXML.py: More XML updates.
* doc/grampsxml.rng: Update to reflect new XML.
2006-01-27 Don Allingham <don@gramps-project.org> 2006-01-27 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcomp.py: preselect gramps ids for events * src/GrampsDb/_ReadGedcomp.py: preselect gramps ids for events

View File

@ -4,7 +4,7 @@
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2001 Graham J. Williams # Copyright (C) 2001 Graham J. Williams
# Copyright (C) 2000-2005 Donald N. Allingham # Copyright (C) 2000-2006 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by

View File

@ -3,7 +3,7 @@
<!-- <!--
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2005 Donald N. Allingham # Copyright (C) 2005-2006 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -62,6 +62,12 @@
</element></zeroOrMore> </element></zeroOrMore>
</element></optional> </element></optional>
<optional><element name="events">
<zeroOrMore><element name="event">
<ref name="event-content"/>
</element></zeroOrMore>
</element></optional>
<optional><element name="sources"> <optional><element name="sources">
<zeroOrMore><element name="source"> <zeroOrMore><element name="source">
<ref name="source-content"/> <ref name="source-content"/>
@ -108,14 +114,12 @@
<define name="primary-object"> <define name="primary-object">
<attribute name="id"><text/></attribute> <attribute name="id"><text/></attribute>
<attribute name="handle"><data type="ID"/></attribute> <attribute name="handle"><data type="ID"/></attribute>
<attribute name="change"><text/></attribute>
<optional><attribute name="priv"><choice> <optional><attribute name="priv"><choice>
<value>0</value> <value>0</value>
<value>1</value> <value>1</value>
</choice></attribute></optional> </choice></attribute></optional>
<optional><element name="marker"> <optional><attribute name="marker"><text/></attribute></optional>
<attribute name="value"><text/></attribute> <attribute name="change"><text/></attribute>
</element></optional>
</define> </define>
<define name="person-content"> <define name="person-content">
@ -265,13 +269,9 @@
<define name="family-content"> <define name="family-content">
<ref name="primary-object"/> <ref name="primary-object"/>
<optional><attribute name="type"><choice> <optional><element name="rel">
<value>Married</value> <attribute name="type"><text/></attribute>
<value>Unmarried</value> </element></optional>
<value>Civil Union</value>
<value>Unknown</value>
<value>Other</value>
</choice></attribute></optional>
<optional><element name="father"> <optional><element name="father">
<attribute name="hlink"><data type="IDREF"/></attribute> <attribute name="hlink"><data type="IDREF"/></attribute>
</element></optional> </element></optional>
@ -304,7 +304,7 @@
<define name="event-content"> <define name="event-content">
<ref name="primary-object"/> <ref name="primary-object"/>
<attribute name="type"><text/></attribute> <element name="type"><text/></element>
<optional><ref name="date-content"/></optional> <optional><ref name="date-content"/></optional>
<optional><element name="place"> <optional><element name="place">
<attribute name="hlink"><data type="IDREF"/></attribute> <attribute name="hlink"><data type="IDREF"/></attribute>
@ -345,7 +345,7 @@
<define name="place-content"> <define name="place-content">
<ref name="primary-object"/> <ref name="primary-object"/>
<attribute name="title"><text/></attribute> <optional><element name="ptitle"><text/></element></optional>
<optional><element name="coord"> <optional><element name="coord">
<attribute name="long"><data type="float"/></attribute> <attribute name="long"><data type="float"/></attribute>
<attribute name="lat"><data type="float"/></attribute> <attribute name="lat"><data type="float"/></attribute>
@ -376,9 +376,11 @@
<define name="object-content"> <define name="object-content">
<ref name="primary-object"/> <ref name="primary-object"/>
<attribute name="src"><text/></attribute> <element name="file">
<attribute name="mime"><text/></attribute> <attribute name="src"><text/></attribute>
<attribute name="description"><text/></attribute> <attribute name="mime"><text/></attribute>
<attribute name="description"><text/></attribute>
</element>
<zeroOrMore><element name="attribute"> <zeroOrMore><element name="attribute">
<ref name="attribute-content"/> <ref name="attribute-content"/>
</element></zeroOrMore> </element></zeroOrMore>