Better handling of PAF double dates.

diff --git a/t/output/compat-paf2.ref b/t/output/compat-paf2.ref
index 9dbb289e146a2a433c6c068458534007e4bd16eb..a8c4ecd2b2a0ae096f49d2c6b5d42a078dd3aa30 100644 (file)
--- a/t/output/compat-paf2.ref
+++ b/t/output/compat-paf2.ref
@@ -11605,25 +11605,26 @@ Rec INDI start, xref is @I263@
 == 1 NAME (342) Sarah (Louisa) /Fairbrother/ (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 2684: Converting '       1815/1816' to standard 'BET 1815 AND 1816'
 Contents of the date_value:
   raw value:        1815/1816
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1815/16
+    year: 1815
     date type: 2
-    sdn1: 2384340
-    sdn2: 2384705
+    sdn1: 2383975
+    sdn2: 2384339
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1816
+    date type: 2
+    sdn1: 2384340
+    sdn2: 2384705
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -17788,25 +17789,26 @@ Contents of the date_value:
     sdn2: -1
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 4079: Converting '       1951/1952' to standard 'BET 1951 AND 1952'
 Contents of the date_value:
   raw value:        1951/1952
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1951/52
+    year: 1951
     date type: 2
-    sdn1: 2434013
-    sdn2: 2434378
+    sdn1: 2433648
+    sdn2: 2434012
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1952
+    date type: 2
+    sdn1: 2434013
+    sdn2: 2434378
   phrase: 
 == 1 FAMS (322) @F186@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F136@ (ctxt is 333, conversion failures: 0)
@@ -17835,25 +17837,26 @@ Contents of the date_value:
     sdn2: -1
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 4088: Converting '       1942/1943' to standard 'BET 1942 AND 1943'
 Contents of the date_value:
   raw value:        1942/1943
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1942/43
+    year: 1942
     date type: 2
-    sdn1: 2430726
-    sdn2: 2431090
+    sdn1: 2430361
+    sdn2: 2430725
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1943
+    date type: 2
+    sdn1: 2430726
+    sdn2: 2431090
   phrase: 
 == 1 FAMS (322) @F193@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F136@ (ctxt is 333, conversion failures: 0)
@@ -26257,16 +26260,18 @@ Rec INDI start, xref is @I707@
 == 1 NAME (342) Anne  /Hyde/ (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 6335: Year after slash should be two digits: '1637/1638'
+WARNING: Warning on line 6335: Putting date '12 MAR 1637/1638' in 'phrase' member
 Contents of the date_value:
   raw value: 12 MAR 1637/1638
-  type: 0
+  type: 11
   date1:
-    calendar type: 0
-    day: 12
-    month: MAR
-    year: 1637/38
-    date type: 1
-    sdn1: 2319398
+    calendar type: 4
+    day: 
+    month: 
+    year: 
+    date type: 0
+    sdn1: -1
     sdn2: -1
   date2:
     calendar type: 4
@@ -26276,7 +26281,7 @@ Contents of the date_value:
     date type: 0
     sdn1: -1
     sdn2: -1
-  phrase: 
+  phrase: 12 MAR 1637/1638
 == 2 PLAC (358) Cranbourne Lodge,Near,Windsor,England (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -26702,6 +26707,8 @@ Rec INDI start, xref is @I716@
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 6436: Year is missing: '10 JAN'
 WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
+WARNING: Warning on line 6436: Year is missing: '10 JAN'
+WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
 Contents of the date_value:
   raw value: 10 JAN
   type: 11
@@ -43991,25 +43998,26 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Waltham,Near Winchester (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 10710: Converting '       1361/1362' to standard 'BET 1361 AND 1362'
 Contents of the date_value:
   raw value:        1361/1362
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1361/62
+    year: 1361
     date type: 2
-    sdn1: 2218521
-    sdn2: 2218885
+    sdn1: 2218156
+    sdn2: 2218520
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1362
+    date type: 2
+    sdn1: 2218521
+    sdn2: 2218885
   phrase: 
 == 1 FAMS (322) @F612@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F451@ (ctxt is 333, conversion failures: 0)
@@ -44135,16 +44143,18 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Woodstock (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 10740: Year after slash should be two digits: '1396/1397'
+WARNING: Warning on line 10740: Putting date '15 SEP 1396/1397' in 'phrase' member
 Contents of the date_value:
   raw value: 15 SEP 1396/1397
-  type: 0
+  type: 11
   date1:
-    calendar type: 0
-    day: 15
-    month: SEP
-    year: 1396/97
-    date type: 1
-    sdn1: 2231562
+    calendar type: 4
+    day: 
+    month: 
+    year: 
+    date type: 0
+    sdn1: -1
     sdn2: -1
   date2:
     calendar type: 4
@@ -44154,7 +44164,7 @@ Contents of the date_value:
     date type: 0
     sdn1: -1
     sdn2: -1
-  phrase: 
+  phrase: 15 SEP 1396/1397
 == 2 PLAC (358) Calais (ctxt is 333, conversion failures: 0)
 == 1 FAMS (322) @F491@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F451@ (ctxt is 333, conversion failures: 0)
@@ -46907,25 +46917,26 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Near Moscow,Russia (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 11365: Converting '       1761/1762' to standard 'BET 1761 AND 1762'
 Contents of the date_value:
   raw value:        1761/1762
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1761/62
+    year: 1761
     date type: 2
-    sdn1: 2364618
-    sdn2: 2364982
+    sdn1: 2364253
+    sdn2: 2364617
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1762
+    date type: 2
+    sdn1: 2364618
+    sdn2: 2364982
   phrase: 
 == 1 FAMC (320) @F472@ (ctxt is 333, conversion failures: 0)
 Rec INDI start, xref is @I1305@
@@ -47055,25 +47066,26 @@ Contents of the date_value:
     sdn2: -1
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 11399: Converting '       1675/1676' to standard 'BET 1675 AND 1676'
 Contents of the date_value:
   raw value:        1675/1676
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1675/76
+    year: 1675
     date type: 2
-    sdn1: 2333207
-    sdn2: 2333572
+    sdn1: 2332842
+    sdn2: 2333206
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1676
+    date type: 2
+    sdn1: 2333207
+    sdn2: 2333572
   phrase: 
 == 1 FAMS (322) @F476@ (ctxt is 333, conversion failures: 0)
 == 1 FAMS (322) @F478@ (ctxt is 333, conversion failures: 0)
@@ -48200,25 +48212,26 @@ Rec INDI start, xref is @I1353@
 == 1 TITL (388) Earl of Pembroke (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 11727: Converting '       1495/1496' to standard 'BET 1495 AND 1496'
 Contents of the date_value:
   raw value:        1495/1496
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1495/96
+    year: 1495
     date type: 2
-    sdn1: 2267463
-    sdn2: 2267828
+    sdn1: 2267098
+    sdn2: 2267462
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1496
+    date type: 2
+    sdn1: 2267463
+    sdn2: 2267828
   phrase: 
 == 1 FAMS (322) @F537@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F497@ (ctxt is 333, conversion failures: 0)
@@ -49397,25 +49410,26 @@ Rec INDI start, xref is @I1380@
 == 1 TITL (388) King of England (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12012: Converting '       1027/1028' to standard 'BET 1027 AND 1028'
 Contents of the date_value:
   raw value:        1027/1028
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1027/28
+    year: 1027
     date type: 2
-    sdn1: 2096529
-    sdn2: 2096894
+    sdn1: 2096164
+    sdn2: 2096528
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1028
+    date type: 2
+    sdn1: 2096529
+    sdn2: 2096894
   phrase: 
 == 2 PLAC (358) Falaise,Normandy,France (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
@@ -49597,28 +49611,27 @@ Rec INDI start, xref is @I1384@
 == 1 TITL (388) King of England (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
-WARNING: Warning on line 12060: Year after slash should be following year: '1056/60'
-WARNING: Warning on line 12060: Putting date '       1056/1060' in 'phrase' member
+WARNING: Warning on line 12060: Converting '       1056/1060' to standard 'BET 1056 AND 1060'
 Contents of the date_value:
   raw value:        1056/1060
-  type: 11
+  type: 3
   date1:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1056
+    date type: 2
+    sdn1: 2106756
+    sdn2: 2107121
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
-  phrase:        1056/1060
+    year: 1060
+    date type: 2
+    sdn1: 2108217
+    sdn2: 2108582
+  phrase: 
 == 2 PLAC (358) Normandy,France (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -49706,16 +49719,18 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Normandy,France (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12091: Year after slash should be two digits: '1137/1138'
+WARNING: Warning on line 12091: Putting date ' 8 MAR 1137/1138' in 'phrase' member
 Contents of the date_value:
   raw value:  8 MAR 1137/1138
-  type: 0
+  type: 11
   date1:
-    calendar type: 0
-    day: 8
-    month: MAR
-    year: 1137/38
-    date type: 1
-    sdn1: 2136772
+    calendar type: 4
+    day: 
+    month: 
+    year: 
+    date type: 0
+    sdn1: -1
     sdn2: -1
   date2:
     calendar type: 4
@@ -49725,7 +49740,7 @@ Contents of the date_value:
     date type: 0
     sdn1: -1
     sdn2: -1
-  phrase: 
+  phrase:  8 MAR 1137/1138
 == 2 PLAC (358) Marcigny-sur-,Loire,France (ctxt is 333, conversion failures: 0)
 == 1 FAMS (322) @F569@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F505@ (ctxt is 333, conversion failures: 0)
@@ -49839,25 +49854,26 @@ Rec INDI start, xref is @I1392@
 == 1 NAME (342) Matilda (Edith) of_Scotland// (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12129: Converting '       1079/1080' to standard 'BET 1079 AND 1080'
 Contents of the date_value:
   raw value:        1079/1080
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1079/80
+    year: 1079
     date type: 2
-    sdn1: 2115522
-    sdn2: 2115887
+    sdn1: 2115157
+    sdn2: 2115521
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1080
+    date type: 2
+    sdn1: 2115522
+    sdn2: 2115887
   phrase: 
 == 2 PLAC (358) Dunfermline (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
@@ -49964,25 +49980,26 @@ Rec INDI start, xref is @I1395@
 == 1 NAME (342) Matilda  // (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12159: Converting 'ABT    1103/1104' to standard 'BET 1103 AND 1104'
 Contents of the date_value:
   raw value: ABT    1103/1104
-  type: 7
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1103/04
+    year: 1103
     date type: 2
-    sdn1: 2124287
-    sdn2: 2124652
+    sdn1: 2123922
+    sdn2: 2124286
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1104
+    date type: 2
+    sdn1: 2124287
+    sdn2: 2124652
   phrase: 
 == 2 PLAC (358) Winchester (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
@@ -50118,28 +50135,27 @@ Rec INDI start, xref is @I1398@
 == 1 NAME (342) Matilda of_Boulogne // (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
-WARNING: Warning on line 12199: Year after slash should be following year: '1103/05'
-WARNING: Warning on line 12199: Putting date 'ABT    1103/1105' in 'phrase' member
+WARNING: Warning on line 12199: Converting 'ABT    1103/1105' to standard 'BET 1103 AND 1105'
 Contents of the date_value:
   raw value: ABT    1103/1105
-  type: 11
+  type: 3
   date1:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1103
+    date type: 2
+    sdn1: 2123922
+    sdn2: 2124286
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
-  phrase: ABT    1103/1105
+    year: 1105
+    date type: 2
+    sdn1: 2124653
+    sdn2: 2125017
+  phrase: 
 == 2 PLAC (358) Boulogne (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -50219,25 +50235,26 @@ Rec INDI start, xref is @I1400@
 == 1 TITL (388) Count (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12222: Converting '       1130/1131' to standard 'BET 1130 AND 1131'
 Contents of the date_value:
   raw value:        1130/1131
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1130/31
+    year: 1130
     date type: 2
-    sdn1: 2134149
-    sdn2: 2134513
+    sdn1: 2133784
+    sdn2: 2134148
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1131
+    date type: 2
+    sdn1: 2134149
+    sdn2: 2134513
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -69645,25 +69662,26 @@ Rec INDI start, xref is @I2354@
 == 1 TITL (388) Earl of Sussex (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 18576: Converting '       1556/1557' to standard 'BET 1556 AND 1557'
 Contents of the date_value:
   raw value:        1556/1557
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1556/57
+    year: 1556
     date type: 2
-    sdn1: 2289743
-    sdn2: 2290107
+    sdn1: 2289377
+    sdn2: 2289742
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1557
+    date type: 2
+    sdn1: 2289743
+    sdn2: 2290107
   phrase: 
 == 1 FAMS (322) @F1104@ (ctxt is 333, conversion failures: 0)
 Rec INDI start, xref is @I2355@
@@ -96598,25 +96616,26 @@ Family start, xref is @F450@
 == 1 CHIL (293) @I1227@ (ctxt is 450, conversion failures: 0)
 == 1 CHIL (293) @I1228@ (ctxt is 450, conversion failures: 0)
 == 1 MARR (339) (null) (ctxt is 450, conversion failures: 0)
+WARNING: Warning on line 26175: Converting '       1380/1381' to standard 'BET 1380 AND 1381'
 Contents of the date_value:
   raw value:        1380/1381
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1380/81
+    year: 1380
     date type: 2
-    sdn1: 2225461
-    sdn2: 2225825
+    sdn1: 2225095
+    sdn2: 2225460
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1381
+    date type: 2
+    sdn1: 2225461
+    sdn2: 2225825
   phrase: 
 == 2 PLAC (358) Arundel Castle (ctxt is 450, conversion failures: 0)
 Family end, xref is <NOTSAVED>
@@ -99337,6 +99356,8 @@ Family start, xref is @F602@
 == 1 MARR (339) (null) (ctxt is 602, conversion failures: 0)
 WARNING: Warning on line 27126: Year is missing: '20 JUL'
 WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
+WARNING: Warning on line 27126: Year is missing: '20 JUL'
+WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
 Contents of the date_value:
   raw value: 20 JUL
   type: 11
@@ -120077,25 +120098,26 @@ Rec INDI start, xref is @I263@
 == 1 NAME (342) Sarah (Louisa) /Fairbrother/ (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 2684: Converting '       1815/1816' to standard 'BET 1815 AND 1816'
 Contents of the date_value:
   raw value:        1815/1816
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1815/16
+    year: 1815
     date type: 2
-    sdn1: 2384340
-    sdn2: 2384705
+    sdn1: 2383975
+    sdn2: 2384339
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1816
+    date type: 2
+    sdn1: 2384340
+    sdn2: 2384705
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -126260,25 +126282,26 @@ Contents of the date_value:
     sdn2: -1
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 4079: Converting '       1951/1952' to standard 'BET 1951 AND 1952'
 Contents of the date_value:
   raw value:        1951/1952
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1951/52
+    year: 1951
     date type: 2
-    sdn1: 2434013
-    sdn2: 2434378
+    sdn1: 2433648
+    sdn2: 2434012
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1952
+    date type: 2
+    sdn1: 2434013
+    sdn2: 2434378
   phrase: 
 == 1 FAMS (322) @F186@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F136@ (ctxt is 333, conversion failures: 0)
@@ -126307,25 +126330,26 @@ Contents of the date_value:
     sdn2: -1
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 4088: Converting '       1942/1943' to standard 'BET 1942 AND 1943'
 Contents of the date_value:
   raw value:        1942/1943
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1942/43
+    year: 1942
     date type: 2
-    sdn1: 2430726
-    sdn2: 2431090
+    sdn1: 2430361
+    sdn2: 2430725
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1943
+    date type: 2
+    sdn1: 2430726
+    sdn2: 2431090
   phrase: 
 == 1 FAMS (322) @F193@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F136@ (ctxt is 333, conversion failures: 0)
@@ -134729,16 +134753,18 @@ Rec INDI start, xref is @I707@
 == 1 NAME (342) Anne  /Hyde/ (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 6335: Year after slash should be two digits: '1637/1638'
+WARNING: Warning on line 6335: Putting date '12 MAR 1637/1638' in 'phrase' member
 Contents of the date_value:
   raw value: 12 MAR 1637/1638
-  type: 0
+  type: 11
   date1:
-    calendar type: 0
-    day: 12
-    month: MAR
-    year: 1637/38
-    date type: 1
-    sdn1: 2319398
+    calendar type: 4
+    day: 
+    month: 
+    year: 
+    date type: 0
+    sdn1: -1
     sdn2: -1
   date2:
     calendar type: 4
@@ -134748,7 +134774,7 @@ Contents of the date_value:
     date type: 0
     sdn1: -1
     sdn2: -1
-  phrase: 
+  phrase: 12 MAR 1637/1638
 == 2 PLAC (358) Cranbourne Lodge,Near,Windsor,England (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -135174,6 +135200,8 @@ Rec INDI start, xref is @I716@
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 6436: Year is missing: '10 JAN'
 WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
+WARNING: Warning on line 6436: Year is missing: '10 JAN'
+WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
 Contents of the date_value:
   raw value: 10 JAN
   type: 11
@@ -152463,25 +152491,26 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Waltham,Near Winchester (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 10710: Converting '       1361/1362' to standard 'BET 1361 AND 1362'
 Contents of the date_value:
   raw value:        1361/1362
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1361/62
+    year: 1361
     date type: 2
-    sdn1: 2218521
-    sdn2: 2218885
+    sdn1: 2218156
+    sdn2: 2218520
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1362
+    date type: 2
+    sdn1: 2218521
+    sdn2: 2218885
   phrase: 
 == 1 FAMS (322) @F612@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F451@ (ctxt is 333, conversion failures: 0)
@@ -152607,16 +152636,18 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Woodstock (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 10740: Year after slash should be two digits: '1396/1397'
+WARNING: Warning on line 10740: Putting date '15 SEP 1396/1397' in 'phrase' member
 Contents of the date_value:
   raw value: 15 SEP 1396/1397
-  type: 0
+  type: 11
   date1:
-    calendar type: 0
-    day: 15
-    month: SEP
-    year: 1396/97
-    date type: 1
-    sdn1: 2231562
+    calendar type: 4
+    day: 
+    month: 
+    year: 
+    date type: 0
+    sdn1: -1
     sdn2: -1
   date2:
     calendar type: 4
@@ -152626,7 +152657,7 @@ Contents of the date_value:
     date type: 0
     sdn1: -1
     sdn2: -1
-  phrase: 
+  phrase: 15 SEP 1396/1397
 == 2 PLAC (358) Calais (ctxt is 333, conversion failures: 0)
 == 1 FAMS (322) @F491@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F451@ (ctxt is 333, conversion failures: 0)
@@ -155379,25 +155410,26 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Near Moscow,Russia (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 11365: Converting '       1761/1762' to standard 'BET 1761 AND 1762'
 Contents of the date_value:
   raw value:        1761/1762
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1761/62
+    year: 1761
     date type: 2
-    sdn1: 2364618
-    sdn2: 2364982
+    sdn1: 2364253
+    sdn2: 2364617
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1762
+    date type: 2
+    sdn1: 2364618
+    sdn2: 2364982
   phrase: 
 == 1 FAMC (320) @F472@ (ctxt is 333, conversion failures: 0)
 Rec INDI start, xref is @I1305@
@@ -155527,25 +155559,26 @@ Contents of the date_value:
     sdn2: -1
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 11399: Converting '       1675/1676' to standard 'BET 1675 AND 1676'
 Contents of the date_value:
   raw value:        1675/1676
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1675/76
+    year: 1675
     date type: 2
-    sdn1: 2333207
-    sdn2: 2333572
+    sdn1: 2332842
+    sdn2: 2333206
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1676
+    date type: 2
+    sdn1: 2333207
+    sdn2: 2333572
   phrase: 
 == 1 FAMS (322) @F476@ (ctxt is 333, conversion failures: 0)
 == 1 FAMS (322) @F478@ (ctxt is 333, conversion failures: 0)
@@ -156672,25 +156705,26 @@ Rec INDI start, xref is @I1353@
 == 1 TITL (388) Earl of Pembroke (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 11727: Converting '       1495/1496' to standard 'BET 1495 AND 1496'
 Contents of the date_value:
   raw value:        1495/1496
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1495/96
+    year: 1495
     date type: 2
-    sdn1: 2267463
-    sdn2: 2267828
+    sdn1: 2267098
+    sdn2: 2267462
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1496
+    date type: 2
+    sdn1: 2267463
+    sdn2: 2267828
   phrase: 
 == 1 FAMS (322) @F537@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F497@ (ctxt is 333, conversion failures: 0)
@@ -157869,25 +157903,26 @@ Rec INDI start, xref is @I1380@
 == 1 TITL (388) King of England (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12012: Converting '       1027/1028' to standard 'BET 1027 AND 1028'
 Contents of the date_value:
   raw value:        1027/1028
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1027/28
+    year: 1027
     date type: 2
-    sdn1: 2096529
-    sdn2: 2096894
+    sdn1: 2096164
+    sdn2: 2096528
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1028
+    date type: 2
+    sdn1: 2096529
+    sdn2: 2096894
   phrase: 
 == 2 PLAC (358) Falaise,Normandy,France (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
@@ -158069,28 +158104,27 @@ Rec INDI start, xref is @I1384@
 == 1 TITL (388) King of England (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
-WARNING: Warning on line 12060: Year after slash should be following year: '1056/60'
-WARNING: Warning on line 12060: Putting date '       1056/1060' in 'phrase' member
+WARNING: Warning on line 12060: Converting '       1056/1060' to standard 'BET 1056 AND 1060'
 Contents of the date_value:
   raw value:        1056/1060
-  type: 11
+  type: 3
   date1:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1056
+    date type: 2
+    sdn1: 2106756
+    sdn2: 2107121
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
-  phrase:        1056/1060
+    year: 1060
+    date type: 2
+    sdn1: 2108217
+    sdn2: 2108582
+  phrase: 
 == 2 PLAC (358) Normandy,France (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -158178,16 +158212,18 @@ Contents of the date_value:
   phrase: 
 == 2 PLAC (358) Normandy,France (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12091: Year after slash should be two digits: '1137/1138'
+WARNING: Warning on line 12091: Putting date ' 8 MAR 1137/1138' in 'phrase' member
 Contents of the date_value:
   raw value:  8 MAR 1137/1138
-  type: 0
+  type: 11
   date1:
-    calendar type: 0
-    day: 8
-    month: MAR
-    year: 1137/38
-    date type: 1
-    sdn1: 2136772
+    calendar type: 4
+    day: 
+    month: 
+    year: 
+    date type: 0
+    sdn1: -1
     sdn2: -1
   date2:
     calendar type: 4
@@ -158197,7 +158233,7 @@ Contents of the date_value:
     date type: 0
     sdn1: -1
     sdn2: -1
-  phrase: 
+  phrase:  8 MAR 1137/1138
 == 2 PLAC (358) Marcigny-sur-,Loire,France (ctxt is 333, conversion failures: 0)
 == 1 FAMS (322) @F569@ (ctxt is 333, conversion failures: 0)
 == 1 FAMC (320) @F505@ (ctxt is 333, conversion failures: 0)
@@ -158311,25 +158347,26 @@ Rec INDI start, xref is @I1392@
 == 1 NAME (342) Matilda (Edith) of_Scotland// (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12129: Converting '       1079/1080' to standard 'BET 1079 AND 1080'
 Contents of the date_value:
   raw value:        1079/1080
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1079/80
+    year: 1079
     date type: 2
-    sdn1: 2115522
-    sdn2: 2115887
+    sdn1: 2115157
+    sdn2: 2115521
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1080
+    date type: 2
+    sdn1: 2115522
+    sdn2: 2115887
   phrase: 
 == 2 PLAC (358) Dunfermline (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
@@ -158436,25 +158473,26 @@ Rec INDI start, xref is @I1395@
 == 1 NAME (342) Matilda  // (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12159: Converting 'ABT    1103/1104' to standard 'BET 1103 AND 1104'
 Contents of the date_value:
   raw value: ABT    1103/1104
-  type: 7
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1103/04
+    year: 1103
     date type: 2
-    sdn1: 2124287
-    sdn2: 2124652
+    sdn1: 2123922
+    sdn2: 2124286
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1104
+    date type: 2
+    sdn1: 2124287
+    sdn2: 2124652
   phrase: 
 == 2 PLAC (358) Winchester (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
@@ -158590,28 +158628,27 @@ Rec INDI start, xref is @I1398@
 == 1 NAME (342) Matilda of_Boulogne // (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
-WARNING: Warning on line 12199: Year after slash should be following year: '1103/05'
-WARNING: Warning on line 12199: Putting date 'ABT    1103/1105' in 'phrase' member
+WARNING: Warning on line 12199: Converting 'ABT    1103/1105' to standard 'BET 1103 AND 1105'
 Contents of the date_value:
   raw value: ABT    1103/1105
-  type: 11
+  type: 3
   date1:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1103
+    date type: 2
+    sdn1: 2123922
+    sdn2: 2124286
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
-  phrase: ABT    1103/1105
+    year: 1105
+    date type: 2
+    sdn1: 2124653
+    sdn2: 2125017
+  phrase: 
 == 2 PLAC (358) Boulogne (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -158691,25 +158728,26 @@ Rec INDI start, xref is @I1400@
 == 1 TITL (388) Count (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 12222: Converting '       1130/1131' to standard 'BET 1130 AND 1131'
 Contents of the date_value:
   raw value:        1130/1131
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1130/31
+    year: 1130
     date type: 2
-    sdn1: 2134149
-    sdn2: 2134513
+    sdn1: 2133784
+    sdn2: 2134148
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1131
+    date type: 2
+    sdn1: 2134149
+    sdn2: 2134513
   phrase: 
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 Contents of the date_value:
@@ -178117,25 +178155,26 @@ Rec INDI start, xref is @I2354@
 == 1 TITL (388) Earl of Sussex (ctxt is 333, conversion failures: 0)
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
+WARNING: Warning on line 18576: Converting '       1556/1557' to standard 'BET 1556 AND 1557'
 Contents of the date_value:
   raw value:        1556/1557
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1556/57
+    year: 1556
     date type: 2
-    sdn1: 2289743
-    sdn2: 2290107
+    sdn1: 2289377
+    sdn2: 2289742
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1557
+    date type: 2
+    sdn1: 2289743
+    sdn2: 2290107
   phrase: 
 == 1 FAMS (322) @F1104@ (ctxt is 333, conversion failures: 0)
 Rec INDI start, xref is @I2355@
@@ -205070,25 +205109,26 @@ Family start, xref is @F450@
 == 1 CHIL (293) @I1227@ (ctxt is 1872, conversion failures: 0)
 == 1 CHIL (293) @I1228@ (ctxt is 1872, conversion failures: 0)
 == 1 MARR (339) (null) (ctxt is 1872, conversion failures: 0)
+WARNING: Warning on line 26175: Converting '       1380/1381' to standard 'BET 1380 AND 1381'
 Contents of the date_value:
   raw value:        1380/1381
-  type: 0
+  type: 3
   date1:
     calendar type: 0
     day: 
     month: 
-    year: 1380/81
+    year: 1380
     date type: 2
-    sdn1: 2225461
-    sdn2: 2225825
+    sdn1: 2225095
+    sdn2: 2225460
   date2:
-    calendar type: 4
+    calendar type: 0
     day: 
     month: 
-    year: 
-    date type: 0
-    sdn1: -1
-    sdn2: -1
+    year: 1381
+    date type: 2
+    sdn1: 2225461
+    sdn2: 2225825
   phrase: 
 == 2 PLAC (358) Arundel Castle (ctxt is 1872, conversion failures: 0)
 Family end, xref is <NOTSAVED>
@@ -207809,6 +207849,8 @@ Family start, xref is @F602@
 == 1 MARR (339) (null) (ctxt is 2024, conversion failures: 0)
 WARNING: Warning on line 27126: Year is missing: '20 JUL'
 WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
+WARNING: Warning on line 27126: Year is missing: '20 JUL'
+WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
 Contents of the date_value:
   raw value: 20 JUL
   type: 11

diff --git a/t/output/write_gom_compat-lifelines.ref b/t/output/write_gom_compat-lifelines.ref
index 46f9d44ae90eeb8bcd559c4b85d60b8d83d6edbb..ec6c8a84bcced2320a4f760edcecaf1ad6d5c0eb 100644 (file)
--- a/t/output/write_gom_compat-lifelines.ref
+++ b/t/output/write_gom_compat-lifelines.ref
@@ -1,5 +1,4 @@
 WARNING: Warning on line 2: Enabling compatibility with 'Lifelines'
-WARNING: Warning on line 5: Header change time '17:43' lost in the compatibility (out of context)
 WARNING: Warning on line 5: Adding link to submitter record with xref '@__COMPAT__SUBM__@'
 WARNING: Warning on line 9: Empty value changed to '-'
 WARNING: Warning on line 9: Putting date '-' in 'phrase' member

diff --git a/t/output/write_gom_compat-paf2.ged b/t/output/write_gom_compat-paf2.ged
index d7cd8182519b40a0ccb8366e133b35b09dc8af60..bd12f7155874d70580fd3ffd59591c9c78959827 100644 (file)
--- a/t/output/write_gom_compat-paf2.ged
+++ b/t/output/write_gom_compat-paf2.ged
@@ -2691,7 +2691,7 @@
 1 NAME Sarah (Louisa) /Fairbrother/
 1 SEX F
 1 BIRT
-2 DATE 1815/16
+2 DATE BET 1815 AND 1816
 1 DEAT
 2 DATE 1890
 1 FAMS @F87@
@@ -4085,7 +4085,7 @@
 1 BIRT
 2 DATE 1882
 1 DEAT
-2 DATE 1951/52
+2 DATE BET 1951 AND 1952
 1 TITL Crown Prince
 1 FAMC @F136@
 1 FAMS @F186@
@@ -4095,7 +4095,7 @@
 1 BIRT
 2 DATE 1883
 1 DEAT
-2 DATE 1942/43
+2 DATE BET 1942 AND 1943
 1 FAMC @F136@
 1 FAMS @F193@
 0 @I422@ INDI
@@ -6342,7 +6342,7 @@
 1 NAME Anne  /Hyde/
 1 SEX F
 1 BIRT
-2 DATE 12 MAR 1637/38
+2 DATE (12 MAR 1637/1638)
 2 PLAC Cranbourne Lodge,Near,Windsor,England
 1 DEAT
 2 DATE 31 MAR 1671
@@ -10717,7 +10717,7 @@
 2 DATE 10 OCT 1344
 2 PLAC Waltham,Near Winchester
 1 DEAT
-2 DATE 1361/62
+2 DATE BET 1361 AND 1362
 1 FAMC @F451@
 1 FAMS @F612@
 0 @I1240@ INDI
@@ -10746,7 +10746,7 @@
 2 DATE 7 JAN 1355
 2 PLAC Woodstock
 1 DEAT
-2 DATE 15 SEP 1396/97
+2 DATE (15 SEP 1396/1397)
 2 PLAC Calais
 1 TITL Duke of Glouces.
 1 FAMC @F451@
@@ -11371,7 +11371,7 @@
 2 DATE 1709
 2 PLAC Near Moscow,Russia
 1 DEAT
-2 DATE 1761/62
+2 DATE BET 1761 AND 1762
 1 TITL Empress
 1 FAMC @F472@
 0 @I1305@ INDI
@@ -11405,7 +11405,7 @@
 1 BIRT
 2 DATE 1629
 1 DEAT
-2 DATE 1675/76
+2 DATE BET 1675 AND 1676
 1 TITL Emperor
 1 FAMC @F477@
 1 FAMS @F476@
@@ -11733,7 +11733,7 @@
 1 NAME Jasper  /Tudor/
 1 SEX M
 1 DEAT
-2 DATE 1495/96
+2 DATE BET 1495 AND 1496
 1 TITL Earl of Pembroke
 1 FAMC @F497@
 1 FAMS @F537@
@@ -12018,7 +12018,7 @@
 1 NAME William_I the_Conqueror //
 1 SEX M
 1 BIRT
-2 DATE 1027/28
+2 DATE BET 1027 AND 1028
 2 PLAC Falaise,Normandy,France
 1 DEAT
 2 DATE 7 SEP 1087
@@ -12066,7 +12066,7 @@
 1 NAME William_II Rufus //
 1 SEX M
 1 BIRT
-2 DATE (       1056/1060)
+2 DATE BET 1056 AND 1060
 2 PLAC Normandy,France
 1 DEAT
 2 DATE 2 AUG 1100
@@ -12098,7 +12098,7 @@
 2 DATE ABT 1062
 2 PLAC Normandy,France
 1 DEAT
-2 DATE 8 MAR 1137/38
+2 DATE ( 8 MAR 1137/1138)
 2 PLAC Marcigny-sur-,Loire,France
 1 FAMC @F505@
 1 FAMS @F569@
@@ -12136,7 +12136,7 @@
 1 NAME Matilda (Edith) of_Scotland//
 1 SEX F
 1 BIRT
-2 DATE 1079/80
+2 DATE BET 1079 AND 1080
 2 PLAC Dunfermline
 1 DEAT
 2 DATE 1 MAY 1118
@@ -12166,7 +12166,7 @@
 1 NAME Matilda  //
 1 SEX F
 1 BIRT
-2 DATE ABT 1103/04
+2 DATE BET 1103 AND 1104
 2 PLAC Winchester
 1 DEAT
 2 DATE 10 SEP 1167
@@ -12206,7 +12206,7 @@
 1 NAME Matilda of_Boulogne //
 1 SEX F
 1 BIRT
-2 DATE (ABT    1103/1105)
+2 DATE BET 1103 AND 1105
 2 PLAC Boulogne
 1 DEAT
 2 DATE 3 MAY 1152
@@ -12228,7 +12228,7 @@
 1 NAME Eustace of_Boulongne //
 1 SEX M
 1 BIRT
-2 DATE 1130/31
+2 DATE BET 1130 AND 1131
 1 DEAT
 2 DATE 10 AUG 1153
 2 PLAC Bury St Edmunds
@@ -18582,7 +18582,7 @@
 1 NAME Henry  /Radcliffe/
 1 SEX M
 1 DEAT
-2 DATE 1556/57
+2 DATE BET 1556 AND 1557
 1 TITL Earl of Sussex
 1 FAMS @F1104@
 0 @I2355@ INDI
@@ -26173,7 +26173,7 @@
 1 CHIL @I1217@
 0 @F450@ FAM
 1 MARR
-2 DATE 1380/81
+2 DATE BET 1380 AND 1381
 2 PLAC Arundel Castle
 1 HUSB @I1221@
 1 WIFE @I1222@

diff --git a/t/output/write_gom_compat-paf2.ref b/t/output/write_gom_compat-paf2.ref
index 724c3156133f13be41f4c60fcf304b3cf6209934..f1361da393c893c4876b66f6b605fff344b6ad87 100644 (file)
--- a/t/output/write_gom_compat-paf2.ref
+++ b/t/output/write_gom_compat-paf2.ref
@@ -1,12 +1,33 @@
 WARNING: Warning on line 2: Enabling compatibility with 'Personal Ancestral File', version 2
 WARNING: Warning on line 6: Adding link to submitter record with xref '@__COMPAT__SUBM__@'
 WARNING: Warning on line 13: Converting non-standard tag 'COMM' to user tag '_COMM'
+WARNING: Warning on line 2684: Converting '       1815/1816' to standard 'BET 1815 AND 1816'
+WARNING: Warning on line 4079: Converting '       1951/1952' to standard 'BET 1951 AND 1952'
+WARNING: Warning on line 4088: Converting '       1942/1943' to standard 'BET 1942 AND 1943'
+WARNING: Warning on line 6335: Year after slash should be two digits: '1637/1638'
+WARNING: Warning on line 6335: Putting date '12 MAR 1637/1638' in 'phrase' member
 WARNING: Warning on line 6436: Year is missing: '10 JAN'
 WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
-WARNING: Warning on line 12060: Year after slash should be following year: '1056/60'
-WARNING: Warning on line 12060: Putting date '       1056/1060' in 'phrase' member
-WARNING: Warning on line 12199: Year after slash should be following year: '1103/05'
-WARNING: Warning on line 12199: Putting date 'ABT    1103/1105' in 'phrase' member
+WARNING: Warning on line 6436: Year is missing: '10 JAN'
+WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
+WARNING: Warning on line 10710: Converting '       1361/1362' to standard 'BET 1361 AND 1362'
+WARNING: Warning on line 10740: Year after slash should be two digits: '1396/1397'
+WARNING: Warning on line 10740: Putting date '15 SEP 1396/1397' in 'phrase' member
+WARNING: Warning on line 11365: Converting '       1761/1762' to standard 'BET 1761 AND 1762'
+WARNING: Warning on line 11399: Converting '       1675/1676' to standard 'BET 1675 AND 1676'
+WARNING: Warning on line 11727: Converting '       1495/1496' to standard 'BET 1495 AND 1496'
+WARNING: Warning on line 12012: Converting '       1027/1028' to standard 'BET 1027 AND 1028'
+WARNING: Warning on line 12060: Converting '       1056/1060' to standard 'BET 1056 AND 1060'
+WARNING: Warning on line 12091: Year after slash should be two digits: '1137/1138'
+WARNING: Warning on line 12091: Putting date ' 8 MAR 1137/1138' in 'phrase' member
+WARNING: Warning on line 12129: Converting '       1079/1080' to standard 'BET 1079 AND 1080'
+WARNING: Warning on line 12159: Converting 'ABT    1103/1104' to standard 'BET 1103 AND 1104'
+WARNING: Warning on line 12199: Converting 'ABT    1103/1105' to standard 'BET 1103 AND 1105'
+WARNING: Warning on line 12222: Converting '       1130/1131' to standard 'BET 1130 AND 1131'
+WARNING: Warning on line 18576: Converting '       1556/1557' to standard 'BET 1556 AND 1557'
+WARNING: Warning on line 26175: Converting '       1380/1381' to standard 'BET 1380 AND 1381'
+WARNING: Warning on line 27126: Year is missing: '20 JUL'
+WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
 WARNING: Warning on line 27126: Year is missing: '20 JUL'
 WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
 WARNING: Warning: Cross-reference @I359@ defined on line 3543 is never used

diff --git a/t/output/write_gom_compat-paf4.ref b/t/output/write_gom_compat-paf4.ref
index b9ae42fbf98b2f252875f34b6515fce7a8c9d4e8..07ed4123e3ec42eb0661c9f519a40c8d35f4f516 100644 (file)
--- a/t/output/write_gom_compat-paf4.ref
+++ b/t/output/write_gom_compat-paf4.ref
@@ -1,7 +1,6 @@
 WARNING: Warning on line 7: Enabling compatibility with 'Personal Ancestral File', version 4
-WARNING: Warning on line 24: Country 'Australia' lost in the compatibility (out of context)
 WARNING: Warning: Cross-reference @I41@ defined on line 27 is never used
 Writing file...
 Re-parsing file...
-WARNING: Warning: Cross-reference @I41@ defined on line 29 is never used
+WARNING: Warning: Cross-reference @I41@ defined on line 30 is never used
 Test succeeded