diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 32d4d79f7..2f2b2f803 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2005-10-13 Alex Roitman + * example/gramps/data.gramps: Update example data to conform with + the format changes and the DTD. + * doc/grampsxml.dtd, doc/grampsxml.rng: Update. + 2005-10-13 Martin Hawlisch * src/plugins/TestcaseGenerator.py: Randomize more; Add LDS events diff --git a/gramps2/doc/grampsxml.dtd b/gramps2/doc/grampsxml.dtd index ec0220ad7..a3a549846 100644 --- a/gramps2/doc/grampsxml.dtd +++ b/gramps2/doc/grampsxml.dtd @@ -285,7 +285,7 @@ SHARED ELEMENTS @@ -334,3 +334,22 @@ EVENT key CDATA #REQUIRED value CDATA #REQUIRED > + + + + + + + + + + + diff --git a/gramps2/doc/grampsxml.rng b/gramps2/doc/grampsxml.rng index b8222cfc1..83aaecb15 100644 --- a/gramps2/doc/grampsxml.rng +++ b/gramps2/doc/grampsxml.rng @@ -38,7 +38,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -99,10 +99,14 @@ - + + + + + 0 1 @@ -113,7 +117,7 @@ U - + @@ -171,30 +175,40 @@ 0 1 - - 0 - 1 + + + + + Also Known As + Birth Name + Married Name + Other Name - + - + + + + + + + - - 0 - 1 - - + + + + @@ -210,15 +224,14 @@ - - - + + - + before @@ -230,32 +243,216 @@ - - - + + + 0 + 1 + + + Married + Unmarried + Civil Union + Unknown + Other + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - + + + + + + 0 + 1 + + + + + + + + + + + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gramps2/example/gramps/data.gramps b/gramps2/example/gramps/data.gramps index 65d86ea43..b76d26a64 100644 --- a/gramps2/example/gramps/data.gramps +++ b/gramps2/example/gramps/data.gramps @@ -1,8 +1,9 @@ - - - + + +
- + Joe Smith Over There @@ -14,200 +15,37 @@ bobsmith@somewhere.net
- - + + F Anna - Streiffert + Hansdotter - - + + - - + + - + - + M - Craig Peter + Keith Lloyd Smith - - + + - - This is a simple test. - - + + - - M - - Martin - Smith - - - - - - - - - - - - - F - - Jennifer - Anderson - - - - - - - - - - - - - M - - Eric Lloyd - Smith - - - - - - - - - - M - - John Hjalmar - Smith - - - - - - - - - - M - - Hjalmar - Smith - - - - - - - - - - - - - - - - - - - - BIOGRAPHY - -Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November 1912 arriving in New York 27 November 1912. He was seventeen years old. On the ship passenger list his trade was listed as a Blacksmith. He came to Reno, Nevada and lived with his sister Marie for a time before settling in Sparks. He worked for Southern Pacific Railroad as a car inspector for a time, then went to work for Standard Oil -Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corporal in the Medical Corp until his discharge 12 August 1919 at the Presidio in San Francisco, California. Both he and Marjorie are buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th June 1975, and she the 25th of June 1980. - - - M - - Gus - Smith - - - - - - - - - - - - - - F - - Marjorie Lee - Smith - - - - - - - - - F - - Marjorie - Ohman - - - - - - - - - - - - - F - - Astrid Shermanna Augusta - Smith - - - - - - - - - - - - - - F - - Hanna - Smith - - - - - - - - + M Hans Peter @@ -215,17 +53,44 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo - + - + - - - + + + - + + F + + Hanna + Smith + + + + + + + + + M + + Herman Julius + Nielsen + + + + + + + + + + + F Evelyn @@ -234,57 +99,183 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo - + - - M - - Herman Julius - Nielsen - - - - - - - - - - - + F - Kerstina - Hansdotter - - - - - - - - - - - - - F - - Kirsti Marie + Marjorie Lee Smith - - + + + + + + + M + + Gus + Smith + + + + - - + + - - + + - + + F + + Jennifer + Anderson + + + + + + + + + + + + + F + + Lillie Harriet + Jones + + + + + + + + + + + + M + + John Hjalmar + Smith + + + + + + + + + + M + + Eric Lloyd + Smith + + + + + + + + + + F + + Amber Marie + Smith + + + + + + + + + + + + + M + + Carl Emil + Smith + + + + + + + + + + + + + M + + Hjalmar + Smith + + + + + + + + + + + + + M + + Martin + Smith + + + + + + + + + + + + + + + + BIOGRAPHY +Martin was listed as being a Husman, (owning a house as opposed to a farm) in the house records of Gladsax. + + + F + + Astrid Shermanna Augusta + Smith + + + + + + + + + + + + + M Gustaf @@ -293,270 +284,26 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo - + - + - + - + - - - - + + + + - - M - - Carl Emil - Smith - - - - - - - - - - - - - M - - Ingeman - Smith - - - - - - - - - F - - Alice Paula - Perkins - - - - - - - - - M - - Emil - Smith - - - - - - - - - M - - Lars Peter - Smith - - - - - - - - - F - - Elna - Jefferson - - - - - - - - - - - - - - - - F - - Lillie Harriet - Jones - - - - - - - - - - - - F - - Janice Ann - Adams - - - - - - - Retail Manager - - - - Business Management - - - - - M - - Keith Lloyd - Smith - - - - - - - - - - F - - Anna - Hansdotter - - - - - - - - - - - - - M - - Magnes - Smith - - - - - - - - - - - - - - F - - Amber Marie - Smith - - - - - - - - - - - - - M - - Mason Michael - Smith - - - - - - - - - - - - - - M - - Ingeman - Smith - - - - - - - - - F - - Ingar - Smith - - - - - - - - - M - - Edwin - Willard - - - - - - - - M - - Lloyd - Smith - - - - - - - - - + F Marta @@ -564,40 +311,127 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo - + - + - - M + + F - Edwin Michael + Kirsti Marie Smith - - - - + + + + + + + + + + + + M + + Ingeman + Smith + + + + + + + + + F + + Anna + Streiffert + + + + + + + + + + + + + M + + Craig Peter + Smith + + + + + + + + + This is a simple test. + + + + + + M + + Magnes + Smith + + + + + + + + + + + + + + F + + Janice Ann + Adams + + + + - - - Software Engineer - - - - + + Retail Manager - - B.S.E.E. + + Business Management - - - + - + + F + + Marjorie + Ohman + + + + + + + + + + + + F Darcy @@ -605,50 +439,150 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo - + - + - + M - Hjalmar + Lloyd Smith - - + + + + + + + + F + + Alice Paula + Perkins + + + + + + + + + M + + Lars Peter + Smith + + + + + + + + + F + + Elna + Jefferson + + + + - - + + - + + + + + - + + M + + Edwin Michael + Smith + + + + + + + + + + + + + + + + + + + Software Engineer + + + + + + + + B.S.E.E. + + + + + + + F + + Kerstina + Hansdotter + + + + + + + + + + + + M Martin Smith - - + + - - + + - - - - - - - BIOGRAPHY -Martin was listed as being a Husman, (owning a house as opposed to a farm) in the house records of Gladsax. + + - + + M + + Ingeman + Smith + + + + + + + + F Marjorie Alice @@ -656,12 +590,12 @@ Martin was listed as being a Husman, (owning a house as opposed to a farm) in th - + - - + + - + F Janis Elaine @@ -670,205 +604,282 @@ Martin was listed as being a Husman, (owning a house as opposed to a farm) in th - + + + + M + + Mason Michael + Smith + + + + + + + + + + + + + + M + + Edwin + Willard + + + + + + + + F + + Ingar + Smith + + + + + + + + + M + + Hjalmar + Smith + + + + + + + + + + + + + + + + + + + + BIOGRAPHY + +Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November 1912 arriving in New York 27 November 1912. He was seventeen years old. On the ship passenger list his trade was listed as a Blacksmith. He came to Reno, Nevada and lived with his sister Marie for a time before settling in Sparks. He worked for Southern Pacific Railroad as a car inspector for a time, then went to work for Standard Oil +Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corporal in the Medical Corp until his discharge 12 August 1919 at the Presidio in San Francisco, California. Both he and Marjorie are buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th June 1975, and she the 25th of June 1980. + + + M + + Emil + Smith + + + + + + - - - + + + - + - - - - + + + + - - - + + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - + - - - - - - - + + + + + + + - - - + + + - - - + + + - + - - - + + + - + - - + + - - - + + + - - - + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - Birth, Death and Marriage Records - - - Birth Records - - + Birth Certificate - + + Birth Records + + + + Birth, Death and Marriage Records + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - -