2006-07-27 Alex Roitman <shura@gramps-project.org>

* src/GrampsDb/_GrampsBSDDB.py (_load_metadata): Upgrade custom
	name formats.
	* src/GrampsDb/_ReadXML.py (start_format): Attempt parsing the
	active state for the custom name format.
	* src/GrampsDb/_WriteXML.py (write_name_formats): Write 4-tuple
	custom name formats; 
	(_xml_version): Output as version 1.1.1.
	* data/grampsxml.rng: Update XML description for 1.1.1.
	* data/grampsxml.dtd: Update XML description for 1.1.1.
	* src/ViewManager.py (post_load_newdb): Revert changes (done on
	the lower level).
	* src/NameDisplay.py (register_custom_formats): Revert changes (done on
	the lower level).



svn: r7085
This commit is contained in:
Alex Roitman
2006-07-27 17:44:02 +00:00
parent de0f900d60
commit 002d180d88
8 changed files with 66 additions and 28 deletions

View File

@@ -31,7 +31,7 @@
<grammar
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://gramps-project.org/xml/1.1.0/"
ns="http://gramps-project.org/xml/1.1.1/"
xmlns="http://relaxng.org/ns/structure/1.0">
<start><element name="database">
@@ -98,6 +98,11 @@
</element></zeroOrMore>
</element></optional>
<optional><element name="name-formats">
<zeroOrMore><element name="format">
<ref name="format-content"/>
</element></zeroOrMore>
</element></optional>
</element></start>
<define name="researcher-content">
@@ -431,6 +436,16 @@
<attribute name="hlink"><data type="IDREF"/></attribute>
</define>
<define name="format-content">
<attribute name="number"><text/></attribute>
<attribute name="name"><text/></attribute>
<attribute name="fmt_str"><text/></attribute>
<optional><attribute name="active"><choice>
<value>0</value>
<value>1</value>
</choice></attribute></optional>
</define>
<define name="note-content">
<optional><attribute name="format"><choice>
<value>0</value>