diff --git a/data/tests/exp_sample.gramps b/data/tests/exp_sample.gramps
index ffd37ca8c..f4c0375ce 100644
--- a/data/tests/exp_sample.gramps
+++ b/data/tests/exp_sample.gramps
@@ -3,7 +3,7 @@
"http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
-
+
Alex Roitman,,,
Not Provided
@@ -546,6 +546,34 @@
In cemetary
+
+ Birth
+
+
+
+
+
+
+
+
+
+ Residence
+
+
+
+
+
+
+
+
+
+ Residence
+
+
+
+
+
+
@@ -828,7 +856,7 @@
-
+
M
Lloyd
@@ -1004,6 +1032,49 @@
リチミシキスイミ
+
+ M
+
+ The
+ Tester
+
+
+
+
+
+
+
+ F
+
+ Mrs
+ Tester
+
+
+
+ 123 Main St.
+ Winslow
+ PA
+ 12345
+
+
+
+
+
+
+
+
+
+
+
+ M
+
+ Tom
+ Tester
+
+
+
+
+
@@ -1019,7 +1090,7 @@
-
+
@@ -1027,6 +1098,7 @@
+
@@ -1122,6 +1194,12 @@
+
+
+
+
+
+
@@ -1147,6 +1225,18 @@
2
+
+ 2
+
+
+
+ 2
+
+
+
+ 2
+
+
@@ -1168,6 +1258,22 @@
findagrave.com
+
+ Import from imp_FTM_LINK.ged
+
+
+
+
+
+
+
+
+
+
+
+ Ohio Births, 1958-2002
+
+
@@ -1304,6 +1410,36 @@
+
+ 123 High St, Cleveland, Cuyahoga, Ohio, USA, 44140
+ 44140
+
+
+
+
+ 123 Main St., Winslow, PA, 12345
+
+
+
+
+ Cleveland, Cuyahoga, Ohio, USA
+
+
+
+
+ USA
+
+
+
+ Cuyahoga, Ohio, USA
+
+
+
+
+ Ohio, USA
+
+
+
diff --git a/data/tests/exp_sample.gw b/data/tests/exp_sample.gw
index c9180e96f..dd530c1dd 100644
--- a/data/tests/exp_sample.gw
+++ b/data/tests/exp_sample.gw
@@ -22,35 +22,36 @@ beg
- h Eric_Lloyd.11 28/8/1963 #bp San_Francisco,_San_Francisco_Co.,_CA
- h Keith_Lloyd.12 11/8/1966 #bp San_Francisco,_San_Francisco_Co.,_CA
- h Craig_Peter.13 >1966 #bp San_Francisco,_San_Francisco_Co.,_CA
+- h The.14 Tester 29/12/1954 #bp 123_High_St,_Cleveland,_Cuyahoga,_Ohio,_USA
end
-fam Smith Hans_Peter.8 + #nm Jones Lillie_Harriet.14 2/5/1910 #bp Rnne,_Bornholm,_Denmark 26/6/1990
+fam Smith Hans_Peter.8 + #nm Jones Lillie_Harriet.15 2/5/1910 #bp Rnne,_Bornholm,_Denmark 26/6/1990
beg
- h Lloyd.9 13/3/1935 #bp San_Francisco,_San_Francisco_Co.,_CA
end
-fam Smith Hans_Peter.8 + #nm Anderson Jennifer.15 5/11/1907 #bp Rnne,_Bornholm,_Denmark 29/5/1985 #dp San_Francisco,_San_Francisco_Co.,_CA
+fam Smith Hans_Peter.8 + #nm Anderson Jennifer.16 5/11/1907 #bp Rnne,_Bornholm,_Denmark 29/5/1985 #dp San_Francisco,_San_Francisco_Co.,_CA
-fam Smith Martin.16 +~1816 #mp Gladsax,_Kristianstad_Ln,_Sweden Jefferson Elna.17 14/9/1800 #bp Gladsax,_Kristianstad_Ln,_Sweden #dp Sweden
+fam Smith Martin.17 +~1816 #mp Gladsax,_Kristianstad_Ln,_Sweden Jefferson Elna.18 14/9/1800 #bp Gladsax,_Kristianstad_Ln,_Sweden #dp Sweden
beg
-- f Hanna.18 29/1/1821 #bp Gladsax,_Kristianstad_Ln,_Sweden 0
-- f Ingar.19 >1823 #bp Gladsax,_Kristianstad_Ln,_Sweden 0
-- h Ingeman.20 29/1/1826 #bp Gladsax,_Kristianstad_Ln,_Sweden 0
-- h Martin.21 19/11/1830 #bp Gladsax,_Kristianstad_Ln,_Sweden 1899..1905 #dp Sweden
+- f Hanna.19 29/1/1821 #bp Gladsax,_Kristianstad_Ln,_Sweden 0
+- f Ingar.20 >1823 #bp Gladsax,_Kristianstad_Ln,_Sweden 0
+- h Ingeman.21 29/1/1826 #bp Gladsax,_Kristianstad_Ln,_Sweden 0
+- h Martin.22 19/11/1830 #bp Gladsax,_Kristianstad_Ln,_Sweden 1899..1905 #dp Sweden
end
-notes Smith Martin.21
+notes Smith Martin.22
beg
BIOGRAPHY
Martin was listed as being a Husman, (owning a house as opposed to a farm) in the house records of Gladsax.
end notes
-fam Nielsen Herman_Julius.22 31/8/1889 #bp Rnne,_Bornholm,_Denmark 1945 +30/11/1912 #mp Rnne,_Bornholm,_Denmark Smith Astrid_Shermanna_Augusta.3
+fam Nielsen Herman_Julius.23 31/8/1889 #bp Rnne,_Bornholm,_Denmark 1945 +30/11/1912 #mp Rnne,_Bornholm,_Denmark Smith Astrid_Shermanna_Augusta.3
beg
-- h 雪.23 Ke_柯 0
+- h 雪.24 Ke_柯 0
end
-notes Ke_柯 雪.23
+notes Ke_柯 雪.24
beg
Some Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈
Some Bold Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈
@@ -60,44 +61,54 @@ Some Bold Unicode Characters: ࣶǼЀج⿄㑝㵋
Some Italic Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈
end notes
-fam Smith Gus.6 +~1920 Michaels Evelyn.24 ~1897
+fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897
-fam Smith Hjalmar.5 +31/10/1927 #mp Reno,_Washoe_Co.,_NV Ohman Marjorie.25 3/6/1903 #bp Denver,_Denver_Co.,_CO,_Denver_Co.,_Colorado,_USA 22/6/1980 #dp Reno,_Washoe_Co.,_NV
+fam Smith Hjalmar.5 +31/10/1927 #mp Reno,_Washoe_Co.,_NV Ohman Marjorie.26 3/6/1903 #bp Denver,_Denver_Co.,_CO,_Denver_Co.,_Colorado,_USA 22/6/1980 #dp Reno,_Washoe_Co.,_NV
beg
-- h John_Hjalmar.26 30/1/1932 #bp San_Francisco,_San_Francisco_Co.,_CA
-- f Marjorie_Lee.27 4/11/1934 #bp Reno,_Washoe_Co.,_NV
+- h John_Hjalmar.27 30/1/1932 #bp San_Francisco,_San_Francisco_Co.,_CA
+- f Marjorie_Lee.28 4/11/1934 #bp Reno,_Washoe_Co.,_NV
end
-fam Smith John_Hjalmar.26 +4/6/1954 #mp Sparks,_Washoe_Co.,_NV Perkins Alice_Paula.28 22/11/1933 #bp Sparks,_Washoe_Co.,_NV
+fam Smith John_Hjalmar.27 +4/6/1954 #mp Sparks,_Washoe_Co.,_NV Perkins Alice_Paula.29 22/11/1933 #bp Sparks,_Washoe_Co.,_NV
beg
-- f Marjorie_Alice.29 5/2/1960 #bp San_Jose,_Santa_Clara_Co.,_CA
-- h Edwin_Michael.30 24/5/1961 #bp San_Jose,_Santa_Clara_Co.,_CA
+- f Marjorie_Alice.30 5/2/1960 #bp San_Jose,_Santa_Clara_Co.,_CA
+- h Edwin_Michael.31 24/5/1961 #bp San_Jose,_Santa_Clara_Co.,_CA
end
-fam Smith Eric_Lloyd.11 +12/7/1986 #mp Woodland,_Yolo_Co.,_CA Horne Darcy.31 2/7/1966 #bp Sacramento,_Sacramento_Co.,_CA
+fam Smith Eric_Lloyd.11 +12/7/1986 #mp Woodland,_Yolo_Co.,_CA Horne Darcy.32 2/7/1966 #bp Sacramento,_Sacramento_Co.,_CA
beg
-- h Lars_Peter.32 16/9/1991 #bp Santa_Rosa,_Sonoma_Co.,_CA
+- h Lars_Peter.33 16/9/1991 #bp Santa_Rosa,_Sonoma_Co.,_CA
end
-fam Smith Edwin_Michael.30 +27/5/1995 #mp San_Ramon,_Conta_Costa_Co.,_CA Adams Janice_Ann.33 26/8/1965 #bp Fremont,_Alameda_Co.,_CA
+fam Smith Edwin_Michael.31 +27/5/1995 #mp San_Ramon,_Conta_Costa_Co.,_CA Adams Janice_Ann.34 26/8/1965 #bp Fremont,_Alameda_Co.,_CA
beg
-- h Mason_Michael.34 26/6/1996 #bp Hayward,_Alameda_Co.,_CA
-- f Amber_Marie.35 12/4/1998 #bp Hayward,_Alameda_Co.,_CA
+- h Mason_Michael.35 26/6/1996 #bp Hayward,_Alameda_Co.,_CA
+- f Amber_Marie.36 12/4/1998 #bp Hayward,_Alameda_Co.,_CA
end
-fam Smith Martin.21 +~1856 Hansdotter Kerstina.36 29/11/1832 #bp Smestorp,_Kristianstad_Ln,_Sweden <1908 #dp Sweden
+fam Smith Martin.22 +~1856 Hansdotter Kerstina.37 29/11/1832 #bp Smestorp,_Kristianstad_Ln,_Sweden <1908 #dp Sweden
beg
-- h Magnes.37 6/10/1858 #bp Simrishamn,_Kristianstad_Ln,_Sweden 20/2/1910 #dp Rnne,_Bornholm,_Denmark
-- h Emil.38 27/9/1860 #bp Simrishamn,_Kristianstad_Ln,_Sweden 0
+- h Magnes.38 6/10/1858 #bp Simrishamn,_Kristianstad_Ln,_Sweden 20/2/1910 #dp Rnne,_Bornholm,_Denmark
+- h Emil.39 27/9/1860 #bp Simrishamn,_Kristianstad_Ln,_Sweden 0
- h Gustaf.0 28/11/1862 #bp Grostorp,_Kristianstad_Ln,_Sweden <23/7/1930 #dp Sparks,_Washoe_Co.,_NV
end
-fam Smith Ingeman.39 ~1770 #bp Sweden 0 +~1790 #mp Sweden Ericsdotter Marta.40 ~1775 #bp Sweden 0
+fam Smith Ingeman.40 ~1770 #bp Sweden 0 +~1790 #mp Sweden Ericsdotter Marta.41 ~1775 #bp Sweden 0
beg
-- h Martin.16 1794..1796 #bp Tommarp,_Kristianstad_Ln,_Sweden #dp Sweden
+- h Martin.17 1794..1796 #bp Tommarp,_Kristianstad_Ln,_Sweden #dp Sweden
end
-fam Willard Edwin.41 ~1886 +~1910 Smith Kirsti_Marie.2
+fam Willard Edwin.42 ~1886 +~1910 Smith Kirsti_Marie.2
-fam Smith Magnes.37 +24/8/1884 #mp Rnne,_Bornholm,_Denmark Streiffert Anna.42 23/9/1860 #bp Hoya/Jona/Hoia,_Sweden 2/2/1927 #dp Rnne,_Bornholm,_Denmark
+fam Smith Magnes.38 +24/8/1884 #mp Rnne,_Bornholm,_Denmark Streiffert Anna.43 23/9/1860 #bp Hoya/Jona/Hoia,_Sweden 2/2/1927 #dp Rnne,_Bornholm,_Denmark
+
+fam Tester The.14 + Tester Mrs.44 0
+beg
+- h Tom.45 0
+end
+
+notes Tester Mrs.44
+beg
+Address with PHON,FAX,EMAIL,WWW. attached directly to person is not legal Gedcom, but allowed here.
+end notes
diff --git a/data/tests/exp_sample.vcf b/data/tests/exp_sample.vcf
index 19b48ccda..82590743c 100644
--- a/data/tests/exp_sample.vcf
+++ b/data/tests/exp_sample.vcf
@@ -431,3 +431,37 @@ SORT-STRING:リチミシキスイミ ピーター
X-GENDER:Male
END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:The Tester
+N:Tester;The;;;
+SORT-STRING:Tester The
+X-GENDER:Male
+BDAY:1954-12-29
+END:VCARD
+
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:Mrs Tester
+N:Tester;Mrs;;;
+SORT-STRING:Tester Mrs
+X-GENDER:Female
+ADR:;;123 Main St.;Winslow;PA;12345;
+URL:440-871-3401
+URL:800-871-3401
+EMAIL:mrstester@gmail.com
+URL:440-321-4568
+URL:http://mrstester.com
+END:VCARD
+
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:Tom Tester
+N:Tester;Tom;;;
+SORT-STRING:Tester Tom
+X-GENDER:Male
+END:VCARD
+
diff --git a/data/tests/exp_sample.vcs b/data/tests/exp_sample.vcs
index 061018cb6..f2c14713c 100644
--- a/data/tests/exp_sample.vcs
+++ b/data/tests/exp_sample.vcs
@@ -525,21 +525,6 @@ DTSTART:20160702T000001
DTEND:20160702T235959
END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19350313T000001
-DTEND:19350313T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160313T000001
-DTEND:20160313T235959
-END:VEVENT
-
BEGIN:VEVENT
SUMMARY:Birth of Perkins, Alice Paula
LOCATION:Sparks, Washoe Co., NV
@@ -570,6 +555,36 @@ DTSTART:20160916T000001
DTEND:20160916T235959
END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Birth of Smith, Ingeman
+LOCATION:Gladsax, Kristianstad Ln, Sweden
+DTSTART:18260129T000001
+DTEND:18260129T235959
+END:VEVENT
+
+BEGIN:VEVENT
+SUMMARY:Anniversary: Birth of Smith, Ingeman
+LOCATION:Gladsax, Kristianstad Ln, Sweden
+RRULE:FREQ=YEARLY
+DTSTART:20160129T000001
+DTEND:20160129T235959
+END:VEVENT
+
+BEGIN:VEVENT
+SUMMARY:Birth of Smith, Lloyd
+LOCATION:San Francisco, San Francisco Co., CA
+DTSTART:19350313T000001
+DTEND:19350313T235959
+END:VEVENT
+
+BEGIN:VEVENT
+SUMMARY:Anniversary: Birth of Smith, Lloyd
+LOCATION:San Francisco, San Francisco Co., CA
+RRULE:FREQ=YEARLY
+DTSTART:20160313T000001
+DTEND:20160313T235959
+END:VEVENT
+
BEGIN:VEVENT
SUMMARY:Birth of Jefferson, Elna
LOCATION:Gladsax, Kristianstad Ln, Sweden
@@ -615,21 +630,6 @@ DTSTART:20161129T000001
DTEND:20161129T235959
END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Ingeman
-LOCATION:Gladsax, Kristianstad Ln, Sweden
-DTSTART:18260129T000001
-DTEND:18260129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Ingeman
-LOCATION:Gladsax, Kristianstad Ln, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20160129T000001
-DTEND:20160129T235959
-END:VEVENT
-
BEGIN:VEVENT
SUMMARY:Birth of Smith, Marjorie Alice
LOCATION:San Jose, Santa Clara Co., CA
@@ -718,6 +718,21 @@ DTSTART:20160927T000001
DTEND:20160927T235959
END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Birth of Tester, The
+LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA
+DTSTART:19541229T000001
+DTEND:19541229T235959
+END:VEVENT
+
+BEGIN:VEVENT
+SUMMARY:Anniversary: Birth of Tester, The
+LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA
+RRULE:FREQ=YEARLY
+DTSTART:20161229T000001
+DTEND:20161229T235959
+END:VEVENT
+
BEGIN:VEVENT
SUMMARY:Marriage of Smith, Gustaf Sr. and Hansdotter, Anna
LOCATION:Rnne, Bornholm, Denmark
diff --git a/data/tests/exp_sample.wft b/data/tests/exp_sample.wft
index 622244fed..4d3bf92ed 100644
--- a/data/tests/exp_sample.wft
+++ b/data/tests/exp_sample.wft
@@ -25,14 +25,14 @@ Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910
Janice Ann Adams;;;;;26/8/1965
Marjorie Ohman;;;;;3/6/1903-22/6/1980
Darcy Horne;;;;;2/7/1966
-Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935
Alice Paula Perkins;;;;;22/11/1933
Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991
+Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826
+Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935
Elna Jefferson;;;;;14/9/1800-
Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961
Kerstina Hansdotter;;;;;29/11/1832-1908
Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794-
-Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826
Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960
Janis Elaine Green;;;;;2/12/1935
Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996
@@ -41,4 +41,7 @@ Ingar Smith;Martin Smith0;Elna Jefferson;;;1823
Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975
Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860
雪 Ke 柯;Herman Nielsen;Astrid Smith;;;
+The Tester;Lloyd Smith;Janis Green;;;29/12/1954
+Mrs Tester;;;;;
ピーター リチミシキスイミ;;;;;
+Tom Tester;The Tester;Mrs Tester;;;
diff --git a/data/tests/exp_sample_ged.ged b/data/tests/exp_sample_ged.ged
index be5b35864..893a1efea 100644
--- a/data/tests/exp_sample_ged.ged
+++ b/data/tests/exp_sample_ged.ged
@@ -2,10 +2,10 @@
1 SOUR Gramps
2 VERS 5.0.0-alpha1
2 NAME Gramps
-1 DATE 26 JUN 2016
-2 TIME 08:49:54
+1 DATE 4 SEP 2016
+2 TIME 15:21:50
1 SUBM @SUBM@
-1 FILE C:\Users\prc\AppData\Roaming\gramps\temp\exp_sample_ged.ged
+1 FILE D:\Users\prc\Downloads\exp_sample_ged.ged
1 COPR Copyright (c) 2016 Alex Roitman,,,.
1 GEDC
2 VERS 5.5.1
@@ -592,8 +592,8 @@
1 FAMC @F0009@
1 FAMS @F0008@
1 CHAN
-2 DATE 21 DEC 2007
-3 TIME 01:35:26
+2 DATE 4 SEP 2016
+3 TIME 15:17:13
0 @I0034@ INDI
1 NAME Alice Paula /Perkins/
2 GIVN Alice Paula
@@ -752,6 +752,80 @@
1 CHAN
2 DATE 18 JUN 2016
3 TIME 11:42:08
+0 @I0044@ INDI
+1 NAME The /Tester/
+2 GIVN The
+2 SURN Tester
+1 SEX M
+1 BIRT
+2 DATE 29 DEC 1954
+2 PLAC 123 High St, Cleveland, Cuyahoga, Ohio, USA
+2 ADDR 123 High St
+3 ADR1 123 High St
+3 CITY Cleveland
+3 STAE Ohio
+3 POST 44140
+3 CTRY USA
+2 PHON 440-871-3400
+2 PHON 800-871-3400
+2 EMAIL thetester@gmail.com
+2 FAX 440-123-4567
+2 WWW http://thetester.com
+1 FAMC @F0008@
+1 FAMS @F0016@
+1 SOUR @S0005@
+1 CHAN
+2 DATE 4 SEP 2016
+3 TIME 15:16:39
+0 @I0045@ INDI
+1 NAME Mrs /Tester/
+2 GIVN Mrs
+2 SURN Tester
+1 SEX F
+1 RESI
+2 DATE 30 DEC 1954
+2 PLAC 123 Main St., Winslow, PA, 12345
+2 PHON 440-871-3401
+2 EMAIL mrstester@gmail.com
+2 FAX 440-321-4568
+2 WWW http://mrstester.com
+2 NOTE @N0011@
+1 FAMS @F0016@
+1 SOUR @S0005@
+1 RESI
+2 ADDR 123 Main St.
+3 CONT Winslow
+3 CONT PA
+3 CONT 12345
+3 ADR1 123 Main St.
+3 CITY Winslow
+3 STAE PA
+3 POST 12345
+1 PHON 440-871-3401
+1 PHON 800-871-3401
+1 EMAIL mrstester@gmail.com
+1 PHON 440-321-4568
+1 WWW http://mrstester.com
+1 NOTE @N0010@
+1 CHAN
+2 DATE 4 SEP 2016
+3 TIME 15:16:39
+0 @I0046@ INDI
+1 NAME Tom /Tester/
+2 GIVN Tom
+2 SURN Tester
+1 SEX M
+1 RESI
+2 DATE 1964
+2 PHON 440-871-3402
+2 EMAIL tomtester@gmail.com
+2 FAX 440-321-4569
+2 WWW http://tomtester.com
+1 FAMC @F0016@
+1 SOUR @S0005@
+1 CHAN
+2 DATE 4 SEP 2016
+3 TIME 15:17:49
0 @F0000@ FAM
1 HUSB @I0039@
1 WIFE @I0036@
@@ -857,9 +931,10 @@
1 CHIL @I0019@
1 CHIL @I0001@
1 CHIL @I0029@
+1 CHIL @I0044@
1 CHAN
-2 DATE 21 DEC 2007
-3 TIME 01:35:26
+2 DATE 4 SEP 2016
+3 TIME 15:14:33
0 @F0009@ FAM
1 HUSB @I0010@
1 WIFE @I0017@
@@ -923,6 +998,13 @@
1 CHAN
2 DATE 21 DEC 2007
3 TIME 01:35:26
+0 @F0016@ FAM
+1 HUSB @I0044@
+1 WIFE @I0045@
+1 CHIL @I0046@
+1 CHAN
+2 DATE 4 SEP 2016
+3 TIME 15:16:51
0 @S0000@ SOUR
1 TITL Marriage Certificae
1 REPO @R0002@
@@ -956,6 +1038,42 @@
1 CHAN
2 DATE 4 JUN 2016
3 TIME 16:28:36
+0 @S0005@ SOUR
+1 TITL Import from imp_FTM_LINK.ged
+1 REPO @R0000@
+1 REPO @R0001@
+1 CHAN
+2 DATE 29 AUG 2016
+3 TIME 14:51:48
+0 @S0006@ SOUR
+1 TITL Ohio Births, 1958-2002
+1 REPO @R0004@
+1 CHAN
+2 DATE 29 AUG 2016
+3 TIME 14:51:48
+0 @R0000@ REPO
+1 NAME Business that produced the product: Ancestry.com
+1 ADDR 360 W 4800 N, Provo, UT 84604
+2 ADR1 360 W 4800 N, Provo, UT 84604
+1 PHON (801) 705-7000
+1 FAX (801) 705-7001
+1 EMAIL help@ancestry.com
+1 WWW http://www.ancestry.com
+0 @R0001@ REPO
+1 NAME SUBM (Submitter): (@SUBM@) The Subm /Tester/
+1 ADDR 123 Main St.
+2 CONT Winslow
+2 CONT PA
+2 CONT 12345
+2 ADR1 123 Main St.
+2 CITY Winslow
+2 STAE PA
+2 POST 12345
+1 PHON 440-871-3401
+1 EMAIL mrstester@gmail.com
+1 FAX 440-321-4568
+1 WWW http://mrstester.com
+1 NOTE @N0009@
0 @R0002@ REPO
1 NAME New York Public Library
1 ADDR 5th Ave at 42 street
@@ -980,6 +1098,16 @@
2 CTRY USA
1 WWW http://library.gramps-project.org
1 NOTE @N0006@
+0 @R0004@ REPO
+1 NAME Testers Repository
+1 ADDR 123 High St., OSF village, CA, USA
+2 ADR1 123 High St., OSF village, CA, USA
+1 PHON 988-765-4321
+1 EMAIL tester_repo@osf.com
+1 FAX 987-654-3210
+1 WWW http://www.tester_repo.com
+1 NOTE @N0012@
+1 NOTE @N0013@
0 @N0000@ NOTE Witness name: John Doe
1 CONT Witness comment: This is a simple test.
0 @N0001@ NOTE Witness name: No Name
@@ -1008,4 +1136,21 @@
1 CONT Some Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈
1 CONT Some Bold Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈
1 CONT Some Italic Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈
+0 @N0008@ NOTE Records not imported into HEAD (header):
+1 CONT
+1 CONT Only one phone number supported Lin
+1 CONC e 9: 3 PHON (800) 705-7000
+0 @N0009@ NOTE Records not imported into SUBM (Submitter): (@SUBM@) The Subm /Test
+1 CONC er/:
+1 CONT
+1 CONT Only one phone number supported Lin
+1 CONC e 29: 1 PHON 800-871-3401
+0 @N0010@ NOTE Address with PHON,FAX,EMAIL,WWW. attached directly to person is no
+1 CONC t legal Gedcom, but allowed here.
+0 @N0011@ NOTE Address as event is legal, with PHON,FAX,EMAIL,WWW
+0 @N0012@ NOTE The repository record
+0 @N0013@ NOTE Records not imported into REPO (repository) Gramps ID R0002:
+1 CONT
+1 CONT Only one phone number supported Lin
+1 CONC e 87: 1 PHON 800-765-4321
0 TRLR
diff --git a/gramps/plugins/export/exportgedcom.py b/gramps/plugins/export/exportgedcom.py
index 2e530ba54..244bb09d5 100644
--- a/gramps/plugins/export/exportgedcom.py
+++ b/gramps/plugins/export/exportgedcom.py
@@ -735,6 +735,12 @@ class GedcomWriter(UpdateCallback):
def _url_list(self, obj, level):
"""
+ For Person's FAX, PHON, EMAIL, WWW lines;
+ n PHON {0:3}
+ n EMAIL {0:3}
+ n FAX {0:3}
+ n WWW {0:3}
+
n OBJE {1:1}
+1 FORM {1:1}
+1 TITL {0:1}
@@ -742,12 +748,21 @@ class GedcomWriter(UpdateCallback):
+1 <> {0:M}
"""
for url in obj.get_url_list():
- self._writeln(level, 'OBJE')
- self._writeln(level+1, 'FORM', 'URL')
- if url.get_description():
- self._writeln(level+1, 'TITL', url.get_description())
- if url.get_path():
- self._writeln(level+1, 'FILE', url.get_path(), limit=255)
+ if url.get_type() == UrlType.EMAIL:
+ self._writeln(level, 'EMAIL', url.get_path())
+ elif url.get_type() == UrlType.WEB_HOME:
+ self._writeln(level, 'WWW', url.get_path())
+ elif url.get_type() == _('Phone'):
+ self._writeln(level, 'PHON', url.get_path())
+ elif url.get_type() == _('FAX'):
+ self._writeln(level, 'PHON', url.get_path())
+ else:
+ self._writeln(level, 'OBJE')
+ self._writeln(level+1, 'FORM', 'URL')
+ if url.get_description():
+ self._writeln(level+1, 'TITL', url.get_description())
+ if url.get_path():
+ self._writeln(level+1, 'FILE', url.get_path(), limit=255)
def _families(self):
"""
@@ -945,7 +960,7 @@ class GedcomWriter(UpdateCallback):
for reporef in source.get_reporef_list():
self._reporef(reporef, 1)
- break
+ # break
self._note_references(source.get_note_list(), 1)
self._change(source.get_change_time(), 1)
@@ -1011,10 +1026,12 @@ class GedcomWriter(UpdateCallback):
if addr.get_phone():
self._writeln(1, 'PHON', addr.get_phone())
for url in repo.get_url_list():
- if int(url.get_type()) == UrlType.EMAIL:
+ if url.get_type() == UrlType.EMAIL:
self._writeln(1, 'EMAIL', url.get_path())
- elif int(url.get_type()) == UrlType.WEB_HOME:
+ elif url.get_type() == UrlType.WEB_HOME:
self._writeln(1, 'WWW', url.get_path())
+ elif url.get_type() == _('FAX'):
+ self._writeln(1, 'FAX', url.get_path())
self._note_references(repo.get_note_list(), 1)
def _reporef(self, reporef, level):
@@ -1103,6 +1120,14 @@ class GedcomWriter(UpdateCallback):
self._writeln(2, 'CAUS', attr.get_value())
elif attr_type == AttributeType.AGENCY:
self._writeln(2, 'AGNC', attr.get_value())
+ elif attr_type == _("Phone"):
+ self._writeln(2, 'PHON', attr.get_value())
+ elif attr_type == _("FAX"):
+ self._writeln(2, 'FAX', attr.get_value())
+ elif attr_type == _("EMAIL"):
+ self._writeln(2, 'EMAIL', attr.get_value())
+ elif attr_type == _("WWW"):
+ self._writeln(2, 'WWW', attr.get_value())
for attr in event_ref.get_attribute_list():
attr_type = attr.get_type()