2007-02-11 Don Allingham <don@gramps-project.org>

* src/Merge/_MergePlace.py: merge from 2.2 tree
	* src/GrampsDbUtils/_GedcomParse.py: parsing improvements
	* src/GrampsDbUtils/_GedcomLex.py: parsing improvements

2007-02-11  Don Allingham  <don@gramps-project.org>
	* src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on 
	add_source_reference
2007-02-07  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
	* src/DisplayTabs/_NoteTab.py: move "rich text" notes to 2.3 branch.

2007-02-06  Brian Matherly  <brian@gramps-project.org>
	* src/docgen/PdfDoc.py: provide a more useful error when reportlab crashes

2007-02-06  Douglas Blank  <dblank@cs.brynmawr.edu>
	* src/ReportBase/_ReportDialog.py: 0000905: Typo in catching exceptions in 
	  buggy reports
	* src/plugins/holidays.xml: 0000906: Canada holidays patch

2007-02-06  Don Allingham  <don@gramps-project.org>
	* src/GrampsDb/_ReadGedcom.py: fix cal/est parsing
	* src/DisplayTabs/_ButtonTab.py: catch window already being open
	* example/gedcom/sample.ged: Add est/cal samples



svn: r8088

src/GrampsDbUtils/_GedcomLex.py

@@ -335,8 +335,8 @@ def extract_date(text):
 #-------------------------------------------------------------------------
 class Reader:
 
-    def __init__(self,name):
-        self.f = open(name,'rU')
+    def __init__(self, f):
+        self.f = f
         self.current_list = []
         self.eof = False
         self.cnv = None
@@ -348,6 +348,7 @@ class Reader:
             }
 
     def set_charset_fn(self,cnv):
+        print "Character set changed", cnv
         self.cnv = cnv
 
     def set_broken_conc(self,broken):
@@ -384,7 +385,6 @@ class Reader:
             line = self.f.readline()
             self.index += 1
             if not line:
-                self.f.close()
                 self.eof = True
                 return
 

src/Merge/_MergePlace.py

@@ -134,7 +134,7 @@ class MergePlaces(ManagedWindow.ManagedWindow):
 
         # Copy sources from P2 to P1
         for source in self.p2.get_source_references():
-            self.p1.add_source(source)
+            self.p1.add_source_reference(source)
 
         # Add notes from P2 to P1
         if self.note_conflict: