Release Gramps-5.0.2 on Mac.

Revert "Add entitlements file for hardening and notarizing Gramps.app."
This reverts commit e72695ca90. I'd already added the correct version of the file.
2019-08-24 16:11:26 -07:00 · 2019-08-17 17:39:06 -07:00 · 2019-08-17 17:37:18 -07:00 · 2019-08-16 12:41:18 -07:00 · 2019-08-15 13:08:56 +02:00 · 2019-08-11 15:49:23 +01:00
449 changed files with 259062 additions and 262663 deletions
@@ -1,4 +1,3 @@
-<!-- $Id$ -->


 Alex Roitman shura@gramps-project.org
@@ -65,6 +64,8 @@ Martin Hawlisch martin.hawlisch@gmx.de

 Nick Hall nick__hall@hotmail.com

+Paul Culley paulr2787@gmail.com
+
 Peter Landgren peter.talken@telia.com

 Raphael Ackermann raphael.ackermann@gmail.com
@@ -133,7 +133,7 @@ Gramps is a [http://en.wikipedia.org/wiki/Gtk GTK] application. Gramps needs to

 The Linux Genealogy CD can function as a live CD that you boot directly from. You can then run Linux and Gramps off the CD, even if your computer is entirely Windows.

-An experimental Windows installer is available, however we do not have the manpower to offer support for Windows. A windows mailing list is available however and we do do our best to solve windows related problems.
+An Windows installer is available for 32 and 64 bit versions of windows from Windows versions 7 through 10. As with all other support, we do do our best to solve windows related problems.


 8. Does it work with the Mac?
@@ -145,7 +145,7 @@ This present version of Gramps (2.2.x) does not appear to have been ported by th

 9. What are the Minimum Specs to run Gramps?

-We would recommend at least an 800x600 video display. For Gramps 2.0, the memory requirements have been reduced, and Gramps can run quite efficiently on a 256MB system, holding considerably more people. A system with 512MB should be able to hold around 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.
+We would recommend at least an 800x600 video display. For Gramps 5.x, Gramps can run quite efficiently on a 3GB memory system. A system with that much RAM should be able to hold more than 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.


 ==Preferences==
@@ -181,7 +181,7 @@ The nice thing about standards is that there never is a shortage of them. Gramps

 15. How do I import data from another genealogy program into Gramps?

-The best way is to create a new gramps database file (.grdb), and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it. 
+The best way is to create a new gramps database file, and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it. 


 16. Can I install Gramps on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.
@@ -315,7 +315,7 @@ gramps-devel@lists.sf.net :-)
 The next best thing would be to submit a good bug report. This can be done in
 one of the two ways: (1) send your report to gramps-bugs@lists.sf.net
 or (2) file your report with the bug tracker system at 
-http://bugs.gramps-project.org (this function is also 
+https://gramps-project.org/bugs/ (this function is also 
 available by selecting "Help->Report a bug" from gramps main menu). 

 A good bug report would include: 
@@ -355,4 +355,3 @@ Since Gramps generates HTML pages, you can upload the pages to your personal web

 **** End of Gramps Frequently Asked Questions ****

-$Id$
@@ -33,11 +33,11 @@ all required and optional dependencies. Missing dependencies will
 result in runtime errors.

 To build and install, whether from a tarball or git repo:
-   python setup.py build
-   sudo python setup.py install
+   python3 setup.py build
+   sudo python3 setup.py install

 You can avoid using sudo for the install step by specifying a prefix to which you have write priviledge. The default is /usr/local, which is usually owned by root. You can learn of more options with
-   python setup.py --help
+   python3 setup.py --help

 One can use gramps from the command line without installing it by
 setting the following environment variables, but that won't provide
@@ -71,7 +71,7 @@ from the source directory.
 b) You installed Gramps, and want to start it from the PYTHONPATH. In this
    case use the command:

-     python -c 'from gramps.grampsapp import main; main()'
+     python3 -c 'from gramps.grampsapp import main; main()'

   The executable 'gramps' in /usr/local/bin or /usr/bin from a) does
   this for you.
@@ -79,7 +79,7 @@ from the source directory.
 b) You downloaded the Gramps source code to a directory, and want to run it.
    You can start Gramps from the source code directory with

-     python Gramps.py
+     python3 Gramps.py

    See gramps/gen/const.py how Gramps finds its resource directories in case
    you encounter problems.
@@ -90,17 +90,17 @@ If you would like to install Gramps without being root, or in an
 alternative location on windows, supply the --root argument to setup.py

 For example:
-   python setup.py install --root ~/test
+   python3 setup.py install --root ~/test

 Packager's issues
 ------------------
 There is a MANIFEST.in file to indicate the work needed.
 To create a source distribution run:

-   python setup.py sdist
+   python3 setup.py sdist

 If Gramps is built outside of the source tree in a temporary location (e.g. when
 packaging for a distribution), the --resourcepath option can be used to specify
 the path to the installed location of the Gramps resources (e.g. /usr/share):

-   python setup.py install --resourcepath=/usr/share
+   python3 setup.py install --resourcepath=/usr/share
@@ -10,9 +10,11 @@ include RELEASE_NOTES
 include TODO
 include CONTRIBUTING
 include TestPlan.txt
+recursive-include bash *
 recursive-include data *
 recursive-include debian *
 recursive-include docs *
+recursive-include example *
 recursive-include gramps *
 recursive-include help *
 recursive-include images *
@@ -1,3 +1,515 @@
+2018-08-08
+Version 5.0.2
+Update translations: cs, da, de, fi, fr, hr, it, ru, sl, sv
+* Fix some Gramplets not updating during tree changes after db change.
+* Fix Events Grampslet for bad sort order on dates/ages
+* Fix References Tab to update on Deletes of items when editor is open
+* Fix GEDCOM import for better support of TMG
+* Fix Edit Link 'New' button to work
+* Fix GEDCOM importer to properly handle multiple surnames per 5.5.1
+* Narrative web: Sort problem with places.
+* Fix Navigator sidebar so can change view type with proper resize
+* Fix crash when using sidebar filter and merging in another view
+* Fix AncestorTree so add siblings to center person works
+* Fix graphs on Windows for font selection not working
+* Fix dbapi reindex_reference_maps tool to properly close transaction
+* Fix zoom via mouse wheel in media event editor selectionwidget, also fixes
+  zooming with scroll bars always present
+* Fix metadata viewer so that metadata is actually detected and displayed
+* Avoid comma in a lat/lon entry field.
+* Avoid invalid characters and leading or trailing spaces in the entry field
+* Fix crash for multiple deletes in one transaction
+* Adjust translation strings for unmarried partners to give correct text in English
+* Fix failure after Gedcom import if missing objects were found
+* Mac: Fix none type has no len() error.
+  Set correct font resolution when drawing text directly to cairo.
+* Fix Gedcom import so it doesn't create completely empty Birth events
+* Fix Relationship view so ages are according to Preferences
+* Fix Person Editor Events to properly update during external changes like
+  Event delete or update.
+* Gedcom import/export fixes for mime and finding media
+* Fix Unhandled exception in Geography editor
+* Fix relationship path between filter rule when parent is missing
+* Fix Graphs that use graphdoc pdf via Ghostscript with multi-page for poor
+  font rendering of some characters
+* Fix finddupes tool when run from Match Threshold screen again after merge.
+* Fix Gedcom import for multiple notes on OBJE (MULTIMEDIA_LINK)
+* Deal with SQLite db corrupted by None name mapping
+* Fix XML import to add tags to Events, Sources, Places, Repos, Cits when
+  requested.
+* Fix for delete of a referenced primary obj while editing an added obj.
+  Also fixed to update the referenced obj on changes from outside the editor.
+* Fix Place Tree view when using enclosed by sidebar filter
+* Fix EditFamily for adding a child to single parent family with Surname
+  guessing set to combination.
+* Fix Descendent Tree report for crash when person has multiple families
+  and one of them doesn't have a spouse.
+* Fix Name editor crash after clearing a group_as name on dbapi dbs
+* When we merge two objects:
+    We should stay on the selected row in list views.
+    In case we select the first family and select the gramps_id of the second
+    family, the new gramps_id is ignored
+* Fix Relationship Graph; extra people when using filters & subgraphs
+* Fix Place Format Editor file save/load for difficult names
+* Fix Not all place types appears on family lines Graph
+* Remember location of Sort Events Tool
+* Fix Media editor when using double click the preview of added media
+* Avoid leading and trailing spaces when copy/paste coordinates from a
+  map provider.
+
+2018-12-20
+Version 5.0.1
+* Media Manager: add help button and remove '...'
+* Edit/Preferences: add Help button
+* Style Editor, Document Styles dialog: add help buttons
+* Fix Select Person dialog Help button URL
+* Fix Select Repository dialog Help button URL
+* Relationship Calculator: Add help button
+* Reorder Relationships dialog; add Help button
+* Generate Book Dialog; Fix Help URL
+* Manage Book dialog; add help button
+* Fix Detached Gramplets Help button URL when 'help_url' not in .gpr
+* Fix help URLs when they contain illegal characters and to match
+  wiki section targetID algorithm Issue
+* Update translations: hu, hr, de, ru, fi, pt_PT, fr, sv, sl
+* Fix contents of enclosed_by secondary	dbapi column
+  (fixes scrambled places in tree view)
+* Google maps URL problem
+* Fix ODT reports with links when run in non-English languages
+* Allow addon Reports to specify a help button URL for options dialog
+* Fix Rebuild Secondary Indexes tool for dbapi backends.
+  For dbapi backends, this tool will update the secondary columns that
+  are used for indexing.
+* Fix dbapi set_name_group_mapping to properly close transaction
+* Fix Russian date handler crash when Russian language isn't installed
+* Fix Quickview for missing table data on some Gtk Versions
+* Fix startup messages when command line contains a bad filename
+* Restrict Place view Name col to the primary name while allowing searchbar
+  to find alt and primary names
+* Fix Person Sidebarfilter when using 'Event' and Reg expressions
+* Fix Find Duplicate People; exception when deleting someone shown outside
+  of the tool
+* Gedcom export, upgrade OBJE handling to Gedcom 5.5.1 style
+* Fix CSV import to set marriage event role to family
+* Update gramps bugtracker URL in all po files
+* Narrative Web:
+  - thumbnails bad alignment.
+  - thumbnails problems in some cases.
+  - use latest version from openlayers.
+  - fixes Space between place, description and the event note
+    when there are many sources.
+  - Change the css order between print and screen.  The chosen theme can erase
+    prior values.
+  - Add a width for the source column in all themes.
+  - Events difficult to read (screen and mobile)
+* Fix typo in CitationListModel for sort change
+* Fix Adding "ToDo" note crash when no active object
+* Fix Citation List view Source Last Changed Column to sort properly
+* Fix for re-entrant main window close when user hits 'x' again
+* Fix exception when closing early editor in tree of editors
+* Fix 'Generate Book' dialog for crash on 'x' close
+* Fix ToDo Gramplet for multiple attempts to edit a note
+* Fix Dashboard for multiple copies of a Gramplet
+* Fix Dashboard to recall minimized or undocked Gramplets
+* Fix Statusbar update to avoid intermittent exception on closed db
+* Fix FilterParser for much older 3.x custom_filters.xml files
+* Fix IsDuplicatedAncestorOf filter rule to avoid crash on tree loop
+* Fix StyledTextEditor EditLink for root text changed to zero length
+  in the background Fixes
+* Fix AgeOnDate and some reports using SimpleAccess for missing surname
+* Fix crash when a filter with loop in definition is defined
+* Fix HandleErrors related to LDS
+* Fix ReferencedBySelection proxy for 'None' LDS Parents
+* Fix HandleError in Citations Gramplet for lds place missing
+* Change PlaceView drag from whole row to just icon during drag
+* Add drag Icon to drags from DisplayTabs Gramplet lists
+* Fix dialogs for 'Help' button closes the dialog, and non-functional 'Help'
+* Fix Family Tree manager for 'Help' button closes dialog
+* Fix selectors for 'Help' button closes dialog
+* Fix 'Generate Book' dialog for 'Help' button closes dialog
+* Fix TestcaseGenerator for 'Help' button closes dialog
+* Fix Selectors to enable the 'Help' buttons to actually work
+* Avoid HandleError when dragging an Added Family from EditFamily
+* Avoid HandleError when dragging an Added Person from EditPerson
+* Fix Clipboard rows cannot be sorted via drag/drop
+* Better default directory choices for import/export file dialogs
+* Records Report: call name not underlined in HTML
+* Fix InteractiveSearch for find before model is populated
+* Fix Gedcom export for incorrect escaping with @#DFRENCH R@
+* Fix reports for shared event attribute and note errors
+* Fix Fan and Descendant Fan charts in Quadrant and Half Circle modes
+  The Descendant Fan chart had several bugs:
+  1) a bug that affected the centering of the chart for these modes
+  2) the chart was drawn in the wrong quadrant
+  3) the centering of the chart for printing was incorrect
+    (the legend was off the page some of the time).
+  4) the sizing of the chart for printing was incorrect
+    (for very small charts of one generation, the legend would overwrite the
+    chart).
+  The Fan Chart for the quadrant view:
+  1) the centering of the chart for printing was incorrect
+    (the legend was off the page some of the time).
+* Fixed issues in the Dutch relationship calculator
+  - extended the ordinal and removed lists till 50, like the English lists.
+  - Fixed bug in which uncles/aunts, nephews/nieces (niblings), siblings and
+    cousins with an unknown gender show up as female.
+  - Fixed some misspellings
+* Setting the year as an ordinal number in Croatian; two more reports now show
+  a year as an ordinal number in Croatian
+* fix name-note is not being cleared in Complete Individual report
+* Fix View Column sizing so last column size setting is maintained
+* Fix view so column widths are preserved when using filters
+* fix the place-format option in Detailed Descendant and Detailed Ancestor text
+  reports
+* Fix bsddb for person sort with empty Surname list
+* Webcal: link problems in some cases Year 2016 is highlighted by default
+  instead of current year.
+* Webcal: Missing links when muliyear unselected
+* Geoclose: exception when a family has no father
+* Family Descendant Tree; fix HandleError
+* fix unhandled exception parsing "future dates" in some locales
+* fix Julian/Gregorian calendar issue when entering only year as date when
+  running gramps in Norwegian
+* Fix and restore Statistics Gramplet to 4.2.x status
+* Fix Check and Repair to deal with bad references empty handle string
+* Speed up Check and Repair, backlinks check stage.
+* Fix strings containing deprecated (Python 3.6+) illegal escape sequences
+* Whatsnext: check if db is open, fixes error if not.
+* Fix usage of posixpath; should be os.path for os independence
+* Fix generate_checksum routine to avoid MemoryError crash
+* Fix corrupted Bookmarks that can happen after Gramps crash
+* Fix Merge Family when same parent is missing from both families
+* Fix <ctrl>c in view to get selected item to clipboard
+* Fix Quickview Gramplet so updates work when changing active
+* Fix place reference editor for bad cut/paste on set_latlongitude
+* Fix Find Database Loop Tool (bad import of _collections)
+* mac/gramps.modules: Switch included moduleset to gitlab.gnome.org.
+* mac/gramps.bundle: File copy doesn't work if the glob can match directories.
+* mac/gramps.bundle: Install the docs/gramps directory in the bundle.
+* debian/changelog: Update the Debian changelog after the 5.0.0 release
+* mac/Info.plist, mac/gramps.modules: Release Gramps-5.0.0 on Mac.
+
+2018-07-24
+Version 5.0.0
+* Correct binary test logic for primary mask.
+* Fix BaseSelector to avoid long delay before display on large trees.
+* Export options > Gui alignment issue.
+* Fix dialog button order on non-Mac systems.
+* Update Debian directory after Gramps 5.0.0-rc1 release.
+* Fix Custom filter update when created via sidebar.
+* Fix Gramplet configure (View/Configure) for large options.
+* Fix IndexError crash in Statistics Charts.
+* [Mac] Change accel for Undo History.  So that it doesn't conflict with a
+  system binding for hiding the window.
+* Fix Family Lines/Family Colors picker for bad transient parent.
+* Fix import_as_dict to utilize user gramps_id prefixes.
+* Fix error when opening bsddb db in read-only mode.
+* Fix dbapi dbs for closeing read-only db crash.
+* Fix menus when operating with read-only db.
+* Fix Name formats to show all parts.
+* Fix dialogs for crash when canceling via 'x'.
+* Remove obsolete omeat-python-modules dependencies.
+* Update translations: cs, da, de, en_GB, eo, fi, hu, is, it, nb, pt_BR, ru, sk, uk, vi
+
+2018-05-20
+Version 5.0.0-rc1
+* po/fi.po: Update Finnish translation
+* po/ru.po: Update Russian translation
+* po/de.po: update German translation
+* po/cs.po: Update Czech translation
+* po/ca.po: Update Catalan translation
+* Fix merge persons when removed person was the Home (default) person
+* Fix FanChartDesc for typo (copy/paste error). Bug occurs when selected
+  person has more than 4 parents.
+* Fix Tag editor for multiple tag removes
+* In Narweb, Relationship to Center person reversed
+* Fix Citation Tree view for crash after plugin reload
+* Fix 'References' Gramplet for issue when activated during an import 
+* disable Application Menu during import
+* Fix Person/Family/Event view updates on various associated changes
+  * Fix Event view for changes in Main Participants
+  * Fix Person/Event/Place views for update to a Place or enclosing place
+  * Fix Person views to update on changes in birth/death event/place
+* Allow unicode characters in json export
+* Filtering problems in the geography view
+* Crash when looking for a place within an area
+* use same box margin for SVG and PDF.
+* Webcal crashes after Narrative Web site exists
+  multiyear select option problem
+* Catch exceptions when loading recent files
+* Check that backend exists before loading database
+* Disable family tree manager features when a backend is unavailable
+  If the default backend is unavailable, then reset it to bsddb.
+* Enclose tree report image path and file name in braces
+* Crash when selecting an old note, event, media, ...
+  Try to sort on another column.
+* [NewRepositoryEditor]Fix help link
+* [ReorderGrampsID]Fix broken help link
+* Fix FTM for delete tree, followed by close; Title etc. shows old tree
+* Fix Relationship path between filter for silent fail
+* setup: Add configuration flag --no-compress-manpages.
+* glade: Don't strip newlines from builder files.
+* List sort by number for citation confidence level
+* Fix confidence level sort in list views -based on the date-sort code.
+* Fix confidence level tooltip -Stop run on text.
+* Fix error in place displayer when offset is outside valid range
+* Fix places in example.gramps 
+  - Moved Greek places into top level Greece entry & added English names.
+  - Removed Puerto Rico as a country as part of USA
+* Use sgettext for Name Format dialog
+* Enable copying the birth & death fields for relationship view 
+* Allow Copying of text fields for Details tabs in selected views with
+  Details gramplets.
+  - Person Details
+  - Place Details
+  - Repository Details
+* Geography: KML media objects not shown on map. Geography doesn't conform to the
+  relative paths If a place has no coordinates, KML files are not displayed.
+* Fix Fan charts for scrolling/resizing of window; bad rendering
+* Fix Clipboard for HandleErrors during db changes
+* Fix Clipboard for Drop/Edit of Surname group in People Tree view
+* Fix Relationship Graph for extraneous families when using filter
+* Fix export gpkg when media files have fractional timestamps.
+* Remove reference to postgresql in core code
+* Move dbapi-specific code out of DbGeneric
+* Create db _schema_exists method
+* Fix place format option in place report
+  * Use -1 instead of None for default place format
+  * adds New [Place format:] option on the [Report Options (2)] tab
+* [Narrative Web Report] Incorrect heading for stepmother or stepfather
+* Cairodoc: Fix Book TOC and Index numbering and placement
+* Fix Fan Chart(s) so they don't crash when opened as last view
+* Fix Organize Tag editor for exception on 'x' close
+* selectors: Change BaseSelector so that selection is kept during Find/Clear
+* Fix multi-page Graph output to pdf with filenames containg spaces
+* Fix Clipboard for right-click on empty clipboard
+* docs/conf.py, docs/gen/gen_db.rst: Fix ImportError & update API docs year 2018
+  - Fixes ImportError: No module named 'gramps.plugins.db.dummydb'
+  - Update Copyright to 2018
+* Webreport: Privacy problem with the relation to the center person.
+* Fix Report Options when used with empty db
+* debian/changelog: Finalise debian/changelog for beta1 release.
+  Also fix old syntax & trailing whitespace issues
+* debian/rules: Enable extra tests that were failing for alpha3
+* debian/patches: Patch person_rules_test.py To remove hard coded build path
+  from import. Fixes FTBFS due to test failure.
+* debian/NEWS: Delete debian/NEWS file, only really applies in Debian
+* debian/changelog: First beta release of gramps 5.0
+  * Sync debian directory with Debian experimental branch on salsa
+  * Point Vcs URLs at the Gramps Project on Github
+  * Correct spelling in debian/rules, node > nose
+  * Delete gbp.conf, not required as gbp not used to build package
+* debian/gbp.conf: Remove gbp.conf, will not be using gbp to build
+  deb package Avoids updating it for every branch used to build it
+* debian/rules: Fix spelling in d/rules node > nose
+* debian/control: Update Vcs URLs to point at Gramps Github repo
+* debian/NEWS, debian/README.Debian, debian/README.test,
+  debian/compat, debian/control, debian/copyright, debian/gbp.conf,
+  debian/gramps.docs, debian/rules, debian/source/format,
+  debian/source/local-options, debian/tests/control,
+  debian/tests/gramps-import-export, debian/upstream/metadata,
+  debian/watch: Resync debian dir from Debian 5.0 experimental branch
+* debian/changelog: Update debian/changelog with releases since 4.0.3
+* Fix testsuite failure when build happens out of the source tree.
+  Build path was hardcoded in an import in: person_rules_test.py
+* mac/Info.plist, mac/gramps.modules: Release Gramps 5.0.0-beta1 on MacOS.
+
+2018-02-17
+Version 5.0.0-beta1
+* pt_PT, hu, cs, it, fi, de, ru: update translation
+* update Readme for Gramps 5.0.0
+* new genealogy tree report
+  * Replace backslash in image path for Windows
+  * Escape special LaTeX characters
+  * Copy output file from temporary directory
+  * Fix character encoding for new tree category reports.
+  * Add support for new genealogy tree report category.
+* Fix Place Tree view for proper display after filter cleared.
+* Implement place formats
+* Some dates are not translated in webcal
+* Some dates are not translated in webcal
+* Webcal link problem in the year glance page
+* Link problems depending on LANGUAGES.
+* Increment year to 2018 for About box.
+* data/holidays.xml.in: Fix holidays in Finnish
+* fix Sidebar to resize better
+* mac/gramps.modules: Update pyicu to v 2.0.3
+* mac/gramps.modules: Consolidate Python2 and Python3 meta-modules.
+  GObject-Introspection now works with Python3 so the split isn't needed
+  any more.
+* Add tooltip to links in styled text editor.
+* [MacOS] Replace GDK_CONTROL_MASK with GDK_META_MASK in accelerators.
+* Set the mnemonic modifier key to Alt-Ctrl for the Quartz Gdk backend.
+  This avoids interference with the use of the Alt/Option key for extending
+  the keyboard.
+* Fix Family Lines Graph when 'unknown' places are present
+* Fix Export View to CSV when Unicode characters are present
+* Fix several intl date displayers for missing parameter.
+* mac/gramps.accel: Update gramps.accel for gramps50
+* Some filter optimizations to avoid repeated parts of tree scan
+* Fix view buttons order keeps changing on different startups
+* Fix DescendentTree report; more space beneath Title
+* Fix DescendentTree report for crashes
+* Fix Book XML handler for unusual characters in report name
+* Fix 'Generate Book' dialog for bad transient parent
+* Fix Book XML handler to deal with unusual characters in Book name
+* Add color schemes to config
+* Surname Editor; fix so changes made update Person 'Preferred Name'
+* Surname Editor, fix fields for better fit in minimum width dialogs
+* Surname Editor; fix loss of data if using mouse to change fields
+* Add Garbage collection after tools/reports
+* Main Window menu 'Add' keyboard Acellerators
+* Fix Add menu Accelerators so they don't activate on Shift-'x'
+* Change Gramps 'Add' menu so 'New' is not used
+* Export Web Family Tree; error on file write is now a message, not exception.
+* Fix Export Web Family Tree for errors on file write
+* Pylint on Web Family Tree export
+* Fix Citation Editor to Tab out of Confidence ComboBox
+* Narrated Web Site:
+  * Translation problem in narrative web.
+  * crash in narrative web if no unused media
+  * Apply places changes to the narrativeweb.
+    Also change order between locations and locations alternate names.
+  * Suppress extra line in Alternate Names section.
+  * Added an option for the statistics page.
+  * We have problems with notes: pages are too large
+  * Difficult to see some page on a mobile phone when you have notes.
+  * Resizing of images on a mobile
+  * Maps are too bigs on a mobile
+  * Split the event line to have a narrower page
+  * The note is spanned on two columns (Place + Description)
+  * In media pages, the progress meter doesn't work well.
+  * Add a progress meter for the medialistpage
+  * warnings reported to console
+  * Mainz css file produces left aligned FamilyMap pages
+    Solving Mainz problem creates new ones with Basic-Blue and Nebraska
+    styles sheet.
+    Some cleanup with unused css file (GeoView.css)
+  * Many problems with css files and the ancestor tree
+  * media file not created if we have unused media.
+  * Fix Narrative Web works poorly on Android browser
+* Clear old custom name formats when database loaded
+* Fix shading colour in relationship view for dark themes.
+* Fix link colour for dark themes.
+* Fix default foreground colour in list views for dark themes.
+* fix Fan Chart for exception on right-click of person with no parent
+* Fix Fan Chart Print centering and scaling on Windows
+* Fix Media Preview Gramplet for closed db
+* Added a requirement for pango and pangocairo versions
+  Eliminates a warning that was present when calling a report from the
+  command line.
+* Fix Styled Text Editor for exception on non-editable text click
+  Also prevent editing of links on non-editable text.
+* Suport FTM 2017 Gedcom tags on import
+  FTM adds subordinate PLAC and OBJE data to INDI.ADDR which is non-standard.
+  So treat it as a Residence Event, instead of an Address.
+  FTM puts _DATE and _TEXT tags subordinate to OBJE, also non-standard.
+* Fix Family tree Manager: rename a locked db, don't open, but title bar
+  changes.
+* Fix Person, Family Sidebar Filters to add custom Event types
+  Also fix Family Sidebar Filter RelType init with closed db
+* Fix ProxyCache to deal with memory leak
+* Fix duplicated method in ProxyCache
+  Also changed size request to better utilize actual memory
+* Dbapi: Fix for broken 'backlinks' after a delete.
+* Dbapi: Use UPDATE instead of DELETE and INSERT
+* Remove write_version method from the database API
+  This is specific to the BSDDB backend.
+* Fixes for in-memory databases
+  In-memory databases always allow write access and don't need to use lock
+  files.
+* Enable Sqlite backend for all users
+* Move PostgreSQL backend into third-party addons
+* Implement locking for dbapi backends
+* New convenience function to return database methods
+  Examples: db.method('get_%s_from_handle', 'Person')
+  db.method('get_%s_from_%s', 'Event', 'gramps_id')
+  Returns None if the method doesn't exist.
+  Formats 'iter_%s' and 'get_number_of_%s' use the plural forms and are
+  not yet implemented.  Replaces old get_table_metadata method.
+* postgresql: Add login dialog and username/password command line options
+* Write dbapi schema version to metadata table instead of a file
+* Remove hardcoded references to BSDDB database backend
+  The default backend in the preferences is now used for:
+  * Archive checkout
+  * Import from the command line - python Gramps.py file
+  * Import by drag and drop onto the family tree manager
+* db:  Remove set_save_path method
+  The path is already set in the database load method.
+* Add missing methods to database unit test
+* Add missing base database method.
+* db: Remove get_schema_version method.
+* db: Remove has_gramps_id method from the public API.
+* db: Remove get_gramps_ids method from the public API.
+* db: Make get_number_of, get_raw_data and has_handle methods protected.
+* db: Remove get_from_name_and_gramps_id method.
+* db: Remove get_from_name_and_handle_method.
+* postgresql: Ignore empty connection settings
+* Include new PostgreSQL error handling in CLI
+* Improve PostgreSQL error handling
+  Re-raise a DbConnectionError if the connection raises an error.
+* Add connection preferences for PostgreSQL databases
+* bsddb: Build surname list with unique names.
+* fanchart2way: Use escape from html rather than cgi package
+* Fix QuestionDialog display for html like characters in title
+* Fix Find Database Loop tool for faster operation and better display
+* Fix FamilyRelationshpType _DATAMAP order to correspond with values
+* Fix HandleError on IsLessThanNthGenerationAncestorOf filters
+* Fix Relationship Graph to shows families if siblings but no parents
+* Fix Deep Relationship filter to avoid recursion crash
+  This also changes filter to use shortest paths.
+* Fix to allow filter progress meters in flat views
+* Fix Gedcom import for illegal Gedcom Family Attributes
+  TMG Gedcom exports an illegal NCHI with sub-data for FAM.
+  Gramps could not handle this and attached the sub-data to the FAM creating
+  some corrupted Event records.
+* Fix Session Log for exception on closed db reference click
+* Fix 'Welcome' Gramplet and StyledTextEditor for Link handling
+* fix Quickreport start from Editor when object not yet committed
+* Fix Find Database Loop tool for wrong transient parent for progress
+* Fix Test Case Generator to not create illegal 'None' handles
+* Fix Gedcom export for bad Hebrew Months
+* Can't link to a place if wrong lat/lon in the db.
+* Update redirected wiki link from GRAMPS_XML > Gramps_XML
+* Missing arg when right clicking in geography view.
+* INSTALL: Change INSTALL to replace 'python' with 'python3 for script invokes
+* Check&Repair; add checks for 'backlinks' and repair if needed.
+* Fix CSV importer for place event name using gramps_id
+* Fix PlaceModel to avoid exception following merge
+* Fix Geography view 'Find' when db is closed.
+* Fix interactive search for exception on click then down arrow
+* Create where_is utility to locate a binary in the standard places
+  This is particularly useful on Mac OS X where Gramps is passed a PATH that
+  does not include elements added by the terminal shell.
+* Fix relationship Graph so Unicode chars on Multiple pages works.
+* Use Gdk.Event.triggers_context_menu in osmgpsmaps.py.
+* Replace is_right_click implementation with Gdk.Event.triggers_context_menu().
+* Replace use of CONTROL_MASK with PRIMARY_INTENT.  For better UX on Macs.
+* Fix opening recent family trees
+* Fix exception when changing a family with Add person editor open
+* Remove eval() and rename self.dbstate
+* reorderids: Another way to protect GOV IDs in Gramps ID position
+* updated German date handler: added missing Latin month names and
+  some old German month names
+* remove vestage of (old) SVN source-control system
+* update authors file
+* Fix ManagedWindow/GrampsWindowManager for subsidiary window close
+* Fix Gedcom import for "1 MARR Y" issue
+* Correct ReorderID tool for several bugs and deal with GetGov ID
+* Bad call to unlink function.
+* Fix Gedcom export for erroneously removed WriterOptionBox import
+* Try to handle OSError when we use the --export argument in CLI mode.
+* Special char in place's name breaks xdot view
+* Organize Bookmarks Dialog doesn't close with x
+* tweak some DateParser comments
+* DateParserEN failures under the DateTest tool
+* Fix make_unknown to create valid Place
+* editplace: fix typos
+* StyledText.join method fails if the joint_text has StyledText Tags
+* 3.4 database conversion fails
+* fix invalid export (and import) of Gedcom EMAIL records
+  Gedcom spec 5.5 requires '@' in general text to be doubled '@@'
+
 2017-09-02
 Version 5.0.0-alpha3
 * Fix Undo -- crashes due to race in Gtk
@@ -16,14 +16,15 @@ The following packages **MUST** be installed in order for Gramps to work:

 The following three packages with GObject Introspection bindings (the gi packages)

-* **cairo** - a 2D graphics library with support for multiple output devices. http://cairographics.org/
+* **cairo** 1.13.1 or greater - a 2D graphics library with support for multiple output devices. http://cairographics.org/
+* **Pycairo** 1.13.3 or greater - GObject Introspection bindings for cairo. https://github.com/pygobject/pycairo
 * **pango** - a library for laying out and rendering of text, with an emphasis on internationalization. http://www.pango.org/
 * **pangocairo** - Allows you to use Pango with Cairo http://www.pango.org/

 * **librsvg2** - (SVG icon view) a library to render SVG files using cairo. http://live.gnome.org/LibRsvg
 * **xdg-utils** - Desktop integration utilities from freedesktop.org
 * **bsddb3** - Python bindings for Oracle Berkeley DB https://pypi.python.org/pypi/bsddb3/
-
+* **sqlite3** - Python bindings for SQLite Database library

 The following package is needed for full translation of the interface
 to your language:
@@ -44,7 +45,7 @@ The following packages are **STRONGLY RECOMMENDED** to be installed:
 It may be osmgpsmap, osm-gps-map, or python-osmgpsmap,
 but the Python bindings for this must also be present, so gir1.2-osmgpsmap-1.0.
 Without this the GeoView will not be active, see
- https://gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_Categories#Geography_Category
+ https://gramps-project.org/wiki/index.php?title=Gramps_5.0_Wiki_Manual_-_Categories#Geography_Category

 * **Graphviz**

@@ -65,6 +66,10 @@ The following packages are **STRONGLY RECOMMENDED** to be installed:
 (These are Python bindings for the ICU package. 
 https://pypi.python.org/pypi/PyICU/)

+* **Ghostscript**
+
+  Used by Graphviz reports to help create PDF's
+
 The following packages are optional:
 ------------------------------------
 * **gtkspell** 
@@ -77,12 +82,12 @@ The following packages are optional:

 The GNU Revision Control System (RCS) can be used to manage
 multiple revisions of your family trees. See info at
- https://gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
+ https://gramps-project.org/wiki/index.php?title=Gramps_5.0_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
 Only rcs is needed, NO python bindings are required

 * **PIL**

- Python Image Library is needed to crop
+ Python Image Library (PILLOW) is needed to crop
 images and also to convert non-JPG images to
 JPG so as to include them in LaTeX output.
 (For Python3 a different source may be needed,
@@ -112,6 +117,9 @@ Prerequistes required for the following Addons to work:
 * **Graph View** - Requires: PyGoocanvas and Goocanvas (python-pygoocanvas, gir1.2-goocanvas-2.0).
 ( https://gramps-project.org/wiki/index.php?title=Graph_View )

+* **Network Chart** - Requires: networkx and pygraphviz
+( https://gramps-project.org/wiki/index.php?title=NetworkChart )
+
 * **PedigreeChart** - Can optionally use - numpy if installed
 ( https://gramps-project.org/wiki/index.php?title=PedigreeChart )

@@ -1,4 +1,3 @@
-$Id$

 UNSTABLE Gramps 4.0.0 Beta2 release.

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
 <authors xmlns:html="http://www.w3.org/1999/xhtml">
 <author title="author">
  Alex Roitman &lt;<html:a href="mailto:shura@gramps-project.org">shura@gramps-project.org</html:a>&gt;
@@ -94,6 +93,9 @@
 <author title="contributor">
  Nick Hall &lt;<html:a href="mailto:nick__hall@hotmail.com">nick__hall@hotmail.com</html:a>&gt;
 </author>
+ <author title="contributor">
+  Paul Culley &lt;<html:a href="mailto:paulr2787@gmail.com">paulr2787@gmail.com</html:a>&gt;
+ </author>
 <author title="contributor">
  Peter Landgren &lt;<html:a href="mailto:peter.talken@telia.com">peter.talken@telia.com</html:a>&gt;
 </author>
@@ -1,55 +0,0 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2009 Serge Noiraud
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
----------------------------------------------------------------------------
-GeoView Style Sheet
-Style Name: GeoView
-Style Author: Serge Noiraud (2009)
-
----------------------------------------------------------------------------
-This file was created for GeoView usage.
-
-# $Id$
-
- GeoView Styles
-
----------------------------------------------------- */
-
-#geo-map
-{
- margin-left:0px;
- margin-top:0px;
- margin-right:auto;
- margin-bottom:auto;
-}
-
-/* InfoWindow */
-#geo-info {
- font-size:10pt;
- max-height:200px;
- max-width: 600px;
- min-width: 300px;
- text-align: left;
- padding-right: 6px;
- overflow-x: auto;
- overflow-y: auto; 
-}
-
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$

 NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
@@ -87,6 +86,12 @@ h1 {
    font-weight: bold;
    padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
    font-size: large;
    padding-left: 15px;
@@ -104,6 +109,7 @@ p#description {
 a {
    color: black;
    text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    text-decoration: underline;
@@ -325,6 +331,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -416,7 +426,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -441,8 +451,7 @@ div#families table.attrlist td.ColumnType {
 ----------------------------------------------------- */
 #indivgallery .thumbnail {
    float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
@@ -134,7 +134,6 @@ h5, h6 {
    margin:1.3em 0 .5em 1em;
 }
 p#description {
-    max-width: 800px;
    margin: 0;
    padding: 1em 20px;
    text-indent: 30px;
@@ -289,10 +288,6 @@ table.infolist thead tr th {
 table.infolist tr td {
    border-bottom: dashed 1px #000;
    vertical-align: middle;
-    padding: 6px 0 6px 10px;
-}
-table.infolist tr td a {
-    display: block;
 }
 table.infolist tr.BeginLetter td, table.infolist tr.BeginSurname td {
    border-top: solid 1px #000;
@@ -352,15 +347,15 @@ div#Individuals {
    margin: 0;
    padding: 0;
 }
-div#Individuals table.individuallist {
+div#Individuals table.IndividualList {
    border-bottom: solid 1px #000;
 }
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:hover,
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:active {
+div#Individuals table.IndividualList tbody tr td.ColumnSurname a:hover,
+div#Individuals table.IndividualList tbody tr td.ColumnSurname a:active {
    cursor: default;
    background: none;
 }
-div#Individuals table.individuallist tbody tr td.ColumnName a {
+div#Individuals table.IndividualList tbody tr td.ColumnName a {
    vertical-align: middle;
 }
 div#Individuals div table.infolist tr td p {
@@ -494,7 +489,7 @@ table.eventlist tbody tr td.ColumnNotes {
    width: 20%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 17%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
    width: 35%;
@@ -1098,7 +1093,6 @@ div.Residence table.infolist tr td {
    margin: 0;
    float: left;
    width: 130px;
-    height: 150px;
    text-align: center;
 }
 #indivgallery div.thumbnail a {
@@ -1107,6 +1101,7 @@ div.Residence table.infolist tr td {
    padding: 0;
    text-decoration: none;
    cursor: pointer;
+    word-wrap: break-word;
 }
 #indivgallery div.thumbnail a img {
    padding: 0;
@@ -1130,9 +1125,10 @@ div.narrative {
 }
 .narrative p {
    font: normal .9em/1.4em sans-serif;
-    margin-top: .5em;
-    margin-bottom: 0;
-    padding: 0 20px 1em 20px;
+    margin: 0.1em 0 0.2em 0;
+}
+i + div.grampsstylednote p {
+    margin: 0.1em 0 0.2em 0;
 }

 /* Subsections : References
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$

 NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
@@ -87,6 +86,12 @@ h1 {
    font-weight: bold;
    padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
    font-size: large;
    padding-left: 15px;
@@ -104,6 +109,7 @@ p#description {
 a {
    color: black;
    text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #9DBF9D;
@@ -368,6 +374,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -466,7 +476,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -491,8 +501,7 @@ div#families table.attrlist td.ColumnType {
 ----------------------------------------------------- */
 #indivgallery .thumbnail {
    float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$

 NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
@@ -87,6 +86,12 @@ h1 {
    font-weight: bold;
    padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
    font-size: large;
    padding-left: 15px;
@@ -105,6 +110,7 @@ p#description {
 a {
    color: black;
    text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #E0E0E9
@@ -361,6 +367,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -459,7 +469,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -484,8 +494,7 @@ div#families table.attrlist td.ColumnType {
 ----------------------------------------------------- */
 #indivgallery .thumbnail {
    float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$

 NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
@@ -87,6 +86,12 @@ h1 {
    font-weight: bold;
    padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
    font-size: large;
    padding-left: 15px;
@@ -105,6 +110,7 @@ p#description {
 a {
    color: #36220B;
    text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #FFE09F
@@ -361,6 +367,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -459,7 +469,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -484,8 +494,7 @@ div#families table.attrlist td.ColumnType {
 ----------------------------------------------------- */
 #indivgallery .thumbnail {
    float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$

 NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
@@ -87,6 +86,12 @@ h1 {
    font-weight: bold;
    padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
    font-size: large;
    padding-left: 15px;
@@ -105,6 +110,7 @@ p#description {
 a {
    color: black;
    text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #EAEEF4
@@ -361,6 +367,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -459,7 +469,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -484,8 +494,7 @@ div#families table.attrlist td.ColumnType {
 ----------------------------------------------------- */
 #indivgallery .thumbnail {
    float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
@@ -25,7 +25,6 @@ GRAMPS Cascading Style Sheet
 Style Name: Web_Citations-Outline.css
 ******************************************************

-# $Id$

    Source Citations Outline styles
 ------------------------------------------------------ */
@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id$
 #
 *************************************************
 GRAMPS Cascading Style Sheet
@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id$
 #
 *************************************************
 GRAMPS Cascading Style Sheet
@@ -25,7 +25,6 @@ GRAMPS Cascading Style Sheet
 Style Name: Web_Navigation-Horizontal.css
 ******************************************************

-# $Id$

    Body Element
 ------------------------------------------------------ */
@@ -33,7 +32,6 @@ body {
    background-color: #00029D;
    color: #00029D;
    width: 100%;
-    padding: 0px 14px;
 }

 /*   Navigation Menus
@@ -54,7 +54,6 @@ Middle                  images/Web_Mainz_Mid.png
 Middle Light            images/Web_Mainz_MidLight.png
 ----------------------------------------------------------------------------

-# $Id$

 NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
@@ -68,7 +67,7 @@ body {
    background: url(../images/Web_Mainz_Bkgd.png) black repeat;
 }
 body > div {
-    width: 950px;
+    width: 85%;
    margin: 0px auto;
    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
    overflow: hidden;
@@ -91,6 +90,12 @@ h1 {
    font-style: italic;
    margin-left: 2em;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
    font-size: xx-large;
    font-weight: normal;
@@ -114,6 +119,7 @@ h4 {
 a {
    color: #7D5925;
    text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #FFFFE7;
@@ -144,7 +150,7 @@ div#nav ul li, #subnavigation ul li {
    float: left;
 }
 div#nav ul li a, #subnavigation ul li a {
-    display: block;
+    display: run-in;
    padding: 0.4em 0.8em 0.3em 0.8em;
    font-size: smaller;
    font-family: sans-serif;
@@ -307,6 +313,10 @@ table#SortByCount thead th.ColumnQuantity a:after {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 -----------------------------------------------------------------*/
 #GalleryNav {
@@ -427,8 +437,7 @@ div#families table.fixed_subtables table.eventlist th:last-child {
 }
 #indivgallery .thumbnail {
    float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
    font-size: smaller;
    text-align: center;
    margin: 0.5em;
@@ -524,7 +533,6 @@ div#map_canvas {
 table.calendar {
    table-layout: fixed;
    empty-cells: show;
-    width: 950px;
    margin: 0px auto;
    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
 }
@@ -45,7 +45,6 @@ gray                #696969
 green               #5D835F
 --------------------------------------------------------------------------------------------

-# $Id$

 NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
@@ -115,7 +114,7 @@ h1 {
    font:normal 2em/1.2em serif;
 }
 h2 {
-    display:none;
+    display:block;
 }
 h3 {
    font:normal 2em/1.2em serif;
@@ -139,7 +138,6 @@ h5, h6 {

 p#description {
    color:#542;
-    max-width:800px;
    margin:0;
    padding:1em 20px;
    background-color:#FFF;
@@ -278,7 +276,6 @@ table.infolist tr th a:hover {
 table.infolist tr td {
    font:normal 1.1em/1.4em serif;
    vertical-align:middle;
-    padding:.1em 10px;
 }
 table.infolist tr td a {
    display:block;
@@ -398,30 +395,30 @@ table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents
 /* Individuals
 ----------------------------------------------------- */
 #Individuals {  }
-#Individuals table.individuallist {
+#Individuals table.IndividualList {
    border-bottom:solid 1px #A97;
 }
-#Individuals table.individuallist tbody tr td {
+#Individuals table.IndividualList tbody tr td {
    border-bottom:dashed 1px #C1B398;
 }
-#Individuals table.individuallist tbody tr td a:hover {
+#Individuals table.IndividualList tbody tr td a:hover {
    text-decoration:none;
 }
-table.individuallist tbody tr td.ColumnSurname a:hover, table.individuallist tbody tr td.ColumnSurname a:active {
+table.IndividualList tbody tr td.ColumnSurname a:hover, table.IndividualList tbody tr td.ColumnSurname a:active {
    cursor:default;
    color:black;
    background:none;
 }
-table.individuallist tbody tr td.ColumnName {
+table.IndividualList tbody tr td.ColumnName {
    padding:0;
    background-color:#FFF;
 }
-table.individuallist tbody tr td.ColumnName a {
+table.IndividualList tbody tr td.ColumnName a {
    display:block;
-    padding:.6em 10px;
+    padding:.1em .1em;
    vertical-align:middle;
 }
-table.individuallist tbody tr td.ColumnName a:hover {
+table.IndividualList tbody tr td.ColumnName a:hover {
    background-color:#C1B398;
 }
 #Individuals div table.infolist tr td p {
@@ -579,6 +576,10 @@ table.relationships tbody tr td.ColumnPartner a:hover {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #Gallery {  }
@@ -735,7 +736,7 @@ table.download {
    width:100%;
 }
 table.download img {
-    float:center;
+    float:none;
 }
 table.download thead tr th {
    text-align:center;
@@ -932,7 +933,6 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
    margin:0;
    float:left;
    width:130px;
-    height:150px;
    text-align:center;
 }
 #indivgallery .thumbnail a {
@@ -940,6 +940,7 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
    margin:0;
    padding:0;
    background:none;
+    word-wrap: break-word;
 }
 #indivgallery .thumbnail a img {
    margin:0;
@@ -962,11 +963,12 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
 div.narrative {
    padding-bottom:0;
 }
+i + div.grampsstylednote p {
+    margin: 0.1em 0 0.2em 0;
+}
 .narrative p {
+    margin: 0.1em 0 0.2em 0;
    font:normal .9em/1.4em sans-serif;
-    margin-top:.5em;
-    margin-bottom:0;
-    padding:0 20px 1em 20px;
 }

 /* Subsections : References
@@ -1095,7 +1097,7 @@ div#pedigree {
    margin-right: 10px;
 }
 #footer p#copyright img {
-    margin-right: 10px[
+    margin-right: 10px;
 }
 #user_footer {
    width: 70%;
@@ -41,7 +41,6 @@ black           #000
 white           #FFF
 ---------------------------------------------------------------------------------------------------

-# $Id$

 NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
@@ -45,7 +45,6 @@ Unknown     #000
 Males       Web_Gender_Male.png
 Females     Web_Gender_Female.png

-# $Id$

 NarrativeWeb Styles
 --------------------------------------------------------------------------------------------  */
@@ -156,7 +155,6 @@ h5, h6 {
    margin:1.3em 0 .5em 1em;
 }
 p#description {
-    max-width:800px;
    margin:0;
    padding:1em 20px;
 }
@@ -456,30 +454,30 @@ div#Individuals {
    margin: 0;
    padding: 0;
 }
-div#Individuals table.individuallist {
+div#Individuals table.IndividualList {
    border-bottom: solid 1px #5D835F;
 }
-div#Individuals table.individuallist tbody tr td {
+div#Individuals table.IndividualList tbody tr td {
    border-bottom: dashed 1px #5D835F;
    background-color: #D8F3D6;
 }
-div#Individuals table.individuallist tbody tr td a {
+div#Individuals table.IndividualList tbody tr td a {
    display: block;
    padding: .6em 10px;
 }
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:hover, 
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:active {
+div#Individuals table.IndividualList tbody tr td.ColumnSurname a:hover, 
+div#Individuals table.IndividualList tbody tr td.ColumnSurname a:active {
    cursor:default;
    color: #000;
    background:none;
 }
-div#Individuals table.individuallist tbody tr td.ColumnName {
+div#Individuals table.IndividualList tbody tr td.ColumnName {
    background-color: #FFF;
 }
-div#Individuals table.individuallist tbody tr td.ColumnName a {
+div#Individuals table.IndividualList tbody tr td.ColumnName a {
    vertical-align:middle;
 }
-div#Individuals table.individuallist tbody tr td.ColumnPartner {
+div#Individuals table.IndividualList tbody tr td.ColumnPartner {
    background-color: #FFF;
 }
 div#Individuals div table.infolist tr td p {
@@ -45,6 +45,9 @@ Females     Web_Gender_Female.png
 }
 #treeContainer {
    position:relative;
+    display: table-cell;
+    vertical-align: middle;
+    overflow: visible;
    z-index:1;
 }
 #treeContainer div.boxbg {
@@ -29,7 +29,6 @@ Style Author: Stephane Charette and Jason Simanek
 Image Gallery 
 ------------- 

-# $Id$

 ensure RegionBox <ol> is hidden and has no margins/padding that would shift the image */
 ol.RegionBox {
@@ -18,13 +18,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id$
 #
 ###################################################### */
 body#FamilyMap {
    background-color: #000;
    padding: 0 14px;
-    width: 965px;
 }

 /*    Family Maps
@@ -33,8 +31,11 @@ body#FamilyMap {
    margin-left: 10px;
    margin-right: 10px;
    border: solid 4px #000;
-    width: 931px;
-    height: 1000px;
+    margin: 0px auto;
+    width: 800px;
+    height: 400px;
+    max-width: 90%;
+    max-height: 90%;
 }

 /*    Place Maps
@@ -44,6 +45,8 @@ div#place_canvas {
    border: solid 4px #000;
    width: 500px;
    height: 400px;
+    max-width: 90%;
+    max-height: 90%;
 }
 button#drop {
    background-color: purple;
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- $Id$ -->

 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-gramps">
@@ -19,7 +19,6 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.


- $Id$
 -->
 <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -21,7 +21,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-# $Id$
 -->

 <!--
@@ -201,12 +201,12 @@
    <date name="Pääsiäispäivä" type="religious" value="> easter(y)" />
    <date name="2. Pääsiäispäivä" type="religious" value="> easter(y)" offset="1" />
    <date name="Helatorstai" type="religious" value="> easter(y)" offset="39" if="not(y>=1973)" />
-    <date name="Kristuksen taivaaseenastumisen päivä." type="religious" value="> easter(y)" offset="34" if="(y>=1973) and not(y>=1992)" />
+    <date name="Kristuksen taivaaseenastumisen päivä" type="religious" value="> easter(y)" offset="34" if="(y>=1973) and not(y>=1992)" />
    <date name="Helatorstai" type="religious" value="> easter(y)" offset="39" if="(y>=1992)" />
    <date name="Helluntaipäivä" value="easter(y)" offset="49" type="religious" />
    <date name="Pyhän Kolminaisuuden päivä" value="easter(y)" offset="56" type="religious" />
    <date name="Apostolienpäivä" value="easter(y)" offset="91" type="religious" />
-    <date name="Kirkastussunnuntai." value="easter(y)" offset="105" type="religious" />
+    <date name="Kirkastussunnuntai" value="easter(y)" offset="105" type="religious" />
    <date name="Juhannusaatto" value="*/jun/19" offset="fri" type="religious" if="(y>=1955)" />
    <date name="Juhannusaatto" value="*/jun/23" type="religious" if="not(y>=1955)"  />
    <date name="Juhannuspäivä" value="*/jun/20" offset="sat" type="religious" if="(y>=1955)" />
@@ -224,12 +224,12 @@
    <date name="Joulupäivä" value="*/12/25" type="religious" />
    <date name="Tapaninpäivä" value="*/12/26" type="religious" />
    <date name="Johannes Evankelistan päivä" value="*/dec/27" type="religious" if="not(y>=1774)" />
-    <date name="Apostoli Johanneksen päivä." value="*/dec/27" type="religious" if="dow(y, m, d) == 7 and (y>=2000)" />
+    <date name="Apostoli Johanneksen päivä" value="*/dec/27" type="religious" if="dow(y, m, d) == 7 and (y>=2000)" />
    <date name="Viattomien lasten päivä" value="*/12/28" type="religious" />
    <date name="Uudenvuodenpäivä" value="*/1/1" type="national" />
    <date name="Vainojen uhrien muistopäivä" value="*/1/27" type="national" if="(y>=2002)" />
    <date name="J.L. Runebergin päivä" value="*/2/5" type="national" if="(y>=1854)" />
-    <date name="Saamelaisten kansallis päivä" value="*/2/6" type="religious" if="(y>=2004)" />
+    <date name="Saamelaisten kansallispäivä" value="*/2/6" type="religious" if="(y>=2004)" />
    <date name="Ystävänpäivä" value="*/2/14" type="national" if="(y>=1987)" />
    <date name="Kalevalan päivä" value="*/2/28" type="national" if="(y>=1978)" />
    <date name="Naistenpäivä" value="*/3/8" type="national" if="(y>=1975)" />
@@ -1,12 +1,12 @@
 0 HEAD
 1 SOUR Gramps
-2 VERS 5.0.0-alpha1
+2 VERS 5.0.2
 2 NAME Gramps
-1 DATE 29 OCT 2016
-2 TIME 15:10:31
+1 DATE 31 JUL 2019
+2 TIME 10:58:33
 1 SUBM @SUBM@
 1 FILE C:\Users\prc\AppData\Roaming\gramps\temp\exp_sample_ged.ged
-1 COPR Copyright (c) 2016 Alex Roitman,,,.
+1 COPR Copyright (c) 2019 Alex Roitman,,,.
 1 GEDC
 2 VERS 5.5.1
 2 FORM LINEAGE-LINKED
@@ -17,7 +17,7 @@
 1 ADDR Not Provided
 2 ADR1 Not Provided
 1 PHON 666-555-4444
-1 EMAIL an_email@gmail.com
+1 EMAIL an_email@@gmail.com
 0 @I0000@ INDI
 1 NAME Anna /Hansdotter/
 2 GIVN Anna
@@ -786,11 +786,7 @@
 3 ADOP BOTH
 1 FAMC @F0005@
 2 PEDI adopted
-1 OBJE
-2 FORM jpeg
-2 TITL Michael O'Toole 2015-11
-2 FILE c:\grampsaio64-4.9.9\share\gramps\tests\O0.jpg
-2 NOTE @N0019@
+1 OBJE @O0000@
 1 NOTE @N0007@
 1 CHAN
 2 DATE 18 JUN 2016
@@ -820,7 +816,7 @@
 3 CTRY USA
 2 PHON 440-871-3400
 2 PHON 800-871-3400
-2 EMAIL thetester@gmail.com
+2 EMAIL thetester@@gmail.com
 2 FAX 440-123-4567
 2 WWW http://thetester.com
 1 EVEN A very bad day
@@ -862,7 +858,7 @@
 2 DATE 30 DEC 1954
 2 PLAC 123 Main St., Winslow, PA, 12345
 2 PHON 440-871-3401
-2 EMAIL mrstester@gmail.com
+2 EMAIL mrstester@@gmail.com
 2 FAX 440-321-4568
 2 WWW http://mrstester.com
 2 NOTE @N0011@
@@ -879,7 +875,7 @@
 3 POST 12345
 1 PHON 440-871-3401
 1 PHON 800-871-3401
-1 EMAIL mrstester@gmail.com
+1 EMAIL mrstester@@gmail.com
 1 FAX 440-321-4568
 1 WWW http://mrstester.com
 1 NOTE @N0010@
@@ -889,7 +885,7 @@
 0 @I0046@ INDI
 1 NAME Tom /Von Tester y tested/
 2 GIVN Tom
-2 SPFX Von, 
+2 SPFX Von
 2 SURN Tester y, tested
 2 NICK TesterNickname
 1 SEX M
@@ -904,7 +900,7 @@
 3 STAE Colorado
 3 CTRY USA
 2 PHON 440-871-3402
-2 EMAIL tomtester@gmail.com
+2 EMAIL tomtester@@gmail.com
 2 FAX 440-321-4569
 2 WWW http://tomtester.com
 1 RESI
@@ -1316,10 +1312,10 @@
 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 EMAIL help@@ancestry.com
 1 WWW http://www.ancestry.com
 0 @R0001@ REPO
-1 NAME SUBM (Submitter): (@SUBM@) The Subm /Tester/
+1 NAME SUBM (Submitter): (@@SUBM@@) The Subm /Tester/
 1 ADDR 123 Main St.
 2 CONT Winslow
 2 CONT PA
@@ -1329,7 +1325,7 @@
 2 STAE PA
 2 POST 12345
 1 PHON 440-871-3401
-1 EMAIL mrstester@gmail.com
+1 EMAIL mrstester@@gmail.com
 1 FAX 440-321-4568
 1 WWW http://mrstester.com
 1 NOTE @N0009@
@@ -1362,7 +1358,7 @@
 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 EMAIL tester_repo@@osf.com
 1 FAX 987-654-3210
 1 WWW http://www.tester_repo.com
 1 NOTE @N0012@
@@ -1401,8 +1397,8 @@
 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/:
+0 @N0009@ NOTE Records not imported into SUBM (Submitter): (@@SUBM@@) The Subm /Te
+1 CONC ster/:
 1 CONT 
 1 CONT Only one phone number supported                                     Lin
 1 CONC e    29: 1 PHON 800-871-3401
@@ -1423,4 +1419,12 @@
 0 @N0017@ NOTE A citation Note Source text
 0 @N0018@ NOTE Another Citation Note
 0 @N0019@ NOTE A bad photo for sure
+0 @O0000@ OBJE
+1 FILE c:\users\prc\workspace\grampsm\main\data\tests\O0.jpg
+2 FORM jpg
+2 TITL Michael O'Toole 2015-11
+1 NOTE @N0019@
+1 CHAN
+2 DATE 29 OCT 2016
+3 TIME 15:23:37
 0 TRLR
@@ -3,41 +3,41 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2016-08-29" version="5.0.0-alpha1"/>
+    <created date="2019-03-13" version="5.0.2"/>
    <researcher>
    </researcher>
  </header>
  <events>
-    <event handle="_0000000500000005" change="1472500305" id="E0000">
+    <event handle="_0000000500000005" change="1" id="E0000">
      <type>Birth</type>
      <dateval val="1816"/>
      <place hlink="_0000000700000007"/>
      <citationref hlink="_0000000600000006"/>
    </event>
-    <event handle="_0000000800000008" change="1472500305" id="E0001">
+    <event handle="_0000000800000008" change="1" id="E0001">
      <type>Residence</type>
      <dateval val="1850"/>
      <place hlink="_0000000a0000000a"/>
      <citationref hlink="_0000000900000009"/>
    </event>
-    <event handle="_0000000b0000000b" change="1472500305" id="E0002">
+    <event handle="_0000000b0000000b" change="1" id="E0002">
      <type>Death</type>
      <datestr val="1850/1860"/>
      <place hlink="_0000000c0000000c"/>
    </event>
-    <event handle="_0000000f0000000f" change="1472500305" id="E0003">
+    <event handle="_0000000f0000000f" change="1" id="E0003">
      <type>Marriage</type>
      <dateval val="1841" type="about"/>
      <place hlink="_0000001000000010"/>
    </event>
-    <event handle="_0000001100000011" change="1472500305" id="E0004">
+    <event handle="_0000001100000011" change="1" id="E0004">
      <type>Marriage</type>
      <dateval val="1847-08"/>
      <place hlink="_0000001200000012"/>
    </event>
  </events>
  <people>
-    <person handle="_0000000100000001" change="1472500305" id="I0278">
+    <person handle="_0000000100000001" change="1" id="I0278">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Andrew</first>
@@ -54,13 +54,13 @@
    </person>
  </people>
  <families>
-    <family handle="_0000000d0000000d" change="1472500305" id="F0073">
+    <family handle="_0000000d0000000d" change="1" id="F0073">
      <rel type="Married"/>
      <father hlink="_0000000100000001"/>
      <eventref hlink="_0000000f0000000f" role="Family"/>
      <childref hlink="_0000000100000001"/>
    </family>
-    <family handle="_0000000e0000000e" change="1472500305" id="F0074">
+    <family handle="_0000000e0000000e" change="1" id="F0074">
      <rel type="Married"/>
      <father hlink="_0000000100000001"/>
      <eventref hlink="_0000001100000011" role="Family"/>
@@ -68,19 +68,19 @@
    </family>
  </families>
  <citations>
-    <citation handle="_0000000400000004" change="1472500305" id="C0000">
+    <citation handle="_0000000400000004" change="1" id="C0000">
      <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
      <confidence>2</confidence>
      <objref hlink="_0000000300000003"/>
      <sourceref hlink="_0000000200000002"/>
    </citation>
-    <citation handle="_0000000600000006" change="1472500305" id="C0001">
+    <citation handle="_0000000600000006" change="1" id="C0001">
      <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
      <confidence>2</confidence>
      <objref hlink="_0000000300000003"/>
      <sourceref hlink="_0000000200000002"/>
    </citation>
-    <citation handle="_0000000900000009" change="1472500305" id="C0002">
+    <citation handle="_0000000900000009" change="1" id="C0002">
      <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
      <confidence>2</confidence>
      <objref hlink="_0000000300000003"/>
@@ -88,7 +88,7 @@
    </citation>
  </citations>
  <sources>
-    <source handle="_0000000200000002" change="1472500305" id="S0029">
+    <source handle="_0000000200000002" change="1" id="S0029">
      <stitle>1850 United States Federal Census</stitle>
      <sauthor>Ancestry.com</sauthor>
      <spubinfo>Name: Ancestry.com Operations, Inc.; Location: Provo, UT, USA; Date: 2009;</spubinfo>
@@ -96,42 +96,43 @@
    </source>
  </sources>
  <places>
-    <placeobj handle="_0000000700000007" change="1472500305" id="P0000" type="Unknown">
+    <placeobj handle="_0000000700000007" change="1" id="P0000" type="Unknown">
      <ptitle>Tennessee, USA</ptitle>
      <pname value="Tennessee, USA"/>
    </placeobj>
-    <placeobj handle="_0000000a0000000a" change="1472500305" id="P0001" type="Unknown">
+    <placeobj handle="_0000000a0000000a" change="1" id="P0001" type="Unknown">
      <ptitle>District 14, Cape Girardeau, Missouri, USA</ptitle>
      <pname value="District 14, Cape Girardeau, Missouri, USA"/>
    </placeobj>
-    <placeobj handle="_0000000c0000000c" change="1472500305" id="P0002" type="Unknown">
+    <placeobj handle="_0000000c0000000c" change="1" id="P0002" type="Unknown">
      <ptitle>Bollinger Co. MO</ptitle>
      <pname value="Bollinger Co. MO"/>
    </placeobj>
-    <placeobj handle="_0000001000000010" change="1472500305" id="P0003" type="Unknown">
+    <placeobj handle="_0000001000000010" change="1" id="P0003" type="Unknown">
      <ptitle>Union Co.?, IL</ptitle>
      <pname value="Union Co.?, IL"/>
    </placeobj>
-    <placeobj handle="_0000001200000012" change="1472500305" id="P0004" type="Unknown">
+    <placeobj handle="_0000001200000012" change="1" id="P0004" type="Unknown">
      <ptitle>Wayne, Missouri, United States</ptitle>
      <pname value="Wayne, Missouri, United States"/>
    </placeobj>
  </places>
  <objects>
-    <object handle="_0000000300000003" change="1472500305" id="M159">
+    <object handle="_0000000300000003" change="1" id="M159">
      <file src="1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="1850 United States Federal Census"/>
      <noteref hlink="_0000001400000014"/>
      <noteref hlink="_0000001500000015"/>
    </object>
-    <object handle="_0000001600000016" change="1472500305" id="M158">
-      <file src="D:/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="D:\Users\PRC\Downloads\1850 United States Federal Census(11)-1.jpg"/>
+    <object handle="_0000001600000016" change="1" id="M158">
+      <file src="/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg"/>
+      <noteref hlink="_0000001700000017"/>
    </object>
-    <object handle="_0000001700000017" change="1472500305" id="M157">
+    <object handle="_0000001800000018" change="1" id="M157">
      <file src="http://1.gravatar.com/avatar/77e02a3c8c665155ad1acaac8c2742e0?s=120&amp;d=mm&amp;r=pg" mime="unknown" description="http://1.gravatar.com/avatar/77e02a3c8c665155ad1acaac8c2742e0?s=120&amp;d=mm&amp;r=pg"/>
    </object>
  </objects>
  <repositories>
-    <repository handle="_0000001300000013" change="1472500305" id="R0001">
+    <repository handle="_0000001300000013" change="1" id="R0001">
      <rname>Ancestry.com</rname>
      <type>Library</type>
      <address>
@@ -140,16 +141,26 @@
    </repository>
  </repositories>
  <notes>
-    <note handle="_0000001400000014" change="1472500305" id="N0000" type="Media Note">
-      <text>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</text>
+    <note handle="_0000001400000014" change="1" id="N0000" type="Media Note">
+      <text>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248 </text>
    </note>
-    <note handle="_0000001500000015" change="1472500305" id="N0001" type="GEDCOM import">
+    <note handle="_0000001500000015" change="1" id="N0001" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M159:

-Could not import 1850 United States Federal Census(11)-1.jpg        Line    70: 1 FILE 1850 United States Federal Census(11)-1.jpg</text>
+Could not import 1850 United States Federal Census(11)-1.jpg        Line    70: 1 FILE 1850 United States Federal Census(11)-1.jpg
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="200"/>
      </style>
    </note>
+    <note handle="_0000001700000017" change="1" id="N0002" type="GEDCOM import">
+      <text>Records not imported into OBJE (multi-media object) Gramps ID M158:
+
+Could not import D:\Users\PRC\Downloads\1850 United States Federa   Line    75: 1 FILE D:\Users\PRC\Downloads\1850 United States Federal Census(11)-1.jpg
+</text>
+      <style name="fontface" value="Monospace">
+        <range start="0" end="223"/>
+      </style>
+    </note>
  </notes>
 </database>
@@ -3,7 +3,7 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2017-05-30" version="5.0.0-alpha1"/>
+    <created date="2019-03-05" version="5.0.2"/>
    <researcher>
    </researcher>
  </header>
@@ -66,9 +66,10 @@
    <object handle="_0000000300000003" change="1" id="O0000">
      <file src="test_emb_55.jpg" mime="image/jpeg" description="Multimedia link embedded form v5.5"/>
      <noteref hlink="_0000000200000002"/>
+      <noteref hlink="_0000000b0000000b"/>
    </object>
    <object handle="_0000000400000004" change="548708291" id="M1">
-      <file src="" mime="" description="Multimedia link to linked form v5.5 blob"/>
+      <file src="" mime="image/jpeg" description="Multimedia link to linked form v5.5 blob"/>
      <attribute type="REFN" value="Ref12345M1">
        <noteref hlink="_0000001200000012"/>
      </attribute>
@@ -117,7 +118,7 @@
      <citationref hlink="_0000002700000027"/>
    </object>
    <object handle="_0000000c0000000c" change="1" id="O0002">
-      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="unknown" description="Multimedia link embedded form v5.5 URL"/>
+      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="text/html" description="Multimedia link embedded form v5.5 URL"/>
      <noteref hlink="_0000000b0000000b"/>
    </object>
    <object handle="_0000000d0000000d" change="1" id="M7">
@@ -129,7 +130,7 @@
      <noteref hlink="_0000002900000029"/>
    </object>
    <object handle="_0000001500000015" change="1" id="M2">
-      <file src="" mime="" description="2nd blob Multimedia link to linked form v5.5 blob"/>
+      <file src="" mime="image/jpeg" description="2nd blob Multimedia link to linked form v5.5 blob"/>
      <noteref hlink="_0000001600000016"/>
    </object>
  </objects>
@@ -1,7 +1,7 @@
 0 HEAD
-1 SOUR FTM
-2 VERS Family Tree Maker (22.0.0.1410)
-2 NAME Family Tree Maker for Windows
+1 SOUR Tester
+2 VERS 1.0
+2 NAME The Tester
 2 CORP Ancestry.com
 3 ADDR 360 W 4800 N
 4 CONT Provo, UT 84604
@@ -44,7 +44,7 @@
 3 FORM Street, City, County, State, Country, Zip code
 2 PHON 440-871-3400
 2 PHON 800-871-3400
-2 EMAIL thetester@gmail.com
+2 EMAIL thetester@@gmail.com
 2 FAX 440-123-4567
 2 WWW http://thetester.com
 0 @I1@ INDI
@@ -3,7 +3,7 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2016-10-23" version="5.0.0-alpha1"/>
+    <created date="2017-12-19" version="5.0.0-alpha3"/>
    <researcher>
      <resname>The Subm /Tester/</resname>
      <resaddr>123 Main St.</resaddr>
@@ -109,12 +109,12 @@
    <source handle="_0000000300000003" change="1" id="S0000">
      <stitle>Import from imp_FTM_LINK.ged</stitle>
      <sauthor>The Tester</sauthor>
-      <srcattribute type="Approved system identification" value="FTM"/>
-      <srcattribute type="Version number of software product" value="Family Tree Maker (22.0.0.1410)"/>
-      <srcattribute type="Name of software product" value="Family Tree Maker for Windows"/>
+      <srcattribute type="Approved system identification" value="Tester"/>
+      <srcattribute type="Version number of software product" value="1.0"/>
+      <srcattribute type="Name of software product" value="The Tester"/>
      <srcattribute type="Name of source data" value="FTM Source data"/>
      <srcattribute type="Copyright of source data" value="Copyright 2999"/>
-      <srcattribute type="Generated By" value="Family Tree Maker for Windows Family Tree Maker (22.0.0.1410)"/>
+      <srcattribute type="Generated By" value="The Tester 1.0"/>
      <srcattribute type="Creation date of GEDCOM" value="2016-03-01"/>
      <srcattribute type="Character set and version" value="UTF-8 1.1"/>
      <srcattribute type="GEDCOM version" value="5.5"/>
@@ -206,7 +206,8 @@

 Only one phone number supported                                     Line     9: 3 PHON (800) 705-7000
 Line ignored as not understood                                      Line    15: 2 DATE 1111-01-01
-GEDCOM FORM should be in uppercase                                  Line    26: 2 FORM Lineage-Linked</text>
+GEDCOM FORM should be in uppercase                                  Line    26: 2 FORM Lineage-Linked
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="344"/>
      </style>
@@ -214,7 +215,8 @@ GEDCOM FORM should be in uppercase                                  Line    26:
    <note handle="_0000000600000006" change="1" id="N0001" type="GEDCOM import">
      <text>Records not imported into SUBM (Submitter): (@SUBM@) The Subm /Tester/:

-Only one phone number supported                                     Line    35: 1 PHON 800-871-3401</text>
+Only one phone number supported                                     Line    35: 1 PHON 800-871-3401
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="173"/>
      </style>
@@ -234,7 +236,8 @@ Only one phone number supported                                     Line    35:
    <note handle="_0000001700000017" change="1" id="N0005" type="GEDCOM import">
      <text>Records not imported into REPO (repository) Gramps ID R0002:

-Only one phone number supported                                     Line    93: 1 PHON 800-765-4321</text>
+Only one phone number supported                                     Line    93: 1 PHON 800-765-4321
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="162"/>
      </style>
@@ -3,7 +3,7 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2016-10-23" version="5.0.0-alpha1"/>
+    <created date="2019-07-30" version="5.0.2"/>
    <researcher>
      <resname>John A. Tester</resname>
    </researcher>
@@ -26,27 +26,23 @@
      <type>Death</type>
      <noteref hlink="_0000001600000016"/>
    </event>
-    <event handle="_0000001e0000001e" change="1" id="E0003">
-      <type>Who knows OBJE REFN TYPE</type>
-      <description>REFN</description>
-    </event>
-    <event handle="_0000002700000027" change="1" id="E0004">
+    <event handle="_0000002700000027" change="1" id="E0003">
      <type>Birth</type>
      <dateval val="1901-06-15"/>
    </event>
-    <event handle="_0000002800000028" change="1" id="E0005">
+    <event handle="_0000002800000028" change="1" id="E0004">
      <type>Death</type>
      <dateval val="1975-07-05"/>
    </event>
-    <event handle="_0000002e0000002e" change="1" id="E0006">
+    <event handle="_0000002e0000002e" change="1" id="E0005">
      <type>Birth</type>
      <dateval val="1922-06-15"/>
    </event>
-    <event handle="_0000002f0000002f" change="1" id="E0007">
+    <event handle="_0000002f0000002f" change="1" id="E0006">
      <type>Death</type>
      <dateval val="1994-07-05"/>
    </event>
-    <event handle="_0000003b0000003b" change="1" id="E0008">
+    <event handle="_0000003b0000003b" change="1" id="E0007">
      <type>TEST</type>
      <description>family</description>
    </event>
@@ -61,10 +57,11 @@
      <eventref hlink="_0000000f0000000f" role="Primary"/>
      <eventref hlink="_0000001000000010" role="Primary"/>
      <eventref hlink="_0000001500000015" role="Primary"/>
-      <eventref hlink="_0000001e0000001e" role="Primary"/>
      <objref hlink="_0000001f0000001f"/>
      <attribute type="RIN" value="123456 Person"/>
-      <attribute type="REFN" value="98765 for PERSON"/>
+      <attribute type="REFN" value="98765 for PERSON">
+        <noteref hlink="_0000001e0000001e"/>
+      </attribute>
      <url  href="http://homepages.rootsweb.com/~pmcbride/gedcom/55gctoc.htm" type="Web Home" description="GEDCOM 5.5 documentation web site"/>
      <parentin hlink="_0000001700000017"/>
      <noteref hlink="_0000001800000018"/>
@@ -270,7 +267,8 @@

 Line ignored as not understood                                      Line    18: 2 TEST Header Note
 Empty note ignored                                                  Line    19: 1 NOTE 
-Skipped subordinate line                                            Line    20: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line    20: 2 TEST Empty Note
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="327"/>
      </style>
@@ -288,7 +286,8 @@ Skipped subordinate line                                            Line    20:
 Line ignored as not understood                                      Line    26: 2 TEST Submission Note
 Empty note ignored                                                  Line    27: 1 NOTE 
 Skipped subordinate line                                            Line    28: 2 TEST Empty Note
-Line ignored as not understood                                      Line    29: 1 TEST submission</text>
+Line ignored as not understood                                      Line    29: 1 TEST submission
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="425"/>
      </style>
@@ -300,7 +299,8 @@ Tag recognized but not supported                                    Line    32:
 Tag recognized but not supported                                    Line    33: 1 REFN Submission Note REFN
 Skipped subordinate line                                            Line    34: 2 TYPE Submission Note REFN TYPE
 Tag recognized but not supported                                    Line    35: 1 SOUR Submission note source
-Line ignored as not understood                                      Line    39: 1 TEST on XREF Note</text>
+Line ignored as not understood                                      Line    39: 1 TEST on XREF Note
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="586"/>
      </style>
@@ -318,7 +318,8 @@ Line ignored as not understood                                      Line    39:
 Line ignored as not understood                                      Line    43: 2 TEST Submitter Note
 Empty note ignored                                                  Line    44: 1 NOTE 
 Skipped subordinate line                                            Line    45: 2 TEST Empty Note
-Line ignored as not understood                                      Line    46: 1 TEST Submitter</text>
+Line ignored as not understood                                      Line    46: 1 TEST Submitter
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="460"/>
      </style>
@@ -360,7 +361,10 @@ Line ignored as not understood                                      Line    46:
    <note handle="_0000001d0000001d" change="979250406" id="N0018" type="Media Note">
      <text>Media xref note</text>
    </note>
-    <note handle="_0000002100000021" change="1" id="N0019" type="GEDCOM import">
+    <note handle="_0000001e0000001e" change="1" id="N0019" type="REFN-TYPE">
+      <text>Who knows OBJE REFN TYPE</text>
+    </note>
+    <note handle="_0000002100000021" change="1" id="N0020" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0001:

 Empty note ignored                                                  Line    54: 2 NOTE 
@@ -382,12 +386,14 @@ Empty note ignored                                                  Line    85:
 Skipped subordinate line                                            Line    86: 3 TEST Empty Note
 Line ignored as not understood                                      Line    88: 3 TEST 123456 Note
 Empty note ignored                                                  Line    90: 2 NOTE 
-Skipped subordinate line                                            Line    91: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line    91: 3 TEST Empty Note
+Line ignored as not understood                                      Line    94: 2 TEST REFN
+</text>
      <style name="fontface" value="Monospace">
-        <range start="0" end="2009"/>
+        <range start="0" end="2101"/>
      </style>
    </note>
-    <note handle="_0000002200000022" change="1" id="N0020" type="GEDCOM import">
+    <note handle="_0000002200000022" change="1" id="N0021" type="GEDCOM import">
      <text>Records not imported into NOTE Gramps ID N0018:

 Tag recognized but not supported                                    Line   103: 1 RIN 123456
@@ -396,85 +402,89 @@ Skipped subordinate line                                            Line   105:
 Tag recognized but not supported                                    Line   109: 2 NOTE Note on a change on a note!!!
 Skipped subordinate line                                            Line   110: 3 CHAN 
 Skipped subordinate line                                            Line   111: 4 DATE 2001-01-11
-Skipped subordinate line                                            Line   112: 5 TIME 16:00:06</text>
+Skipped subordinate line                                            Line   112: 5 TIME 16:00:06
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="741"/>
      </style>
    </note>
-    <note handle="_0000002300000023" change="1" id="N0021" type="REFN-TYPE">
+    <note handle="_0000002300000023" change="1" id="N0022" type="REFN-TYPE">
      <text>Who knows REFN TYPE</text>
    </note>
-    <note handle="_0000002500000025" change="1" id="N0022" type="GEDCOM import">
+    <note handle="_0000002500000025" change="1" id="N0023" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M1:

-Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg</text>
+Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="164"/>
      </style>
    </note>
-    <note handle="_0000002900000029" change="979250406" id="N0023" type="Person Note">
+    <note handle="_0000002900000029" change="979250406" id="N0024" type="Person Note">
      <text>Family Spouse reference Note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000002b0000002b" change="1" id="N0024" type="GEDCOM import">
+    <note handle="_0000002b0000002b" change="1" id="N0025" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0002:

 Empty note ignored                                                  Line   132: 2 NOTE 
-Skipped subordinate line                                            Line   133: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line   133: 3 TEST Empty Note
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="248"/>
      </style>
    </note>
-    <note handle="_0000002d0000002d" change="979250406" id="N0025" type="General">
+    <note handle="_0000002d0000002d" change="979250406" id="N0026" type="General">
      <text>Name note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003100000031" change="1" id="N0026" type="LDS Note">
+    <note handle="_0000003100000031" change="1" id="N0027" type="LDS Note">
      <text>Place note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003400000034" change="1" id="N0027" type="LDS Note">
+    <note handle="_0000003400000034" change="1" id="N0028" type="LDS Note">
      <text>LDS xref note</text>
    </note>
-    <note handle="_0000003600000036" change="979250406" id="N0028" type="Association Note">
+    <note handle="_0000003600000036" change="979250406" id="N0029" type="Association Note">
      <text>Association link note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003800000038" change="1" id="N0029" type="GEDCOM import">
+    <note handle="_0000003800000038" change="1" id="N0030" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0003:

 Empty note ignored                                                  Line   141: 2 NOTE 
 Skipped subordinate line                                            Line   142: 3 TEST Empty Note
 Line ignored as not understood                                      Line   163: 3 TEST Accociation note
 Empty note ignored                                                  Line   167: 2 NOTE 
-Skipped subordinate line                                            Line   168: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line   168: 3 TEST Empty Note
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="538"/>
      </style>
    </note>
-    <note handle="_0000003900000039" change="979250406" id="N0030" type="General">
+    <note handle="_0000003900000039" change="979250406" id="N0031" type="General">
      <text>Just for association</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003e0000003e" change="1" id="N0031" type="Family Note">
+    <note handle="_0000003e0000003e" change="1" id="N0032" type="Family Note">
      <text>Family xref note</text>
    </note>
-    <note handle="_0000003f0000003f" change="979250406" id="N0032" type="Family Note">
+    <note handle="_0000003f0000003f" change="979250406" id="N0033" type="Family Note">
      <text>Family note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004000000040" change="1" id="N0033" type="Citation">
+    <note handle="_0000004000000040" change="1" id="N0034" type="Citation">
      <text>Citation Data Note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004100000041" change="1" id="N0034" type="Source text">
+    <note handle="_0000004100000041" change="1" id="N0035" type="Source text">
      <text>A sample text from a source of this family</text>
    </note>
-    <note handle="_0000004200000042" change="979250406" id="N0035" type="Citation">
+    <note handle="_0000004200000042" change="979250406" id="N0036" type="Citation">
      <text>A note this citation is on the FAMILY record.</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004400000044" change="1" id="N0036" type="GEDCOM import">
+    <note handle="_0000004400000044" change="1" id="N0037" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0001:

 Line ignored as not understood                                      Line   183: 2 TEST Family Note
@@ -482,41 +492,44 @@ Empty note ignored                                                  Line   187:
 Skipped subordinate line                                            Line   188: 2 TEST Empty Note
 Line ignored as not understood                                      Line   190: 2 TEST citation
 Line ignored as not understood                                      Line   194: 3 TEST Citation Data
-Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note</text>
+Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="645"/>
      </style>
    </note>
-    <note handle="_0000004600000046" change="979250406" id="N0037" type="Repository Reference Note">
+    <note handle="_0000004600000046" change="979250406" id="N0038" type="Repository Reference Note">
      <text>A short note about the repository link.</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004700000047" change="979250406" id="N0038" type="Source Note">
+    <note handle="_0000004700000047" change="979250406" id="N0039" type="Source Note">
      <text>note embedded in the SOURCE Record</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004800000048" change="1" id="N0039" type="GEDCOM import">
+    <note handle="_0000004800000048" change="1" id="N0040" type="GEDCOM import">
      <text>Records not imported into SOUR (source) Gramps ID S0001:

 Line ignored as not understood                                      Line   206: 1 TEST source
 Empty note ignored                                                  Line   208: 2 NOTE 
 Skipped subordinate line                                            Line   209: 3 TEST Empty Note
 Empty note ignored                                                  Line   214: 1 NOTE 
-Skipped subordinate line                                            Line   215: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line   215: 2 TEST Empty Note
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="524"/>
      </style>
    </note>
-    <note handle="_0000004900000049" change="1" id="N0040" type="Repository Note">
+    <note handle="_0000004900000049" change="1" id="N0041" type="Repository Note">
      <text>Repository Note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004a0000004a" change="1" id="N0041" type="GEDCOM import">
+    <note handle="_0000004a0000004a" change="1" id="N0042" type="GEDCOM import">
      <text>Records not imported into REPO (repository) Gramps ID R0002:

 Line ignored as not understood                                      Line   223: 1 TEST Repo
 Empty note ignored                                                  Line   224: 1 NOTE 
-Skipped subordinate line                                            Line   225: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line   225: 2 TEST Empty Note
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="340"/>
      </style>
@@ -50,9 +50,9 @@
 0 @I0@ INDI
 1 NAME Anna /Hansdotter/
 2 GIVN Anna
+2 SURN Hansdotter, Smith
+2 SPFX Vrow, huh
 2 SURN Hansdotter
-2 SPFX Vrow
-2 SURN Smith
 2 _AKA Anna Smith
 2 _AKA Hanna
 2 NOTE Hans daughter? N0000
@@ -3,7 +3,7 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2016-10-24" version="5.0.0-alpha1"/>
+    <created date="2019-07-31" version="5.0.2"/>
    <researcher>
      <resname>Alex Roitman,,,</resname>
      <resaddr>Not Provided</resaddr>
@@ -163,6 +163,7 @@
    </event>
    <event handle="_0000005500000055" change="1" id="E0026">
      <type>Birth</type>
+      <description>No Date Information</description>
    </event>
    <event handle="_0000005600000056" change="1" id="E0027">
      <type>Death</type>
@@ -616,7 +617,8 @@
      <gender>F</gender>
      <name type="Birth Name">
        <first>Anna</first>
-        <surname prefix="Vrow">Smith</surname>
+        <surname prefix="Vrow">Hansdotter</surname>
+        <surname prim="0">Smith</surname>
        <noteref hlink="_0000001100000011"/>
      </name>
      <name alt="1" type="Also Known As">
@@ -1456,13 +1458,13 @@
      <noteref hlink="_000000f9000000f9"/>
    </object>
    <object handle="_000000d1000000d1" change="1" id="O0001">
-      <file src="Magnes&amp;Anna_smiths_marr_cert.jpg" mime="unknown" description="Magnes&amp;Anna_smiths_marr_cert.jpg"/>
+      <file src="Magnes&amp;Anna_smiths_marr_cert.jpg" mime="image/jpeg" description="Magnes&amp;Anna_smiths_marr_cert.jpg"/>
    </object>
    <object handle="_000000d8000000d8" change="1" id="O0002">
-      <file src="John&amp;Alice_smiths_marr_cert.jpg" mime="unknown" description="John&amp;Alice_smiths_marr_cert.jpg"/>
+      <file src="John&amp;Alice_smiths_marr_cert.jpg" mime="image/jpeg" description="John&amp;Alice_smiths_marr_cert.jpg"/>
    </object>
    <object handle="_000000f1000000f1" change="1" id="O0003">
-      <file src="Attic_photo.jpg" mime="unknown" description="Attic_photo.jpg"/>
+      <file src="Attic_photo.jpg" mime="image/jpeg" description="Attic_photo.jpg"/>
    </object>
  </objects>
  <repositories>
@@ -1506,7 +1508,8 @@
    <note handle="_0000000100000001" change="1" id="N0000" type="GEDCOM import">
      <text>Records not imported into HEAD (header):

-GEDCOM FORM not supported                                           Line    14: 2 FORM NOT LINEAGE-LINKED</text>
+GEDCOM FORM not supported                                           Line    14: 2 FORM NOT LINEAGE-LINKED
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="148"/>
      </style>
@@ -1514,7 +1517,8 @@ GEDCOM FORM not supported                                           Line    14:
    <note handle="_0000000200000002" change="1" id="N0001" type="GEDCOM import">
      <text>Records not imported into SUBM (Submitter): (@SUBM@) Alex Roitman,,,:

-Line ignored as not understood                                      Line    23: 2 NOTE No address provided (note not supported)</text>
+Line ignored as not understood                                      Line    23: 2 NOTE No address provided (note not supported)
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="199"/>
      </style>
@@ -1523,7 +1527,8 @@ Line ignored as not understood                                      Line    23:
      <text>Records not imported into FAM (family) Gramps ID F0003:

 Line ignored as not understood                                      Line    46: 2 SOUR Not really allowed here
-Filename omitted                                                    Line    48: 1 OBJE</text>
+Filename omitted                                                    Line    48: 1 OBJE 
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="256"/>
      </style>
@@ -1562,7 +1567,8 @@ Filename omitted                                                    Line    48:
      <text>Records not imported into INDI (individual) Gramps ID I0016:

 Warn: ADDR overwritten                                              Line   204: 3 ADR1 456 Main St again
-ADDR element ignored '459 Main St.'                                 Line   202: 2 ADDR 459 Main St., The Village, San Francisco, CA, USA</text>
+ADDR element ignored '459 Main St.'                                 Line   202: 2 ADDR 459 Main St., The Village, San Francisco, CA, USA
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="304"/>
      </style>
@@ -1573,7 +1579,8 @@ ADDR element ignored '459 Main St.'                                 Line   202:
    <note handle="_0000004700000047" change="1" id="N0014" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0018:

-Tag recognized but not supported                                    Line   245: 2 TYPE first generaton</text>
+Tag recognized but not supported                                    Line   245: 2 TYPE first generaton
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="165"/>
      </style>
@@ -1604,7 +1611,8 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo
    <note handle="_000000cf000000cf" change="1" id="N0021" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0010:

-Tag recognized but not supported                                    Line   863: 2 _STAT</text>
+Tag recognized but not supported                                    Line   863: 2 _STAT 
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="146"/>
      </style>
@@ -1613,7 +1621,8 @@ Tag recognized but not supported                                    Line   863:
      <text>Records not imported into FAM (family) Gramps ID F0011:

 Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   878: 3 OBJE 
-Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   881: 2 OBJE</text>
+Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   881: 2 OBJE 
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="233"/>
      </style>
@@ -1621,7 +1630,8 @@ Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   8
    <note handle="_000000d9000000d9" change="1" id="N0023" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0012:

-Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   905: 1 OBJE</text>
+Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   905: 1 OBJE 
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="145"/>
      </style>
@@ -1629,7 +1639,8 @@ Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   9
    <note handle="_000000e4000000e4" change="1" id="N0024" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0008:

-Tag recognized but not supported                                    Line  1005: 1 ADDR 123 Main st, Grantville, Virginia, USA</text>
+Tag recognized but not supported                                    Line  1005: 1 ADDR 123 Main st, Grantville, Virginia, USA
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="183"/>
      </style>
@@ -1653,7 +1664,8 @@ Tag recognized but not supported                                    Line  1005:
      <text>Records not imported into SOUR (source) Gramps ID S0003:

 Tag recognized but not supported                                    Line  1045: 1 DATA 
-Skipped subordinate line                                            Line  1046: 2 AGNC NYC Public Library</text>
+Skipped subordinate line                                            Line  1046: 2 AGNC NYC Public Library
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="252"/>
      </style>
@@ -1669,7 +1681,8 @@ Skipped subordinate line                                            Line  1046:

 REFN ignored                                                        Line  1075: 3 REFN blah blah
 Skipped subordinate line                                            Line  1076: 4 TYPE who knows
-Could not import Attic_photo.jpg                                    Line  1079: 3 OBJE</text>
+Could not import Attic_photo.jpg                                    Line  1079: 3 OBJE 
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="344"/>
      </style>
@@ -1677,7 +1690,8 @@ Could not import Attic_photo.jpg                                    Line  1079:
    <note handle="_000000f6000000f6" change="1" id="N0034" type="GEDCOM import">
      <text>Records not imported into Top Level:

-Unknown tag                                                         Line  1106: 0 XXX an unknown token at level 0</text>
+Unknown tag                                                         Line  1106: 0 XXX an unknown token at level 0
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="152"/>
      </style>
@@ -1685,12 +1699,13 @@ Unknown tag                                                         Line  1106:
    <note handle="_000000f8000000f8" change="1" id="N0035" type="GEDCOM import">
      <text>Records not imported into Top Level:

-Unknown tag                                                         Line  1109: 1 @X1@ XXX and unknown token xref definition</text>
+Unknown tag                                                         Line  1109: 1 @X1@ XXX and unknown token xref definition
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="163"/>
      </style>
    </note>
-    <note handle="_000000f9000000f9" change="1477325896" id="N0036" type="General">
+    <note handle="_000000f9000000f9" change="1564588949" id="N0036" type="General">
      <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
    </note>
  </notes>
@@ -57,7 +57,7 @@

 <_tip number="29"><b>Show All Checkbutton</b><br/>When adding an existing person as a spouse, the list of people shown is filtered to display only people who could realistically fit the role (based on dates in the database). In case Gramps is wrong in making this choice, you can override the filter by checking the Show All checkbutton.</_tip>

-<_tip number="31"><b>Improving Gramps</b><br/>Users are encouraged to request enhancements to Gramps. Requesting an enhancement can be done either through the gramps-users or gramps-devel mailing lists, or by going to http://bugs.gramps-project.org and creating a Feature Request. Filing a Feature Request is preferred but it can be good to discuss your ideas on the email lists.</_tip>
+<_tip number="31"><b>Improving Gramps</b><br/>Users are encouraged to request enhancements to Gramps. Requesting an enhancement can be done either through the gramps-users or gramps-devel mailing lists, or by going to https://gramps-project.org/bugs/ and creating a Feature Request. Filing a Feature Request is preferred but it can be good to discuss your ideas on the email lists.</_tip>

 <_tip number="32"><b>Gramps Mailing Lists</b><br/>Want answers to your questions about Gramps? Check out the gramps-users email list. Many helpful people are on the list, so you're likely to get an answer quickly. If you have questions related to the development of Gramps, try the gramps-devel list. You can see the lists by selecting &quot;Help &gt; Gramps Mailing Lists&quot;.</_tip>

@@ -91,7 +91,7 @@

 <_tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web.</_tip>

-<_tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at http://bugs.gramps-project.org</_tip>
+<_tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at https://gramps-project.org/bugs/</_tip>

 <_tip number="51"><b>The Gramps Homepage</b><br/>The Gramps homepage is at http://gramps-project.org/</_tip>

@@ -1,18 +1,18 @@
 Gramps for Debian
----------------------
+-----------------

-This is the Debian package of the 4.0 series of GRAMPS.
+Version 5.0 of gramps adds the option of using a new database backend called
+DB_API, as an alternative to the default BSDDB (Berkeley).

-It is a major update of Gramps to upgrade to GTK 3. A switch was also made to distutils from autotools.
+Two DB-API SQL engines have been developed, sqlite3 and postgresql. Compared
+to BSDDB, the alternative backends have beend designed allow some flexibility
+with respect to using the database with multiple users, or in multiple
+locations (different computers).

-The 4.0 series of Gramps is being packaged for the experimental distribution until all dependencies are available
-and it proves stable.
+For more details, please read the Gramps wiki:
+https://gramps-project.org/wiki/index.php?title=DB-API_Database_Backend

-Webkit - gir1.2-webkit-3.0 crashes. Gramps has been patched disable the hidden
-HTML view instead until a solution is found.
+Please note, this particular version is a pre-release version for testing.
+Please do not use it on your only copy of important genealogical data.

-Goocanvas2 - The latest Goocanvas is not available in Debian yet. If you miss
-the Graphview plugin, you could try installing the gir1.2-goocanvas-2.0-9 which
-is available in Ubuntu.
-
- -- Ross Gammon <rossgammon@mail.dk>  Sat, 25 Jan 2014 18:00:00 +0100
+ -- Ross Gammon <rossgammon@debian.org>  Mon, 19 Feb 2018 00:04:00 +0100
@@ -0,0 +1,157 @@
+Run gramps -v from the commandline and check dependencies:
+- From the commandline type $ gramps -v
+	- The gramps version and versions of library dependencies are output
+	- Check that all dependencies have been installed, show their versions, and that there are no error messages
+- If required, install the dependencies that have not been found (typically icu, osmgpsmap & gexiv)
+- Type $ gramps -v again
+        - Check that all dependencies have been installed, show their versions, and that there are no error messages
+
+Open Gramps, create an empty Family Tree, and check the Gramps version, credits & license:
+- Run gramps
+	- Family Trees window opens
+- Click "New" to create an empty Family Tree
+- Type a name for your family tree (e.g. Sample), and press "Enter"
+- Click "Load Family Tree"
+	- Gramps displays the "Welcome to Gramps!" start screen
+- Choose Help > About from the menu
+	- The "About gramps" window is displayed with Version information
+- Click on "Credits"
+	- A list of Authors and Contributors to Gramps is displayed
+- Click on "License"
+	- The GNU General Public License is displayed
+- Click on the "X" to close the "About gramps" window
+	- Gramps closes the "About gramps" window and returns to the "Welcome to Gramps!" start screen
+
+Import a GEDCOM file into Gramps
+If you do not have one to hand, the provided example can be extracted to your home directory and imported from there.
+/usr/share/doc/gramps/example/gedcom/sample.ged.gz
+- From your open and empty Family Tree, choose Family Trees > Import from the menu
+	- The Gramps: Import Family Tree window opens
+- Locate your GEDCOM file, select it and click on "Import"
+	- The Import Statistics window displays "Results: done"
+- Click on "Close"
+	- The GEDCOM import report window displays "No errors detected"
+- CLick on "Close"
+	- The Top Surnames gramplet displays the surnames of the people imported into the Tree
+
+Test aspects of the People View
+- Click on the People View
+	- A list of people in "Group View" mode are shown
+- Click on the arrow for a surname (e.g. Hansdotter)
+	- The people with this surname are revealed
+- Select a person and click in the "Edit selcted person" icon (or just double click on the person)
+	- The "Person" window opens showing the details of this person
+- Click on Cancel
+	- The "Person" window closes
+- Choose the person list view (not grouped) by clicking on the "People" icon
+	- The people are now listed without any grouping by surname
+- Click on the "+" icon to create a new person
+	- An empty "Person" window opens
+- Enter some details about the person (e.g. given name, surname, and gender)
+- Click on the "+" button to create a new event for this person
+	- The "Event Reference Editor" window opens
+- Create an event (e.g. birth) by entering a date
+- Click on the "+" button to add a new place
+	- The "New Place" window opens
+- Type in some details about the place (Name, Type, Latitude & Longitude)
+- Click on OK
+	- The "New Place" window closes
+- In the "Event Reference Editor" click OK
+- In the "Person" window click OK
+	- The "Person" window closes and you can find the person just created in the list of people
+
+Test aspects of the Relationships View
+- Click on Anna Hansdotter to select her
+- Click on the Relationships View
+	- Details of Anna and her family are displayed
+- Click on one of her children, Hjalmar Smith
+	- Details of Hjalmar and his family are displayed
+- Click on the "Add existing Child to family" icon just above Halmar's children
+	- The "Select Child" window opens
+- Find the person you entered previously and select it
+- Click OK
+	- The "Select Child" window closes and you can see the new person listed as a child in Hjalmar's family
+
+Test aspects of the Charts View
+- Click on the Charts View
+	- The Pedigree View is shown
+- Click somewhere in the Pedigree View and drag the chart around
+	- The mouse pointer changes to a hand and the chart can be move around
+- Click on the left and right arrows (when going left you need to choose the child to move to)
+	- The chart will move to reveal the next generation in the family
+- Make sure there are several families in view, then Click on the "Fan Chart" icon
+	- A fan chart showing the ancesters of the main person is shown
+- Click on the Descendant Fan icon
+	- A fan chart showing the descendants of the same person is shown
+
+Test aspects of the Geography View
+- Click on the Geography View
+	- The map may take some time to load, then a pin for the person you entered early should be shown on the map at the coordinates you entered
+- Click on the pin
+	- A choice of the place, or the person will be offered
+- Hover over the place name, and choose "Edit Place"
+	- The "Place Selection in a region" opens
+- Double click on the place
+	- The "Place:" editor opens
+- Click on Cancel
+- Click on the pin
+	- A choice of the place, or the person will be offered
+- Hover over the persons name, and choose "Edit Event"
+	- The "Event:" window opens
+- Click on Cancel
+
+Import a Gramps Xml file (*.gramps) into Gramps
+An existing Gramps *.gramps file with links to media will be needed for this and the next test. If you do not have one to hand, the provided example can be extracted to your home directory and imported from there.
+/usr/share/doc/gramps/example/gramps/example.gramps.gz
+- From the "Family Trees" menu, choose "Manage Family Trees"
+	- The Family Trees window opens
+- Click "New" to create an empty Family Tree
+- Type a name for your family tree (e.g. Example), and press "Enter"
+- Click "Load Family Tree"
+	- Gramps opens an empty database
+- From your open and empty Family Tree, choose Family Trees > Import from the menu
+	- The Gramps: Import Family Tree window opens
+- Locate your *.gramps file, select it and click on "Import"
+	- The import may take some minutes, then the Import Statistics window displays the number of objects imported.
+- Click on "Close"
+	- The Import Statistics window closes.
+
+View Media for a person, and add new media
+The media for the example file you may have used in the previous test can be found in /usr/share/doc/gramps/example/gramps/. Create a folder in your home directory to store Gramps media, and then copy the media there.
+You will also need a photo to add to Gramps. Any photo will do (e.g. *.jpg file - but you can use the ones provided with Gramps).
+You also need to set the base media patch for Gramps.
+- In the "Edit" menu, choose "Preferences".
+	- The Preferences window opens on the "General" tab.
+- Click the "Folder" icon to set the "Base path for relative media paths".
+	- The "Select media directory" window opens
+- Choose the directory where your media is stored and then click "Apply"
+	- The "Select media directory" window closes
+- Click Close
+	- The "Preferences" window closes
+- In the "People" View, find a person with media associated (e.g. Eugene Stanley Garner, Jr. in the example database) and select him/her.
+	- Below the Detials tab, a thumbnail image of the person should appear (in the case of Eugene Stanley Garner, Jr. you should see him yawning). It may be necessary to restart Gramps to see the Thumbnail.
+- Double click on the person's name in the People View.
+	- The "Person:" window opens, and the image is dispayed for the person in the Image square in the top left corner of the "Person:" window.
+- Double click on the image.
+	- The Media Reference Editor opens showing details about the image.
+- Double click in the bottom image Preview.
+	- An external viewer opens giving details of the image metadata and allowing some basic manipulation of the image.
+- Click on the "X" to close the external viewer
+- Click "Cancel" on the Media Reference Editor
+- Click "Cancel" on the "Person:" window.
+	- All three windows close.
+- Click on the "Media View".
+	- A list of available media is shown.
+- Click on the "+" icon.
+	- The "Select a media object" window opens.
+- Move to the folder where the media is and select the new photo (if you are using the examples provided with Gramps, I can recommend choosing O3.jpg).
+- Click on "OK".
+	- The "New Media" window opens.
+- Click on "OK".
+	- The media is added to the list of media.
+- Select the new media.
+	- A preview (thumbnail) image is shown.
+- Close Gramps by choosing "Quit" from the "Family Trees" menu.
+	- Gramps closes.
+
+TODO: Tagging & Filtering
@@ -1,16 +1,142 @@
-Old Changelog:
+gramps (5.0.2-1) unstable; urgency=medium
+
+  * New release
+  * Remove ancient python version field from debian/control
+  * Bump standards version, no changes required
+
+ -- Ross Gammon <rossgammon@debian.org>  Sun, 11 Aug 2019 14:11:35 +0200
+
+gramps (5.0.1-1) unstable; urgency=medium
+
+  * New release
+  * Update copyright file
+
+ -- Ross Gammon <rossgammon@debian.org>  Thu, 20 Dec 2018 20:41:23 +0100
+
+gramps (5.0.0-1) unstable; urgency=medium
+
+  * New Gramps release
+
+ -- Ross Gammon <rossgammon@debian.org>  Wed, 25 Jul 2018 21:19:00 +0200
+
+gramps (5.0.0~rc1-1) unstable; urgency=medium
+
+  * First release candidate for Gramps 5.0
+  * Drop patch applied upstream
+  * Update copyrights
+
+ -- Ross Gammon <rossgammon@debian.org>  Sun, 01 Jul 2018 21:57:10 +0200
+
+gramps (5.0.0~beta1-1) unstable; urgency=medium
+
+  * First beta release of gramps 5.0
+  * Sync debian directory with Debian experimental branch on salsa
+  * Point Vcs URLs at the Gramps Project on Github
+  * Correct spelling in debian/rules, node > nose
+  * Delete gbp.conf, not required as gbp not used to build package
+  * Delete NEWS file, only really applicable in Debian
+  * Fix syntax errors in d/changelog and remove trailing whitespace
+  * Patch person_rules_test.py to remove hard coded build path from
+    import. Fixes FTBFS due to test failure.
+  * Enable extra tests that were failing for alpha3
+
+ -- Ross Gammon <rossgammon@debian.org>  Mon, 19 Feb 2018 19:25:25 +0100
+
+gramps (4.2.8) unstable; urgency=medium
+
+  * Quick bug fix release
+
+ -- Ross Gammon <rossgammon@debian.org>  Sat, 10 Feb 2018 08:30:33 +0100
+
+gramps (5.0.0-alpha3) experimental; urgency=medium
+
+  * New alpha release for Gramps 5.0.0
+
+ -- Ross Gammon <rossgammon@debian.org>  Mon, 04 Sep 2017 16:55:41 +0200
+
+gramps (4.2.6) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.6
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 01 Aug 2017 14:10:19 +0200
+
+gramps (5.0.0-alpha2) experimental; urgency=medium
+
+  * 2nd Alpha release for testing
+
+ -- Ross Gammon <rosco2@ubuntu.com>  Mon, 12 Jun 2017 19:42:39 +0200
+
+gramps (4.2.5) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.5
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Thu, 15 Dec 2016 18:52:08 +0100
+
+gramps (4.2.4) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.4
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Sun, 04 Sep 2016 18:34:49 +0200
+
+gramps (5.0.0-alpha1) UNRELEASED; urgency=medium
+
+  * Alpha stream for Gramps 5.0.0
+
+ -- système <romjerome@yahoo.fr>  Sat, 04 Jun 2016 20:07:14 +0200
+
+gramps (4.2.3) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.3
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Sun, 10 Apr 2016 21:09:19 +0200
+
+gramps (4.2.2) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.2
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 06 Jan 2016 19:38:25 +0100
+
+gramps (4.2.1) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.1
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 13 Oct 2015 05:08:30 +0200
+
+gramps (4.2.0) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.0
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Sun, 02 Aug 2015 17:03:37 +0200
+
+gramps (4.1.3) precise; urgency=low
+
+  * New upstream for Gramps 4.1 branch (4.1.3)
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Thu, 30 Apr 2015 18:42:34 +0200
+
+gramps (3.4.9-1) precise; urgency=low
+
+  * New upstream release for 3.4.x branch
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Thu, 30 Apr 2015 16:02:44 +0200
+
+gramps (4.0.4) precise; urgency=low
+
+  * New upsteam for Gramps 4.0.4
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Fri, 23 May 2014 17:07:41 +0200

 gramps (4.0.3) precise; urgency=low

  * - 4.0.4-git.f08e40 Experimental stream gramps.git

 -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 04 Feb 2014 19:49:32 +0100
- 
+
 gramps (4.0.2) precise; urgency=low

  * experimental .deb for gramps 4.0.2
-  
-- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100

 gramps (4.0.1-2) precise; urgency=low

@@ -705,7 +831,7 @@ gramps (0.7.3-1) unstable; urgency=low
  * Added new entry to the upstream NEWS file - it was missing.
  * Added '#! usr/bin/python -O' line to src/AddMedia.py to make lintian happy.
    Also removed this line from src/DbPrompter.py for the same reason.
-  * Edited debian/rules to call '$(MAKE) clean' instead of 
+  * Edited debian/rules to call '$(MAKE) clean' instead of
    '$(MAKE) distclean' which did not exist.
  * Edited src/Makefile.in - 'clean' target should also remove *.so files.
  * Pre-built static HTMLs since the on-the-fly generation from SGML is buggy.
@@ -840,7 +966,7 @@ gramps (0.3.1-2) unstable; urgency=low
  * The author has finally addressed the issue of a missing help file. Though
    as of now none have been created the error produced before is gone and the
    author is working on better documentation.
-    Closes: #99617 
+    Closes: #99617

 -- Brandon L. Griffith <brandon@debian.org>  Thu, 28 Jun 2001 20:27:30 -0500

@@ -917,7 +1043,7 @@ gramps (0.1.4-3) unstable; urgency=low
    This should take care of the startup problem some people have had.
    Bug Fixed. Closes: #98646

-  * Silly me named the menu file wrong so it never got included into the 
+  * Silly me named the menu file wrong so it never got included into the
    Debian Menu system. Gramps should now show up under Apps->Tools. Have
    no idea how I overlooked this.

@@ -1 +1 @@
-9
+11
@@ -1,29 +1,37 @@
 Source: gramps
-Section: python
+Section: gnome
 Priority: optional
-Maintainer: Ross Gammon <rossgammon@mail.dk>
+Maintainer: Ross Gammon <rossgammon@debian.org>
 Build-Depends-Indep:
- dh-linktree,
+ dh-python,
 gettext,
 intltool,
 libxml-parser-perl,
 python3-all,
- python3-setuptools
+ python3-setuptools,
+ python3-nose,
+ gir1.2-gtk-3.0 (>= 3.10.0),
+ python3-gi (>= 3.12.0),
+ python3-gi-cairo,
+ python3-bsddb3,
+ python3-lxml,
+ python3-jsonschema,
+ python3-mock,
+ python3-icu,
+ python3-nose-exclude
 Build-Depends:
- dh-python,
- debhelper (>= 9.0.0)
-Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
-Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git
-Homepage: http://www.gramps-project.org/
-X-Python-Version: >= 3.2
+ debhelper (>= 11)
+Standards-Version: 4.4.0
+Vcs-Git: https://github.com/gramps-project/gramps.git
+Vcs-browser: https://github.com/gramps-project/gramps/tree/maintenance/gramps50
+Homepage: https://www.gramps-project.org/

-Package: python3-gramps
+Package: gramps
 Architecture: all
 Depends:
 gir1.2-gtk-3.0 (>= 3.10.0),
 librsvg2-2,
- python3-gi,
+ python3-gi (>= 3.12.0),
 python3-gi-cairo,
 python3-bsddb3,
 xdg-utils,
@@ -31,16 +39,22 @@ Depends:
 ${python3:Depends}
 Recommends:
 graphviz,
- gir1.2-goocanvas-2.0,
- libosmgpsmap-1.0-0,
+ gir1.2-gexiv2-0.10,
 gir1.2-osmgpsmap-1.0,
- python3-pyicu
+ python3-icu
 Suggests:
 fonts-freefont-ttf,
- gir1.2-gexiv2-0.10,
+ gir1.2-goocanvas-2.0,
 gir1.2-gtkspell3-3.0,
 python3-pil,
- rcs
+ rcs,
+ python3-numpy
+Conflicts:
+ python-gramps,
+ python3-gramps
+Replaces:
+ python-gramps,
+ python3-gramps
 Description: Genealogical research program
 Gramps is an Open Source genealogy program written in Python, using
 the GTK/GNOME interface. It is an extremely flexible program fitting
@@ -1,37 +1,37 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Gramps
-Source: http://gramps-project.org
+Source: https://gramps-project.org

 Files: *
 Copyright: 2000-2007, Alex Roitman
           2000-2002, Bruce J. DeGrasse
           2000-2008, Donald N. Allingham
           2000-2007, Martin Hawlisch
-           2001, Andrés Sepúlveda
+           2001, AndrÃ©s SepÃºlveda
           2001, David R. Hampton
-           2001-2013, Free Software Foundation, Inc.
+           2001-2017, Free Software Foundation, Inc.
           2001, Graham J. Williams
           2001, Jesper Zedlitz
-           2001-2013, The Gramps Project
+           2001-2018, The Gramps Project
           2002, Gary Shao
           2003-2006, Josiah Carlson
           2004-2006, Eero Tamminen
-           2004-2013, Julio Sánchez
-           2004, Toshio Kuratomi
-           2005-2011, Serge Noiraud
-           2006-2011, Brian G. Matherly
+           2004-2013, Julio SÃ¡nchez
+           2005-2017, Serge Noiraud
+           2006-2012, Brian G. Matherly
           2006, 2008-2011, Kees Bakker           
           2006-2008, Steve Hall
-           2007-2012, Benny Malengier
-           2007-2012, Douglas S. Blank
+           2007-2013, Benny Malengier
+           2007-2013, 2015-2016, Douglas S. Blank
           2007-2012, Gary Burton
           2007-2011, Jerome Rapinat
           2007, Johan Gronqvist
           2007, Robert Cawley
           2007-2009, Stephane Charette
+           2007-2016, The Gramps Developers
           2007, Thom Sturgill
           2007-2008, Zsolt Foldvari
-           2008-2010, 2012, Craig J. Anderson
+           2008-2010, 2012-2015, Craig J. Anderson
           2008-2009, James Friedmann
           2008-2009, Jason Simanek
           2008, Lukasz Rymarczyk
@@ -43,133 +43,59 @@ Copyright: 2000-2007, Alex Roitman
           2008, Stefan Siegel
           2008-2010, Stephen George
           2009-2010, Andrew I Baznikin
-           2009, 2011, The Dojo Foundation
           2009, Florian Heinle
           2009, Gerald W. Britton
           2009, Igal Shapira
-           2009, 2011, John Resig
-           2009-2013, Nick Hall
+           2009-2018, Nick Hall
           2009, Pander Musubi
           2009, Robert Ham
           2009, Swoon on bug tracker
           2009, Yevgeny Zegzda
-           2010, Gramps
+           2010, 2015 Gramps
           2010, Jakim Friant
           2010, Josip
           2010, lcc & Robert Jerome
           2010-2012, Michiel D. Nauta
-           2010-2013, Tim G L Lyons
-           2010-2011, Vlada Perić
+           2010-2016, Tim G L Lyons
+           2010-2011, 2014, Vlada Perić
           2011, Adam Stein
           2011-2012,  Harald Rosemann
           2011, 2013, Heinz Brinker
           2011, Helge Herz
           2011, 2013 John Ralls
-           2011, Matt Keenan
-           2011-2013, Paul Franklin
-           2012, Mathieu MD
+           2011, 2016 Matt Keenan
+           2011-2018, Paul Franklin
+           2012, lcc
+           2012, 2014, Mathieu MD
           2012, Nicolas Adenis-Lamarre
-           2013, Fedir Zinchuk
-           2013, Oleh Petrivk
-           2013, Vassilii Khachaturov
+           2013, Artem Glebov
+           2011-2016, Fedir Zinchuk
+           2013-2017, Alois Poettker
+           2013-2014, Vassilii Khachaturov
           2013, Zissis Papadopoulos
+           2015, Icelandic translators of Gramps
+           2014, Bastien Jacquet
+           2014, Gerald Kunzmann
+           2015, Fabrice
+           2015, Lajos Nemeséri
+           2015, Detlef Wolz
+           2016, Allen Crider
+           2016, DaAwesomeP
+           2016-2017, Paul Culley
+           2016, QuLogic
+           2016, Tom Samstag
+           2017, Mindaugas Baranauskas
+           2017, Robert Carnell
+           2018, Robin van der Vliet
 License: GPL-2+

-Files: data/javascript/jquery-1.3.2.min.js
-Copyright: 2009, John Resig
-License: MIT and GPL
-
-Files: data/javascript/jquery-1.7.1.js
-Copyright: 2011, John Resig
-           2011, The Dojo Foundation
-License: BSD and MIT and GPL-2
-
-Files: data/javascript/jquery-ui-1.7.2.custom.min.js
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
-License: MIT and GPL-2
-
-Files: data/javascript/jquery.flexbox*
-Copyright: 2008-2010, Noah Heldman and Fairway Technologies
-License: Ms-PL
-
-Files: data/jhtmlarea/Readme.txt
-Copyright: 2009, Chris Pietschmann
-License: Ms-RL
-
-Files: data/jhtmlarea/scripts/jHtmlArea*
-Copyright: 2009, Chris Pietschmann
-License: Ms-RL
-
-Files: data/jhtmlarea/scripts/jquery-1.3.2*
-Copyright: 2009, John Resig
-           2009, The Dojo Foundation
-License: MIT
-
-Files: data/jhtmlarea/scripts/jquery-ui-*
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about)
-License: MIT and GPL
-
 Files: debian/*
 Copyright: 2001-2002, Brandon L. Griffith
           2002, Alex Roitman
           2002-2012, James A. Treacy
-           2013, Ross Gammon
+           2013-2018, Ross Gammon
 License: GPL-2+

-Files: gramps/webapp/grampsdb/view/png.py
-Copyright: 2006, Johann C. Rocholl
-           2009, David Jones
-           2006, Nicko van Someren
-License: MIT
-
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  * Neither the name of the <organization> nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY John Resig ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: GPL
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 1 only of the License.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
-
-License: GPL-2
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 only of the License.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
 License: GPL-2+
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -187,128 +113,3 @@ License: GPL-2+
 .
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-License: Ms-PL
- This license governs use of the accompanying software. If you use the
- software, you accept this license. If you do not accept the license, do not
- use the software.
- .
- 1. Definitions
- .
- The terms "reproduce," "reproduction," "derivative works," and "distribution"
- have the same meaning here as under U.S. copyright law.
- .
- A "contribution" is the original software, or any additions or changes to the
- software.
- .
- A "contributor" is any person that distributes its contribution under this
- license.
- .
- "Licensed patents" are a contributor's patent claims that read directly on its
- contribution.
- .
- 2. Grant of Rights
- .
- (A) Copyright Grant- Subject to the terms of this license, including the
- license conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free copyright license to reproduce its
- contribution, prepare derivative works of its contribution, and distribute its
- contribution or any derivative works that you create.
- .
- (B) Patent Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free license under its licensed patents to
- make, have made, use, sell, offer for sale, import, and/or otherwise dispose of
- its contribution in the software or derivative works of the contribution in the
- software.
- .
- 3. Conditions and Limitations
- .
- (A) No Trademark License- This license does not grant you rights to use any
- contributors' name, logo, or trademarks.
- .
- (B) If you bring a patent claim against any contributor over patents that you
- claim are infringed by the software, your patent license from such contributor
- to the software ends automatically.
- .
- (C) If you distribute any portion of the software, you must retain all copyright,
- patent, trademark, and attribution notices that are present in the software.
- .
- (D) If you distribute any portion of the software in source code form, you may do
- so only under this license by including a complete copy of this license with your
- distribution. If you distribute any portion of the software in compiled or object
- code form, you may only do so under a license that complies with this license.
- .
- (E) The software is licensed "as-is." You bear the risk of using it. The
- contributors give no express warranties, guarantees or conditions. You may have
- additional consumer rights under your local laws which this license cannot change.
- To the extent permitted under your local laws, the contributors exclude the
- implied warranties of merchantability, fitness for a particular purpose and
- non-infringement.
-
-License: Ms-RL
- This license governs use of the accompanying software. If you use the software,
- you accept this license. If you do not accept the license, do not use the software.
- .
- 1. Definitions
- The terms "reproduce," "reproduction," "derivative works," and "distribution" have
- the same meaning here as under U.S. copyright law.
- A "contribution" is the original software, or any additions or changes to the
- software.
- A "contributor" is any person that distributes its contribution under this license.
- "Licensed patents" are a contributor's patent claims that read directly on its
- contribution.
- .
- 2. Grant of Rights
- (A) Copyright Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free copyright license to reproduce its
- contribution, prepare derivative works of its contribution, and distribute its
- contribution or any derivative works that you create.
- (B) Patent Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free license under its licensed patents to make,
- have made, use, sell, offer for sale, import, and/or otherwise dispose of its
- contribution in the software or derivative works of the contribution in the software.
- .
- 3. Conditions and Limitations
- (A) Reciprocal Grants- For any file you distribute that contains code from the
- software (in source code or binary format), you must provide recipients the source
- code to that file along with a copy of this license, which license will govern that
- file. You may license other files that are entirely your own work and do not contain
- code from the software under any terms you choose.
- (B) No Trademark License- This license does not grant you rights to use any
- contributors' name, logo, or trademarks.
- (C) If you bring a patent claim against any contributor over patents that you claim
- are infringed by the software, your patent license from such contributor to the
- software ends automatically.
- (D) If you distribute any portion of the software, you must retain all copyright,
- patent, trademark, and attribution notices that are present in the software.
- (E) If you distribute any portion of the software in source code form, you may do so
- only under this license by including a complete copy of this license with your
- distribution. If you distribute any portion of the software in compiled or object code
- form, you may only do so under a license that complies with this license.
- (F) The software is licensed "as-is." You bear the risk of using it. The contributors
- give no express warranties, guarantees or conditions. You may have additional consumer
- rights under your local laws which this license cannot change. To the extent permitted
- under your local laws, the contributors exclude the implied warranties of
- merchantability, fitness for a particular purpose and non-infringement.
@@ -0,0 +1 @@
+RELEASE_NOTES
@@ -1,35 +1,38 @@
 #!/usr/bin/make -f

 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
+export PYBUILD_NAME=gramps
+export PYBUILD_INSTALL_ARGS_python3=--resourcepath=/usr/share --force

 %:
 	dh $@ --with python3 --buildsystem=pybuild

-# Override auto test because upstream do not use the standard unittest discover
+# Override auto test to enable nose tests
 override_dh_auto_test:
-
-# Override of auto_build
-override_dh_auto_build:
-	python3 setup.py build
+	HOME=$(CURDIR)/build \
+	nosetests3 -vv \
+	--exclude=TestcaseGenerator \
+	--exclude=test4_arbitrary_uncode_path \
+	--exclude-dir=gramps/plugins/test/ \
+	gramps

 # Override of auto_install to remove information from package
 override_dh_auto_install:
-	#dh_auto_install
-	python3 setup.py install --resourcepath=/usr/share --root=debian/python3-gramps --install-layout=deb
-	# Remove duplicate license/copyright information
-	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING
+	dh_installchangelogs NEWS
+	dh_auto_install
 	# Remove install file as it is not needed by package users
-	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/INSTALL
-	# Link license/copyright information to debians
-	ln -s /usr/share/common-licenses/GPL-2 $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING
+	rm $(CURDIR)/debian/gramps/usr/share/doc/gramps/INSTALL
+	# Remove NEWS file as it is now installed as the changelog
+	rm $(CURDIR)/debian/gramps/usr/share/doc/gramps/NEWS
+	#Remove license information in COPYING file & link to system license
+	rm $(CURDIR)/debian/gramps/usr/share/doc/gramps/COPYING
+	ln -s /usr/share/common-licenses/GPL-2 $(CURDIR)/debian/gramps/usr/share/doc/gramps/COPYING

-# Make css style sheets and png icons non-executable
-override_dh_fixperms:
-	dh_fixperms
-	chmod a-x $(CURDIR)/debian/python3-gramps/usr/share/gramps/css/Web_*.css
-
-# Avoid compressing COPYING file so that it can appear in the "About" dialog
-override_dh_compress:
-	dh_compress -X COPYING
+# Fix clean target
+override_dh_clean:
+	rm -rf data/tips.xml
+	rm -rf gramps/plugins/lib/holidays.xml
+	rm -rf po/.intltool-merge-cache
+	dh_clean
@@ -1 +1 @@
-1.8
+3.0 (quilt)
@@ -0,0 +1 @@
+unapply-patches
@@ -0,0 +1,3 @@
+Tests: gramps-import-export
+Depends: gramps, gzip
+Restrictions: allow-stderr
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Author: Ross Gammon <rossgammon@mail.dk>
+#
+# autopkgtest check: Tests that gramps can import the sample gedcom file and
+# export it in the .gpkg format, and then import the example gramps database
+# and export it in gedcom format.
+
+set -e
+
+echo "--------------------------------"
+echo "GEDCOM to Gramps conversion test"
+echo "--------------------------------"
+echo "Retrieving sample gedcom"
+cp /usr/share/doc/gramps/example/gedcom/sample.ged.gz .
+echo "Unzipping sample gedcom"
+gunzip sample.ged.gz
+echo "Importing gedcom into gramps and exporting a gramps .gpkg file"
+gramps -i sample.ged -e sample.gpkg
+echo "-----------------------------------"
+echo "GEDCOM to Gramps conversion SUCCESS"
+echo "-----------------------------------"
+echo
+
+echo "--------------------------------"
+echo "Gramps to GEDCOM conversion test"
+echo "--------------------------------"
+echo "Retrieving example gramps file"
+cp /usr/share/doc/gramps/example/gramps/example.gramps.gz .
+echo "Unzipping example gramps file"
+gunzip example.gramps.gz
+echo "Importing gramps file into gramps and exporting a gedcom"
+gramps -i example.gramps -e example.ged
+echo "-----------------------------------"
+echo "Gramps to GEDCOM conversion SUCCESS"
+echo "-----------------------------------"
+echo
+echo "gramps-import-export: TEST PASSED"
@@ -0,0 +1,7 @@
+Bug-Database: https://gramps-project.org/bugs/my_view_page.php
+Contact: https://lists.sourceforge.net/lists/listinfo/gramps-users
+Donation: https://sourceforge.net/project/project_donations.php?group_id=25770
+Name: Gramps
+Homepage: https://gramps-project.org/
+Repository: https://github.com/gramps-project/gramps.git
+Repository-Browse: https://github.com/gramps-project/gramps
@@ -0,0 +1,8 @@
+version=3
+
+opts=\
+dversionmangle=s/(\~|\+)(debian|dfsg|ds|deb)(\.\d+)?$//,\
+filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/$1\.tar\.gz/,\
+repacksuffix=~dfsg \
+https://github.com/gramps-project/gramps/tags \
+.*/archive/v?([\d\.]+).tar.gz
@@ -57,7 +57,7 @@ master_doc = 'index'

 # General information about the project.
 project = 'Gramps'
-copyright = '2017, The Gramps Project'
+copyright = '2001-2018, The Gramps Project'
 author = 'Donald N. Allingham'

 # The version info for the project you're documenting, acts as replacement for
@@ -46,7 +46,7 @@ Generic

 DummyDb
 ====================================
-.. automodule:: gramps.plugins.db.dummydb
+.. automodule:: gramps.gen.db.dummydb
   :members:
   :undoc-members:
   :show-inheritance:
@@ -15,7 +15,7 @@
      <resphone>(555)123-4567</resphone>
      <resemail>anyone@someplace.com</resemail>
    </researcher>
-    <mediapath>{GRAMPS_RESOURCES}/example/gramps</mediapath>
+    <mediapath>{GRAMPS_RESOURCES}/doc/gramps/example/gramps</mediapath>
  </header>
  <tags>
    <tag handle="_c7642d9389b54417e8b" change="1370206720" name="tag1" color="#000000000000" priority="0"/>
@@ -3,11 +3,11 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2016-08-31" version="5.0.0"/>
+    <created date="2018-03-08" version="5.0.0"/>
    <researcher>
      <resname>Alex Roitman,,,</resname>
    </researcher>
-    <mediapath>{GRAMPS_RESOURCES}/example/gramps</mediapath>
+    <mediapath>{GRAMPS_RESOURCES}/doc/gramps/example/gramps</mediapath>
  </header>
  <name-formats>
    <format number="-1" name="SURNAME, Given (Common)" fmt_str="SURNAME, given (common)" active="1"/>
@@ -13946,10 +13946,10 @@
      <place hlink="_VDCKQCZX3MEHKVDR8S"/>
      <description>Death of Schultz, Rev.Isaac</description>
    </event>
-    <event handle="_a5af0ed3f64432fb742" change="1284030595" id="E2618">
+    <event handle="_a5af0ed3f64432fb742" change="1520536150" id="E2618">
      <type>Burial</type>
      <dateval val="1818" type="about"/>
-      <place hlink="_4ECKQCWCLO5YIHXEXZ"/>
+      <place hlink="_c965872633b600e8b5ca4d5e6db"/>
      <description>Burial of Schultz, Rev.Isaac</description>
    </event>
    <event handle="_a5af0ed3f9b07f938fb" change="1284030602" id="E2619">
@@ -59379,10 +59379,6 @@
      <ptitle>USA</ptitle>
      <pname value="USA"/>
    </placeobj>
-    <placeobj handle="_4ECKQCWCLO5YIHXEXZ" change="1234373374" id="P1704" type="Country">
-      <ptitle>Puerto Rico</ptitle>
-      <pname value="Puerto Rico"/>
-    </placeobj>
    <placeobj handle="_4FUJQCDFTJJJNKKJMH" change="1234390522" id="P0958" type="City">
      <ptitle>Boone, IA</ptitle>
      <pname value="Boone"/>
@@ -65622,29 +65618,44 @@
      <pname value="St. Lawrence"/>
      <placeref hlink="_c96587263cc11e217c35cc9003f"/>
    </placeobj>
-    <placeobj handle="_d583a5b7ab21971300a" change="1467134436" id="P0435" type="Unknown">
+    <placeobj handle="_d583a5b7ab21971300a" change="1520535854" id="P0435" type="City">
      <ptitle>Δράμα</ptitle>
-      <pname value="Δράμα"/>
+      <pname value="Δράμα" lang="el"/>
+      <pname value="Drama" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
    </placeobj>
-    <placeobj handle="_d583a5b8614206a939d" change="1467134581" id="P0436" type="Unknown">
+    <placeobj handle="_d583a5b8614206a939d" change="1520535887" id="P0436" type="City">
      <ptitle>Θεσσαλονίκη</ptitle>
-      <pname value="Θεσσαλονίκη"/>
+      <pname value="Θεσσαλονίκη" lang="el"/>
+      <pname value="Thessaloniki" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
    </placeobj>
-    <placeobj handle="_d583a5b8a8c1474357d" change="1467135440" id="P0437" type="Unknown">
+    <placeobj handle="_d583a5b8a8c1474357d" change="1520535915" id="P0437" type="City">
      <ptitle>Ιωάννινα</ptitle>
-      <pname value="Ιωάννινα"/>
+      <pname value="Ιωάννινα" lang="el"/>
+      <pname value="Ioannina" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
    </placeobj>
-    <placeobj handle="_d583a5b8b586fb992c8" change="1467135553" id="P0438" type="Unknown">
+    <placeobj handle="_d583a5b8b586fb992c8" change="1520535978" id="P0438" type="City">
      <ptitle>Σιάτιστα</ptitle>
-      <pname value="Σιάτιστα"/>
+      <pname value="Σιάτιστα" lang="el"/>
+      <pname value="Siatista" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
    </placeobj>
-    <placeobj handle="_d583a5b8c380fb024c9" change="1467136002" id="P0439" type="Unknown">
+    <placeobj handle="_d583a5b8c380fb024c9" change="1520535800" id="P0439" type="City">
      <ptitle>Άργος</ptitle>
-      <pname value="Άργος"/>
+      <pname value="Άργος" lang="el"/>
+      <pname value="Argos" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
    </placeobj>
-    <placeobj handle="_d583a5b8d1106cda712" change="1467136077" id="P0440" type="Unknown">
+    <placeobj handle="_d583a5b8d1106cda712" change="1520535947" id="P0440" type="City">
      <ptitle>Μεσολόγγι</ptitle>
-      <pname value="Μεσολόγγι"/>
+      <pname value="Μεσολόγγι" lang="el"/>
+      <pname value="Missolonghi" lang="en"/>
+      <placeref hlink="_dd445e5bfcc17bd1838"/>
+    </placeobj>
+    <placeobj handle="_dd445e5bfcc17bd1838" change="1520535973" id="P0441" type="Country">
+      <pname value="Greece" lang="en"/>
    </placeobj>
  </places>
  <objects>
@@ -180,6 +180,8 @@ class ArgHandler:
        self.imports = []
        self.exports = []
        self.removes = parser.removes
+        self.username = parser.username
+        self.password = parser.password

        self.open = self.__handle_open_option(parser.open, parser.create)
        self.sanitize_args(parser.imports, parser.exports)
@@ -380,7 +382,7 @@ class ArgHandler:
                self.open = db_path
                self.__open_action()
            else:
-                sys.exit(1)
+                sys.exit(_("Error: cannot open '%s'") % self.open_gui)
            return db_path

        # if not open_gui, parse any command line args. We can only have one
@@ -502,10 +504,9 @@ class ArgHandler:
                    self.imp_db_path = get_empty_tempdir("import_dbdir")
                    dbid = config.get('database.backend')
                    newdb = make_database(dbid)
-                    newdb.write_version(self.imp_db_path)

                try:
-                    self.smgr.open_activate(self.imp_db_path)
+                    self.smgr.open_activate(self.imp_db_path, self.username, self.password)
                    msg = _("Created empty Family Tree successfully")
                    print(msg, file=sys.stderr)
                except:
@@ -532,7 +533,7 @@ class ArgHandler:

            # we load this file for use
            try:
-                self.smgr.open_activate(self.open)
+                self.smgr.open_activate(self.open, self.username, self.password)
                print(_("Opened successfully!"), file=sys.stderr)
            except:
                print(_("Error opening the file."), file=sys.stderr)
@@ -553,6 +554,9 @@ class ArgHandler:
        if self.dbman.needs_recovery(dbpath):
            self.__error(_("Database needs recovery, cannot open it!"))
            return False
+        if self.dbman.backend_unavailable(dbpath):
+            self.__error(_("Database backend unavailable, cannot open it!"))
+            return False
        return True

    #-------------------------------------------------------------------------
@@ -9,6 +9,7 @@
 # Copyright (C) 2008       Brian G. Matherly
 # Copyright (C) 2012       Doug Blank
 # Copyright (C) 2012-2013  Paul Franklin
+# Copyright (C) 2017       Serge Noiraud
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@ Module responsible for handling the command line arguments for Gramps.
 #
 #-------------------------------------------------------------------------
 import sys
+import os
 import getopt
 import logging

@@ -60,6 +62,8 @@ Help options

 Application options
  -O, --open=FAMILY_TREE                 Open Family Tree
+  -U, --username=USERNAME                Database username
+  -P, --password=PASSWORD                Database password
  -C, --create=FAMILY_TREE               Create on open if new Family Tree
  -i, --import=FILENAME                  Import file
  -e, --export=FILENAME                  Export file
@@ -136,6 +140,8 @@ class ArgParser:
    The valid options are:

    -O, --open=FAMILY_TREE          Open Family Tree
+    -U, --username=USERNAME         Database username
+    -P, --password=PASSWORD         Database password
    -C, --create=FAMILY_TREE        Create on open if new Family Tree
    -i, --import=FILENAME           Import file
    -e, --export=FILENAME           Export file
@@ -194,6 +200,8 @@ class ArgParser:

        self.open_gui = None
        self.open = None
+        self.username = None
+        self.password = None
        self.exports = []
        self.actions = []
        self.imports = []
@@ -277,6 +285,10 @@ class ArgParser:
                self.open = value
            elif option in ['-C', '--create']:
                self.create = value
+            elif option in ['-U', '--username']:
+                self.username = value
+            elif option in ['-P', '--password']:
+                self.password = value
            elif option in ['-i', '--import']:
                family_tree_format = None
                if (opt_ix < len(options) - 1
@@ -290,6 +302,21 @@ class ArgParser:
                if (opt_ix < len(options) - 1
                        and options[opt_ix + 1][0] in ('-f', '--format')):
                    family_tree_format = options[opt_ix + 1][1]
+                abs_name = os.path.abspath(os.path.expanduser(value))
+                if not os.path.exists(abs_name):
+                    # The file doesn't exists, try to create it.
+                    try:
+                        open(abs_name, 'w').close()
+                        os.unlink(abs_name)
+                    except OSError as e:
+                        message = _("WARNING: %(strerr)s "
+                                    "(errno=%(errno)s):\n"
+                                    "WARNING: %(name)s\n") % {
+                                      'strerr' : e.strerror,
+                                      'errno'  : e.errno,
+                                      'name'   : e.filename}
+                        print(message)
+                        sys.exit(1)
                self.exports.append((value, family_tree_format))
            elif option in ['-a', '--action']:
                action = value
@@ -48,8 +48,8 @@ import logging
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.config import config
 from gramps.gen.constfunc import win
-from gramps.gen.db.dbconst import DBLOGNAME
-from gramps.gen.db.utils import make_database
+from gramps.gen.db.dbconst import DBLOGNAME, DBBACKEND
+from gramps.gen.db.utils import make_database, get_dbid_from_path
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext

@@ -69,6 +69,7 @@ _LOG = logging.getLogger(DBLOGNAME)
 DEFAULT_TITLE = _("Family Tree")
 NAME_FILE = "name.txt"
 META_NAME = "meta_data.db"
+UNAVAILABLE = _('Unavailable')

 #-------------------------------------------------------------------------
 #
@@ -154,11 +155,7 @@ class CLIDbManager:
        _("Version")
        _("Schema version")
        """
-        dbid = "bsddb"
-        dbid_path = os.path.join(dirpath, "database.txt")
-        if os.path.isfile(dbid_path):
-            with open(dbid_path) as file:
-                dbid = file.read().strip()
+        dbid = get_dbid_from_path(dirpath)
        if not self.is_locked(dirpath):
            try:
                database = make_database(dbid)
@@ -182,7 +179,7 @@ class CLIDbManager:
        for plugin in pmgr.get_reg_databases():
            if plugin.id == dbid:
                return plugin._name
-        return _("Unknown")
+        return UNAVAILABLE

    def print_family_tree_summaries(self, database_names=None):
        """
@@ -235,11 +232,7 @@ class CLIDbManager:
            for dpath in os.listdir(dbdir):
                dirpath = os.path.join(dbdir, dpath)
                path_name = os.path.join(dirpath, NAME_FILE)
-                try:
-                    with open(os.path.join(dirpath, "database.txt")) as file:
-                        backend_type = file.read()
-                except:
-                    backend_type = "bsddb"
+                backend_type = get_dbid_from_path(dirpath)
                if os.path.isfile(path_name):
                    with open(path_name, 'r', encoding='utf8') as file:
                        name = file.readline().strip()
@@ -303,11 +296,13 @@ class CLIDbManager:
            name_file.write(title)

        if create_db:
-            # write the version number into metadata
            if dbid is None:
-                dbid = "bsddb"
+                dbid = config.get('database.backend')
            newdb = make_database(dbid)
-            newdb.write_version(new_path)
+
+        backend_path = os.path.join(new_path, DBBACKEND)
+        with open(backend_path, "w", encoding='utf8') as backend_file:
+            backend_file.write(dbid)

        (tval, last) = time_val(new_path)

@@ -355,15 +350,6 @@ class CLIDbManager:
                    # write locally:
                    temp_fp.write(data)
                    url_fp.close()
-                    from  gramps.gen.db.dbconst import BDBVERSFN
-                    # name not set
-                    (name, ext) = os.path.splitext(os.path.basename(filename))
-                    versionpath = os.path.join(name, BDBVERSFN)
-                    # dbase not set
-                    dbase = make_database("bsddb")
-                    _LOG.debug("Write bsddb version %s", str(dbase.version()))
-                    with open(versionpath, "w") as version_file:
-                        version_file.write(str(dbase.version()))
                    temp_fp.close()

        (name, ext) = os.path.splitext(os.path.basename(filename))
@@ -372,13 +358,13 @@ class CLIDbManager:
        for plugin in pmgr.get_import_plugins():
            if format == plugin.get_extension():

-                new_path, name = self._create_new_db(name, edit_entry=False)
+                dbid = config.get('database.backend')
+                new_path, name = self._create_new_db(name, dbid=dbid,
+                                                     edit_entry=False)

                # Create a new database
                self.__start_cursor(_("Importing data..."))

-                ## Use bsddb, for now, because we assumed that above.
-                dbid = "bsddb" ## config.get('database.backend')
                dbase = make_database(dbid)
                dbase.load(new_path, user.callback)

@@ -408,6 +394,13 @@ class CLIDbManager:
            return True
        return False

+    def backend_unavailable(self, dbpath):
+        """
+        Returns True if the database in dirpath has an unavailable backend
+        """
+        dbid = get_dbid_from_path(dbpath)
+        return self.get_backend_name_from_dbid(dbid) == UNAVAILABLE
+
    def remove_database(self, dbname, user=None):
        """
        Deletes a database folder given a pattenr that matches
@@ -59,7 +59,8 @@ from gramps.gen.db.exceptions import (DbUpgradeRequiredError,
                                      BsddbUpgradeRequiredError,
                                      BsddbDowngradeRequiredError,
                                      PythonUpgradeRequiredError,
-                                      PythonDowngradeError)
+                                      PythonDowngradeError,
+                                      DbConnectionError)
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.utils.config import get_researcher
 from gramps.gen.recentfiles import recent_files
@@ -131,7 +132,7 @@ class CLIDbLoader:
        """
        pass

-    def read_file(self, filename):
+    def read_file(self, filename, username, password):
        """
        This method takes care of changing database, and loading the data.
        In 3.0 we only allow reading of real databases of filetype
@@ -172,8 +173,8 @@ class CLIDbLoader:
        self._begin_progress()

        try:
-            self.dbstate.db.load(filename, self._pulse_progress, mode)
-            self.dbstate.db.set_save_path(filename)
+            self.dbstate.db.load(filename, self._pulse_progress, mode,
+                                 username=username, password=password)
        except DbEnvironmentError as msg:
            self.dbstate.no_database()
            self._errordialog(_("Cannot open database"), str(msg))
@@ -201,6 +202,9 @@ class CLIDbLoader:
        except DbPythonError as msg:
            self.dbstate.no_database()
            self._errordialog(_("Cannot open database"), str(msg))
+        except DbConnectionError as msg:
+            self.dbstate.no_database()
+            self._errordialog(_("Cannot open database"), str(msg))
        except OSError as msg:
            self.dbstate.no_database()
            self._errordialog(
@@ -237,11 +241,11 @@ class CLIManager:
        self._pmgr = BasePluginManager.get_instance()
        self.user = user

-    def open_activate(self, path):
+    def open_activate(self, path, username=None, password=None):
        """
        Open and make a family tree active
        """
-        self._read_recent_file(path)
+        self._read_recent_file(path, username, password)

    def _errordialog(self, title, errormessage):
        """
@@ -250,7 +254,7 @@ class CLIManager:
        print(_('ERROR: %s') % errormessage, file=sys.stderr)
        sys.exit(1)

-    def _read_recent_file(self, filename):
+    def _read_recent_file(self, filename, username=None, password=None):
        """
        Called when a file needs to be loaded
        """
@@ -271,7 +275,7 @@ class CLIManager:
                  "that the database is not in use."))
            return

-        if self.db_loader.read_file(filename):
+        if self.db_loader.read_file(filename, username, password):
            # Attempt to figure out the database title
            path = os.path.join(filename, "name.txt")
            try:
@@ -303,11 +307,6 @@ class CLIManager:
        if title:
            name = title

-        # This method is for UI stuff when the database has changed.
-        # Window title, recent files, etc related to new file.
-
-        self.dbstate.db.set_save_path(filename)
-
        # apply preferred researcher if loaded file has none
        res = self.dbstate.db.get_researcher()
        owner = get_researcher()
@@ -319,6 +318,7 @@ class CLIManager:
                and self.dbstate.db.get_total() == 0):
            self.dbstate.db.set_researcher(owner)

+        name_displayer.clear_custom_formats()
        name_displayer.set_name_format(self.dbstate.db.name_formats)
        fmt_default = config.get('preferences.name-format')
        name_displayer.set_default_format(fmt_default)
@@ -47,7 +47,8 @@ LOG = logging.getLogger(".")
 #-------------------------------------------------------------------------
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.plug.docgen import (StyleSheet, StyleSheetList, PaperStyle,
-                                    PAPER_PORTRAIT, PAPER_LANDSCAPE, graphdoc)
+                                    PAPER_PORTRAIT, PAPER_LANDSCAPE, graphdoc,
+                                    treedoc)
 from gramps.gen.plug.menu import (FamilyOption, PersonOption, NoteOption,
                                  MediaOption, PersonListOption, NumberOption,
                                  BooleanOption, DestinationOption, Option,
@@ -56,8 +57,8 @@ from gramps.gen.plug.menu import (FamilyOption, PersonOption, NoteOption,
 from gramps.gen.display.name import displayer as name_displayer
 from gramps.gen.errors import ReportError, FilterError
 from gramps.gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
-                                    CATEGORY_GRAPHVIZ, CATEGORY_CODE,
-                                    ReportOptions, append_styles)
+                                    CATEGORY_GRAPHVIZ, CATEGORY_TREE,
+                                    CATEGORY_CODE, ReportOptions, append_styles)
 from gramps.gen.plug.report._paper import paper_sizes
 from gramps.gen.const import USER_HOME, DOCGEN_OPTIONS
 from gramps.gen.dbstate import DbState
@@ -250,6 +251,15 @@ class CommandLineReport:
                if name not in self.option_class.options_dict:
                    self.option_class.options_dict[
                        name] = menu.get_option_by_name(name).get_value()
+        if category == CATEGORY_TREE:
+            # Need to include Genealogy Tree options
+            self.__toptions = treedoc.TreeOptions()
+            menu = self.option_class.menu
+            self.__toptions.add_menu_options(menu)
+            for name in menu.get_all_option_names():
+                if name not in self.option_class.options_dict:
+                    self.option_class.options_dict[
+                        name] = menu.get_option_by_name(name).get_value()
        self.option_class.load_previous_values()
        _validate_options(self.option_class, database)
        self.show = options_str_dict.pop('show', None)
@@ -320,6 +330,10 @@ class CommandLineReport:
            for graph_format in graphdoc.FORMATS:
                self.options_help['off'][2].append(
                    graph_format["type"] + "\t" + graph_format["descr"])
+        elif self.category == CATEGORY_TREE:
+            for tree_format in treedoc.FORMATS:
+                self.options_help['off'][2].append(
+                    tree_format["type"] + "\t" + tree_format["descr"])
        else:
            self.options_help['off'][2] = "NA"

@@ -498,6 +512,15 @@ class CommandLineReport:
                # Pick the first one as the default.
                self.format = graphdoc.FORMATS[0]["class"]
                _chosen_format = graphdoc.FORMATS[0]["type"]
+        elif self.category == CATEGORY_TREE:
+            for tree_format in treedoc.FORMATS:
+                if tree_format['type'] == self.options_dict['off']:
+                    if not self.format: # choose the first one, not the last
+                        self.format = tree_format["class"]
+            if self.format is None:
+                # Pick the first one as the default.
+                self.format = tree_format.FORMATS[0]["class"]
+                _chosen_format = tree_format.FORMATS[0]["type"]
        else:
            self.format = None
        if _chosen_format and _format_str:
@@ -665,7 +688,7 @@ def cl_report(database, name, category, report_class, options_class,
                    clr.selected_style,
                    PaperStyle(clr.paper, clr.orien, clr.marginl,
                               clr.marginr, clr.margint, clr.marginb))
-        elif category == CATEGORY_GRAPHVIZ:
+        elif category in [CATEGORY_GRAPHVIZ, CATEGORY_TREE]:
            clr.option_class.handler.doc = clr.format(
                clr.option_class,
                PaperStyle(clr.paper, clr.orien, clr.marginl,
@@ -163,6 +163,8 @@ register('database.backup-path', USER_HOME)
 register('database.backup-on-exit', True)
 register('database.autobackup', 0)
 register('database.path', os.path.join(HOME_DIR, 'grampsdb'))
+register('database.host', '')
+register('database.port', '')

 register('export.proxy-order',
         [["privacy", 0],
@@ -219,9 +221,9 @@ register('interface.view', True)
 register('interface.surname-box-height', 150)
 register('interface.treemodel-cache-size', 1000)

-register('paths.recent-export-dir', '')
+register('paths.recent-export-dir', USER_HOME)
 register('paths.recent-file', '')
-register('paths.recent-import-dir', '')
+register('paths.recent-import-dir', USER_HOME)
 register('paths.report-directory', USER_HOME)
 register('paths.website-directory', USER_HOME)
 register('paths.website-cms-uri', '')
@@ -234,7 +236,6 @@ register('preferences.quick-backup-include-mode', False)
 register('preferences.date-format', 0)
 register('preferences.calendar-format-report', 0)
 register('preferences.cprefix', 'C%04d')
-register('preferences.alternate-fonthandler', False)
 register('preferences.default-source', False)
 register('preferences.tag-on-import', False)
 register('preferences.tag-on-import-format', _("Imported %Y/%m/%d %H:%M:%S"))
@@ -245,11 +246,8 @@ register('preferences.hide-ep-msg', False)
 register('preferences.invalid-date-format', "<b>%s</b>")
 register('preferences.iprefix', 'I%04d')
 register('preferences.name-format', 1)
+register('preferences.place-format', 0)
 register('preferences.place-auto', True)
-register('preferences.place-number', False)
-register('preferences.place-reverse', False)
-register('preferences.place-restrict', 0)
-register('preferences.place-lang', '')
 register('preferences.patronimic-surname', False)
 register('preferences.no-given-text', "[%s]" % _("Missing Given Name"))
 register('preferences.no-record-text', "[%s]" % _("Missing Record"))
@@ -270,22 +268,25 @@ register('preferences.last-view', '')
 register('preferences.last-views', [])
 register('preferences.family-relation-type', 3) # UNKNOWN
 register('preferences.age-display-precision', 1)
-register('preferences.color-gender-male-alive', '#b8cee6')
-register('preferences.color-gender-male-death', '#b8cee6')
-register('preferences.color-gender-female-alive', '#feccf0')
-register('preferences.color-gender-female-death', '#feccf0')
-register('preferences.color-gender-unknown-alive', '#f3dbb6')
-register('preferences.color-gender-unknown-death', '#f3dbb6')
-#register('preferences.color-gender-other-alive', '#fcaf3e')
-#register('preferences.color-gender-other-death', '#fcaf3e')
-register('preferences.bordercolor-gender-male-alive', '#1f4986')
-register('preferences.bordercolor-gender-male-death', '#000000')
-register('preferences.bordercolor-gender-female-alive', '#861f69')
-register('preferences.bordercolor-gender-female-death', '#000000')
-register('preferences.bordercolor-gender-unknown-alive', '#8e5801')
-register('preferences.bordercolor-gender-unknown-death', '#000000')
-#register('preferences.bordercolor-gender-other-alive', '#f57900')
-#register('preferences.bordercolor-gender-other-death', '#000000')
+
+register('colors.scheme', 0)
+register('colors.male-alive', ['#b8cee6', '#1f344a'])
+register('colors.male-dead', ['#b8cee6', '#2d3039'])
+register('colors.female-alive', ['#feccf0', '#62242D'])
+register('colors.female-dead', ['#feccf0', '#3a292b'])
+register('colors.unknown-alive', ['#f3dbb6', '#75507B'])
+register('colors.unknown-dead', ['#f3dbb6', '#35103b'])
+register('colors.family', ['#eeeeee', '#454545'])
+register('colors.family-divorced', ['#ffdede', '#5c3636'])
+register('colors.home-person', ['#bbe68a', '#304918'])
+register('colors.border-male-alive', ['#1f4986', '#171d26'])
+register('colors.border-male-dead', ['#000000', '#000000'])
+register('colors.border-female-alive', ['#861f69', '#261111'])
+register('colors.border-female-dead', ['#000000', '#000000'])
+register('colors.border-unknown-alive', ['#8e5801', '#8e5801'])
+register('colors.border-unknown-dead', ['#000000', '#000000'])
+register('colors.border-family', ['#cccccc', '#252525'])
+register('colors.border-family-divorced', ['#ff7373', '#720b0b'])

 register('researcher.researcher-addr', '')
 register('researcher.researcher-locality', '')
@@ -323,7 +324,7 @@ if not os.path.exists(CONFIGMAN.filename):
    # check previous version of gramps:
    fullpath, filename = os.path.split(CONFIGMAN.filename)
    fullpath, previous = os.path.split(fullpath)
-    match = re.match('gramps(\d*)', previous)
+    match = re.match(r'gramps(\d*)', previous)
    if match:
        # cycle back looking for previous versions of gramps
        for i in range(1, 20): # check back 2 gramps versions
@@ -112,6 +112,7 @@ VERSION_DIR = os.path.join(
 CUSTOM_FILTERS = os.path.join(VERSION_DIR, "custom_filters.xml")
 REPORT_OPTIONS = os.path.join(HOME_DIR, "report_options.xml")
 TOOL_OPTIONS = os.path.join(HOME_DIR, "tool_options.xml")
+PLACE_FORMATS = os.path.join(HOME_DIR, "place_formats.xml")

 ENV_DIR = os.path.join(HOME_DIR, "env")
 TEMP_DIR = os.path.join(HOME_DIR, "temp")
@@ -137,7 +138,7 @@ sys.path.insert(0, ROOT_DIR)
 git_revision = get_git_revision(ROOT_DIR).replace('\n', '')
 if sys.platform == 'win32' and git_revision == "":
    git_revision = get_git_revision(os.path.split(ROOT_DIR)[1])
-# VERSION += git_revision
+VERSION += git_revision

 #
 # Glade files
@@ -216,7 +217,7 @@ GTK_GETTEXT_DOMAIN = 'gtk30'
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG = "© 2001-2006 Donald N. Allingham\n" \
-                "© 2007-2017 The Gramps Developers"
+                "© 2007-2018 The Gramps Developers"
 COMMENTS = _("Gramps\n (Genealogical Research and Analysis "
             "Management Programming System)\n"
             "is a personal genealogy program.")
@@ -288,6 +289,8 @@ LONGOPTS = [
    "oaf-ior-fd=",
    "oaf-private",
    "open=",
+    "username=",
+    "password=",
    "create=",
    "options=",
    "screen=",
@@ -303,7 +306,7 @@ LONGOPTS = [
    "quiet",
 ]

-SHORTOPTS = "O:C:i:e:f:a:p:d:c:r:lLthuv?syq"
+SHORTOPTS = "O:U:P:C:i:e:f:a:p:d:c:r:lLthuv?syq"

 GRAMPS_UUID = uuid.UUID('516cd010-5a41-470f-99f8-eb22f1098ad6')

@@ -124,12 +124,12 @@ class DateParserAR(DateParser):
        _span_2 = ['إلى']
        _range_1 = ['بين']
        _range_2 = ['و']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
-                                 re.IGNORECASE)
+        self._span = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_span_1), '|'.join(_span_2)), re.IGNORECASE)
+        self._range = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_range_1), '|'.join(_range_2)), re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -166,12 +166,12 @@ class DateParserBG(DateParser):
        _span_2 = ['до']
        _range_1 = ['между']
        _range_2 = ['и']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
-                                 re.IGNORECASE)
+        self._span = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_span_1), '|'.join(_span_2)), re.IGNORECASE)
+        self._range = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_range_1), '|'.join(_range_2)), re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -98,14 +98,14 @@ class DateParserCA(DateParser):
        DateParser.init_strings(self)
        _span_1 = ['des de']
        _span_2 = ['fins a']
-        _range_1 = ['entre', 'ent\.', 'ent']
+        _range_1 = ['entre', r'ent\.', 'ent']
        _range_2 = ['i']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
-                                 re.IGNORECASE)
+        self._span = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_span_1), '|'.join(_span_2)), re.IGNORECASE)
+        self._range = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_range_1), '|'.join(_range_2)), re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -89,10 +89,11 @@ class DateParserDa(DateParser):

    def init_strings(self):
        DateParser.init_strings(self)
-        self._span     = re.compile("(fra)?\s*(?P<start>.+)\s*(til|--|–)\s*(?P<stop>.+)",
-                                    re.IGNORECASE)
-        self._range    = re.compile("(mellem)\s+(?P<start>.+)\s+og\s+(?P<stop>.+)",
-                                    re.IGNORECASE)
+        self._span = re.compile(
+            r"(fra)?\s*(?P<start>.+)\s*(til|--|–)\s*(?P<stop>.+)",
+            re.IGNORECASE)
+        self._range = re.compile(
+            r"(mellem)\s+(?P<start>.+)\s+og\s+(?P<stop>.+)", re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -58,30 +58,60 @@ class DateParserDE(DateParser):
    # Add other common latin,

    month_to_int["januaris"] = 1
+    month_to_int["ianarius"] = 1
    month_to_int["januarii"] = 1
    month_to_int["januarius"] = 1
+    month_to_int["january"] = 1
+    month_to_int["ianuary"] = 1
+    month_to_int["mensis"] = 1
    month_to_int["februaris"] = 2
    month_to_int["februarii"] = 2
    month_to_int["februarius"] = 2
+    month_to_int["february"] = 2
    month_to_int["martii"] = 3
    month_to_int["martius"] = 3
+    month_to_int["martij"] = 3
+    month_to_int["marty"] = 3
    month_to_int["aprilis"] = 4
    month_to_int["maius"] = 5
+    month_to_int["majus"] = 5
    month_to_int["maii"] = 5
+    month_to_int["maij"] = 5
+    month_to_int["may"] = 5
    month_to_int["junius"] = 6
+    month_to_int["iunius"] = 6
    month_to_int["junii"] = 6
+    month_to_int["iunius"] = 6
+    month_to_int["junij"] = 6
+    month_to_int["iunij"] = 6
+    month_to_int["juny"] = 6
+    month_to_int["iuny"] = 6
    month_to_int["julius"] = 7
+    month_to_int["iulius"] = 7
    month_to_int["julii"] = 7
+    month_to_int["iulii"] = 7
+    month_to_int["july"] = 7
+    month_to_int["iuly"] = 7
+    month_to_int["quintilis"] = 7
    month_to_int["augustus"] = 8
    month_to_int["augusti"] = 8
+    month_to_int["sextilis"] = 8
    month_to_int["septembris"] = 9
+    month_to_int["7ber"] = 9
    month_to_int["7bris"] = 9
+    month_to_int["viiber"] = 9
+    month_to_int["viibris"] = 9
    month_to_int["september"] = 9
    month_to_int["october"] = 10
    month_to_int["octobris"] = 10
    month_to_int["8bris"] = 10
+    month_to_int["viiiber"] = 10
+    month_to_int["viiibris"] = 10
    month_to_int["novembris"] = 11
+    month_to_int["9ber"] = 11
    month_to_int["9bris"] = 11
+    month_to_int["ixber"] = 11
+    month_to_int["ixbris"] = 11
    month_to_int["november"] = 11
    month_to_int["decembris"] = 12
    month_to_int["10bris"] = 12
@@ -103,38 +133,79 @@ class DateParserDE(DateParser):
    # old german names

    month_to_int["hartung"] = 1
+    month_to_int["hartmonat"] = 1
+    month_to_int["hartmond"] = 1
    month_to_int["eismond"] = 1
+    month_to_int["eismonat"] = 1
+    month_to_int["lassmonat"] = 1
+    month_to_int["wolfsmonat"] = 1
+    month_to_int["wintermonat"] = 1
    month_to_int["hornung"] = 2
+    month_to_int["hintester"] = 2
+    month_to_int["sporkel"] = 2
+    month_to_int["spörkel"] = 2
+    month_to_int["rebmonat"] = 2
    month_to_int["schmelzmond"] = 2
    month_to_int["taumond"] = 2
    month_to_int["narrenmond"] = 2
    month_to_int["rebmond"] = 2
-    month_to_int["hintester"] = 2
+    month_to_int["letzter Wintermonat"] = 2
    month_to_int["lenzing"] = 3
    month_to_int["lenzmond"] = 3
+    month_to_int["lenzmonat"] = 3
+    month_to_int["frühlingsmonat"] = 3
    month_to_int["launing"] = 4
+    month_to_int["grasmond"] = 4
    month_to_int["ostermond"] = 4
+    month_to_int["ostermonat"] = 4
+    month_to_int["beuet"] = 5
+    month_to_int["blühmond"] = 5
    month_to_int["winnemond"] = 5
+    month_to_int["wonnemond"] = 5
+    month_to_int["wonnemonat"] = 5
    month_to_int["weidenmonat"] = 5
    month_to_int["blumenmond"] = 5
    month_to_int["brachet"] = 6
    month_to_int["brachmond"] = 6
+    month_to_int["brachmonat"] = 6
+    month_to_int["johannismond"] = 6
+    month_to_int["weidemaent"] = 6
+    month_to_int["heuet"] = 7
    month_to_int["heuert"] = 7
    month_to_int["heumond"] = 7
+    month_to_int["heumonat"] = 7
+    month_to_int["bärenmonat"] = 7
+    month_to_int["honigmond"] = 7
+    month_to_int["honigmonat"] = 7
    month_to_int["ernting"] = 8
    month_to_int["erntemond"] = 8
    month_to_int["bisemond"] = 8
+    month_to_int["holzing"] = 9
+    month_to_int["holzmond"] = 9
    month_to_int["scheiding"] = 9
-    month_to_int["herbstmond"] = 9
+    month_to_int["scheidung"] = 9
+    month_to_int["erster herbstmond"] = 9
+    month_to_int["herbstmonat"] = 9
+    month_to_int["engelmonat"] = 9
    month_to_int["gilbhard"] = 10
    month_to_int["gilbhart"] = 10
+    month_to_int["weinmond"] = 10
+    month_to_int["weinmonat"] = 10
+    month_to_int["zweiter herbstmond"] = 10
    month_to_int["windmond"] = 11
+    month_to_int["windmonat"] = 11
    month_to_int["nebelung"] = 11
+    month_to_int["nebelmond"] = 11
+    month_to_int["schlachtmond"] = 11
    month_to_int["wintermond"] = 11
+    month_to_int["dritter herbstmond"] = 11
    month_to_int["julmond"] = 12
    month_to_int["heilmond"] = 12
    month_to_int["christmond"] = 12
+    month_to_int["christmonat"] = 12
    month_to_int["dustermond"] = 12
+    month_to_int["heiligenmonat"] = 12
+    month_to_int["wendeling"] = 11

    modifier_to_int = {
        'vor'    : Date.MOD_BEFORE,
@@ -177,14 +248,16 @@ class DateParserDE(DateParser):

    def init_strings(self):
        DateParser.init_strings(self)
-        self._span   = re.compile("(von|vom)\s+(?P<start>.+)\s+(bis)\s+(?P<stop>.+)",
-                                  re.IGNORECASE)
-        self._range  = re.compile("zwischen\s+(?P<start>.+)\s+und\s+(?P<stop>.+)",
-                                  re.IGNORECASE)
-        self._text2  = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._mon_str,
-                                  re.IGNORECASE)
-        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._jmon_str,
-                                  re.IGNORECASE)
+        self._span = re.compile(
+            r"(von|vom)\s+(?P<start>.+)\s+(bis)\s+(?P<stop>.+)", re.IGNORECASE)
+        self._range = re.compile(
+            r"zwischen\s+(?P<start>.+)\s+und\s+(?P<stop>.+)", re.IGNORECASE)
+        self._text2 = re.compile(
+            r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._mon_str,
+            re.IGNORECASE)
+        self._jtext2 = re.compile(
+            r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._jmon_str,
+            re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -221,7 +294,7 @@ class DateDisplayDE(DateDisplay):
        )
        # this definition must agree with its "_display_gregorian" method

-    def _display_gregorian(self, date_val):
+    def _display_gregorian(self, date_val, **kwargs):
        """
        display gregorian calendar date in different format
        """
@@ -116,14 +116,14 @@ class DateParserEL(DateParser):
        DateParser.init_strings(self)
        _span_1 = ['από']
        _span_2 = ['έως']
-        _range_1 = ['μετ', 'μετ\.', 'μεταξύ']
+        _range_1 = ['μετ', r'μετ\.', 'μεταξύ']
        _range_2 = ['και']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
-                                 re.IGNORECASE)
+        self._span = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_span_1), '|'.join(_span_2)), re.IGNORECASE)
+        self._range = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_range_1), '|'.join(_range_2)), re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -155,7 +155,7 @@ class DateDisplayEL(DateDisplay):
        )
        # this definition must agree with its "_display_gregorian" method

-    def _display_gregorian(self, date_val):
+    def _display_gregorian(self, date_val, **kwargs):
        """
        display gregorian calendar date in different format
        """
@@ -97,14 +97,14 @@ class DateParserES(DateParser):
        DateParser.init_strings(self)
        _span_1 = ['de']
        _span_2 = ['a']
-        _range_1 = ['entre', 'ent\.', 'ent']
+        _range_1 = ['entre', r'ent\.', 'ent']
        _range_2 = ['y']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
-                                 re.IGNORECASE)
+        self._span = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_span_1), '|'.join(_span_2)), re.IGNORECASE)
+        self._range = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_range_1), '|'.join(_range_2)), re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -98,12 +98,12 @@ class DateParserFI(DateParser):

    def init_strings(self):
        DateParser.init_strings(self)
-        self._text2 = re.compile('(\d+)?\.?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$'
-                                         % self._mon_str, re.IGNORECASE)
-        self._span = re.compile("(?P<start>.+)\s+(-)\s+(?P<stop>.+)",
-                           re.IGNORECASE)
+        self._text2 = re.compile(r'(\d+)?\.?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._mon_str, re.IGNORECASE)
+        self._span = re.compile(r"(?P<start>.+)\s+(-)\s+(?P<stop>.+)",
+                                re.IGNORECASE)
        self._range = re.compile(
-            "(vuosien\s*)?(?P<start>.+)\s+ja\s+(?P<stop>.+)\s+välillä",
+            r"(vuosien\s*)?(?P<start>.+)\s+ja\s+(?P<stop>.+)\s+välillä",
            re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -22,6 +22,7 @@
 #

 # Croatian version 2008 by Josip
+# Croatian version 2018 by Milo

 """
 Croatian-specific classes for parsing and displaying dates.
@@ -51,13 +52,15 @@ from ._datehandler import register_datehandler
 #-------------------------------------------------------------------------
 class DateParserHR(DateParser):
    modifier_to_int = {
-        'prije'    : Date.MOD_BEFORE,
+        'prije'   : Date.MOD_BEFORE,
        'pr. '    : Date.MOD_BEFORE,
-        'poslije'   : Date.MOD_AFTER,
-        'po. '   : Date.MOD_AFTER,
-        'okolo'  : Date.MOD_ABOUT,
-        'ok. '     : Date.MOD_ABOUT,
-
+        'poslije' : Date.MOD_AFTER,
+        'po. '    : Date.MOD_AFTER,
+        'nakon'   : Date.MOD_AFTER,
+        'na. '    : Date.MOD_AFTER,
+        'oko'     : Date.MOD_ABOUT,
+        'okolo'   : Date.MOD_ABOUT,
+        'ok. '    : Date.MOD_ABOUT,
        }

    quality_to_int = {
@@ -75,19 +78,27 @@ class DateParserHR(DateParser):
        compiles regular expression strings for matching dates
        """
        DateParser.init_strings(self)
-        #~ DateParser.calendar_to_int.update({
-            #~ 'персидский'    : Date.CAL_PERSIAN,
-            #~ 'п'             : Date.CAL_PERSIAN,
-        #~ })
+
+        # match 'Day. MONTH year.' format with or without dots
+        self._text2 = re.compile(r'(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*\.?$'
+                                 % self._mon_str, re.IGNORECASE)
+
+        # match Day.Month.Year.
+        self._numeric = re.compile(
+                            r"((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\.?$")
+
+        self._jtext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
+                                  % self._jmon_str, re.IGNORECASE)
+
        _span_1 = ['od']
        _span_2 = ['do']
        _range_1 = ['između']
        _range_2 = ['i']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                % ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                 % ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -105,11 +116,35 @@ class DateDisplayHR(DateDisplay):

    display = DateDisplay.display_formatted

+    def format_short_month_year(self, month, year, inflect, short_months):
+        """ Allow a subclass to modify the year, e.g. add a period """
+        if not hasattr(short_months[1], 'f'): # not a Lexeme: no inflection
+            return "{short_month} {year}.".format(
+                     short_month = short_months[month], year = year)
+        return self.FORMATS_short_month_year[inflect].format(
+                     short_month = short_months[month], year = year)
+
+    def _get_localized_year(self, year):
+        """ Allow a subclass to modify the year, e.g. add a period """
+        return year + '.'
+
+    # FIXME probably there should be a Croatian-specific "formats" (and this
+    # ("American comma") format (and dd_dformat03 too) should be eliminated)
+    def dd_dformat02(self, date_val, inflect, long_months):
+        """ month_name day, year """
+        return DateDisplay.dd_dformat02(
+            self, date_val, inflect, long_months).replace(' .', '')
+
+    def dd_dformat04(self, date_val, inflect, long_months):
+        """ day month_name year """
+        return DateDisplay.dd_dformat04(
+            self, date_val, inflect, long_months).replace(' .', '')
+
 #-------------------------------------------------------------------------
 #
 # Register classes
 #
 #-------------------------------------------------------------------------
 register_datehandler(
-    ('hr_HR', 'hr', 'HR', 'croatian', 'Croatian', 'hrvatski', ('%d.%m.%Y',)),
+    ('hr_HR', 'hr', 'HR', 'croatian', 'Croatian', 'hrvatski', ('%d. %m. %Y.',)),
    DateParserHR, DateDisplayHR)
@@ -228,18 +228,19 @@ class DateParserHU(DateParser):
        DateParser.init_strings(self)

        self._numeric = re.compile(
-                            "((\d+)[/\.])?\s*((\d+)[/\.])?\s*(\d+)[/\. ]?$")
-        self._text2 = re.compile('((\d+)(/\d+)?\.)?\s+?%s\.?\s*(\d+\.)?\s*$'
-                                       % self._mon_str, re.IGNORECASE)
-        _span_1 = ['-tó\(ő\)l', '-tól', '-től']
+            r"((\d+)[/\.])?\s*((\d+)[/\.])?\s*(\d+)[/\. ]?$")
+        # this next RE has the (possibly-slashed) year at the string's start
+        self._text2 = re.compile(r'((\d+)(/\d+)?\.)?\s+?%s\.?\s*(\d+\.)?\s*$'
+                                 % self._mon_str, re.IGNORECASE)
+        _span_1 = [r'-tó\(ő\)l', '-tól', '-től']
        _span_2 = ['-ig']
        _range_1 = ['és']
        _range_2 = ['között']
-        self._span  = re.compile("(?P<start>.+)(%s)\s+(?P<stop>.+)(%s)" %
-                                     ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(?P<start>.+)\s+(%s)\s+(?P<stop>.+)\s+(%s)" %
-                                     ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(?P<start>.+)(%s)\s+(?P<stop>.+)(%s)" %
+                                ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(?P<start>.+)\s+(%s)\s+(?P<stop>.+)\s+(%s)"
+                                 % ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)


@@ -90,22 +90,23 @@ class DateParserIs(DateParser):
        }

    def dhformat_changed(self):
-        self._dhformat_parse = re.compile(".*%(\S).*%(\S).*%(\S).*%(\S).*")
+        self._dhformat_parse = re.compile(r".*%(\S).*%(\S).*%(\S).*%(\S).*")

    def init_strings(self):
        DateParser.init_strings(self)

        # match 'day. month year' format
-        self._text2 = re.compile('(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*$'
+        self._text2 = re.compile(r'(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*$'
                                 % self._mon_str, re.IGNORECASE)
        # match 'short-day day.month year' format
        short_day_str = '(' + '|'.join(self._ds.short_days[1:]) + ')'
-        self._numeric = re.compile("%s\s*((\d+)[\.]\s*)?((\d+)\s*)?(\d+)\s*$"
+        self._numeric = re.compile(r"%s\s*((\d+)[\.]\s*)?((\d+)\s*)?(\d+)\s*$"
                                   % short_day_str, re.IGNORECASE)
-        self._span     = re.compile("(frá)?\s*(?P<start>.+)\s*(til|--|–)\s*(?P<stop>.+)",
-                                    re.IGNORECASE)
-        self._range    = re.compile("(milli)\s+(?P<start>.+)\s+og\s+(?P<stop>.+)",
-                                    re.IGNORECASE)
+        self._span = re.compile(
+            r"(frá)?\s*(?P<start>.+)\s*(til|--|–)\s*(?P<stop>.+)",
+            re.IGNORECASE)
+        self._range = re.compile(
+            r"(milli)\s+(?P<start>.+)\s+og\s+(?P<stop>.+)", re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -185,7 +186,8 @@ class DateDisplayIs(DateDisplay):
                                 text, scal)

    def _get_weekday(self, date_val):
-        if date_val[0] == 0 or date_val[1] == 0: # no day or no month or both
+        if (date_val[0] == 0 or date_val[1] == 0 # no day or no month or both
+                or date_val[2] > datetime.MAXYEAR): # bug 10815
            return ''
        w_day = datetime.date(date_val[2], date_val[1], date_val[0]) # y, m, d
        return self.short_days[((w_day.weekday() + 1) % 7) + 1]
@@ -96,12 +96,12 @@ class DateParserIT(DateParser):
        _span_2 = ['al', 'a']
        _range_1 = ['tra', 'fra']
        _range_2 = ['e']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+                                ('|'.join(_span_1), '|'.join(_span_2)),
                                 re.IGNORECASE)
+        self._range = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_range_1), '|'.join(_range_2)), re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -166,13 +166,13 @@ class DateParserJA(DateParser):
        _span_2 = ['まで', '']
        _range_1 = ['から', 'と', '~', '〜']
        _range_2 = ['までの間', 'の間']
-        self._span =  re.compile("(?P<start>.+)(%s)(?P<stop>\d+)(%s)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(?P<start>.+)(%s)(?P<stop>.+)(%s)" %
+        self._span = re.compile(r"(?P<start>.+)(%s)(?P<stop>\d+)(%s)" %
+                                ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(?P<start>.+)(%s)(?P<stop>.+)(%s)" %
                                 ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)
-        self._numeric = re.compile("((\d+)年\s*)?((\d+)月\s*)?(\d+)?日?\s*$")
+        self._numeric = re.compile(r"((\d+)年\s*)?((\d+)月\s*)?(\d+)?日?\s*$")

 #-------------------------------------------------------------------------
 #
@@ -130,18 +130,20 @@ class DateParserLT(DateParser):

    def init_strings(self):
        DateParser.init_strings(self)
-        self._text2 = re.compile('((\d+)(/\d+)?)?\s+?m\.\s+%s\s*(\d+)?\s*d?\.?$'
-                                 % self._mon_str, re.IGNORECASE)
+        # this next RE has the (possibly-slashed) year at the string's start
+        self._text2 = re.compile(
+            r'((\d+)(/\d+)?)?\s+?m\.\s+%s\s*(\d+)?\s*d?\.?$'
+            % self._mon_str, re.IGNORECASE)
        _span_1 = ['nuo']
        _span_2 = ['iki']
        _range_1 = ['tarp']
        _range_2 = ['ir']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
-                                 re.IGNORECASE)
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+                                ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(
+            r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+            ('|'.join(_range_1), '|'.join(_range_2)), re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -186,7 +188,7 @@ class DateDisplayLT(DateDisplay):
        "mmmm m. mėnesio diena d.", "Mėn diena, metai")
        # this definition must agree with its "_display_gregorian" method

-    def _display_gregorian(self, date_val):
+    def _display_gregorian(self, date_val, **kwargs):
        """
        display gregorian calendar date in different format
        """
@@ -58,6 +58,7 @@ class DateParserNb(DateParser):
        'innen'  : Date.MOD_BEFORE,
        'etter'   : Date.MOD_AFTER,
        'omkring' : Date.MOD_ABOUT,
+        'omtrent' : Date.MOD_ABOUT,
        'ca'      : Date.MOD_ABOUT
        }

@@ -89,12 +90,13 @@ class DateParserNb(DateParser):

    def init_strings(self):
        DateParser.init_strings(self)
-        # match day. month year
-        self._numeric  = re.compile("((\d+)[\.])?\s*((\d+))?\s*(\d+)$")
-        self._span     = re.compile("(fra)?\s*(?P<start>.+)\s*(til|--|–)\s*(?P<stop>.+)",
-                                    re.IGNORECASE)
-        self._range    = re.compile("(mellom)\s+(?P<start>.+)\s+og\s+(?P<stop>.+)",
-                                    re.IGNORECASE)
+        self._numeric = re.compile(
+            r"((\d+)[/\.\s]\s*)?((\d+)[/\.\-\s]\s*)?(\d+)\s*$")
+        self._span = re.compile(
+            r"(fra)?\s*(?P<start>.+)\s*(til|--|–)\s*(?P<stop>.+)",
+            re.IGNORECASE)
+        self._range = re.compile(
+            r"(mellom)\s+(?P<start>.+)\s+og\s+(?P<stop>.+)", re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -173,6 +175,10 @@ class DateDisplayNb(DateDisplay):
            return "%s%s%s%s" % (qual_str, self._mod_str[mod],
                                 text, scal)

+    def dd_dformat01(self, date_val):
+        """ numerical -- for Norwegian dates """
+        return DateDisplay.dd_dformat01(self, date_val).lstrip()
+
 #-------------------------------------------------------------------------
 #
 # Register classes
@@ -119,16 +119,14 @@ class DateParserNL(DateParser):

    def init_strings(self):
        DateParser.init_strings(self)
-        self._span  = re.compile("(van)\s+(?P<start>.+)\s+(tot)\s+(?P<stop>.+)",
+        self._span = re.compile(
+            r"(van)\s+(?P<start>.+)\s+(tot)\s+(?P<stop>.+)", re.IGNORECASE)
+        self._range = re.compile(r"tussen\s+(?P<start>.+)\s+en\s+(?P<stop>.+)",
                                 re.IGNORECASE)
-        self._range  = re.compile("tussen\s+(?P<start>.+)\s+en\s+(?P<stop>.+)",
-                                  re.IGNORECASE)
-        self._text2  = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
-                                  % self._mon_str,
-                                  re.IGNORECASE)
-        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
-                                  % self._jmon_str,
-                                  re.IGNORECASE)
+        self._text2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
+                                 % self._mon_str, re.IGNORECASE)
+        self._jtext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
+                                  % self._jmon_str, re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -164,7 +162,7 @@ class DateDisplayNL(DateDisplay):
        )
        # this definition must agree with its "_display_gregorian" method

-    def _display_gregorian(self, date_val):
+    def _display_gregorian(self, date_val, **kwargs):
        """
        display gregorian calendar date in different format
        """
@@ -156,13 +156,16 @@ class DateParserPL(DateParser):

    def init_strings(self):
        DateParser.init_strings(self)
-        self._span  = re.compile("(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)", re.IGNORECASE)
+        self._span = re.compile(
+            r"(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)", re.IGNORECASE)
        # Also handle a common mistakes
-        self._range = re.compile("((?:po)?mi(?:ę|e)dzy)\s+(?P<start>.+)\s+(a)\s+(?P<stop>.+)", re.IGNORECASE)
-        self._text2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._mon_str,
-                                 re.IGNORECASE)
-        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._jmon_str,
-                                 re.IGNORECASE)
+        self._range = re.compile(
+            r"((?:po)?mi(?:ę|e)dzy)\s+(?P<start>.+)\s+(a)\s+(?P<stop>.+)",
+            re.IGNORECASE)
+        self._text2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
+                                 % self._mon_str, re.IGNORECASE)
+        self._jtext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
+                                  % self._jmon_str, re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -215,7 +218,7 @@ class DateDisplayPL(DateDisplay):
        "XII"
        )

-    def _display_gregorian(self, date_val):
+    def _display_gregorian(self, date_val, **kwargs):
        """
        display gregorian calendar date in different format
        """
@@ -102,13 +102,13 @@ class DateParserPT(DateParser):
        DateParser.init_strings(self)
        _span_1 = ['de']
        _span_2 = ['a']
-        _range_1 = ['entre','ent\.','ent']
+        _range_1 = ['entre', r'ent\.', 'ent']
        _range_2 = ['e']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                % ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                 % ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -94,13 +94,13 @@ class DateParserRU(DateParser):
        _span_1 = ['с', 'от']
        #_span_2 = ['по', 'до'] # <-- clashes with bce parsing :-(
        _span_2 = ['по']
-        _range_1 = ['между', 'меж\.', 'меж']
+        _range_1 = ['между', r'меж\.', 'меж']
        _range_2 = ['и']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                % ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                 % ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -132,6 +132,11 @@ class DateDisplayRU(DateDisplay):
                                                   inflect, long_months)
        elif date_val[1] == 0: # month is zero but day is not (see 8477)
            return self.display_iso(date_val)
+        elif not hasattr(long_months[date_val[1]], 'f'): # not a Lexeme
+            return "{day:d} {long_month} {year}".format(
+                     day = date_val[0],
+                     long_month = long_months[date_val[1]],
+                     year = year)
        else:
            return "{day:d} {long_month.f[Р]} {year}".format(
                     day = date_val[0],
@@ -151,6 +156,11 @@ class DateDisplayRU(DateDisplay):
                                                    inflect, short_months)
        elif date_val[1] == 0: # month is zero but day is not (see 8477)
            return self.display_iso(date_val)
+        elif not hasattr(short_months[date_val[1]], 'f'): # not a Lexeme
+            return "{day:d} {short_month} {year}".format(
+                     day = date_val[0],
+                     short_month = short_months[date_val[1]],
+                     year = year)
        else:
            return "{day:d} {short_month.f[Р]} {year}".format(
                     day = date_val[0],
@@ -86,11 +86,11 @@ class DateParserSK(DateParser):
        _span_2 = ['do']
        _range_1 = ['medzi']
        _range_2 = ['a']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                % ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                 % ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -88,18 +88,18 @@ class DateParserSL(DateParser):

        DateParser.init_strings(self)
        # match 'Day. MONTH year.' format with or without dots
-        self._text2 = re.compile('(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*\.?$'
-                                % self._mon_str, re.IGNORECASE)
+        self._text2 = re.compile(r'(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*\.?$'
+                                 % self._mon_str, re.IGNORECASE)
        # match Day.Month.Year.
-        self._numeric  = re.compile("((\d+)[/\.-])?\s*((\d+)[/\.-])?\s*(\d+)\.?$")
+        self._numeric = re.compile(
+            r"((\d+)[/\.-])?\s*((\d+)[/\.-])?\s*(\d+)\.?$")

-        self._span  = re.compile("od\s+(?P<start>.+)\s+do\s+(?P<stop>.+)",
+        self._span = re.compile(r"od\s+(?P<start>.+)\s+do\s+(?P<stop>.+)",
                                re.IGNORECASE)
        self._range = re.compile(
-                            "med\s+(?P<start>.+)\s+in\s+(?P<stop>.+)",
-                            re.IGNORECASE)
-        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'\
-                                % self._jmon_str, re.IGNORECASE)
+            r"med\s+(?P<start>.+)\s+in\s+(?P<stop>.+)", re.IGNORECASE)
+        self._jtext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'
+                                  % self._jmon_str, re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -208,21 +208,22 @@ class DateParserSR(DateParser):
        """
        DateParser.init_strings(self)
        # match 'Day. MONTH year.' format with or without dots
-        self._text2 = re.compile('(\d+)?\.?\s*?%s\s*((\d+)(/\d+)?)?\.?\s*$'
-                                % self._mon_str, re.IGNORECASE)
+        self._text2 = re.compile(r'(\d+)?\.?\s*?%s\s*((\d+)(/\d+)?)?\.?\s*$'
+                                 % self._mon_str, re.IGNORECASE)

        # match Day.Month.Year.
-        self._numeric  = re.compile("((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\.?$")
+        self._numeric = re.compile(
+            r"((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\.?$")

        _span_1 = ['od', 'од']
        _span_2 = ['do', 'до']
        _range_1 = ['između', 'између']
        _range_2 = ['i', 'и']
-        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                % ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                 % ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -240,7 +241,7 @@ class DateDisplaySR_Base(DateDisplay):
        "VII", "VIII", "IX", "X", "XI", "XII"
        )

-    def _display_gregorian(self, date_val):
+    def _display_gregorian(self, date_val, **kwargs):
        """
        display gregorian calendar date in different format
        """
@@ -95,14 +95,16 @@ class DateParserSv(DateParser):
    def init_strings(self):
        """ Define, in Swedish, span and range regular expressions"""
        DateParser.init_strings(self)
-        self._numeric = re.compile("((\d+)/)?\s*((\d+)/)?\s*(\d+)[/ ]?$")
+        self._numeric = re.compile(r"((\d+)/)?\s*((\d+)/)?\s*(\d+)[/ ]?$")
        # this next RE has the (possibly-slashed) year at the string's start
-        self._text2 = re.compile('((\d+)(/\d+)?)?\s+?%s\s*(\d+)?\s*$'
-                                     % self._mon_str, re.IGNORECASE)
-        self._span     = re.compile("(från)?\s*(?P<start>.+)\s*(till|--|–)\s*(?P<stop>.+)",
-                                    re.IGNORECASE)
-        self._range    = re.compile("(mellan)\s+(?P<start>.+)\s+och\s+(?P<stop>.+)",
-                                    re.IGNORECASE)
+        self._text2 = re.compile(r'((\d+)(/\d+)?)?\s+?%s\s*(\d+)?\s*$'
+                                 % self._mon_str, re.IGNORECASE)
+        self._span = re.compile(
+            r"(från)?\s*(?P<start>.+)\s*(till|--|–)\s*(?P<stop>.+)",
+            re.IGNORECASE)
+        self._range = re.compile(
+            r"(mellan)\s+(?P<start>.+)\s+och\s+(?P<stop>.+)",
+            re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -108,14 +108,14 @@ class DateParserUK(DateParser):

        _span_1 = ['з', 'від']
        # b.c.e. pattern also have "до" so skip "до н."
-        _span_2 = ['по', 'до(?!\s+н)']
+        _span_2 = ['по', r'до(?!\s+н)']
        _range_1 = ['між']
        _range_2 = ['і', 'та']
-        self._span  = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
-                                 ('|'.join(_range_1), '|'.join(_range_2)),
+        self._span = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+                                ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)"
+                                 % ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -124,13 +124,13 @@ class DateParserZH_CN(DateParser):
        _span_2 = ['至']
        _range_1 = ['介于']
        _range_2 = ['与']
-        self._span =  re.compile("(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
+        self._span = re.compile(r"(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
+                                ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
                                 ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)
-        self._numeric = re.compile("((\d+)年\s*)?((\d+)月\s*)?(\d+)?日?\s*$")
+        self._numeric = re.compile(r"((\d+)年\s*)?((\d+)月\s*)?(\d+)?日?\s*$")

 #-------------------------------------------------------------------------
 #
@@ -124,13 +124,13 @@ class DateParserZH_TW(DateParser):
        _span_2 = ['至']
        _range_1 = ['介於']
        _range_2 = ['與']
-        self._span =  re.compile("(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
-                                 ('|'.join(_span_1), '|'.join(_span_2)),
-                                 re.IGNORECASE)
-        self._range = re.compile("(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
+        self._span = re.compile(r"(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
+                                ('|'.join(_span_1), '|'.join(_span_2)),
+                                re.IGNORECASE)
+        self._range = re.compile(r"(%s)(?P<start>.+)(%s)(?P<stop>\d+)" %
                                 ('|'.join(_range_1), '|'.join(_range_2)),
                                 re.IGNORECASE)
-        self._numeric = re.compile("((\d+)年\s*)?((\d+)月\s*)?(\d+)?日?\s*$")
+        self._numeric = re.compile(r"((\d+)年\s*)?((\d+)月\s*)?(\d+)?日?\s*$")

 #-------------------------------------------------------------------------
 #
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2004-2006  Donald N. Allingham
 # Copyright (C) 2013       Vassilii Khachaturov
-# Copyright (C) 2014-2017  Paul Franklin
+# Copyright (C) 2014-2018  Paul Franklin
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -570,6 +570,7 @@ class DateDisplay:
    def _get_short_weekday(self, date_val):
        if (date_val[0] == 0 or date_val[1] == 0 # no day or no month or both
                or date_val[1] == 13 # Hebrew has 13 months
+                or date_val[2] > datetime.MAXYEAR # bug 10815
                or date_val[2] < 0): # B.C.E. date
            return ''
        w_day = datetime.date(date_val[2], date_val[1], date_val[0]) # y, m, d
@@ -578,11 +579,16 @@ class DateDisplay:
    def _get_long_weekday(self, date_val):
        if (date_val[0] == 0 or date_val[1] == 0 # no day or no month or both
                or date_val[1] == 13 # Hebrew has 13 months
+                or date_val[2] > datetime.MAXYEAR # bug 10815
                or date_val[2] < 0): # B.C.E. date
            return ''
        w_day = datetime.date(date_val[2], date_val[1], date_val[0]) # y, m, d
        return self.long_days[((w_day.weekday() + 1) % 7) + 1]

+    def _get_localized_year(self, year):
+        """ Allow a subclass to modify the year, e.g. add a period """
+        return year
+
    def dd_dformat01(self, date_val):
        """
        numerical
@@ -594,19 +600,23 @@ class DateDisplay:
            return self.display_iso(date_val)
        else:
            if date_val[0] == date_val[1] == 0:
-                return str(date_val[2])
+                return self._get_localized_year(str(date_val[2]))
            else:
                value = self.dhformat.replace('%m', str(date_val[1]))
-                # some locales have %b for the month, e.g. ar_EG, is_IS, nb_NO
-                # so it would be "Jan" but as it's "numeric" I'll make it "1"
-                value = value.replace('%b', str(date_val[1]))
-                # some locales have %B for the month, e.g. ta_IN
-                # so it would be "January" but as it's "numeric" I'll make it 1
-                value = value.replace('%B', str(date_val[1]))
-                # some locales have %a for the abbreviated day, e.g. is_IS
-                value = value.replace('%a', self._get_short_weekday(date_val))
-                # some locales have %A for the long/full day, e.g. ta_IN
-                value = value.replace('%A', self._get_long_weekday(date_val))
+                if '%b' in value or '%B' in value:
+                    # some locales have %b for the month (ar_EG, is_IS, nb_NO)
+                    # so it would be "Jan" but as it's "numeric" make it "1"
+                    value = value.replace('%b', str(date_val[1]))
+                    # some locales have %B for the month, e.g. ta_IN
+                    # so it would be "January" but as it's "numeric" make it 1
+                    value = value.replace('%B', str(date_val[1]))
+                if '%a' in value or '%A' in value:
+                    # some locales have %a for the abbreviated day, e.g. is_IS
+                    value = value.replace('%a',
+                                          self._get_short_weekday(date_val))
+                    # some locales have %A for the long/full day, e.g. ta_IN
+                    value = value.replace('%A',
+                                          self._get_long_weekday(date_val))
                if date_val[0] == 0: # ignore the zero day and its delimiter
                    i_day = value.find('%d')
                    if len(value) == i_day + 2: # delimiter is left of the day
@@ -628,7 +638,7 @@ class DateDisplay:
        year = self._slash_year(date_val[2], date_val[3])
        if date_val[0] == 0:
            if date_val[1] == 0:
-                return year
+                return self._get_localized_year(year)
            else:
                return self.format_long_month_year(date_val[1], year,
                                                   inflect, long_months)
@@ -654,7 +664,7 @@ class DateDisplay:
        year = self._slash_year(date_val[2], date_val[3])
        if date_val[0] == 0:
            if date_val[1] == 0:
-                return year
+                return self._get_localized_year(year)
            else:
                return self.format_short_month_year(date_val[1], year,
                                                    inflect, short_months)
@@ -680,7 +690,7 @@ class DateDisplay:
        year = self._slash_year(date_val[2], date_val[3])
        if date_val[0] == 0:
            if date_val[1] == 0:
-                return year
+                return self._get_localized_year(year)
            else:
                return self.format_long_month_year(date_val[1], year,
                                                   inflect, long_months)
@@ -706,7 +716,7 @@ class DateDisplay:
        year = self._slash_year(date_val[2], date_val[3])
        if date_val[0] == 0:
            if date_val[1] == 0:
-                return year
+                return self._get_localized_year(year)
            else:
                return self.format_short_month_year(date_val[1], year,
                                                    inflect, short_months)
@@ -193,7 +193,7 @@ class DateParser:
    converted, the text string is assigned.
    """

-    _dhformat_parse = re.compile(".*%(\S).*%(\S).*%(\S).*")
+    _dhformat_parse = re.compile(r".*%(\S).*%(\S).*%(\S).*")

    # RFC-2822 only uses capitalized English abbreviated names, no locales.
    _rfc_days = ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat')
@@ -423,63 +423,69 @@ class DateParser:
        # bce, calendar type and quality may be either at the end or at
        # the beginning of the given date string, therefore they will
        # be parsed from the middle and will be in match.group(2).
-        self._bce_re    = re.compile("(.*)\s+%s( ?.*)" % self._bce_str)
+        self._bce_re = re.compile(r"(.*)\s+%s( ?.*)" % self._bce_str)

-        self._cal       = re.compile("(.*)\s+\(%s\)( ?.*)" % self._cal_str,
-                                     re.IGNORECASE)
-        self._calny     = re.compile("(.*)\s+\(%s,\s*%s\)( ?.*)" % (self._cal_str,
-                                                                    self._ny_str),
-                                     re.IGNORECASE)
-        self._calny_iso = re.compile("(.*)\s+\(%s,\s*(\d{1,2}-\d{1,2})\)( ?.*)" % self._cal_str,
-                                     re.IGNORECASE)
+        self._cal = re.compile(r"(.*)\s+\(%s\)( ?.*)" % self._cal_str,
+                               re.IGNORECASE)
+        self._calny = re.compile(r"(.*)\s+\(%s,\s*%s\)( ?.*)" %
+                                 (self._cal_str, self._ny_str), re.IGNORECASE)
+        self._calny_iso = re.compile(
+            r"(.*)\s+\(%s,\s*(\d{1,2}-\d{1,2})\)( ?.*)" % self._cal_str,
+            re.IGNORECASE)

-        self._ny        = re.compile("(.*)\s+\(%s\)( ?.*)" % self._ny_str,
-                                     re.IGNORECASE)
-        self._ny_iso    = re.compile("(.*)\s+\((\d{1,2}-\d{1,2})\)( ?.*)")
+        self._ny = re.compile(r"(.*)\s+\(%s\)( ?.*)" % self._ny_str,
+                              re.IGNORECASE)
+        self._ny_iso = re.compile(r"(.*)\s+\((\d{1,2}-\d{1,2})\)( ?.*)")

-        self._qual     = re.compile("(.* ?)%s\s+(.+)" % self._qual_str,
-                                    re.IGNORECASE)
+        self._qual = re.compile(r"(.* ?)%s\s+(.+)" % self._qual_str,
+                                re.IGNORECASE)

-        self._span     = re.compile("(from)\s+(?P<start>.+)\s+to\s+(?P<stop>.+)",
+        self._span = re.compile(r"(from)\s+(?P<start>.+)\s+to\s+(?P<stop>.+)",
+                                re.IGNORECASE)
+        self._range = re.compile(
+            r"(bet|bet.|between)\s+(?P<start>.+)\s+and\s+(?P<stop>.+)",
+            re.IGNORECASE)
+        self._modifier = re.compile(r'%s\s+(.*)' % self._mod_str,
                                    re.IGNORECASE)
-        self._range    = re.compile("(bet|bet.|between)\s+(?P<start>.+)\s+and\s+(?P<stop>.+)",
-                                    re.IGNORECASE)
-        self._modifier = re.compile('%s\s+(.*)' % self._mod_str,
-                                    re.IGNORECASE)
-        self._modifier_after = re.compile('(.*)\s+%s' % self._mod_after_str,
+        self._modifier_after = re.compile(r'(.*)\s+%s' % self._mod_after_str,
                                          re.IGNORECASE)
-        self._abt2     = re.compile('<(.*)>', re.IGNORECASE)
-        self._text     = re.compile('%s\.?\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$' % self._mon_str,
-                                    re.IGNORECASE)
+        self._abt2 = re.compile('<(.*)>', re.IGNORECASE)
+        self._text = re.compile(r'%s\.?(\s+\d+)?\s*,?\s+((\d+)(/\d+)?)?\s*$'
+                                % self._mon_str, re.IGNORECASE)
        # this next RE has the (possibly-slashed) year at the string's end
-        self._text2    = re.compile('(\d+)?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$' % self._mon_str,
-                                    re.IGNORECASE)
-        self._jtext    = re.compile('%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$' % self._jmon_str,
-                                    re.IGNORECASE)
-        self._jtext2   = re.compile('(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$' % self._jmon_str,
-                                    re.IGNORECASE)
-        self._ftext    = re.compile('%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$' % self._fmon_str,
-                                    re.IGNORECASE)
-        self._ftext2   = re.compile('(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$' % self._fmon_str,
-                                    re.IGNORECASE)
-        self._ptext    = re.compile('%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$' % self._pmon_str,
-                                    re.IGNORECASE)
-        self._ptext2   = re.compile('(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$' % self._pmon_str,
-                                    re.IGNORECASE)
-        self._itext    = re.compile('%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$' % self._imon_str,
-                                    re.IGNORECASE)
-        self._itext2   = re.compile('(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$' % self._imon_str,
-                                    re.IGNORECASE)
-        self._stext     = re.compile('%s\.?\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$' % self._smon_str,
-                                    re.IGNORECASE)
-        self._stext2    = re.compile('(\d+)?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$' % self._smon_str,
-                                    re.IGNORECASE)
-        self._numeric  = re.compile("((\d+)[/\.]\s*)?((\d+)[/\.]\s*)?(\d+)\s*$")
-        self._iso      = re.compile("(\d+)(/(\d+))?-(\d+)-(\d+)\s*$")
-        self._isotimestamp = re.compile("^\s*?(\d{4})([01]\d)([0123]\d)(?:(?:[012]\d[0-5]\d[0-5]\d)|(?:\s+[012]\d:[0-5]\d(?::[0-5]\d)?))?\s*?$")
-        self._rfc      = re.compile("(%s,)?\s+(\d|\d\d)\s+%s\s+(\d+)\s+\d\d:\d\d(:\d\d)?\s+(\+|-)\d\d\d\d"
-                                    % (self._rfc_day_str, self._rfc_mon_str))
-        self._today = re.compile("^\s*%s\s*$" % self._today_str, re.IGNORECASE)
+        self._text2 = re.compile(r'(\d+)?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._mon_str, re.IGNORECASE)
+        self._jtext = re.compile(r'%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._jmon_str, re.IGNORECASE)
+        self._jtext2 = re.compile(r'(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$'
+                                  % self._jmon_str, re.IGNORECASE)
+        self._ftext = re.compile(r'%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._fmon_str, re.IGNORECASE)
+        self._ftext2 = re.compile(r'(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$'
+                                  % self._fmon_str, re.IGNORECASE)
+        self._ptext = re.compile(r'%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._pmon_str, re.IGNORECASE)
+        self._ptext2 = re.compile(r'(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$'
+                                  % self._pmon_str, re.IGNORECASE)
+        self._itext = re.compile(r'%s\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._imon_str, re.IGNORECASE)
+        self._itext2 = re.compile(r'(\d+)?\s+?%s\s*((\d+)(/\d+)?)?\s*$'
+                                  % self._imon_str, re.IGNORECASE)
+        self._stext = re.compile(r'%s\.?\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._smon_str, re.IGNORECASE)
+        self._stext2 = re.compile(r'(\d+)?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$'
+                                  % self._smon_str, re.IGNORECASE)
+        self._numeric = re.compile(
+            r"((\d+)[/\.]\s*)?((\d+)[/\.]\s*)?(\d+)\s*$")
+        self._iso = re.compile(r"(\d+)(/(\d+))?-(\d+)-(\d+)\s*$")
+        self._isotimestamp = re.compile(
+            r"^\s*?(\d{4})([01]\d)([0123]\d)(?:(?:[012]\d[0-5]\d[0-5]\d)|"
+            r"(?:\s+[012]\d:[0-5]\d(?::[0-5]\d)?))?\s*?$")
+        self._rfc = re.compile(
+            r"(%s,)?\s+(\d|\d\d)\s+%s\s+(\d+)\s+\d\d:\d\d(:\d\d)?\s+"
+            r"(\+|-)\d\d\d\d" % (self._rfc_day_str, self._rfc_mon_str))
+        self._today = re.compile(r"^\s*%s\s*$" % self._today_str,
+                                 re.IGNORECASE)

    def _get_int(self, val):
        """
@@ -522,7 +528,7 @@ class DateParser:

    def _parse_calendar(self, text, regex1, regex2, mmap, check=None):
        match = regex1.match(text.lower())
-        if match: # user typed in month-name day year
+        if match: # user typed in 'month-name day year' or 'month-name year'
            groups = match.groups()
            if groups[0] is None:
                m = 0
@@ -535,14 +541,16 @@ class DateParser:
                s = False
            else:
                d = self._get_int(groups[1])
-                if groups[4] is not None: # slash year "/80"
+                if groups[4] is not None:
                    y = int(groups[3]) + 1 # fullyear + 1
-                    s = True
-                else: # regular, non-slash date
+                    s = True # slash year
+                else: # regular year
                    y = int(groups[3])
                    s = False
            value = (d, m, y, s)
-            if check and not check((d, m, y)):
+            if s and julian_valid(value): # slash year
+                pass
+            elif check and not check((d, m, y)):
                value = Date.EMPTY
            return value

@@ -559,10 +567,10 @@ class DateParser:
                    y = None
                    s = False
                else:
-                    if groups[2] is not None: # slash year digit
+                    if groups[2] is not None:
                        y = int(groups[1]) + 1 # fullyear + 1
-                        s = True
-                    else: # regular, non-slash year
+                        s = True # slash year
+                    else: # regular year
                        y = int(groups[1])
                        s = False
            else:
@@ -575,10 +583,10 @@ class DateParser:
                    y = None
                    s = False
                else:
-                    if groups[4] is not None: # slash year digit
+                    if groups[4] is not None:
                        y = int(groups[3]) + 1 # fullyear + 1
-                        s = True
-                    else: # regular, non-slash year
+                        s = True # slash year
+                    else: # regular year
                        y = int(groups[3])
                        s = False
            value = (d, m, y, s)
@@ -619,8 +627,8 @@ class DateParser:
            y = self._get_int(groups[0])
            m = self._get_int(groups[3])
            d = self._get_int(groups[4])
-            if groups[2] and julian_valid((d, m, y + 1)): # slash year digit
-                return (d, m, y + 1, True)
+            if groups[2] and julian_valid((d, m, y + 1)):
+                return (d, m, y + 1, True) # slash year
            if check is None or check((d, m, y)):
                return (d, m, y, False)
            return Date.EMPTY
@@ -670,6 +678,15 @@ class DateParser:
                    y = self._get_int(groups[1])
                    m = self._get_int(groups[3])
                    d = self._get_int(groups[4])
+                if m > 12: # maybe a slash year, not a month (1722/3 is March)
+                    if y % 100 == 99:
+                        modyear = (y + 1) % 1000
+                    elif y % 10 == 9:
+                        modyear = (y + 1) % 100
+                    else:
+                        modyear = (y + 1) % 10
+                    if m == modyear:
+                        return (0, 0, y + 1, True) # slash year
            else:
                y = self._get_int(groups[4])
                if self.dmy:
@@ -682,6 +699,15 @@ class DateParser:
                else:
                    m = self._get_int(groups[1])
                    d = self._get_int(groups[3])
+                if m > 12: # maybe a slash year, not a month
+                    if m % 100 == 99:
+                        modyear = (m + 1) % 1000
+                    elif m % 10 == 9:
+                        modyear = (m + 1) % 100
+                    else:
+                        modyear = (m + 1) % 10
+                    if y == modyear:
+                        return (0, 0, m + 1, True) # slash year
            value = (d, m, y, False)
            if check and not check((d, m, y)):
                value = Date.EMPTY
@@ -847,12 +847,6 @@ class DbReadBase:
        """
        raise NotImplementedError

-    def get_gramps_ids(self, obj_key):
-        """
-        Returns all the keys from a table given a table name
-        """
-        raise NotImplementedError
-
    def get_mediapath(self):
        """
        Return the default media path of the database.
@@ -1024,12 +1018,6 @@ class DbReadBase:
        """
        raise NotImplementedError

-    def has_gramps_id(self, obj_key, gramps_id):
-        """
-        Returns True if the key exists in table given a table name
-        """
-        raise NotImplementedError
-
    def has_citation_gramps_id(self, gramps_id):
        """
        Return True if the Gramps ID exists in the Citation table.
@@ -1416,12 +1404,6 @@ class DbReadBase:
        """
        raise NotImplementedError

-    def set_save_path(self, path):
-        """
-        Set the save path for the database.
-        """
-        raise NotImplementedError
-
    def get_dbid(self):
        """
        A unique ID for this database on this computer.
@@ -1434,6 +1416,50 @@ class DbReadBase:
        """
        raise NotImplementedError

+    def get_summary(self):
+        """
+        Returns dictionary of summary item.
+        Should include, if possible:
+
+        _("Number of people")
+        _("Version")
+        _("Data version")
+        """
+        raise NotImplementedError
+
+    def requires_login(self):
+        """
+        Returns True for backends that require a login dialog, else False.
+        """
+        return False
+
+    def method(self, fmt, *args):
+        """
+        Convenience function to return database methods.
+
+        :param fmt: Method format string.
+        :type fmt: str
+        :param args: Substitutions arguments.
+        :type args: str
+        :returns: Returns a database method or None.
+        :rtype: method
+
+        Examples::
+
+            db.method('get_%s_from_handle, 'Person')
+            Returns the get_person_from_handle method.
+
+            db.method('get_%s_from_%s, 'Event', 'gramps_id')
+            Returns the get_event_from_gramps_id method.
+
+            db.method('get_%s_handles, 'Attribute')
+            Returns None.  Attribute is not a primary object.
+
+        .. warning::  Formats 'iter_%s' and 'get_number_of_%s' are not yet
+                      implemented.
+        """
+        return getattr(self, fmt % tuple([arg.lower() for arg in args]), None)
+

 class DbWriteBase(DbReadBase):
    """
@@ -1771,12 +1797,6 @@ class DbWriteBase(DbReadBase):
        """
        raise NotImplementedError

-    def write_version(self, name):
-        """
-        Write version number for a newly created DB.
-        """
-        raise NotImplementedError
-
    def add_child_to_family(self, family, child,
                            mrel=ChildRefType(),
                            frel=ChildRefType(),
@@ -555,14 +555,6 @@ class DummyDb(M_A_M_B("NewBaseClass", (DbReadBase, Callback, object,), {})):
            LOG.warning("database is closed")
        return []

-    def get_gramps_ids(self, obj_key):
-        """
-        Returns all the keys from a table given a table name
-        """
-        if not self.db_is_open:
-            LOG.warning("database is closed")
-        return []
-
    def get_media_attribute_types(self):
        """
        Return a list of all Attribute types associated with Media and MediaRef
@@ -1276,16 +1268,6 @@ class DummyDb(M_A_M_B("NewBaseClass", (DbReadBase, Callback, object,), {})):
            LOG.warning("database is closed")
        return False

-    def has_gramps_id(self, obj_key, gramps_id):
-        """
-        Returns True if the key exists in table given a table name
-
-        Not used in current codebase
-        """
-        if not self.db_is_open:
-            LOG.warning("database is closed")
-        return False
-
    def has_name_group_key(self, name):
        """
        Return if a key exists in the name_group table.
@@ -1648,13 +1630,6 @@ class DummyDb(M_A_M_B("NewBaseClass", (DbReadBase, Callback, object,), {})):
        if not self.db_is_open:
            LOG.warning("database is closed")

-    def set_save_path(self, path):
-        """
-        Set the save path for the database.
-        """
-        if not self.db_is_open:
-            LOG.warning("database is closed")
-
    def get_dbid(self):
        """
        A unique ID for this database on this computer.
@@ -343,6 +343,23 @@ class PythonUpgradeRequiredError(Exception):
                     'db_python_version': self.db_python_version,
                     'current_python_version': self.current_python_version }

+class DbConnectionError(Exception):
+    """
+    Error used to report that a database connection failed.
+    """
+    def __init__(self, msg, settings_file):
+        Exception.__init__(self)
+        self.msg = msg
+        self.settings_file = settings_file
+
+    def __str__(self):
+        return _('Database connection failed.\n\n'
+                 '%(message)s\n'
+                 'Please check your connection settings file:\n'
+                 '%(settings_file)s') % {
+                    'message': self.msg,
+                    'settings_file': self.settings_file}
+
 if __name__ == "__main__":
    """
    Call this from the CLI (in order to find the imported modules):
@@ -42,15 +42,15 @@ import glob
 #
 #------------------------------------------------------------------------
 from . import (DbReadBase, DbWriteBase, DbUndo, DBLOGNAME, DBUNDOFN,
-               KEY_TO_CLASS_MAP, REFERENCE_KEY, PERSON_KEY, FAMILY_KEY,
+               REFERENCE_KEY, PERSON_KEY, FAMILY_KEY,
               CITATION_KEY, SOURCE_KEY, EVENT_KEY, MEDIA_KEY, PLACE_KEY,
               REPOSITORY_KEY, NOTE_KEY, TAG_KEY, TXNADD, TXNUPD, TXNDEL,
-               KEY_TO_NAME_MAP)
+               KEY_TO_NAME_MAP, DBMODE_R, DBMODE_W)
+from .utils import write_lock_file, clear_lock_file
 from ..errors import HandleError
 from ..utils.callback import Callback
 from ..updatecallback import UpdateCallback
 from .bookmarks import DbBookmarks
-from . import exceptions

 from ..utils.id import create_id
 from ..lib.researcher import Researcher
@@ -144,9 +144,9 @@ class DbGenericUndo(DbUndo):
                    pickle.loads(self.undodb[record_id])

                if key == REFERENCE_KEY:
-                    self.undo_reference(new_data, handle)
+                    self.db.undo_reference(new_data, handle)
                else:
-                    self.undo_data(new_data, handle, key)
+                    self.db.undo_data(new_data, handle, key)
                    sigs[key][trans_type].append(handle)
            # now emit the signals
            self.undo_sigs(sigs, False)
@@ -193,9 +193,9 @@ class DbGenericUndo(DbUndo):
                        pickle.loads(self.undodb[record_id])

                if key == REFERENCE_KEY:
-                    self.undo_reference(old_data, handle)
+                    self.db.undo_reference(old_data, handle)
                else:
-                    self.undo_data(old_data, handle, key)
+                    self.db.undo_data(old_data, handle, key)
                    sigs[key][trans_type].append(handle)
            # now emit the signals
            self.undo_sigs(sigs, True)
@@ -221,39 +221,6 @@ class DbGenericUndo(DbUndo):
            db.undo_history_callback()
        return True

-    def undo_reference(self, data, handle):
-        """
-        Helper method to undo a reference map entry
-        """
-        if data is None:
-            sql = ("DELETE FROM reference " +
-                   "WHERE obj_handle = ? AND ref_handle = ?")
-            self.db.dbapi.execute(sql, [handle[0], handle[1]])
-        else:
-            sql = ("INSERT INTO reference " +
-                   "(obj_handle, obj_class, ref_handle, ref_class) " +
-                   "VALUES(?, ?, ?, ?)")
-            self.db.dbapi.execute(sql, data)
-
-    def undo_data(self, data, handle, obj_key):
-        """
-        Helper method to undo/redo the changes made
-        """
-        cls = KEY_TO_CLASS_MAP[obj_key]
-        table = cls.lower()
-        if data is None:
-            sql = "DELETE FROM %s WHERE handle = ?" % table
-            self.db.dbapi.execute(sql, [handle])
-        else:
-            if self.db.has_handle(obj_key, handle):
-                sql = "UPDATE %s SET blob_data = ? WHERE handle = ?" % table
-                self.db.dbapi.execute(sql, [pickle.dumps(data), handle])
-            else:
-                sql = "INSERT INTO %s (handle, blob_data) VALUES (?, ?)" % table
-                self.db.dbapi.execute(sql, [handle, pickle.dumps(data)])
-            obj = self.db._get_table_func(cls)["class_func"].create(data)
-            self.db._update_secondary_values(obj)
-
    def undo_sigs(self, sigs, undo):
        """
        Helper method to undo/redo the signals for changes made
@@ -529,7 +496,6 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
                "del_func": self.remove_tag,
            }
        }
-        self.set_save_path(directory)
        self.readonly = False
        self.db_is_open = False
        self.name_formats = []
@@ -577,34 +543,58 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        if directory:
            self.load(directory)

-    def _initialize(self, directory):
+    def _initialize(self, directory, username, password):
        """
        Initialize database backend.
        """
        raise NotImplementedError

-    def load(self, directory, callback=None, mode=None,
+    def __check_readonly(self, name):
+        """
+        Return True if we don't have read/write access to the database,
+        otherwise return False (that is, we DO have read/write access)
+        """
+        # In-memory databases always allow write access.
+        if name == ':memory:':
+            return False
+
+        # See if we write to the target directory at all?
+        if not os.access(name, os.W_OK):
+            return True
+
+        # See if we lack write access to the database file
+        path = os.path.join(name, 'sqlite.db')
+        if os.path.isfile(path) and not os.access(path, os.W_OK):
+            return True
+
+        # All tests passed.  Inform caller that we are NOT read only
+        return False
+
+    def load(self, directory, callback=None, mode=DBMODE_W,
             force_schema_upgrade=False,
             force_bsddb_upgrade=False,
             force_bsddb_downgrade=False,
             force_python_upgrade=False,
-             update=True):
+             update=True,
+             username=None,
+             password=None):
        """
        If update is False: then don't update any files
        """
-        db_schema_version = self.get_schema_version(directory)
-        current_schema_version = self.VERSION[0]
-        if db_schema_version != current_schema_version:
-            raise exceptions.DbVersionError(str(db_schema_version),
-                                            str(current_schema_version),
-                                            str(current_schema_version))
-        # run backend-specific code:
-        self._initialize(directory)
+        if self.__check_readonly(directory):
+            mode = DBMODE_R

-        # We use the existence of the person table as a proxy for the database
-        # being new
-        if not self.dbapi.table_exists("person"):
+        self.readonly = mode == DBMODE_R
+
+        if not self.readonly and directory != ':memory:':
+            write_lock_file(directory)
+
+        # run backend-specific code:
+        self._initialize(directory, username, password)
+
+        if not self._schema_exists():
            self._create_schema()
+            self._set_metadata('version', str(self.VERSION[0]))

        # Load metadata
        self.name_formats = self._get_metadata('name_formats')
@@ -643,7 +633,8 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        # surname list
        self.surname_list = self.get_surname_list()

-        self.set_save_path(directory)
+        self._set_save_path(directory)
+
        if self._directory:
            self.undolog = os.path.join(self._directory, DBUNDOFN)
        else:
@@ -680,7 +671,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        if update is False, don't change access times, etc.
        """
        if self._directory != ":memory:":
-            if update:
+            if update and not self.readonly:
                # This is just a dummy file to indicate last modified time of
                # the database for gramps.cli.clidbman:
                filename = os.path.join(self._directory, "meta_data.db")
@@ -739,6 +730,12 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
                self._set_metadata('nmap_index', self.nmap_index)

            self._close()
+
+            try:
+                clear_lock_file(self.get_save_path())
+            except IOError:
+                pass
+
        self.db_is_open = False
        self._directory = None

@@ -770,13 +767,6 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        """Return True when the file has a supported version."""
        return True

-    def get_schema_version(self, directory=None):
-        """
-        Get the version of the schema that the database was created
-        under. Assumes 18, if not found.
-        """
-        raise NotImplementedError
-
    def _get_table_func(self, table=None, func=None):
        """
        Private implementation of get_table_func.
@@ -790,45 +780,6 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        else:
            return None

-    def get_table_names(self):
-        """Return a list of valid table names."""
-        return list(self._get_table_func())
-
-    def get_table_metadata(self, table_name):
-        """Return the metadata for a valid table name."""
-        if table_name in self._get_table_func():
-            return self._get_table_func(table_name)
-        return None
-
-    def get_from_name_and_handle(self, table_name, handle):
-        """
-        Returns a gen.lib object (or None) given table_name and
-        handle.
-
-        Examples:
-
-        >>> self.get_from_name_and_handle("Person", "a7ad62365bc652387008")
-        >>> self.get_from_name_and_handle("Media", "c3434653675bcd736f23")
-        """
-        if table_name in self._get_table_func() and handle:
-            return self._get_table_func(table_name, "handle_func")(handle)
-        return None
-
-    def get_from_name_and_gramps_id(self, table_name, gramps_id):
-        """
-        Returns a gen.lib object (or None) given table_name and
-        Gramps ID.
-
-        Examples:
-
-        >>> self.get_from_name_and_gramps_id("Person", "I00002")
-        >>> self.get_from_name_and_gramps_id("Family", "F056")
-        >>> self.get_from_name_and_gramps_id("Media", "M00012")
-        """
-        if table_name in self._get_table_func():
-            return self._get_table_func(table_name, "gramps_id_func")(gramps_id)
-        return None
-
    def _txn_begin(self):
        """
        Lowlevel interface to the backend transaction.
@@ -1050,7 +1001,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        Helper function for find_next_<object>_gramps_id methods
        """
        index = prefix % map_index
-        while self.has_gramps_id(obj_key, index):
+        while self._has_gramps_id(obj_key, index):
            map_index += 1
            index = prefix % map_index
        map_index += 1
@@ -1152,7 +1103,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
    #
    ################################################################

-    def get_number_of(self, obj_key):
+    def _get_number_of(self, obj_key):
        """
        Return the number of objects currently in the database.
        """
@@ -1162,61 +1113,61 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        """
        Return the number of people currently in the database.
        """
-        return self.get_number_of(PERSON_KEY)
+        return self._get_number_of(PERSON_KEY)

    def get_number_of_events(self):
        """
        Return the number of events currently in the database.
        """
-        return self.get_number_of(EVENT_KEY)
+        return self._get_number_of(EVENT_KEY)

    def get_number_of_places(self):
        """
        Return the number of places currently in the database.
        """
-        return self.get_number_of(PLACE_KEY)
+        return self._get_number_of(PLACE_KEY)

    def get_number_of_tags(self):
        """
        Return the number of tags currently in the database.
        """
-        return self.get_number_of(TAG_KEY)
+        return self._get_number_of(TAG_KEY)

    def get_number_of_families(self):
        """
        Return the number of families currently in the database.
        """
-        return self.get_number_of(FAMILY_KEY)
+        return self._get_number_of(FAMILY_KEY)

    def get_number_of_notes(self):
        """
        Return the number of notes currently in the database.
        """
-        return self.get_number_of(NOTE_KEY)
+        return self._get_number_of(NOTE_KEY)

    def get_number_of_citations(self):
        """
        Return the number of citations currently in the database.
        """
-        return self.get_number_of(CITATION_KEY)
+        return self._get_number_of(CITATION_KEY)

    def get_number_of_sources(self):
        """
        Return the number of sources currently in the database.
        """
-        return self.get_number_of(SOURCE_KEY)
+        return self._get_number_of(SOURCE_KEY)

    def get_number_of_media(self):
        """
        Return the number of media objects currently in the database.
        """
-        return self.get_number_of(MEDIA_KEY)
+        return self._get_number_of(MEDIA_KEY)

    def get_number_of_repositories(self):
        """
        Return the number of source repositories currently in the database.
        """
-        return self.get_number_of(REPOSITORY_KEY)
+        return self._get_number_of(REPOSITORY_KEY)

    ################################################################
    #
@@ -1224,7 +1175,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
    #
    ################################################################

-    def get_gramps_ids(self, obj_key):
+    def _get_gramps_ids(self, obj_key):
        """
        Return a list of Gramps IDs, one ID for each object in the
        database.
@@ -1236,63 +1187,63 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        Return a list of Gramps IDs, one ID for each Person in the
        database.
        """
-        return self.get_gramps_ids(PERSON_KEY)
+        return self._get_gramps_ids(PERSON_KEY)

    def get_family_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Family in the
        database.
        """
-        return self.get_gramps_ids(FAMILY_KEY)
+        return self._get_gramps_ids(FAMILY_KEY)

    def get_source_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Source in the
        database.
        """
-        return self.get_gramps_ids(SOURCE_KEY)
+        return self._get_gramps_ids(SOURCE_KEY)

    def get_citation_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Citation in the
        database.
        """
-        return self.get_gramps_ids(CITATION_KEY)
+        return self._get_gramps_ids(CITATION_KEY)

    def get_event_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Event in the
        database.
        """
-        return self.get_gramps_ids(EVENT_KEY)
+        return self._get_gramps_ids(EVENT_KEY)

    def get_media_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Media in the
        database.
        """
-        return self.get_gramps_ids(MEDIA_KEY)
+        return self._get_gramps_ids(MEDIA_KEY)

    def get_place_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Place in the
        database.
        """
-        return self.get_gramps_ids(PLACE_KEY)
+        return self._get_gramps_ids(PLACE_KEY)

    def get_repository_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Repository in the
        database.
        """
-        return self.get_gramps_ids(REPOSITORY_KEY)
+        return self._get_gramps_ids(REPOSITORY_KEY)

    def get_note_gramps_ids(self):
        """
        Return a list of Gramps IDs, one ID for each Note in the
        database.
        """
-        return self.get_gramps_ids(NOTE_KEY)
+        return self._get_gramps_ids(NOTE_KEY)

    ################################################################
    #
@@ -1305,7 +1256,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
            raise HandleError('Handle is None')
        if not handle:
            raise HandleError('Handle is empty')
-        data = self.get_raw_data(obj_key, handle)
+        data = self._get_raw_data(obj_key, handle)
        if data:
            return obj_class.create(data)
        else:
@@ -1389,41 +1340,41 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
    #
    ################################################################

-    def has_handle(self, obj_key, handle):
+    def _has_handle(self, obj_key, handle):
        """
        Return True if the handle exists in the database.
        """
        raise NotImplementedError

    def has_person_handle(self, handle):
-        return self.has_handle(PERSON_KEY, handle)
+        return self._has_handle(PERSON_KEY, handle)

    def has_family_handle(self, handle):
-        return self.has_handle(FAMILY_KEY, handle)
+        return self._has_handle(FAMILY_KEY, handle)

    def has_source_handle(self, handle):
-        return self.has_handle(SOURCE_KEY, handle)
+        return self._has_handle(SOURCE_KEY, handle)

    def has_citation_handle(self, handle):
-        return self.has_handle(CITATION_KEY, handle)
+        return self._has_handle(CITATION_KEY, handle)

    def has_event_handle(self, handle):
-        return self.has_handle(EVENT_KEY, handle)
+        return self._has_handle(EVENT_KEY, handle)

    def has_media_handle(self, handle):
-        return self.has_handle(MEDIA_KEY, handle)
+        return self._has_handle(MEDIA_KEY, handle)

    def has_place_handle(self, handle):
-        return self.has_handle(PLACE_KEY, handle)
+        return self._has_handle(PLACE_KEY, handle)

    def has_repository_handle(self, handle):
-        return self.has_handle(REPOSITORY_KEY, handle)
+        return self._has_handle(REPOSITORY_KEY, handle)

    def has_note_handle(self, handle):
-        return self.has_handle(NOTE_KEY, handle)
+        return self._has_handle(NOTE_KEY, handle)

    def has_tag_handle(self, handle):
-        return self.has_handle(TAG_KEY, handle)
+        return self._has_handle(TAG_KEY, handle)

    ################################################################
    #
@@ -1431,35 +1382,35 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
    #
    ################################################################

-    def has_gramps_id(self, obj_key, gramps_id):
+    def _has_gramps_id(self, obj_key, gramps_id):
        raise NotImplementedError

    def has_person_gramps_id(self, gramps_id):
-        return self.has_gramps_id(PERSON_KEY, gramps_id)
+        return self._has_gramps_id(PERSON_KEY, gramps_id)

    def has_family_gramps_id(self, gramps_id):
-        return self.has_gramps_id(FAMILY_KEY, gramps_id)
+        return self._has_gramps_id(FAMILY_KEY, gramps_id)

    def has_source_gramps_id(self, gramps_id):
-        return self.has_gramps_id(SOURCE_KEY, gramps_id)
+        return self._has_gramps_id(SOURCE_KEY, gramps_id)

    def has_citation_gramps_id(self, gramps_id):
-        return self.has_gramps_id(CITATION_KEY, gramps_id)
+        return self._has_gramps_id(CITATION_KEY, gramps_id)

    def has_event_gramps_id(self, gramps_id):
-        return self.has_gramps_id(EVENT_KEY, gramps_id)
+        return self._has_gramps_id(EVENT_KEY, gramps_id)

    def has_media_gramps_id(self, gramps_id):
-        return self.has_gramps_id(MEDIA_KEY, gramps_id)
+        return self._has_gramps_id(MEDIA_KEY, gramps_id)

    def has_place_gramps_id(self, gramps_id):
-        return self.has_gramps_id(PLACE_KEY, gramps_id)
+        return self._has_gramps_id(PLACE_KEY, gramps_id)

    def has_repository_gramps_id(self, gramps_id):
-        return self.has_gramps_id(REPOSITORY_KEY, gramps_id)
+        return self._has_gramps_id(REPOSITORY_KEY, gramps_id)

    def has_note_gramps_id(self, gramps_id):
-        return self.has_gramps_id(NOTE_KEY, gramps_id)
+        return self._has_gramps_id(NOTE_KEY, gramps_id)

    ################################################################
    #
@@ -1695,41 +1646,41 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
    #
    ################################################################

-    def get_raw_data(self, obj_key, handle):
+    def _get_raw_data(self, obj_key, handle):
        """
        Return raw (serialized and pickled) object from handle.
        """
        raise NotImplementedError

    def get_raw_person_data(self, handle):
-        return self.get_raw_data(PERSON_KEY, handle)
+        return self._get_raw_data(PERSON_KEY, handle)

    def get_raw_family_data(self, handle):
-        return self.get_raw_data(FAMILY_KEY, handle)
+        return self._get_raw_data(FAMILY_KEY, handle)

    def get_raw_source_data(self, handle):
-        return self.get_raw_data(SOURCE_KEY, handle)
+        return self._get_raw_data(SOURCE_KEY, handle)

    def get_raw_citation_data(self, handle):
-        return self.get_raw_data(CITATION_KEY, handle)
+        return self._get_raw_data(CITATION_KEY, handle)

    def get_raw_event_data(self, handle):
-        return self.get_raw_data(EVENT_KEY, handle)
+        return self._get_raw_data(EVENT_KEY, handle)

    def get_raw_media_data(self, handle):
-        return self.get_raw_data(MEDIA_KEY, handle)
+        return self._get_raw_data(MEDIA_KEY, handle)

    def get_raw_place_data(self, handle):
-        return self.get_raw_data(PLACE_KEY, handle)
+        return self._get_raw_data(PLACE_KEY, handle)

    def get_raw_repository_data(self, handle):
-        return self.get_raw_data(REPOSITORY_KEY, handle)
+        return self._get_raw_data(REPOSITORY_KEY, handle)

    def get_raw_note_data(self, handle):
-        return self.get_raw_data(NOTE_KEY, handle)
+        return self._get_raw_data(NOTE_KEY, handle)

    def get_raw_tag_data(self, handle):
-        return self.get_raw_data(TAG_KEY, handle)
+        return self._get_raw_data(TAG_KEY, handle)

    ################################################################
    #
@@ -2414,7 +2365,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
    def get_save_path(self):
        return self._directory

-    def set_save_path(self, directory):
+    def _set_save_path(self, directory):
        self._directory = directory
        if directory:
            self.full_name = os.path.abspath(self._directory)
@@ -2510,4 +2461,5 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
        enclosed_by = ""
        for placeref in place.get_placeref_list():
            enclosed_by = placeref.ref
+            break
        return enclosed_by
@@ -39,8 +39,9 @@ import logging
 #------------------------------------------------------------------------
 from ..plug import BasePluginManager
 from ..const import PLUGINS_DIR, USER_PLUGINS
+from ..constfunc import win, get_env_var
 from ..config import config
-from .dbconst import DBLOGNAME
+from .dbconst import DBLOGNAME, DBLOCKFN, DBBACKEND

 #-------------------------------------------------------------------------
 #
@@ -108,13 +109,7 @@ def lookup_family_tree(dbname):
            if dbname == name:
                locked = False
                locked_by = None
-                backend = None
-                fname = os.path.join(dirpath, "database.txt")
-                if os.path.isfile(fname):
-                    with open(fname, 'r', encoding='utf8') as ifile:
-                        backend = ifile.read().strip()
-                else:
-                    backend = "bsddb"
+                backend = get_dbid_from_path(dirpath)
                try:
                    fname = os.path.join(dirpath, "lock")
                    with open(fname, 'r', encoding='utf8') as ifile:
@@ -125,6 +120,17 @@ def lookup_family_tree(dbname):
                return (dirpath, locked, locked_by, backend)
    return None

+def get_dbid_from_path(dirpath):
+    """
+    Return a database backend from a directory path.
+    """
+    dbid = "bsddb"
+    dbid_path = os.path.join(dirpath, DBBACKEND)
+    if os.path.isfile(dbid_path):
+        with open(dbid_path) as file:
+            dbid = file.read().strip()
+    return dbid
+
 def import_as_dict(filename, user, skp_imp_adds=True):
    """
    Import the filename into a InMemoryDB and return it.
@@ -132,6 +138,16 @@ def import_as_dict(filename, user, skp_imp_adds=True):
    db = make_database("sqlite")
    db.load(":memory:")
    db.set_feature("skip-import-additions", skp_imp_adds)
+    db.set_prefixes(
+        config.get('preferences.iprefix'),
+        config.get('preferences.oprefix'),
+        config.get('preferences.fprefix'),
+        config.get('preferences.sprefix'),
+        config.get('preferences.cprefix'),
+        config.get('preferences.pprefix'),
+        config.get('preferences.eprefix'),
+        config.get('preferences.rprefix'),
+        config.get('preferences.nprefix'))
    status = import_from_filename(db, filename, user)
    return db if status else None

@@ -179,3 +195,35 @@ def __index_surname(surn_list):
    else:
        surn = ""
    return surn
+
+def clear_lock_file(name):
+    try:
+        os.unlink(os.path.join(name, DBLOCKFN))
+    except OSError:
+        return
+
+def write_lock_file(name):
+    if not os.path.isdir(name):
+        os.mkdir(name)
+    with open(os.path.join(name, DBLOCKFN), "w", encoding='utf8') as f:
+        if win():
+            user = get_env_var('USERNAME')
+            host = get_env_var('USERDOMAIN')
+            if host is None:
+                host = ""
+        else:
+            host = os.uname()[1]
+            # An ugly workaround for os.getlogin() issue with Konsole
+            try:
+                user = os.getlogin()
+            except:
+                # not win, so don't need get_env_var.
+                # under cron getlogin() throws and there is no USER.
+                user = os.environ.get('USER', 'noUSER')
+        if host:
+            text = "%s@%s" % (user, host)
+        else:
+            text = user
+        # Save only the username and host, so the massage can be
+        # printed with correct locale in DbManager.py when a lock is found
+        f.write(text)
@@ -418,6 +418,11 @@ class NameDisplay:
        result = raw_data[_FIRSTNAME]
        return ' '.join(result.split())

+    def clear_custom_formats(self):
+        self.name_formats = {num: value
+                             for num, value in self.name_formats.items()
+                             if num >= 0}
+
    def set_name_format(self, formats):

        raw_func_dict = {
@@ -1054,13 +1059,13 @@ class NameDisplay:
            format_str = format_str[1:]
        else:
            patterns = [
-                ",\W*\"%(" + ("|".join(codes)) + ")\"",  # ,\W*"%s"
-                ",\W*\(%(" + ("|".join(codes)) + ")\)",  # ,\W*(%s)
-                ",\W*%(" + ("|".join(codes)) + ")",      # ,\W*%s
-                "\"%(" + ("|".join(codes)) + ")\"",      # "%s"
-                "_%(" + ("|".join(codes)) + ")_",        # _%s_
-                "\(%(" + ("|".join(codes)) + ")\)",      # (%s)
-                "%(" + ("|".join(codes)) + ")",          # %s
+                ",\\W*\"%(" + ("|".join(codes)) + ")\"",    # ,\W*"%s"
+                ",\\W*\\(%(" + ("|".join(codes)) + ")\\)",  # ,\W*(%s)
+                ",\\W*%(" + ("|".join(codes)) + ")",        # ,\W*%s
+                "\"%(" + ("|".join(codes)) + ")\"",         # "%s"
+                "_%(" + ("|".join(codes)) + ")_",           # _%s_
+                "\\(%(" + ("|".join(codes)) + ")\\)",       # (%s)
+                "%(" + ("|".join(codes)) + ")",             # %s
                ]
        new_fmt = format_str

--- a/Show More
+++ b/Show More