FR10850 V2: freeze/unfreeze button per gramplet

Fixes #10850 This is the second method to avoid reloading gramplet automaticaly.
Merge in changes from Gramps50
2018-10-31 20:36:45 +01:00 · 2018-10-29 09:32:35 -05:00 · 2018-10-21 18:43:11 +01:00 · 2018-10-20 21:30:20 +01:00 · 2018-10-17 11:31:54 +03:00 · 2018-10-12 20:58:04 +01:00
906 changed files with 579247 additions and 463509 deletions
@@ -13,3 +13,6 @@
 *.ged -text
 *.GED -text
 *.csv -text
+*.DEF -text
+*.IXI -text
+*.REM -text
@@ -23,5 +23,8 @@ test/data
 Thumbs.db
 ehthumbs.db

+# IDE
+.idea/
+
 # Glade temp files
 *~
@@ -9,7 +9,7 @@
 Josip Pisoj <josip@pisoj.com>
 Mirko Leonhaeuser <mirko@leonhaeuser.de>
 <martin.hawlisch@gmx.de> <loshawlos@users.sourceforge.net>
-Matti Niemelä <matti.u.niemela@gmail.com>
+Matti Niemelä <matti.u.niemela@gmail.com> <niememat@gmail.com>
 <nick-h@gramps-project.org> <nick__hall@hotmail.com>
 <nick-h@gramps-project.org> <Nick-Hall@users.noreply.github.com>
 Ondrej Krč-Jediný <hou@centrum.sk>
@@ -53,6 +53,17 @@ addons:
    - python3-mock
    - python3-pyicu
    - python3-coverage
+    - python3-jsonschema
+    # lxml dependencies.  for merge_ref_test to work
+    # - libxml2-dev
+    # - libxslt1-dev
+    - libxml2-utils
+    - python3-lxml
+    - python-libxml2
+# ubuntu 14.04 requires this in addition to libxml2-dev and
+# libxslt1-dev for compiling lxml.
+# https://github.com/deanmalmgren/textract/issues/19
+    - zlib1g-dev

 before_install:

@@ -61,7 +72,7 @@ install:
 # by the automatic git checkout.

 # Download Sean Ross-Ross's Pure Python module containing a framework to
-# manipulate and analyze python ast�s and bytecode. This is loaded to 
+# manipulate and analyze python ast�s and bytecode. This is loaded to
 # /home/travis/build/gramps-project/gramps/meta
 # FIXME: This should be loaded from the release directory at
 # https://pypi.python.org/pypi/meta
@@ -79,17 +90,23 @@ before_script:
 - export PYTHONPATH=meta
 # set module exclusions. --exclude=TestUser because of older version of mock
 # without configure_mock
- - export EXCLUDE="--exclude=TestcaseGenerator --exclude=vcard
-   --exclude=merge_ref_test --exclude=user_test"
+ - export EXCLUDE="--exclude=TestcaseGenerator"
+#   --exclude=merge_ref_test"
 # set GRAMPS_RESOURCES for locale, data,image and documentation
 - export GRAMPS_RESOURCES=.
+# Install addons
+ - mkdir -p ~/.gramps/gramps51/plugins/
+ - wget https://github.com/gramps-project/addons/raw/master/gramps51/download/CliMerge.addon.tgz
+ - tar -C ~/.gramps/gramps51/plugins -xzf CliMerge.addon.tgz
+ - wget https://github.com/gramps-project/addons/raw/master/gramps51/download/ExportRaw.addon.tgz
+ - tar -C ~/.gramps/gramps51/plugins -xzf ExportRaw.addon.tgz

 script:
 # Ignore the virtualenv entirely. Use nosetests3, python3 (3.4.0) and coverage
 # from /usr/bin. Use libraries from /usr/lib/python3.4,
 # /usr/local/lib/python3.4/dist-packages and /usr/lib/python3/dist-packages
 - nosetests3 --nologcapture --with-coverage --cover-package=gramps $EXCLUDE
-   gramps  test test/GrampsLogger
+   gramps
 # FIXME: This should have run from the current directory, rather than from
 # gramps, because there is some test code in that directory.

@@ -1,4 +1,3 @@
-<!-- $Id$ -->


 Alex Roitman shura@gramps-project.org
@@ -0,0 +1,12 @@
+See developer documentation at:
+https://gramps-project.org/wiki/index.php?title=Portal:Developers
+https://gramps-project.org/wiki/index.php?title=Brief_introduction_to_Git#Making_a_patchfile
+https://gramps-project.org/wiki/index.php?title=Brief_introduction_to_Git#Making_a_PR
+
+If you are interested in translating:
+* The Gramps program to your language see:
+https://gramps-project.org/wiki/index.php?title=Translating_Gramps
+https://gramps-project.org/wiki/index.php?title=Portal:Translators
+
+* The Gramps user manual to your language see:
+https://gramps-project.org/wiki/index.php?title=Translating_the_Gramps_User_manual
@@ -0,0 +1,243 @@
+2018-07-24  Nick Hall <nick-h@gramps-project.org>
+
+	* setup.py: Update development status for new release
+
+2018-07-24  Nick Hall <nick-h@gramps-project.org>
+
+	* po/gramps.pot: Update translation template for new release
+
+2018-07-22  niememat <niememat@gmail.com>
+
+	* po/fi.po: Fix translation in Finnish
+
+2018-07-01  John Ralls <jralls@ceridwen.us>
+
+	* gramps/gui/clipboard.py,
+	gramps/gui/editors/displaytabs/buttontab.py,
+	gramps/gui/editors/displaytabs/surnametab.py,
+	gramps/gui/filters/_searchbar.py,
+	gramps/gui/filters/sidebar/_sidebarfilter.py, gramps/gui/utils.py,
+	gramps/gui/views/navigationview.py,
+	gramps/gui/widgets/grampletpane.py,
+	gramps/gui/widgets/interactivesearchbox.py,
+	gramps/gui/widgets/multitreeview.py,
+	gramps/gui/widgets/styledtexteditor.py: Correct binary test logic
+	for primary mask.  state & get_primary_mask(another) tested (state & (primary |
+	other)), which will be true if state matches *either* primary *or*
+	other, but what is wanted in a not-negated test is state matching
+	all bits of (primary | other). match_primary_mask does that.  On the other hand there are also cases of "not state & (primary |
+	other)".  no_match_primary_mask handles that, returning true if
+	 state matches none of the bits in (primary | other).  Fixes #10646.
+
+2018-06-21  prculley <paulr2787@gmail.com>
+
+	* gramps/gui/glade/baseselector.glade,
+	gramps/gui/selectors/baseselector.py: Fix BaseSelector to avoid long
+	delay before display on large trees Fixes #10634
+
+2018-05-06  SNoiraud <serge.noiraud@laposte.net>
+
+	* gramps/gui/plug/export/_exportoptions.py: Export options > Gui
+	alignment issue Fixes #10576
+
+2018-07-22  niememat <niememat@gmail.com>
+
+	* po/fi.po: New fix translation in Finnish
+
+2018-07-22  Espen Berg <espenbe@gmail.com>
+
+	* po/nb.po: Revised Norwegian bokmÃ¥l
+
+2018-07-22  Espen Berg <espenbe@gmail.com>
+
+	* po/nb.po: Revised Norwegian bokmÃ¥l
+
+2018-07-22  niememat <niememat@gmail.com>
+
+	* po/fi.po: Fix translation in Finnish
+
+2018-07-21  Nick Hall <nick-h@gramps-project.org>
+
+	* gramps/gui/glade/editplace.glade,
+	gramps/gui/glade/editplaceref.glade: Fix dialog button order on
+	non-Mac systems Resolves #10585.
+
+2018-07-21  De Tran <trande@gmail.com>
+
+	* po/vi.po: Fix and update Vietnamese translation Resolves #10681.
+
+2018-07-21  Sveinn í Felli <sv1@fellsnet.is>
+
+	* po/is.po: Update Icelandic translation
+
+2018-05-10  jose1711 <jose1711@gmail.com>
+
+	* po/sk.po: Fix and update Slovak translation
+
+2018-05-11  jose1711 <jose1711@gmail.com>
+
+	* gramps/plugins/rel/rel_cs.py: Fix typo in translation
+
+2018-07-20  niememat <niememat@gmail.com>
+
+	* po/fi.po: Fix translation in Finnish
+
+2018-07-20  niememat <niememat@gmail.com>
+
+	* po/fi.po: Fix translation in Finnish
+
+2018-07-18  niememat <niememat@gmail.com>
+
+	* po/fi.po: Fix translation in Finnish
+
+2018-07-15  Luigi Toscano <luigi.toscano@tiscali.it>
+
+	* po/it.po: Update Italian translation
+
+2018-07-13  Nick Hall <nick-h@gramps-project.org>
+
+	* po/en_GB.po: Update English (British) translation
+
+2018-07-13  De Tran <trande@gmail.com>
+
+	* po/vi.po: Update Vietnamese translation
+
+2018-07-13  Kaj Mikkelsen <kmi@vgdata.dk>
+
+	* po/da.po: Update Danish translation
+
+2018-07-13  Lajos Nemeséri <nemeseril@gmail.com>
+
+	* po/hu.po: Update Hungarian translation
+
+2018-07-07  Fedik <getthesite@gmail.com>
+
+	* po/uk.po: Update Ukrainian translation for Gramps
+
+2018-07-05  RossGammon <upstream@the-gammons.net>
+
+	* debian/changelog, debian/copyright,
+	debian/patches/hardcoded_path_person_rules_test.patch,
+	debian/patches/series: Update Debian directory after Gramps
+	5.0.0-rc1 release. (#634)
+
+2018-07-02  Leonhaeuser <mirko@leonhaeuser.de>
+
+	* po/de.po: Fix not matching translation csv import/export
+
+2018-07-02  ZdenÄ›k HataÅ¡ <zdenek.hatas@gmail.com>
+
+	* po/cs.po: Update Czech translation
+
+2018-07-02  Pier Luigi Cinquantini <plcinquantini@gmail.com>
+
+	* po/eo.po: Update Esperanto translation
+
+2018-07-01  niememat <niememat@gmail.com>
+
+	* po/fi.po: Fix translation in Finnish
+
+2018-06-30  Paulo Henrique Paiva de Moraes <paulohpmoraes@gmail.com>
+
+	* po/pt_BR.po: Update Brazilian Portuguese translation
+
+2018-06-30  vantu5z <vantu5z@mail.ru>
+
+	* po/ru.po: update Russian translation substantially just merge with
+	latest template
+
+2018-06-29  Nick Hall <nick-h@gramps-project.org>
+
+	* po/ar.po, po/bg.po, po/br.po, po/ca.po, po/cs.po, po/da.po,
+	po/de.po, po/el.po, po/en_GB.po, po/eo.po, po/es.po, po/fi.po,
+	po/fr.po, po/ga.po, po/he.po, po/hr.po, po/hu.po, po/is.po,
+	po/it.po, po/ja.po, po/lt.po, po/mk.po, po/nb.po, po/nl.po,
+	po/nn.po, po/pl.po, po/pt_BR.po, po/pt_PT.po, po/ro.po, po/sk.po,
+	po/sl.po, po/sq.po, po/sr.po, po/sr_Latn.po, po/sv.po, po/ta.po,
+	po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_HK.po, po/zh_TW.po: 
+	Merge translation files with the latest template
+
+2018-06-21  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/gui/filters/sidebar/_sidebarfilter.py: Fix Custom filter
+	update when created via sidebar (#630) Fixes #10620 Adding a filter via the sidebar editor originally only updated the
+	current view, other associated views did not see the new filter.
+	First noticed in People views. This causes the 'filters-changed' to
+	be emitted which updates all associated view.
+
+2018-06-21  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/gui/widgets/grampletpane.py: Fix Gramplet configure
+	(View/Configure) for large options (#629) When a Gramplet uses a BooleanListOption with a lot of entries,
+	along with other options, all the options take on the size of the
+	large BooleanListOption, which doesn't work well at all.
+
+2018-06-22  Serge Noiraud <Serge.Noiraud@laposte.net>
+
+	* gramps/plugins/drawreport/statisticschart.py: Statistics Charts
+	crashes with IndexError (#627) Fixes #010626 In statistics charts, get_month is only localized and the calendar
+	is unused.  If we have an Extra (Sansculottides) month in the french
+	republican calendar (index 13), we have this IndexError because the
+	gregorian calendar is always used and contains only 12 values.
+
+2018-06-10  John Ralls <jralls@ceridwen.us>
+
+	* mac/gramps.accel: [Mac] Change accel for Undo History.  So that it doesn't conflict with a system binding for hiding the
+	window.  Fixes #10619.
+
+2018-06-09  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/gui/plug/_guioptions.py: Fix Family Lines/Family Colors
+	picker for bad transient parent (#625) Fixes #10623
+
+2018-06-09  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/gen/db/utils.py: Fix import_as_dict to utilize user
+	gramps_id prefixes (#626) Issue #10622 Found when comparing dbs with large prefixes 'I%05d'; using database
+	differences or import_merge addons.
+
+2018-06-09  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/plugins/db/bsddb/write.py: Fix error when opening bsddb db
+	in read-only mode (#624) Fixes #10615 BSDDB had errors when trying to open in read-only mode.
+
+2018-06-09  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/gen/db/generic.py: Fix dbapi dbs for closeing read-only db
+	crash (#623) Fixes #10613 The sqlite (and other dbapi dbs) tried to save their metadata on a
+	close operation, which doesn't work for read-only dbs.
+
+2018-06-09  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/gui/viewmanager.py: Fix menus when operating with read-only
+	db (#622) Fixes #10614 An earlier attempt to deal with closed dbs messed up the read-only
+	ActionGroup settings. This corrects that situation.
+
+2018-06-02  Sam Manzi <manzi.sam@gmail.com>
+
+	* gramps/gen/proxy/living.py: Fix Name formats to show all parts
+	(#608) Fixes #10420 Allows reports to use the name format specified by the user.
+
+2018-06-01  Paul Culley <paulr2787@gmail.com>
+
+	* gramps/gui/dbloader.py, gramps/gui/plug/_guioptions.py,
+	gramps/gui/viewmanager.py: Fix dialogs for crash when canceling via
+	'x' (#620) * Fix import dialog for crash when canceling via 'x' Fixes #10607 * Fix 'Make Backup' dialog for crash on 'x' close Issue #10607 * Fix Family Lines/Family Colors/add dialog crash on close with 'x' Issue #10607
+
+2018-05-28  niememat <niememat@gmail.com>
+
+	* po/fi.po: Fix translation in Finnish
+
+2018-05-20  John Ralls <jralls@ceridwen.us>
+
+	* mac/Info.plist, mac/gramps.modules: Release 5.0.0-rc1 on Mac.
+
+2018-05-20  John Ralls <jralls@ceridwen.us>
+
+	* mac/gramps.modules: Remove obsolete omeat-python-modules
+	dependencies.
+
+2018-05-20  prculley <paulr2787@gmail.com>
+
+	* Bump to v5.0.0-rc2
+
@@ -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
@@ -1,397 +0,0 @@
-		GNU Free Documentation License
-		  Version 1.2, November 2002
-
-
- Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The "Document", below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as "you".  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (Thus, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
-   or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications".  You must delete all sections
-Entitled "Endorsements".
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c)  YEAR  YOUR NAME.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.2
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
-    with the Invariant Sections being LIST THEIR TITLES, with the
-    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
@@ -1,13 +1,14 @@
 include AUTHORS
+include ChangeLog
 include COPYING
 include FAQ
 include Gramps.py
 include INSTALL
-include LICENSE
 include MANIFEST.in
 include NEWS
 include RELEASE_NOTES
 include TODO
+include CONTRIBUTING
 include TestPlan.txt
 recursive-include data *
 recursive-include debian *
@@ -1,3 +1,466 @@
+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.
+
+2017-08-01
+Version 4.2.6
+* Fix HasCitation rule in citation filter sidebar
+* Fix use of regular expressions
+* Date Editor had 'Type' and 'Quality' labels swapped
+* Fix FamilyGroup Report
+* Fix names not displayed in relationship graph
+* Fix outdated Bugtracker link in reporting wizard
+* Fix replacements in Ancestor tree
+* Fix Default Browser Setting
+* Fix linking place on OpenStreetMap view
+* Fix Family Lines Report having unescaped characters
+* Fix non-local character in DB name (Windows OS)
+* Fix checking for "event.string" in "treeview_keypress"
+* Fix invalid February 29th date in Julian dual-dated
+* Fix Note on CIR when it is attached to a (preferred or alternative) name through the names dialog.
+* Improve time loading for person selector in census forms
+* Fix incorrect SoundEx result
+* Fix Error printing on ancestor tree graphical report
+* Fix custom filter creation with 'Events occurring on a particular day of the week'
+* Bug in the Name Editor / Group As
+* Gramps CSV export of Places did not generate correct Title.
+* Add custom Family Relations not shown in the filter siderbar
+* Fix non-textual value on Tag report
+* Fix 'interface.dont-ask' config key ignored on Note edition
+* Fix Reorder Relationships dialog
+* Shrink size of Break Lock (and other QuestionDialogs)
+* Only selection of Active or Home person if commited
+* Fix quick search exception when nothing in searched list
+* Fix problem adding parents
+* Fix bookmarks keybinding on Mac
+* Fix failure to load default gramplets if GExiv2 is missing or too old.
+* Update API doc for place displayer
+* Add datestrings to Turkish translation
+* Update translations: cs, de, fr, fi, hu, it, ru, sl, sv, tr
+
+2016-12-15
+Version 4.2.5
+* The configparser is assuming the wrong encoding
+* Sorting in family tab of narrated web report
+* Silence remaining PyGIWarning
+* Sorting of relationships in family tab of narrated web report
+* Use latest valid date rather than today
+* Modify endonym handling in place displayer
+* Fix house number concatenation
+* Allow merging of families with one or more parents in common
+* Jump to Gramps ID functionality doesn't work
+* Ability to search alternate place names when selecting place
+* Fix clear map action on Geography
+* Database repair tool always edit all source objects
+* Database repair tool ignored some objects with tag
+* "Enclosing" gramplet includes places outside valid date ranges
+* Fix icon and tooltip in LDS editor
+* CSV import fails
+* Fix duplicated Gramps IDs on Gedcom import
+* Unexpected error Preferences > Dates > Markup for invalid date format
+* Fix Import Vcard, can create multiple surnames with all selected as 'Primary'
+* Fix Gedcom import in some alternate languages; improper date parsing
+* Export options 'Preview' buttons create hidden quickreport
+* Alignment radio buttons in the style editor do not work
+* Select Place search & Source/Citation hierarchy should NOT be expanded
+* Tweak improvement on Tag editor
+* Support for Windows Python3 pythonw.exe
+* Wrong parsing Numeric date format for cs_CZ locale
+* Fix Norwegian relationship calculator
+* Fix Icelandic and German translations
+* Update translations: cs, de, fi, fr, hu, is, nb, ru
+
+2016-09-04
+Version 4.2.4
+* fixes for the PHON, FAX, EMAIL and WWW Gedcom tags to support Gedcom v5.5.1
+* use more relative import
+* Support for FTM and others Custom Gedcom Event Tags on import
+* fix '_deeprelationshippath' filter rule
+* Narrativeweb: some dates are incorrect in tar archive.
+* MacOS: Update graphviz to 2.38 and change to a binary launcher in app bundles.
+* Gramps crashes when closed while exporting
+* Some events are not shown in familymaps page.
+* Remove old debug bloc on place selection.
+* Add GUI and CLI config option to allow easy setting
+* Chinese characters are not rendered properly in pdf reports
+* Support v5.5.1 OBJE/FORM/MEDI tag on embedded OBJE
+* Sorting of Sources on gedcom
+* Change "class xxx(object)" to "class xxx"
+* Use "with open" instead of "try: except:"
+* Change "raise NotImplemented" to "raise NotImplementedError()"
+* Add new argument to IsEnclosedByRule
+* Narrativeweb: place title must agree the references.place-auto configuration
+* Improvements on CSV file format support
+* update Finnish holidays
+* Some strings in tools and report dialogs will not translate
+* Gedcom import improvements in media area to support v5.5.1 and FTM
+* Trailing whitespace
+* Gedcom import of FTM .ged file containing _LINK tags not supported
+* Change pycairo-python3 to pycairo.
+* pycairo for python2 is now py2cairo.
+* Remove pango modules from bundle, pango no longer uses them.
+* Gedcom import loses spaces in text fields from FTM
+* Gedcom import of FTM file containing _PHOTO tags
+* Missed self.photo initializer
+* Attempting to select an "Available item" for the Book Report gives an error
+* Fix for either valid or invalid FTM Gedcom
+* Gedcom import of FTM file with OCCU record crashes import
+* crash - 'NoneType' object has no attribute 'get_child_ref_list'
+* Family Page maps are non-functional in Narrative Web report
+* Gedcom import loses spaces in text fields from FTM
+* String not translated in geoplaces
+* Descendant Report does not recognise auto. place title generation
+* Translated text will not be printed in the program
+* Geography: Attempting to print crashes (add parent to dialog)
+* GEDCOM doesn't accept CR as a line terminator
+* Wrong Numeric date format for cs_CZ locale
+* Narrativeweb: inconsistent & incomplete display of place hierarchy labels
+* Narratedweb: surname listing errors for people with multiple partners
+* In "Verify" people w/ death event w/o date are not thought dead
+* While starting gramps, it fails to pop up "tips of the day"
+* GEDCOM import in CLI mode with .ged file containing ANSEL encoding tries to pop up gui
+* fix merge conflict
+* Use first matching name when generating place titles
+* GEDCOM import with media files that have no path fails
+* [Geography] Geoclose and mother handle
+* place names empty if Gedcom ADDR record contains no street
+* Tidy up place configuration options
+* Use CSS to fade background colour in ValidatableMaskedEntry
+* crash on GEDCOM import with empty _AKA lines
+* Add inclusive option to IsEnclosedBy rule
+* Saving/closing new person window with Alt-o does not find gender
+* Fix to allow deferred translation of place type
+* Include all place types in place report
+* Allow place selection both individually and by filter on textual report
+* Expand tree in selectors automatically
+* Fix Encloses gramplet to display correct place references
+* Update for appdata stuff
+* UnboundLocalError on ODF doc backend
+* Media Preview: wrong frame
+* fix signals
+* GEDCOM import PLAC:FORM in local mode doesn't work
+* fix empty Place Alternate Names on import
+* Merge unit test for PlaceCheck not working correctly
+* GEDCOM import some Place Names & Titles are blank
+* GEDCOM import PLAC or ADDR attached Notes etc. are lost
+* Gramps not appearing in Gnome Software
+* fix broken GEDCOM import PLAC:FORM handling
+* Place Alt Names gets duplicated entries
+* Multiple GEDCOM imports creates duplicate event IDs
+* The place page in webreport is complete mess
+* Gallery tab of Source view does not display .ods files
+* Narrated Web report - Individual sort order not correct on the Surnames tab
+* Specify required GtkSpell and GExiv2 version
+* Narrated web report link to thumbnails is broken on certain pages
+* Narrated Web report - Individual page sort order has changed
+* Gramps reports that it can't find dictionaries.
+* Turns out it was really that enchant couldn't find its backend because an environment variable wasn't set.
+* Update translations: cs, da, de, fi, fr, hu, pt_BR, ru, sl
+
+2016-04-10
+Version 4.2.3
+* Creation of the "graphic calendar report" failed
+* Fix "TypeError: 'tuple' object does not support item assignment
+* Fix experienced an unexpected error
+* Unable to build narrated web site
+* [NarrativeWeb report] Places index and Media index are incorrectly sorted
+* Error when trying to create narrative report (residence event)
+* Fix filter set by default on selector, 'Show all' button
+* Detailed Ancestors Report has ? for locations when [private data is excluded]
+* Age in the event family view column is wrong.
+* Crash when dragging multiple media items to clipboard
+* vCal Export File format invalid
+* Error occurs for Complete Individual Report -- complete database
+* Narrated Web Site Report: places page is no longer sorted alphabetically
+* Narrative web: html elements emitted in different order
+* Narrative web: "errno: 1, operation is not permitted" when creating archive.
+* Narrative Web report further stops in error.
+* Fix multiple lines for firstname on gramps XML file via import or export
+* fix scrolling in persons view after typing some letters
+* Location on geography view could not convert string to float
+* setup.py: make typeout more accurate
+* Searching in people view when surnames are collapsed
+* Fix error when changing database in new locations gramplets
+* Error loading Participants add-on in French locale
+* Restores setting the stdout encoding to sys.getdefaultencoding() for Python3
+* Fix comment about getting the right encoding for stdout.
+* Date format does not match system.
+* Make US English a special-case locale, where en_GB is the default for english based locales
+* Enhance the Locations gramplet
+* New "Encloses" gramplet to the display places that the active place encloses
+* Individuals with incomplete names, not updated when name completed
+* Children gramplet in Family view does not get updated when a birth/death events are added to a child
+* Non-image media objects don't appear in the main window gallery.
+* Pressing tab stops at element in gui places
+* Double-clicking on a source in the citation gramplet causes exception
+* "Find text in record" filter crash
+* Fix vCard Export
+* Notes used in the "To Do" gramplet are found by the Remove Unused Objects tool
+* Unable to select Unicode
+* Cannot import gedcom generated by RootsMagic custom place details ignoring PlaceName()
+* Fix people sorted by surname view
+* Complete Report about person (whole database) - PDF - crash
+* Update for travis
+* Only consider the values of LC_ALL, LANG, and LANGUAGE, in that order, when choosing the default locale.
+* New Icelandic date and relationships handlers
+* Fix Finnish translation in keywords of desktop entry
+* Update translations: cs, de, el, fi, fr, hu, is, it, ru, sl, sv, uk
+
+2016-01-06
+Version 4.2.2
+* "Show all" checkbox of "Select Family" window not unchecked when the filter is cleared
+* Name of user defined filter is not shown
+* ErrorDialog and GtkDialog mapped without a transient parent
+* 'Find' is broken when used in the Family selector
+* Fix default selection in selectors
+* Comment currently-unused bogus wiki URL pointers
+* Fix counter for filtered entries and indentation on TreeBaseModel
+* Faulty headline in start up screen
+* Check that gramplet is in notebook before setting tab label
+* Fix creation of focus change events
+* Interactivesearch gives "TypeError: unorderable types: str() < NoneType()"
+* Put tag selection list in alphabetical order
+* Remove redundant code
+* Fix delete error in undoable entry widget
+* Fix deprecation warning
+* Re-enable selection in MultiTreeView on a grab_broken event
+* Add validation to gender field
+* Unhandled AttributeError when db.get_tag_from_handle returns None
+* ReferencedBySelectionProxy can forget some referenced tags
+* Remove encoding on stdout and stderr
+* Handle citation objects in glocale.trans_objclass
+* Locality data in address was not imported
+* Don't check SSL certs when fetching addons
+* Catch urlopen TypeError when context arg isn't supported
+* Fix undefined variable error
+* Can not download new or updated add-ons
+* ValueError: underlying buffer has been detached
+* LaTeX backend crashes
+* Geography: performance issue due to bad initialization and performance issue when selecting the events or places views.
+* Narrated Web Site Report: html elements emitted in different order
+* Unused *_init.jpg are created in the narrated website
+* Some media files are not exported to the NAVWEB report
+* Narrative web report: add author to citations
+* TypeError: unorderable types: EventRef() < EventRef(), events list and family list are differents between two reports
+* Permission denied: change mtime to origin instead of destination
+* Thumbnails html file missing in the narrative web
+* Narrativeweb: Place title based on current date not that of the event
+* Webcal: make the month name clickable in the year overview page
+* 'Narrative' word not translatable
+* 'Unknown' spouse uses an harcoded string name on Simple Descendants textual report
+* Father/mother's age attributes are not translated on reports
+* Improve Russian date handler and unittests
+* Mars month instead of Marzec on Polish locale (Date Editor)
+* Translations update: cs, de, fr, fi, nl, pl, ru, sv
+
+2015-10-12
+Version 4.2.1,
+* Support for Retina and HiDPI Display, added 24px icons
+* Fix verification tool with "Estimate missing or inexact dates"
+* Fix missing link in hourglass graph report
+* Sort custom place types in editors
+* Allow Easter calculation with python3
+* Fix crash on Descendants-detailed report
+* FanChartDescendants View should at least have 2 generations
+* Allow hyphenated gramps-id in Graphviz reports
+* Complete Individual Report fails to run
+* Fix broken wiki help links
+* Set TextOption widget to expand vertically
+* Unused Object Dialog box too small
+* Short cut keys does not work in 'Change Event Types' dialog
+* Update some Tips of the day
+* Error when extracting place names
+* Custom filters for note text repaired
+* Fix Pedigreeview crash when selecting Compact view
+* Set "visable_window" in GtkEventBox to fix transparency
+* Faster scrolling
+** cache database access for column values
+** cache do_get_path lookups
+** speed up load access on treeviews with no filters
+** new LRU size of 1k (was 250)
+** use cache in do_get_path from siblings
+* Avoid using person-centric date matching for places
+* Use place title as default name in GEDCOM import
+* Ensure place names are not empty after upgrade
+* Fix proxy to include all referenced place objects
+* Fix bug that prevented any addons being loaded onto the Mac version
+* Remove copy button from family tree manager
+* Consistency for name fields on Person Editor
+* [Geography] Place.set_name(name) requires a PlaceName()
+* [Geography] Fix and improvements on place selection
+* Limit problems with existing selection in media reference editor
+* Stability fixes on Mac port
+* Mac port localization crash with non-standard locale (e.g. en_IT).
+* Fix color on history
+* Fix countries selector for holidays
+* Fix missing markups into textual reports
+* All sidebars with Types now show custom types in combo list
+* [New] Added Places to CSV import/export
+* Some fixes on installer (setup.py)
+* Various improvements on gen.plug.utils
+* Fix graph reports [in Greek locale]
+* New date handler for Hungarian locale
+* Updated translations : cs, de, el, en_GB, fi, fr, hu, is, sv
+
+2015-08-02
+Version 4.2.0,
+* New date and language fields on place name
+* Review on GtkBuilder, fix some Gtk3 warnings and move from deprecated methods
+* Change icons and buttons handling methods
+* Enhanced Place Editor and new Place Name editor
+* New widget: use own interactive-search
+* Ability to import kml data into Geography views
+* Enhancement for removing multiple selected items from Views (action group)
+* Add drag support on more Views, Selectors and Editors
+* Add right-click "Copy all" to ListModel and all QuickTables
+* Review Alternate Place handling and edition
+* New 'Place' configuration keys set by user (settings)
+* New filter rule: is enclosed by
+* Consistency on Privacy option for reports
+* Consistency on "Name-format" options for reports
+* Add DeferredFilter class (a subclass of GenericFilter)
+* New textual Report: Links on Notes
+* Fix alphabetic index and toc bug in books
+* Enhancements on Style Editor
+* Enhancements on End Notes into textual reports
+* Changes on Individuals complete textual report
+* Changes on Ancestors Tree draw report: Include Siblings
+* Add name-format option, and deferred translation on Records report
+* Add deferred translation on Timeline draw report
+* Enable attributes gramplet on Source and Citation Views
+* New place locations gramplet
+* Optimizations around index, Flat and TreeView models
+* Enhanced samples files
+* All importers return now an ImportInfo object
+* Experimental gwplus (geneweb) import file format support
+* Remove experimental HTML renderer view
+* New test scripts
+* New Date handler for Japanese
+* Review on Slovenian and Czech Date Handlers
+* Implement both "traditional" and "simplfied" Chinese (translations and dates)
+* Serbian review
+
 2015-05-01
 Version 4.1.3, "Thou shalt not count to five", a maintenance release.
 * Fix db upgrade failure
@@ -11,19 +11,20 @@ Requirements
 The following packages **MUST** be installed in order for Gramps to work:

 * **Python** 3.2 or greater - The programming language used by Gramps. https://www.python.org/
-* **GTK** 3.10 or greater - A cross-platform widget toolkit for creating graphical user interfaces. http://www.gtk.org/
+* **GTK** 3.12 or greater - A cross-platform widget toolkit for creating graphical user interfaces. http://www.gtk.org/
 * **pygobject** 3.12 or greater - Python Bindings for GLib/GObject/GIO/GTK+ https://wiki.gnome.org/Projects/PyGObject

 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:
@@ -42,15 +43,15 @@ The following packages are **STRONGLY RECOMMENDED** to be installed:

 Used to show maps in the geography view.
 It may be osmgpsmap, osm-gps-map, or python-osmgpsmap,
- but the Python bindings for this must also be present.
+ 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**

  Enable creation of graphs using Graphviz engine.
  Without this, three reports cannot be run.
-  Obtain it from: http://www.graphviz.org
+  Obtain it from: http://www.graphviz.org or try graphviz and python3-pygraphviz from your packages.

 * **PyICU**

@@ -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,
@@ -98,12 +103,17 @@ The following packages are optional:

 More font support in the reports

-* **Meta**
+* **geocodeglib**

- Required for experimental "where" clause creation. This functionality
- is not yet in main-line code so it is not needed by users.  If the package
- will be used by gramps developers, to support further development, then
- it may be included.  Install with pypi: https://pypi.python.org/pypi/meta.
+ A library use to associate a geographical position (latitude, longitude)
+ to a place name. This is used if you already have osmgpsmap installed.
+ If installed, when you add or link a place from the map, you have a red line
+ at the end of the table for selection.
+ Debian, Ubuntu, ... : gir1.2-geocodeglib-1.0
+ Fedora, Redhat, ... : geocode-glib
+ openSUSE            : geocode-glib
+ ArchLinux           : geocode-glib
+ ...

 Optional packages required by Third-party Addons
 ------------------------------------------------
@@ -116,9 +126,12 @@ Prerequistes required for the following Addons to work:
 * **Family Sheet** - Requires: PIL (Python Imaging Library) or PILLOW.
 ( https://gramps-project.org/wiki/index.php?title=Family_Sheet )

-* **Graph View** - Requires: PyGoocanvas and Goocanvas.
+* **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;
@@ -325,6 +330,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -416,7 +425,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -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%;
@@ -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;
@@ -368,6 +373,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -466,7 +475,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -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;
@@ -361,6 +366,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -459,7 +468,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -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;
@@ -361,6 +366,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -459,7 +468,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -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;
@@ -361,6 +366,10 @@ table.IndividualList td.ColumnSurname {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -459,7 +468,7 @@ div#SourceDetail {
 }
 .subsection {
    clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -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;
@@ -144,7 +149,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 +312,10 @@ table#SortByCount thead th.ColumnQuantity a:after {
    content: "";
 }

+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 -----------------------------------------------------------------*/
 #GalleryNav {
@@ -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 {  }
@@ -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
@@ -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)" />
@@ -0,0 +1,236 @@
+[PRO-GEN]
+version=3.0b
+type=def
+format=2
+
+[general]
+dateformat=DD/MM/YYYY
+pointerlength=4
+tables=2
+
+[Table_1]
+name1=Person
+name2=Persons
+fileext=.PER
+indexext=.IXP
+n_lines=42
+hiddenlines=4,5,6,7,8,10,12,13,14,15,19,25,30,32,33,34,35,36,40
+t01=ÉÍµINDIVIDUAL       ÆÍÍÍÍÍÍÍÍÍÍÍÍÍÍµpg30-1gbÆÍÍÍÍÍÍÍÍÍµLAST CHANGE           ÆÍ»
+t02=º ÛGiven name:                                                                  º
+t03=º Surname   :                                                Sex:              º
+t04=º Patronym  :                                                                  º
+t05=º Call name :                    Alias:                     Code:              º
+t06=º Title 1   :                  Title 2:                  Title 3:              º
+t07=º Father    :                                                                  º
+t08=º Mother    :                                                                  º
+t09=º Occupation:                                                                  º
+t10=º Scratch   :                                                                  º
+t11=º Info      :                                                                  º
+t12=ÇÄ´ÛAddressÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t13=º Date  :            Street:                                                   º
+t14=º Zip   :             Place:                             Country:              º
+t15=º Phone :              Info:                                                   º
+t16=ÇÄ´ÛBirthÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t17=º Date  :             Place:                                Time:              º
+t18=º Source:                                              Reference:              º
+t19=º Text  :                                                                      º
+t20=º Info  :                                                                      º
+t21=ÇÄ´ÛChristeningÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t22=º Date  :             Place:                            Religion:              º
+t23=º Witn. :                                                                      º
+t24=º Source:                                              Reference:              º
+t25=º Text  :                                                                      º
+t26=º Info  :                                                                      º
+t27=ÇÄ´ÛDeathÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t28=º Date  :             Place:                                Time:              º
+t29=º Source:                                              Reference:              º
+t30=º Text  :                                                                      º
+t31=º Info  :                                                                      º
+t32=ÇÄ´CÛremationÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t33=º Date  :             Place:                                                   º
+t34=º Source:                                              Reference:              º
+t35=º Text  :                                                                      º
+t36=º Info  :                                                                      º
+t37=ÇÄ´BÛurialÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t38=º Date  :             Place:                                                   º
+t39=º Source:                                              Reference:              º
+t40=º Text  :                                                                      º
+t41=º Info  :                                                                      º
+t42=ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ¼
+n_fields=58
+f01=Person_record       ,31, 6, 0, 1,15,"","INDI RFN"
+f02=Person_last_change  ,32,10,10, 1,68,"","INDI CHAN DATE"
+f03=Given_name          ,47,64, 4, 2,15,"",""
+f04=Surname             ,47,40, 4, 3,15,"","INDI NAME"
+f05=Sex                 ,45, 1, 1, 3,67,"MMFFmmff??","INDI SEX"
+f06=Patronym            ,47,40, 4, 4,15,"","INDI _PATR"
+f07=Call_name           ,47,18, 4, 5,15,"","INDI NAME NICK/INDI NAME ALIA/INDI CHR NICK"
+f08=Alias               ,47,19, 4, 5,41,"","INDI NAME _ALIA/INDI NAME COMM"
+f09=Person_code         ,47,12, 4, 5,67,"","INDI REFN/INDI CODE"
+f10=Title1              ,47,16, 4, 6,15,"","INDI TITL"
+f11=Title2              ,47,16, 4, 6,41,"","INDI _TITL2"
+f12=Title3              ,47,12, 4, 6,67,"","INDI _TITL3"
+f13=Father              , 2,64, 4, 7,15,"",""
+f14=Mother              , 3,64, 4, 8,15,"",""
+f15=Occupation          ,47,64, 4, 9,15,"","INDI OCCU"
+f16=Person_scratch      ,46,64, 4,10,15,"","INDI _COMM/INDI COMM"
+f17=Person_info         ,46,64, 4,11,15,"","INDI NOTE"
+f18=Address_date        ,44,10,10,13,11,"","INDI RESI DATE"
+f19=Address_street      ,47,49, 4,13,30,"","INDI RESI ADDR"
+f20=Address_zip         ,47,11, 4,14,11,"","INDI RESI ADDR POST/INDI RESI POST"
+f21=Address_place       ,47,27, 4,14,30,"","INDI RESI ADDR CITY/INDI RESI PLAC"
+f22=Address_country     ,47,12, 4,14,67,"","INDI RESI ADDR CTRY/INDI RESI CTRY"
+f23=Address_phone       ,47,12, 4,15,11,"","INDI RESI PHON/INDI PHON"
+f24=Address_info        ,46,49, 4,15,30,"","INDI RESI NOTE/INDI ADDR"
+f25=Birth_date          ,44,10,10,17,11,"","INDI BIRT DATE"
+f26=Birth_place         ,47,30, 4,17,30,"","INDI BIRT PLAC"
+f27=Birth_time          ,45, 5, 5,17,67,"09::..","INDI BIRT TIME"
+f28=Birth_source        ,47,44, 4,18,11,"","INDI BIRT SOUR/INDI BIRT SOUR TITL"
+f29=Birth_ref           ,45,12,12,18,67,"","INDI BIRT SOUR REFN"
+f30=Birth_text          ,46,68, 4,19,11,"","INDI BIRT SOUR TEXT"
+f31=Birth_info          ,46,68, 4,20,11,"","INDI BIRT NOTE"
+f32=Christening_date    ,44,10,10,22,11,"","INDI CHR DATE"
+f33=Christening_place   ,47,26, 4,22,30,"","INDI CHR PLAC"
+f34=Religion            ,47,12, 4,22,67,"","INDI CHR RELI/INDI RELI"
+f35=Christening_witness ,47,68, 4,23,11,"","INDI CHR _WITN/INDI CHR WITN"
+f36=Christening_source  ,47,44, 4,24,11,"","INDI CHR SOUR/INDI CHR SOUR TITL"
+f37=Christening_ref     ,45,12,12,24,67,"","INDI CHR SOUR REFN"
+f38=Christening_text    ,46,68, 4,25,11,"","INDI CHR SOUR TEXT"
+f39=Christening_info    ,46,68, 4,26,11,"","INDI CHR NOTE"
+f40=Death_date          ,44,10,10,28,11,"","INDI DEAT DATE"
+f41=Death_place         ,47,30, 4,28,30,"","INDI DEAT PLAC"
+f42=Death_time          ,45, 5, 5,28,67,"09::..","INDI DEAT TIME"
+f43=Death_source        ,47,44, 4,29,11,"","INDI DEAT SOUR/INDI DEAT SOUR TITL"
+f44=Death_ref           ,45,12,12,29,67,"","INDI DEAT SOUR REFN"
+f45=Death_text          ,46,68, 4,30,11,"","INDI DEAT SOUR TEXT"
+f46=Death_info          ,46,68, 4,31,11,"","INDI DEAT NOTE"
+f47=Cremation_date      ,44,10,10,33,11,"","INDI CREM DATE"
+f48=Cremation_place     ,47,49, 4,33,30,"","INDI CREM PLAC"
+f49=Cremation_source    ,47,44, 4,34,11,"","INDI CREM SOUR/INDI CREM SOUR TITL"
+f50=Cremation_ref       ,45,12,12,34,67,"","INDI CREM SOUR REFN"
+f51=Cremation_text      ,46,68, 4,35,11,"","INDI CREM SOUR TEXT"
+f52=Cremation_info      ,46,68, 4,36,11,"","INDI CREM NOTE"
+f53=Burial_date         ,44,10,10,38,11,"","INDI BURI DATE"
+f54=Burial_place        ,47,49, 4,38,30,"","INDI BURI PLAC"
+f55=Burial_source       ,47,44, 4,39,11,"","INDI BURI SOUR/INDI BURI SOUR TITL"
+f56=Burial_ref          ,45,12,12,39,67,"","INDI BURI SOUR REFN"
+f57=Burial_text         ,46,68, 4,40,11,"","INDI BURI SOUR TEXT"
+f58=Burial_info         ,46,68, 4,41,11,"","INDI BURI NOTE"
+n_replace=4
+r01=Surname,Patronym
+r02=Birth_date,Christening_date/Birth_place,Christening_place
+r03=Death_date,Burial_date/Death_place,Burial_place
+r04=Burial_date,Cremation_date/Burial_place,Cremation_place
+
+[Table_2]
+name1=Marriage
+name2=Marriages
+fileext=.REL
+indexext=.IXR
+n_lines=35
+hiddenlines=5,7,8,9,10,11,16,22,28,30,31,32,33,34
+t01=ÉÍµMARRIAGE       ÆÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍµpg30-1gbÆÍÍÍÍÍÍÍÍÍµLAST CHANGE           ÆÍ»
+t02=º ÛHusband:                                                                     º
+t03=º Wife   :                                                                     º
+t04=º Code   :                                                                     º
+t05=º Scratch:                                                                     º
+t06=º Info   :                                                                     º
+t07=ÇÄ´ÛLiving togetherÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t08=º Date  :             Place:                                                   º
+t09=º Source:                                              Reference:              º
+t10=º Text  :                                                                      º
+t11=º Info  :                                                                      º
+t12=ÇÄ´Publication of the ÛbannsÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t13=º Date  :             Place:                                                   º
+t14=º Witn. :                                                                      º
+t15=º Source:                                              Reference:              º
+t16=º Text  :                                                                      º
+t17=º Info  :                                                                      º
+t18=ÇÄ´Civil ÛmarriageÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t19=º Date  :             Place:                                                   º
+t20=º Witn. :                                                                      º
+t21=º Source:                                              Reference:              º
+t22=º Text  :                                                                      º
+t23=º Info  :                                                                      º
+t24=ÇÄ´ÛChurch marriageÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t25=º Date  :             Place:                              Church:              º
+t26=º Witn. :                                                                      º
+t27=º Source:                                              Reference:              º
+t28=º Text  :                                                                      º
+t29=º Info  :                                                                      º
+t30=ÇÄ´ÛDivorceÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
+t31=º Date  :             Place:                                                   º
+t32=º Source:                                              Reference:              º
+t33=º Text  :                                                                      º
+t34=º Info  :                                                                      º
+t35=ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ¼
+n_fields=41
+f01=Relation_record     ,31, 6, 0, 1,13,"","FAM RFN"
+f02=Relation_last_change,32,10,10, 1,68,"","FAM CHAN DATE"
+f03=Husband             ,22,67, 4, 2,12,"","FAM HUSB"
+f04=Wife                ,23,67, 4, 3,12,"","FAM WIFE"
+f05=Relation_code       ,47,12, 4, 4,12,"","FAM REFN/FAM CODE"
+f06=Relation_scratch    ,46,67, 4, 5,12,"","FAM _COMM/FAM COMM"
+f07=Relation_info       ,46,67, 4, 6,12,"","FAM NOTE"
+f08=Living_date         ,44,10,10, 8,11,"","FAM _LIV DATE"
+f09=Living_place        ,47,49, 4, 8,30,"","FAM _LIV PLAC"
+f10=Living_source       ,47,44, 4, 9,11,"","FAM _LIV SOUR/FAM _LIV SOUR TITL"
+f11=Living_ref          ,45,12,12, 9,67,"","FAM _LIV SOUR REFN"
+f12=Living_text         ,46,68, 4,10,11,"","FAM _LIV SOUR TEXT"
+f13=Living_info         ,46,68, 4,11,11,"","FAM _LIV NOTE"
+f14=Banns_date          ,44,10,10,13,11,"","FAM MARB DATE/FAM REGS DATE"
+f15=Banns_place         ,47,49, 4,13,30,"","FAM MARB PLAC/FAM REGS PLAC"
+f16=banns_witnesses     ,47,68, 4,14,11,"","FAM MARB _WITN/FAM MARB WITN"
+f17=Banns_source        ,47,44, 4,15,11,"","FAM MARB SOUR/FAM MARB SOUR TITL/FAM REGS SOUR"
+f18=Banns_ref           ,45,12,12,15,67,"","FAM MARB SOUR REFN/FAM REGS SOUR REFN"
+f19=Banns_text          ,46,68, 4,16,11,"","FAM MARB SOUR TEXT"
+f20=Banns_info          ,46,68, 4,17,11,"","FAM MARB NOTE"
+f21=Civil_date          ,44,10,10,19,11,"","FAM MARR(Civil) DATE/FAM MARR DATE"
+f22=Civil_place         ,47,49, 4,19,30,"","FAM MARR(Civil) PLAC/FAM MARR PLAC"
+f23=Civil_witnesses     ,47,68, 4,20,11,"","FAM MARR(Civil) _WITN/FAM MARR _WITN/FAM MARR WITN/FAM WITN"
+f24=Civil_source        ,47,44, 4,21,11,"","FAM MARR(Civil) SOUR/FAM MARR SOUR/FAM MARR SOUR TITL"
+f25=Civil_ref           ,45,12,12,21,67,"","FAM MARR(Civil) SOUR REFN/FAM MARR SOUR REFN"
+f26=Civil_text          ,46,68, 4,22,11,"","FAM MARR(Civil) SOUR TEXT/FAM MARR SOUR TEXT"
+f27=Civil_info          ,46,68, 4,23,11,"","FAM MARR(Civil) NOTE/FAM MARR NOTE"
+f28=Church_date         ,44,10,10,25,11,"","FAM MARR(Church) DATE/FAM ORDI DATE"
+f29=Church_place        ,47,28, 4,25,30,"","FAM MARR(Church) PLAC/FAM ORDI PLAC"
+f30=Church              ,47,12, 4,25,67,"","FAM MARR(Church) _CHUR/FAM ORDI _CHUR/FAM ORDI RELI"
+f31=Church_witnesses    ,47,68, 4,26,11,"","FAM MARR(Church) _WITN/FAM ORDI _WITN/FAM ORDI WITN"
+f32=Church_source       ,47,44, 4,27,11,"","FAM MARR(Church) SOUR/FAM ORDI SOUR/FAM ORDI SOUR TITL"
+f33=Church_ref          ,45,12,12,27,67,"","FAM MARR(Church) SOUR REFN/FAM ORDI SOUR REFN"
+f34=Church_text         ,46,68, 4,28,11,"","FAM MARR(Church) SOUR TEXT/FAM ORDI SOUR TEXT"
+f35=Church_info         ,46,68, 4,29,11,"","FAM MARR(Church) NOTE/FAM ORDI NOTE"
+f36=Divorce_date        ,44,10,10,31,11,"","FAM DIV DATE/FAM DIVO DATE"
+f37=Divorce_place       ,47,49, 4,31,30,"","FAM DIV PLAC/FAM DIVO PLAC"
+f38=Divorce_source      ,47,44, 4,32,11,"","FAM DIV SOUR/FAM DIV SOUR TITL"
+f39=Divorce_ref         ,45,12,12,32,67,"","FAM DIV SOUR REFN"
+f40=Divorce_text        ,46,68, 4,33,11,"","FAM DIV SOUR TEXT"
+f41=Divorce_info        ,46,68, 4,34,11,"","FAM DIV NOTE"
+n_replace=3
+r01=Banns_date,Living_date/Banns_place,Living_place
+r02=Civil_date,Church_date/Civil_place,Church_place
+r03=Church_date,Banns_date/Church_place,Banns_place
+
+[Genealogical]
+male=M
+female=F
+function_father=[FATHER]
+function_mother=[MOTHER]
+function_husband=[HUSBAND]
+function_wife=[WIFE]
+function_age=[AGE]
+function_initials=[INITIALS]
+field_father=Father
+field_mother=Mother
+field_givenname=Given_name
+field_surname=Surname
+field_sex=Sex
+field_birthdate=Birth_date
+field_christeningdate=Christening_date
+field_deathdate=Death_date
+field_burialdate=Burial_date
+field_husband=Husband
+field_wife=Wife
+field_marriagedate=Civil_date
+field_churchdate=Church_date
+field_divorcedate=Divorce_date
@@ -0,0 +1,2 @@
+\0
+PG30-1GB.DEF
@@ -0,0 +1,22 @@
+[PRO-GEN]
+version=3.21
+type=ixi
+indexformat=2
+
+[Table_1]
+current_record=0
+current_index=1
+indexes=1
+sel_1=
+sort_1=
+mark_1=
+marked_1=0
+
+[Table_2]
+current_record=0
+current_index=1
+indexes=1
+sel_1=
+sort_1=
+mark_1=
+marked_1=0
@@ -0,0 +1,20 @@
+File of remarks for GEDCOM import.
+
+GEDCOM file   : D:\Users\PRC\Documents\Gramps\data\tests\exp_sample_ged.ged
+PRO-GEN file  : C:\PG30\GB\DATA\SAMPLE
+Date          : 13/01/2017
+
+Rec.   Remarks (P=person, R=Marriage)
+--------------------------------------------------------------------------------
+    P1 (@I0000@) Surname (Anna Nana /Hansdotter/) has already been entered.
+2 FAMC @F0008@
+   P25 (@I0024@) Death_date (BEF 23 JUL 1930) too long.
+2 FAMC @F0010@
+   P43 (@I0042@) Surname (Frank /Neilsen/) has already been entered.
+2 FAMC @F0005@
+   P47 (@I0046@) Address_date (FROM 1 JAN 1964 TO 3 MAR 1970) too long.
+       (@I0046@) Address_date (I think 1970 to 1971) has already been entered.
+2 FAMC @F0016@
+2 FAMC @F0016@
+2 FAMC @F0016@
+--------------------------------------------------------------------------------
@@ -3,11 +3,14 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2016-09-04" version="5.0.0-alpha1"/>
+    <created date="2016-10-29" version="5.0.0-alpha1"/>
    <researcher>
      <resname>Alex Roitman,,,</resname>
      <resaddr>Not Provided</resaddr>
+      <resphone>666-555-4444</resphone>
+      <resemail>an_email@gmail.com</resemail>
    </researcher>
+    <mediapath>{DATA_DIR}/tests</mediapath>
  </header>
  <tags>
    <tag handle="_d54b22fbfc721be9331fb706e3" change="1465741788" name="Unicode" color="#000000" priority="0"/>
@@ -566,25 +569,93 @@
      <attribute type="WWW" value="http://mrstester.com"/>
      <noteref hlink="_d65a448167a6b06a71840a1953b"/>
    </event>
-    <event handle="_d65a448167a70779a5ea555fb99" change="1472500308" id="E0094">
+    <event handle="_d65a448167a70779a5ea555fb99" change="1477749917" id="E0094">
      <type>Residence</type>
-      <dateval val="1964"/>
+      <datespan start="1964-01-01" stop="1970-03-03"/>
+      <place hlink="_0000006a0000006a"/>
      <attribute type="Phone" value="440-871-3402"/>
      <attribute type="EMAIL" value="tomtester@gmail.com"/>
      <attribute type="FAX" value="440-321-4569"/>
      <attribute type="WWW" value="http://tomtester.com"/>
    </event>
+    <event handle="_d70437393c02164585e75a1733c" change="1477581914" id="ID_Laborer">
+      <type>Occupation</type>
+      <dateval val="1972"/>
+    </event>
+    <event handle="_d7043782aa05af41571ec778c76" change="1477584625" id="E0095">
+      <type>Birth</type>
+      <dateval val="1954"/>
+      <place hlink="_0000006500000065"/>
+      <attribute type="Time" value="12:45 am"/>
+      <attribute type="Agency" value="A hosptial"/>
+      <attribute type="Unknown" value="Who knows"/>
+    </event>
+    <event handle="_d7044217b59dd082df3d9af68f" change="1477583054" id="E0096">
+      <type>Death</type>
+    </event>
+    <event handle="_d70443bf71c6340e05a9adc10ae" change="1477583227" id="E0097">
+      <type>Burial</type>
+      <dateval val="2017-01-01"/>
+      <description>Buried in a Cemetary</description>
+    </event>
+    <event handle="_d70443f345457255bed58a2c65b" change="1477758153" id="E0098">
+      <type>Marriage</type>
+      <attribute type="Father Age" value="45"/>
+      <attribute type="Mother Age" value="15"/>
+    </event>
+    <event handle="_d70444b050662d2c4b8ae028b26" change="1477583326" id="E0099">
+      <type>Engagement</type>
+      <description>They were engaged</description>
+    </event>
+    <event handle="_d70446576f35592a31604008bf6" change="1477583499" id="E0100">
+      <type>Alternate Marriage</type>
+      <description>Married by a clown in the buff</description>
+    </event>
+    <event handle="_d70446bff1e2c2e3c842d42b8cb" change="1477583668" id="E0101">
+      <type>Alternate Marriage</type>
+      <attribute type="Father Age" value="44"/>
+      <attribute type="Mother Age" value="15"/>
+    </event>
+    <event handle="_d7044d1d2c749802e8116b33f47" change="1477584209" id="E0102">
+      <type>Retirement</type>
+    </event>
+    <event handle="_d70a7933f8d7296231917a2cc14" change="1477749894" id="E0104">
+      <type>Residence</type>
+      <datestr val="I think 1970 to 1971"/>
+      <place hlink="_0000000900000009"/>
+    </event>
+    <event handle="_d70acccb2bdd725c3180c78f28" change="1477758659" id="E0105">
+      <type>Death</type>
+    </event>
+    <event handle="_d70ad043a9e669bb85bfe71deba" change="1477759023" id="E0106">
+      <type>LossOfMojo</type>
+      <dateval val="1973-07-07"/>
+      <description>A very bad day</description>
+    </event>
+    <event handle="_d70ad0ba90b766d0f8966fb0aba" change="1477759072" id="E0107">
+      <type>GainOfMojo</type>
+      <dateval val="1973-07-10"/>
+    </event>
  </events>
  <people>
-    <person handle="_0000000100000001" change="1198222526" id="I0000">
+    <person handle="_0000000100000001" change="1477581282" id="I0000">
      <gender>F</gender>
      <name type="Birth Name">
        <first>Anna</first>
        <surname>Hansdotter</surname>
+        <nick>Annanana</nick>
+      </name>
+      <name alt="1" type="Also Known As">
+        <first>Anna Nana</first>
+        <surname>Hansdotter</surname>
      </name>
      <eventref hlink="_0000000200000002" role="Primary"/>
      <eventref hlink="_0000000400000004" role="Primary"/>
      <parentin hlink="_0000000600000006"/>
+      <personref hlink="_0000008700000087" rel="Friend">
+        <noteref hlink="_d7042e81dfd1dadee8ef6e5cac4"/>
+      </personref>
+      <noteref hlink="_d70429bc98a43469b08051816c7"/>
    </person>
    <person handle="_0000000700000007" change="1198222526" id="I0001">
      <gender>M</gender>
@@ -1032,20 +1103,36 @@
        <surname>リチミシキスイミ</surname>
      </name>
    </person>
-    <person handle="_d65a448167a2736b3dfc08c11d8" change="1473020199" id="I0044">
+    <person handle="_d65a448167a2736b3dfc08c11d8" change="1477759240" id="I0044">
      <gender>M</gender>
      <name type="Birth Name">
        <first>The</first>
        <surname>Tester</surname>
      </name>
      <eventref hlink="_d65a44813a618a10a0abaa1ed6a" role="Primary"/>
+      <eventref hlink="_d70acccb2bdd725c3180c78f28" role="Unknown"/>
+      <eventref hlink="_d70ad043a9e669bb85bfe71deba" role="Primary"/>
+      <eventref hlink="_d70ad0ba90b766d0f8966fb0aba" role="Primary"/>
+      <lds_ord type="baptism">
+        <dateval val="1955-01-02"/>
+        <status val="Infant"/>
+      </lds_ord>
+      <address>
+        <dateval val="2017-10-27"/>
+        <locality>test village</locality>
+        <city>Akron</city>
+        <state>OH</state>
+        <country>Cuyahoga</country>
+        <postal>44177</postal>
+      </address>
+      <attribute type="Nickname" value="Testy"/>
      <childof hlink="_0000000a0000000a"/>
      <parentin hlink="_d65a46d6c0034a50640d7a84213"/>
      <citationref hlink="_d65a448168445feea89cc1499fb"/>
    </person>
-    <person handle="_d65a4481684319731c24a1e105a" change="1473020199" id="I0045">
+    <person handle="_d65a4481684319731c24a1e105a" change="1477750978" id="I0045">
      <gender>F</gender>
-      <name type="Birth Name">
+      <name type="Married Name">
        <first>Mrs</first>
        <surname>Tester</surname>
      </name>
@@ -1065,16 +1152,103 @@
      <noteref hlink="_d65a448168e1061fc46719b5efa"/>
      <citationref hlink="_d65a448168e27ed358658e331d9"/>
    </person>
-    <person handle="_d65a448168e2615f26e025aa37c" change="1473020269" id="I0046">
+    <person handle="_d65a448168e2615f26e025aa37c" change="1477758479" id="I0046">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Tom</first>
-        <surname>Tester</surname>
+        <surname prefix="Von" connector="y">Tester</surname>
+        <surname prim="0">tested</surname>
+        <nick>TesterNickname</nick>
      </name>
      <eventref hlink="_d65a448167a70779a5ea555fb99" role="Primary"/>
+      <eventref hlink="_d70a7933f8d7296231917a2cc14" role="Primary"/>
+      <lds_ord type="sealed_to_parents">
+        <dateval val="1999" type="about" quality="estimated"/>
+        <temple val="DENVE"/>
+        <place hlink="_0000006a0000006a"/>
+        <sealed_to hlink="_d65a46d6c0034a50640d7a84213"/>
+      </lds_ord>
+      <url  href="" type="FTP"/>
      <childof hlink="_d65a46d6c0034a50640d7a84213"/>
      <citationref hlink="_d65a448169813b50e0fdc0eea70"/>
    </person>
+    <person handle="_d70431c6959122e6b45d92a0f79" change="1477758479" id="I0047">
+      <gender>U</gender>
+      <name type="Birth Name">
+        <first>Fake</first>
+        <call>Person</call>
+        <surname prefix="von" derivation="Feudal">Person</surname>
+        <suffix>I</suffix>
+        <title>Fake person</title>
+        <nick>Fake</nick>
+      </name>
+      <eventref hlink="_d70437393c02164585e75a1733c" role="Primary"/>
+      <eventref hlink="_d7043782aa05af41571ec778c76" role="Primary">
+        <attribute type="Father Age" value="47"/>
+        <attribute type="Mother Age" value="16"/>
+        <attribute type="Description" value="An eventref description"/>
+      </eventref>
+      <eventref hlink="_d7044217b59dd082df3d9af68f" role="Primary"/>
+      <eventref hlink="_d70443bf71c6340e05a9adc10ae" role="Primary"/>
+      <eventref hlink="_d7044d1d2c749802e8116b33f47" role="Primary"/>
+      <lds_ord type="baptism">
+        <dateval val="1960-06-07"/>
+        <temple val="DENVE"/>
+        <place hlink="_0000006a0000006a"/>
+        <status val="Qualified"/>
+      </lds_ord>
+      <address>
+        <dateval val="1954"/>
+        <street>8888 Cliff Dr</street>
+        <city>Bay Village</city>
+        <state>Ohio</state>
+        <country>Cuyahoga</country>
+        <postal>44140</postal>
+        <phone>440-871-3400</phone>
+      </address>
+      <attribute type="Identification Number" value="ID99999"/>
+      <attribute type="RFN" value="RFN8888"/>
+      <attribute type="RESN" value="">
+        <noteref hlink="_d7043cbb41e378229bb7645880a"/>
+      </attribute>
+      <attribute type="Age" value="99"/>
+      <attribute type="Agency" value="a hospital"/>
+      <attribute type="Description" value="A fake description"/>
+      <url  href="ftp://whoknows.org" type="FTP" description="A test FTP URL"/>
+      <childof hlink="_d65a46d6c0034a50640d7a84213"/>
+    </person>
+    <person handle="_d704394bd865d87c4e17e0ddb52" change="1477758479" id="I0048">
+      <gender>F</gender>
+      <name type="Birth Name">
+        <first>Mary</first>
+        <surname>Tester</surname>
+      </name>
+      <childof hlink="_d65a46d6c0034a50640d7a84213"/>
+    </person>
+    <person handle="_d7043a0d88d6c229604fb03acd8" change="1477758479" id="I0049">
+      <gender>F</gender>
+      <name type="Unknown">
+        <first>Martha</first>
+        <surname>Tester</surname>
+      </name>
+      <childof hlink="_d65a46d6c0034a50640d7a84213"/>
+    </person>
+    <person handle="_d7043e8a06054d316b49becaa9" change="1477758479" id="I0050">
+      <gender>M</gender>
+      <name type="Also Known As">
+        <first>John</first>
+        <surname>Tester</surname>
+      </name>
+      <childof hlink="_d65a46d6c0034a50640d7a84213"/>
+    </person>
+    <person handle="_d70ac994c26790fb000f95f0a31" change="1477758479" id="I0051">
+      <gender>M</gender>
+      <name type="Birth Name">
+        <first>Mark</first>
+        <surname>Tester</surname>
+      </name>
+      <childof hlink="_d65a46d6c0034a50640d7a84213"/>
+    </person>
  </people>
  <families>
    <family handle="_0000000600000006" change="1198222526" id="F0003">
@@ -1194,11 +1368,30 @@
      <mother hlink="_0000005600000056"/>
      <eventref hlink="_000000a9000000a9" role="Family"/>
    </family>
-    <family handle="_d65a46d6c0034a50640d7a84213" change="1473020211" id="F0016">
+    <family handle="_d65a46d6c0034a50640d7a84213" change="1477758479" id="F0016">
      <rel type="Married"/>
      <father hlink="_d65a448167a2736b3dfc08c11d8"/>
      <mother hlink="_d65a4481684319731c24a1e105a"/>
+      <eventref hlink="_d70443f345457255bed58a2c65b" role="Family"/>
+      <eventref hlink="_d70444b050662d2c4b8ae028b26" role="Family"/>
+      <eventref hlink="_d70446576f35592a31604008bf6" role="Family"/>
+      <eventref hlink="_d70446bff1e2c2e3c842d42b8cb" role="Family"/>
+      <lds_ord type="sealed_to_spouse">
+        <dateval val="2000-02-22"/>
+        <temple val="DENVE"/>
+        <place hlink="_0000003400000034"/>
+        <status val="Cleared"/>
+      </lds_ord>
      <childref hlink="_d65a448168e2615f26e025aa37c"/>
+      <childref hlink="_d70431c6959122e6b45d92a0f79" mrel="Stepchild" frel="Adopted"/>
+      <childref hlink="_d704394bd865d87c4e17e0ddb52" mrel="Adopted"/>
+      <childref hlink="_d7043a0d88d6c229604fb03acd8" mrel="Foster" frel="Foster"/>
+      <childref hlink="_d7043e8a06054d316b49becaa9" mrel="Stepchild" frel="Stepchild"/>
+      <childref hlink="_d70ac994c26790fb000f95f0a31" mrel="Sponsored" frel="Sponsored"/>
+      <attribute type="Number of Children" value="4"/>
+      <attribute type="RFN" value="RFN3333"/>
+      <attribute type="License Number" value="7532951"/>
+      <attribute type="Unknown" value=""/>
    </family>
  </families>
  <citations>
@@ -1219,10 +1412,15 @@
      <confidence>3</confidence>
      <sourceref hlink="_d53252d41b370ebe65ebd50c34f"/>
    </citation>
-    <citation handle="_d53254b0c802fe24bdea26f3180" change="1465075912" id="C0004">
+    <citation handle="_d53254b0c802fe24bdea26f3180" change="1477757692" id="C0004">
      <dateval val="1955-05-05"/>
      <page>22 6</page>
      <confidence>2</confidence>
+      <noteref hlink="_d70a86ba52769996c5099561a3d"/>
+      <noteref hlink="_d70a873db52134a80abb82d9769"/>
+      <srcattribute type="EVEN" value="Citation Event?"/>
+      <srcattribute type="EVEN:ROLE" value="The Event type Role"/>
+      <srcattribute type="Unknown" value="I'ts unknown!"/>
      <sourceref hlink="_000000b9000000b9"/>
    </citation>
    <citation handle="_d65a448168445feea89cc1499fb" change="1472500308" id="C0005">
@@ -1233,8 +1431,9 @@
      <confidence>2</confidence>
      <sourceref hlink="_d65a448169824195df7cdb2236c"/>
    </citation>
-    <citation handle="_d65a448169813b50e0fdc0eea70" change="1472500308" id="C0007">
+    <citation handle="_d65a448169813b50e0fdc0eea70" change="1477757813" id="C0007">
      <confidence>2</confidence>
+      <noteref hlink="_d70a86ba52769996c5099561a3d"/>
      <sourceref hlink="_d65a448169824195df7cdb2236c"/>
    </citation>
  </citations>
@@ -1274,6 +1473,13 @@
      <stitle>Ohio Births, 1958-2002</stitle>
      <reporef hlink="_d65a44816ac165956f5723df07d" medium="Book"/>
    </source>
+    <source handle="_d7044abba5546284583fee1e21c" change="1477758039" id="S0007">
+      <stitle></stitle>
+      <sauthor>The tester</sauthor>
+      <spubinfo>Published when the test was written</spubinfo>
+      <sabbrev>TST</sabbrev>
+      <reporef hlink="_d7044c855b91ee04c40e98987e7"/>
+    </source>
  </sources>
  <places>
    <placeobj handle="_0000000300000003" change="1465741826" id="P0000" type="Unknown">
@@ -1306,7 +1512,7 @@
      <ptitle>Hayward, Alameda Co., CA</ptitle>
      <pname value="Hayward, Alameda Co., CA"/>
    </placeobj>
-    <placeobj handle="_0000003400000034" change="1463929997" id="P0007" type="Unknown">
+    <placeobj handle="_0000003400000034" change="1477754702" id="P0007" type="Locality">
      <ptitle>Community Presbyterian Church, Danville, CA</ptitle>
      <pname value="Community Presbyterian Church, Danville, CA"/>
    </placeobj>
@@ -1442,8 +1648,9 @@
    </placeobj>
  </places>
  <objects>
-    <object handle="_d54c1b52c8636648123580900ca" change="1465767829" id="O0000">
-      <file src="D:/Users/prc/Downloads/Michael O'Toole 2015-11.jpg" mime="image/jpeg" checksum="ed5423c128d9bc43dbc03a8311f185bd" description="Michael O'Toole 2015-11"/>
+    <object handle="_d54c1b52c8636648123580900ca" change="1477754617" id="O0000">
+      <file src="O0.jpg" mime="image/jpeg" checksum="887d22e5822c86bd3961d0d179fbc0a2" description="Michael O'Toole 2015-11"/>
+      <noteref hlink="_d70aa63baa15f9fee23b45f03b"/>
    </object>
  </objects>
  <repositories>
@@ -1509,6 +1716,13 @@
      <noteref hlink="_d65a44816cafa196ba741ab38d"/>
      <noteref hlink="_d65a44816ca32ac25b0b586e61c"/>
    </repository>
+    <repository handle="_d7044c064202cdd982648bfce19" change="1477584095" id="R0005">
+      <type>Library</type>
+      <url  href="555-444-3333" type="Unknown"/>
+    </repository>
+    <repository handle="_d7044c855b91ee04c40e98987e7" change="1477758030" id="R0006">
+      <type>Library</type>
+    </repository>
  </repositories>
  <notes>
    <note handle="_0000004200000042" change="1463929997" id="N0002" type="General">
@@ -1593,5 +1807,24 @@ Only one phone number supported                                     Line     9:
        <range start="0" end="144"/>
      </style>
    </note>
+    <note handle="_d70429bc98a43469b08051816c7" change="1477580626" id="N0014" type="Person Note">
+      <text>******************************************************************890123456789
+******************************************************************89 123456789</text>
+    </note>
+    <note handle="_d7042e81dfd1dadee8ef6e5cac4" change="1477581000" id="N0015" type="Association Note">
+      <text>This should show up under the ASSO tag in Gedcom</text>
+    </note>
+    <note handle="_d7043cbb41e378229bb7645880a" change="1477582492" id="N0016" type="Attribute Note">
+      <text>??? What is RESN???</text>
+    </note>
+    <note handle="_d70a86ba52769996c5099561a3d" change="1477757590" id="N0017" type="Source text">
+      <text>A citation Note Source text</text>
+    </note>
+    <note handle="_d70a873db52134a80abb82d9769" change="1477751366" id="N0018" type="Citation">
+      <text>Another Citation Note</text>
+    </note>
+    <note handle="_d70aa63baa15f9fee23b45f03b" change="1477754616" id="N0019" type="Media Note">
+      <text>A bad photo for sure</text>
+    </note>
  </notes>
 </database>
@@ -4,6 +4,7 @@ PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
 FN:Anna Hansdotter
 N:Hansdotter;Anna;;;
 SORT-STRING:Hansdotter               Anna                          
+NICKNAME:Annanana
 X-GENDER:Female
 BDAY:1864-10-02
 END:VCARD
@@ -439,6 +440,7 @@ N:Tester;The;;;
 SORT-STRING:Tester                   The                           
 X-GENDER:Male
 BDAY:1954-12-29
+ADR:;;;Akron;OH;44177;Cuyahoga
 END:VCARD

 BEGIN:VCARD
@@ -459,9 +461,58 @@ END:VCARD
 BEGIN:VCARD
 VERSION:3.0
 PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Tom Tester
-N:Tester;Tom;;;
+FN:Tom Von Tester y tested
+N:Von Tester y,tested;Tom;;;
 SORT-STRING:Tester                   Tom                           
+NICKNAME:TesterNickname
+X-GENDER:Male
+END:VCARD
+
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:Fake person Fake von Person\, I
+N:von Person;Person;Fake;Fake,person;I
+SORT-STRING:Person                   Fake                          I
+NICKNAME:Fake
+ADR:;;8888 Cliff Dr;Bay Village;Ohio;44140;Cuyahoga
+TEL:440-871-3400
+URL:ftp://whoknows.org
+END:VCARD
+
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:Mary Tester
+N:Tester;Mary;;;
+SORT-STRING:Tester                   Mary                          
+X-GENDER:Female
+END:VCARD
+
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:Martha Tester
+N:Tester;Martha;;;
+SORT-STRING:Tester                   Martha                        
+X-GENDER:Female
+END:VCARD
+
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:John Tester
+N:Tester;John;;;
+SORT-STRING:Tester                   John                          
+X-GENDER:Male
+END:VCARD
+
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
+FN:Mark Tester
+N:Tester;Mark;;;
+SORT-STRING:Tester                   Mark                          
 X-GENDER:Male
 END:VCARD

@@ -43,6 +43,15 @@
 2 NOTE @N0018@
 1 OBJE @M7@
 1 OBJE @M8@
+1 OBJE
+2 FORM URL
+2 FILE http:\\obje.form.on_person.org
+1 BIRT
+2 TYPE Birth of the Tester
+2 DATE 2 OCT 1864
+2 OBJE
+3 FORM URL
+3 FILE http:\\obje.form.on_event.org
 0 @M1@ OBJE
 1 FORM jpeg
 1 TITL Multimedia link to linked form v5.5 blob
@@ -3,17 +3,26 @@
 "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="2017-05-30" version="5.0.0-alpha1"/>
    <researcher>
    </researcher>
  </header>
+  <events>
+    <event handle="_0000000f0000000f" change="1" id="E0000">
+      <type>Birth</type>
+      <dateval val="1864-10-02"/>
+      <description>Birth of the Tester</description>
+      <noteref hlink="_0000001000000010"/>
+    </event>
+  </events>
  <people>
-    <person handle="_0000000100000001" change="1472500307" id="I0001">
+    <person handle="_0000000100000001" change="1" id="I0001">
      <gender>U</gender>
      <name type="Birth Name">
        <first>The</first>
        <surname>Tester</surname>
      </name>
+      <eventref hlink="_0000000f0000000f" role="Primary"/>
      <objref hlink="_0000000300000003"/>
      <objref hlink="_0000000400000004"/>
      <objref hlink="_0000000500000005"/>
@@ -25,105 +34,107 @@
      <objref hlink="_0000000c0000000c"/>
      <objref hlink="_0000000d0000000d"/>
      <objref hlink="_0000000e0000000e"/>
-      <noteref hlink="_0000000f0000000f"/>
+      <url  href="http:\\obje.form.on_person.org" type="Web Home"/>
+      <noteref hlink="_0000001100000011"/>
    </person>
  </people>
  <citations>
-    <citation handle="_0000001b0000001b" change="1472500307" id="C0000">
+    <citation handle="_0000001d0000001d" change="1" id="C0000">
      <confidence>0</confidence>
-      <noteref hlink="_0000001a0000001a"/>
-      <sourceref hlink="_0000001900000019"/>
+      <noteref hlink="_0000001c0000001c"/>
+      <sourceref hlink="_0000001b0000001b"/>
    </citation>
-    <citation handle="_0000002500000025" change="1472500307" id="C0001">
+    <citation handle="_0000002700000027" change="1" id="C0001">
      <dateval val="2014-06-07"/>
      <page>77, 78 discussion of multimedia link with two files</page>
      <confidence>4</confidence>
-      <noteref hlink="_0000002400000024"/>
-      <sourceref hlink="_0000002300000023"/>
+      <noteref hlink="_0000002600000026"/>
+      <sourceref hlink="_0000002500000025"/>
    </citation>
  </citations>
  <sources>
-    <source handle="_0000001900000019" change="1472500307" id="S0002">
+    <source handle="_0000001b0000001b" change="1" id="S0002">
      <stitle>A Great Photographer</stitle>
    </source>
-    <source handle="_0000002300000023" change="1472500307" id="S0001">
+    <source handle="_0000002500000025" change="1" id="S0001">
      <stitle>The Testers personal files</stitle>
      <sauthor>The Tester</sauthor>
      <spubinfo>Name: Tester Publishing Operations, Inc.; Location: OSF world</spubinfo>
    </source>
  </sources>
  <objects>
-    <object handle="_0000000300000003" change="1472500307" id="O0000">
+    <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"/>
    </object>
    <object handle="_0000000400000004" change="548708291" id="M1">
      <file src="" mime="" description="Multimedia link to linked form v5.5 blob"/>
      <attribute type="REFN" value="Ref12345M1">
-        <noteref hlink="_0000001000000010"/>
+        <noteref hlink="_0000001200000012"/>
      </attribute>
      <attribute type="RIN" value="ID09876M1"/>
-      <noteref hlink="_0000001100000011"/>
-      <noteref hlink="_0000001200000012"/>
+      <noteref hlink="_0000001300000013"/>
+      <noteref hlink="_0000001400000014"/>
    </object>
    <object handle="_0000000500000005" change="548797681" id="M3">
      <file src="test.jpg" mime="image/jpeg" description="Multimedia link to linked form Gramps style v5.5ish file"/>
-      <noteref hlink="_0000001500000015"/>
-      <noteref hlink="_0000001600000016"/>
+      <noteref hlink="_0000001700000017"/>
+      <noteref hlink="_0000001800000018"/>
    </object>
    <object handle="_0000000600000006" change="548883481" id="M4">
      <file src="test.jpg" mime="image/jpeg" description="Multimedia link to linked form v5.5.1 file"/>
      <attribute type="Media-Type" value="Photo"/>
      <attribute type="REFN" value="Ref1234567M4">
-        <noteref hlink="_0000001700000017"/>
+        <noteref hlink="_0000001900000019"/>
      </attribute>
      <attribute type="RIN" value="ID098765M4"/>
-      <noteref hlink="_0000001800000018"/>
-      <noteref hlink="_0000001c0000001c"/>
-      <citationref hlink="_0000001b0000001b"/>
+      <noteref hlink="_0000001a0000001a"/>
+      <noteref hlink="_0000001e0000001e"/>
+      <citationref hlink="_0000001d0000001d"/>
    </object>
-    <object handle="_0000000800000008" change="1472500307" id="O0001">
+    <object handle="_0000000800000008" change="1" id="O0001">
      <file src="test_emb_551.jpg" mime="image/jpeg" description="Multimedia link embedded form v5.5.1"/>
      <attribute type="Media-Type" value="Photo"/>
      <noteref hlink="_0000000700000007"/>
    </object>
-    <object handle="_0000000900000009" change="1472500307" id="M5">
+    <object handle="_0000000900000009" change="1" id="M5">
      <file src="test.jpg" mime="image/jpeg" description="Multimedia link to linked form FTM style file"/>
-      <noteref hlink="_0000001d0000001d"/>
-      <noteref hlink="_0000001e0000001e"/>
      <noteref hlink="_0000001f0000001f"/>
      <noteref hlink="_0000002000000020"/>
+      <noteref hlink="_0000002100000021"/>
+      <noteref hlink="_0000002200000022"/>
+      <datestr val="6/4/2016 9:33:57 AM"/>
    </object>
    <object handle="_0000000a0000000a" change="549056401" id="M6">
      <file src="test.jpg" mime="image/jpeg" description="Multimedia link to linked form v5.5.1 with two files(1)"/>
      <attribute type="Media-Type" value="Photo"/>
      <attribute type="REFN" value="Ref1234567M6">
-        <noteref hlink="_0000002100000021"/>
+        <noteref hlink="_0000002300000023"/>
      </attribute>
      <attribute type="RIN" value="ID098765M6"/>
-      <noteref hlink="_0000002200000022"/>
-      <noteref hlink="_0000002600000026"/>
-      <citationref hlink="_0000002500000025"/>
+      <noteref hlink="_0000002400000024"/>
+      <noteref hlink="_0000002800000028"/>
+      <citationref hlink="_0000002700000027"/>
    </object>
-    <object handle="_0000000c0000000c" change="1472500307" id="O0002">
+    <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"/>
      <noteref hlink="_0000000b0000000b"/>
    </object>
-    <object handle="_0000000d0000000d" change="1472500307" id="M7">
+    <object handle="_0000000d0000000d" change="1" id="M7">
      <file src="http://s6.postimg.org/8i2erq27l/Preserve_Record_Numbers_Option.png" mime="image/png" description="Multimedia link to linked form v5.5.1 with URL"/>
      <attribute type="Media-Type" value="Photo"/>
    </object>
-    <object handle="_0000000e0000000e" change="1472500307" id="M8">
+    <object handle="_0000000e0000000e" change="1" id="M8">
      <file src="No_path_No_Title_NoForm.jpg" mime="image/jpeg" description="No_path_No_Title_NoForm.jpg"/>
-      <noteref hlink="_0000002700000027"/>
+      <noteref hlink="_0000002900000029"/>
    </object>
-    <object handle="_0000001300000013" change="1472500307" id="M2">
+    <object handle="_0000001500000015" change="1" id="M2">
      <file src="" mime="" description="2nd blob Multimedia link to linked form v5.5 blob"/>
-      <noteref hlink="_0000001400000014"/>
+      <noteref hlink="_0000001600000016"/>
    </object>
  </objects>
  <notes>
-    <note handle="_0000000200000002" change="1472500307" id="N0010" type="Media Note">
+    <note handle="_0000000200000002" change="1" id="N0010" type="Media Note">
      <text>Media note test: Multimedia link embedded form v5.5
 n OBJE {1:1} p.55
 +1 FORM &lt;MULTIMEDIA_FORMAT&gt; {1:1} p.48
@@ -131,7 +142,7 @@ n OBJE {1:1} p.55
 +1 FILE &lt;MULTIMEDIA_FILE_REFERENCE&gt; {1:1} p.47
 +1 &lt;&lt;NOTE_STRUCTURE&gt;&gt; {0:M} p.33</text>
    </note>
-    <note handle="_0000000700000007" change="1472500307" id="N0014" type="Media Note">
+    <note handle="_0000000700000007" change="1" id="N0014" type="Media Note">
      <text>Media note test: Multimedia link embedded form v5.5.1
 This note is not in the 5.5.1 spec, but is an obvious extrapolation from 5.5.
 n OBJE
@@ -140,23 +151,27 @@ n OBJE
 +3 MEDI &lt;SOURCE_MEDIA_TYPE&gt; {0:1} p.62
 +1 TITL &lt;DESCRIPTIVE_TITLE&gt; {0:1} p.48</text>
    </note>
-    <note handle="_0000000b0000000b" change="1472500307" id="N0018" type="Media Note">
+    <note handle="_0000000b0000000b" change="1" id="N0018" type="Media Note">
      <text>Multimedia embedded 2nd copy v5.5</text>
    </note>
-    <note handle="_0000000f0000000f" change="1472500307" id="N0000" type="GEDCOM import">
+    <note handle="_0000001000000010" change="1" id="N0000" type="Event Note">
+      <text>http:\\obje.form.on_event.org</text>
+    </note>
+    <note handle="_0000001100000011" change="1" id="N0001" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0001:

 Could not import test_emb_55.jpg                                    Line    18: 1 OBJE 
 Could not import test_emb_551.jpg                                   Line    26: 1 OBJE 
-Could not import test_emb_55.jpg                                    Line    34: 1 OBJE</text>
+Could not import test_emb_55.jpg                                    Line    34: 1 OBJE 
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="326"/>
      </style>
    </note>
-    <note handle="_0000001000000010" change="1472500307" id="N0001" type="REFN-TYPE">
+    <note handle="_0000001200000012" change="1" id="N0002" type="REFN-TYPE">
      <text>SOMETEXT</text>
    </note>
-    <note handle="_0000001100000011" change="1472500307" id="N0011" type="Media Note">
+    <note handle="_0000001300000013" change="1" id="N0011" type="Media Note">
      <text>Media note test: Multimedia link to linked form v5.5 blob
 n @XREF:OBJE@ OBJE {1:1}
 +1 FORM &lt;MULTIMEDIA_FORMAT&gt; {1:1} p.48  
@@ -170,10 +185,10 @@ n @XREF:OBJE@ OBJE {1:1}
 +1 RIN &lt;AUTOMATED_RECORD_ID&gt; {0:1} p.38
 +1 &lt;&lt;CHANGE_DATE&gt;&gt; {0:1} p.29</text>
    </note>
-    <note handle="_0000001200000012" change="1472500307" id="N0002" type="GEDCOM import">
+    <note handle="_0000001400000014" change="1" id="N0003" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M1:

-Tag recognized but not supported                                    Line    49: 1 BLOB 
+Tag recognized but not supported                                    Line    58: 1 BLOB 
                                                                                       .HM.......k.1..F.jwA.Dzzzzw............A....1.........0U.66..E.8
                                                                                       .......A..k.a6.A.......A..k.........../6....G.......0../..U.....
                                                                                       .w1/m........HC0..../...zzzzzzzz..5zzk..AnA..U..W6U....2rRrRrRrR
@@ -181,23 +196,25 @@ Tag recognized but not supported                                    Line    49:
                                                                                       /Dw/.Tvz.E5zzUE9/kHz.Tw2/DzzzEEA.kE2zk5yzk2/zzs21.U2/Dw/.Tw/.Tzy
                                                                                       /.fy/.HzzkHzzzo21Ds00.E2.UE2.U62/.k./Ds0.UE0/Do0..E8/UE2.U62.U9w
                                                                                       /.Tx/.20.jg2/jo2..9u/.0U.6A.zk
-Line ignored as not understood                                      Line    57: 1 OBJE @M2@
-Filename omitted                                                    Line    46: 0 M1 OBJE</text>
+Line ignored as not understood                                      Line    66: 1 OBJE @M2@
+Filename omitted                                                    Line    55: 0 M1 OBJE
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="1367"/>
      </style>
    </note>
-    <note handle="_0000001400000014" change="1472500307" id="N0003" type="GEDCOM import">
+    <note handle="_0000001600000016" change="1" id="N0004" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M2:

-Tag recognized but not supported                                    Line    68: 1 BLOB 
+Tag recognized but not supported                                    Line    77: 1 BLOB 
                                                                                       67890gramps doesn't do this anyway, so don't bother doing it right.
-Filename omitted                                                    Line    65: 0 M2 OBJE</text>
+Filename omitted                                                    Line    74: 0 M2 OBJE
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="400"/>
      </style>
    </note>
-    <note handle="_0000001500000015" change="1472500307" id="N0012" type="Media Note">
+    <note handle="_0000001700000017" change="1" id="N0012" type="Media Note">
      <text>Media note test: Multimedia link to linked form Gramps style v5.5ish file
 n @XREF:OBJE@ OBJE {1:1}
 +1 FORM &lt;MULTIMEDIA_FORMAT&gt; {1:1} p.48  
@@ -205,18 +222,19 @@ n @XREF:OBJE@ OBJE {1:1}
 +1 FILE &lt;MULTIMEDIA_FILE_REFERENCE&gt; {1:1} p.47
 +1 &lt;&lt;NOTE_STRUCTURE&gt;&gt; {0:M} p.33</text>
    </note>
-    <note handle="_0000001600000016" change="1472500307" id="N0004" type="GEDCOM import">
+    <note handle="_0000001800000018" change="1" id="N0005" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M3:

-Could not import test.jpg                                           Line    73: 1 FILE test.jpg</text>
+Could not import test.jpg                                           Line    82: 1 FILE test.jpg
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="163"/>
      </style>
    </note>
-    <note handle="_0000001700000017" change="1472500307" id="N0005" type="REFN-TYPE">
+    <note handle="_0000001900000019" change="1" id="N0006" type="REFN-TYPE">
      <text>SOMETEXT</text>
    </note>
-    <note handle="_0000001800000018" change="1472500307" id="N0013" type="Media Note">
+    <note handle="_0000001a0000001a" change="1" id="N0013" type="Media Note">
      <text>Media note test: Multimedia link to linked form v5.5.1 file
 n @XREF:OBJE@ OBJE {1:1}
 +1 FILE &lt;MULTIMEDIA_FILE_REFN&gt; {1:M} p.54
@@ -230,25 +248,26 @@ n @XREF:OBJE@ OBJE {1:1}
 +1 &lt;&lt;SOURCE_CITATION&gt;&gt; {0:M} p.39
 +1 &lt;&lt;CHANGE_DATE&gt;&gt; {0:1} p.31</text>
    </note>
-    <note handle="_0000001a0000001a" change="1472500307" id="N0006" type="Source text">
+    <note handle="_0000001c0000001c" change="1" id="N0007" type="Source text">
      <text>who shall remain un-named</text>
    </note>
-    <note handle="_0000001c0000001c" change="1472500307" id="N0007" type="GEDCOM import">
+    <note handle="_0000001e0000001e" change="1" id="N0008" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M4:

-Could not import test.jpg                                           Line    79: 1 FILE test.jpg</text>
+Could not import test.jpg                                           Line    88: 1 FILE test.jpg
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="163"/>
      </style>
    </note>
-    <note handle="_0000001d0000001d" change="1472500307" id="N0008" type="Media Note">
+    <note handle="_0000001f0000001f" change="1" id="N0009" type="Media Note">
      <text>A fine gentelman was he, upstanding in his community and a great believer in the testing of open source software.</text>
    </note>
-    <note handle="_0000001e0000001e" change="1472500307" id="N0015" type="Media Note">
+    <note handle="_0000002000000020" change="1" id="N0015" type="Media Note">
      <text>A note on the FTM media, to see how this integrates...  The DATE line is bad; it doesnt follow Gedcom standard at all, and includes the time.
 The TEXT line comes from the FTM media description.  This is the media Note.</text>
    </note>
-    <note handle="_0000001f0000001f" change="1472500307" id="N0016" type="Media Note">
+    <note handle="_0000002100000021" change="1" id="N0016" type="Media Note">
      <text>Multimedia link to linked form FTM style
 n @XREF:OBJE@ OBJE {1:1}
 +1 FILE &lt;MULTIMEDIA_FILE_REFN&gt; {1:M} p.54
@@ -257,39 +276,42 @@ n @XREF:OBJE@ OBJE {1:1}
 +2 TEXT text string from FTM media description sometimes populated from exif comments
 +1 &lt;&lt;NOTE_STRUCTURE&gt;&gt; {0:M} p.33</text>
    </note>
-    <note handle="_0000002000000020" change="1472500307" id="N0009" type="GEDCOM import">
+    <note handle="_0000002200000022" change="1" id="N0017" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M5:

-Could not import test.jpg                                           Line    94: 1 FILE test.jpg</text>
+Could not import test.jpg                                           Line   103: 1 FILE test.jpg
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="163"/>
      </style>
    </note>
-    <note handle="_0000002100000021" change="1472500307" id="N0017" type="REFN-TYPE">
+    <note handle="_0000002300000023" change="1" id="N0019" type="REFN-TYPE">
      <text>SOMETEXT</text>
    </note>
-    <note handle="_0000002200000022" change="1472500307" id="N0019" type="Media Note">
+    <note handle="_0000002400000024" change="1" id="N0020" type="Media Note">
      <text>Multimedia link to linked form v5.5.1 with two files</text>
    </note>
-    <note handle="_0000002400000024" change="1472500307" id="N0020" type="Source text">
+    <note handle="_0000002600000026" change="1" id="N0021" type="Source text">
      <text>A source who shall remain un-named</text>
    </note>
-    <note handle="_0000002600000026" change="1472500307" id="N0021" type="GEDCOM import">
+    <note handle="_0000002800000028" change="1" id="N0022" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M6:

-Could not import test.jpg                                           Line   102: 1 FILE test.jpg
-Multiple FILE in a single OBJE ignored                              Line   106: 1 FILE test1.jpg
-Skipped subordinate line                                            Line   107: 2 FORM jpeg
-Skipped subordinate line                                            Line   108: 3 TYPE photo
-Skipped subordinate line                                            Line   109: 2 TITL Multimedia link to linked form v5.5.1 with two files(2)</text>
+Could not import test.jpg                                           Line   111: 1 FILE test.jpg
+Multiple FILE in a single OBJE ignored                              Line   115: 1 FILE test1.jpg
+Skipped subordinate line                                            Line   116: 2 FORM jpeg
+Skipped subordinate line                                            Line   117: 3 TYPE photo
+Skipped subordinate line                                            Line   118: 2 TITL Multimedia link to linked form v5.5.1 with two files(2)
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="588"/>
      </style>
    </note>
-    <note handle="_0000002700000027" change="1472500307" id="N0022" type="GEDCOM import">
+    <note handle="_0000002900000029" change="1" id="N0023" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M8:

-Could not import No_path_No_Title_NoForm.jpg                        Line   129: 1 FILE No_path_No_Title_NoForm.jpg</text>
+Could not import No_path_No_Title_NoForm.jpg                        Line   138: 1 FILE No_path_No_Title_NoForm.jpg
+</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="182"/>
      </style>
@@ -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
@@ -10,14 +10,20 @@
 3 FAX (801) 705-7001
 3 EMAIL help@ancestry.com
 3 WWW http://www.ancestry.com
+2 DATA FTM Source data
+3 COPR Copyright 2999
+2 DATE 1 JAN 1111
 1 DEST GED55
 1 DATE 01 MAR 2016
 1 CHAR UTF-8
+1 CHAR UTF-8
+2 VERS 1.1
 1 FILE D:\Family Tree Maker\imp_FTM_LINK.ged
 1 SUBM @SUBM@
+2 NAME The Tester
 1 GEDC
 2 VERS 5.5
-2 FORM LINEAGE-LINKED
+2 FORM Lineage-Linked
 0 @SUBM@ SUBM
 1 NAME The Subm /Tester/
 1 ADDR 123 Main St., Winslow, PA, 12345
@@ -38,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-08-29" 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>
@@ -14,28 +14,31 @@
      <resemail>mrstester@gmail.com</resemail>
    </researcher>
  </header>
+  <tags>
+    <tag handle="_0000000400000004" change="1" name="Imported" color="#000000000000" priority="0"/>
+  </tags>
  <events>
-    <event handle="_0000000700000007" change="1472500308" id="E0000">
+    <event handle="_0000000800000008" change="1" id="E0000">
      <type>Birth</type>
      <dateval val="1954-12-29"/>
-      <place hlink="_0000000800000008"/>
+      <place hlink="_0000000900000009"/>
      <attribute type="Phone" value="440-871-3400"/>
      <attribute type="Phone" value="800-871-3400"/>
      <attribute type="EMAIL" value="thetester@gmail.com"/>
      <attribute type="FAX" value="440-123-4567"/>
      <attribute type="WWW" value="http://thetester.com"/>
    </event>
-    <event handle="_0000000c0000000c" change="1472500308" id="E0001">
+    <event handle="_0000000d0000000d" change="1" id="E0001">
      <type>Residence</type>
      <dateval val="1954-12-30"/>
-      <place hlink="_0000000e0000000e"/>
+      <place hlink="_0000000f0000000f"/>
      <attribute type="Phone" value="440-871-3401"/>
      <attribute type="EMAIL" value="mrstester@gmail.com"/>
      <attribute type="FAX" value="440-321-4568"/>
      <attribute type="WWW" value="http://mrstester.com"/>
-      <noteref hlink="_0000000d0000000d"/>
+      <noteref hlink="_0000000e0000000e"/>
    </event>
-    <event handle="_0000001100000011" change="1472500308" id="E0002">
+    <event handle="_0000001200000012" change="1" id="E0002">
      <type>Residence</type>
      <dateval val="1964"/>
      <attribute type="Phone" value="440-871-3402"/>
@@ -45,22 +48,23 @@
    </event>
  </events>
  <people>
-    <person handle="_0000000600000006" change="1472500308" id="I0000">
+    <person handle="_0000000700000007" change="1" id="I0000">
      <gender>U</gender>
      <name type="Birth Name">
        <first>The</first>
        <surname>Tester</surname>
      </name>
-      <eventref hlink="_0000000700000007" role="Primary"/>
-      <citationref hlink="_0000000900000009"/>
+      <eventref hlink="_0000000800000008" role="Primary"/>
+      <citationref hlink="_0000000a0000000a"/>
+      <tagref hlink="_0000000400000004"/>
    </person>
-    <person handle="_0000000a0000000a" change="1472500308" id="I0001">
+    <person handle="_0000000b0000000b" change="1" id="I0001">
      <gender>U</gender>
      <name type="Birth Name">
        <first>Mrs</first>
        <surname>Tester</surname>
      </name>
-      <eventref hlink="_0000000c0000000c" role="Primary"/>
+      <eventref hlink="_0000000d0000000d" role="Primary"/>
      <address>
        <street>123 Main St.</street>
        <city>Winslow</city>
@@ -72,85 +76,91 @@
      <url  href="mrstester@gmail.com" type="E-mail"/>
      <url  href="440-321-4568" type="FAX"/>
      <url  href="http://mrstester.com" type="Web Home"/>
-      <noteref hlink="_0000000b0000000b"/>
-      <citationref hlink="_0000000f0000000f"/>
+      <noteref hlink="_0000000c0000000c"/>
+      <citationref hlink="_0000001000000010"/>
+      <tagref hlink="_0000000400000004"/>
    </person>
-    <person handle="_0000001000000010" change="1472500308" id="I0002">
+    <person handle="_0000001100000011" change="1" id="I0002">
      <gender>U</gender>
      <name type="Birth Name">
        <first>Tom</first>
        <surname>Tester</surname>
      </name>
-      <eventref hlink="_0000001100000011" role="Primary"/>
-      <citationref hlink="_0000001200000012"/>
+      <eventref hlink="_0000001200000012" role="Primary"/>
+      <citationref hlink="_0000001300000013"/>
+      <tagref hlink="_0000000400000004"/>
    </person>
  </people>
  <citations>
-    <citation handle="_0000000900000009" change="1472500308" id="C0000">
+    <citation handle="_0000000a0000000a" change="1" id="C0000">
      <confidence>2</confidence>
      <sourceref hlink="_0000000300000003"/>
    </citation>
-    <citation handle="_0000000f0000000f" change="1472500308" id="C0001">
+    <citation handle="_0000001000000010" change="1" id="C0001">
      <confidence>2</confidence>
      <sourceref hlink="_0000000300000003"/>
    </citation>
-    <citation handle="_0000001200000012" change="1472500308" id="C0002">
+    <citation handle="_0000001300000013" change="1" id="C0002">
      <confidence>2</confidence>
      <sourceref hlink="_0000000300000003"/>
    </citation>
  </citations>
  <sources>
-    <source handle="_0000000300000003" change="1472500308" id="S0000">
+    <source handle="_0000000300000003" change="1" id="S0000">
      <stitle>Import from imp_FTM_LINK.ged</stitle>
-      <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="Generated By" value="Family Tree Maker for Windows Family Tree Maker (22.0.0.1410)"/>
+      <sauthor>The Tester</sauthor>
+      <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="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"/>
-      <srcattribute type="GEDCOM form" value="LINEAGE-LINKED"/>
+      <srcattribute type="GEDCOM form" value="Lineage-Linked"/>
      <reporef hlink="_0000000100000001" medium="Unknown"/>
-      <reporef hlink="_0000000400000004" medium="Unknown"/>
+      <reporef hlink="_0000000500000005" medium="Unknown"/>
    </source>
-    <source handle="_0000001300000013" change="1472500308" id="S0006">
+    <source handle="_0000001400000014" change="1" id="S0006">
      <stitle>Ohio Births, 1958-2002</stitle>
-      <reporef hlink="_0000001400000014" medium="Book"/>
+      <reporef hlink="_0000001500000015" medium="Book"/>
    </source>
  </sources>
  <places>
-    <placeobj handle="_0000000800000008" change="1472500308" id="P0000" type="Street">
+    <placeobj handle="_0000000900000009" change="1" id="P0000" type="Street">
      <ptitle>123 High St, Cleveland, Cuyahoga, Ohio, USA, 44140</ptitle>
      <code>44140</code>
      <pname value="123 High St"/>
-      <placeref hlink="_0000001a0000001a"/>
+      <placeref hlink="_0000001b0000001b"/>
    </placeobj>
-    <placeobj handle="_0000000e0000000e" change="1472500308" id="P0001" type="Address">
+    <placeobj handle="_0000000f0000000f" change="1" id="P0001" type="Address">
      <ptitle>123 Main St., Winslow, PA, 12345</ptitle>
      <pname value="123 Main St., Winslow, PA, 12345"/>
      <location street="123 Main St." city="Winslow" state="PA" postal="12345"/>
    </placeobj>
-    <placeobj handle="_0000001700000017" change="1472500308" id="P0002" type="Country">
+    <placeobj handle="_0000001800000018" change="1" id="P0002" type="Country">
      <ptitle>USA</ptitle>
      <pname value="USA"/>
    </placeobj>
-    <placeobj handle="_0000001800000018" change="1472500308" id="P0003" type="State">
+    <placeobj handle="_0000001900000019" change="1" id="P0003" type="State">
      <ptitle>Ohio, USA</ptitle>
      <pname value="Ohio"/>
-      <placeref hlink="_0000001700000017"/>
-    </placeobj>
-    <placeobj handle="_0000001900000019" change="1472500308" id="P0004" type="County">
-      <ptitle>Cuyahoga, Ohio, USA</ptitle>
-      <pname value="Cuyahoga"/>
      <placeref hlink="_0000001800000018"/>
    </placeobj>
-    <placeobj handle="_0000001a0000001a" change="1472500308" id="P0005" type="City">
+    <placeobj handle="_0000001a0000001a" change="1" id="P0004" type="County">
+      <ptitle>Cuyahoga, Ohio, USA</ptitle>
+      <pname value="Cuyahoga"/>
+      <placeref hlink="_0000001900000019"/>
+    </placeobj>
+    <placeobj handle="_0000001b0000001b" change="1" id="P0005" type="City">
      <ptitle>Cleveland, Cuyahoga, Ohio, USA</ptitle>
      <pname value="Cleveland"/>
-      <placeref hlink="_0000001900000019"/>
+      <placeref hlink="_0000001a0000001a"/>
    </placeobj>
  </places>
  <repositories>
-    <repository handle="_0000000100000001" change="1472500308" id="R0000">
+    <repository handle="_0000000100000001" change="1" id="R0000">
      <rname>Business that produced the product: Ancestry.com</rname>
      <type>GEDCOM data</type>
      <address>
@@ -161,7 +171,7 @@
      <url  href="help@ancestry.com" type="E-mail"/>
      <url  href="http://www.ancestry.com" type="Web Home"/>
    </repository>
-    <repository handle="_0000000400000004" change="1472500308" id="R0001">
+    <repository handle="_0000000500000005" change="1" id="R0001">
      <rname>SUBM (Submitter): (@SUBM@) The Subm /Tester/</rname>
      <type>GEDCOM data</type>
      <address>
@@ -174,9 +184,9 @@
      <url  href="mrstester@gmail.com" type="E-mail"/>
      <url  href="440-321-4568" type="FAX"/>
      <url  href="http://mrstester.com" type="Web Home"/>
-      <noteref hlink="_0000000500000005"/>
+      <noteref hlink="_0000000600000006"/>
    </repository>
-    <repository handle="_0000001400000014" change="1472500308" id="R0002">
+    <repository handle="_0000001500000015" change="1" id="R0002">
      <rname>Testers Repository</rname>
      <type>Library</type>
      <address>
@@ -186,40 +196,48 @@
      <url  href="tester_repo@osf.com" type="E-mail"/>
      <url  href="987-654-3210" type="FAX"/>
      <url  href="http://www.tester_repo.com" type="Web Home"/>
-      <noteref hlink="_0000001500000015"/>
      <noteref hlink="_0000001600000016"/>
+      <noteref hlink="_0000001700000017"/>
    </repository>
  </repositories>
  <notes>
-    <note handle="_0000000200000002" change="1472500308" id="N0000" type="GEDCOM import">
+    <note handle="_0000000200000002" change="1" id="N0000" type="GEDCOM import">
      <text>Records not imported into HEAD (header):

-Only one phone number supported                                     Line     9: 3 PHON (800) 705-7000</text>
+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>
      <style name="fontface" value="Monospace">
-        <range start="0" end="144"/>
+        <range start="0" end="344"/>
      </style>
    </note>
-    <note handle="_0000000500000005" change="1472500308" id="N0001" type="GEDCOM import">
+    <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    29: 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>
    </note>
-    <note handle="_0000000b0000000b" change="1472500308" id="N0002" type="Person Note">
+    <note handle="_0000000c0000000c" change="1" id="N0002" type="Person Note">
      <text>Address with PHON,FAX,EMAIL,WWW. attached directly to person is not legal Gedcom, but allowed here.</text>
+      <tagref hlink="_0000000400000004"/>
    </note>
-    <note handle="_0000000d0000000d" change="1472500308" id="N0003" type="Event Note">
+    <note handle="_0000000e0000000e" change="1" id="N0003" type="Event Note">
      <text>Address as event is legal, with PHON,FAX,EMAIL,WWW</text>
+      <tagref hlink="_0000000400000004"/>
    </note>
-    <note handle="_0000001500000015" change="1472500308" id="N0004" type="Repository Note">
+    <note handle="_0000001600000016" change="1" id="N0004" type="Repository Note">
      <text>The repository record</text>
+      <tagref hlink="_0000000400000004"/>
    </note>
-    <note handle="_0000001600000016" change="1472500308" id="N0005" type="GEDCOM import">
+    <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    87: 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,182 +3,190 @@
 "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="2016-10-23" version="5.0.0-alpha1"/>
    <researcher>
      <resname>John A. Tester</resname>
    </researcher>
  </header>
+  <tags>
+    <tag handle="_0000000500000005" change="1" name="Imported" color="#000000000000" priority="0"/>
+  </tags>
  <events>
-    <event handle="_0000000e0000000e" change="1472505121" id="E0000">
+    <event handle="_0000000f0000000f" change="1" id="E0000">
      <type>TEST</type>
      <description>person</description>
    </event>
-    <event handle="_0000000f0000000f" change="1472505121" id="E0001">
+    <event handle="_0000001000000010" change="1" id="E0001">
      <type>Birth</type>
      <dateval val="1900-06-15"/>
-      <place hlink="_0000001300000013"/>
-      <noteref hlink="_0000001000000010"/>
+      <place hlink="_0000001400000014"/>
+      <noteref hlink="_0000001100000011"/>
    </event>
-    <event handle="_0000001400000014" change="1472505121" id="E0002">
+    <event handle="_0000001500000015" change="1" id="E0002">
      <type>Death</type>
-      <noteref hlink="_0000001500000015"/>
+      <noteref hlink="_0000001600000016"/>
    </event>
-    <event handle="_0000001d0000001d" change="1472505121" id="E0003">
+    <event handle="_0000001e0000001e" change="1" id="E0003">
      <type>Who knows OBJE REFN TYPE</type>
      <description>REFN</description>
    </event>
-    <event handle="_0000002600000026" change="1472505121" id="E0004">
+    <event handle="_0000002700000027" change="1" id="E0004">
      <type>Birth</type>
      <dateval val="1901-06-15"/>
    </event>
-    <event handle="_0000002700000027" change="1472505121" id="E0005">
+    <event handle="_0000002800000028" change="1" id="E0005">
      <type>Death</type>
      <dateval val="1975-07-05"/>
    </event>
-    <event handle="_0000002d0000002d" change="1472505121" id="E0006">
+    <event handle="_0000002e0000002e" change="1" id="E0006">
      <type>Birth</type>
      <dateval val="1922-06-15"/>
    </event>
-    <event handle="_0000002e0000002e" change="1472505121" id="E0007">
+    <event handle="_0000002f0000002f" change="1" id="E0007">
      <type>Death</type>
      <dateval val="1994-07-05"/>
    </event>
-    <event handle="_0000003a0000003a" change="1472505122" id="E0008">
+    <event handle="_0000003b0000003b" change="1" id="E0008">
      <type>TEST</type>
      <description>family</description>
    </event>
  </events>
  <people>
-    <person handle="_0000000d0000000d" change="979250406" id="I0001">
+    <person handle="_0000000e0000000e" change="979250406" id="I0001">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Tom</first>
        <surname>Tester</surname>
      </name>
-      <eventref hlink="_0000000e0000000e" role="Primary"/>
      <eventref hlink="_0000000f0000000f" role="Primary"/>
-      <eventref hlink="_0000001400000014" role="Primary"/>
-      <eventref hlink="_0000001d0000001d" role="Primary"/>
-      <objref hlink="_0000001e0000001e"/>
+      <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"/>
      <url  href="http://homepages.rootsweb.com/~pmcbride/gedcom/55gctoc.htm" type="Web Home" description="GEDCOM 5.5 documentation web site"/>
-      <parentin hlink="_0000001600000016"/>
-      <noteref hlink="_0000001700000017"/>
+      <parentin hlink="_0000001700000017"/>
      <noteref hlink="_0000001800000018"/>
      <noteref hlink="_0000001900000019"/>
      <noteref hlink="_0000001a0000001a"/>
-      <noteref hlink="_0000002000000020"/>
-      <citationref hlink="_0000001f0000001f"/>
+      <noteref hlink="_0000001b0000001b"/>
+      <noteref hlink="_0000002100000021"/>
+      <citationref hlink="_0000002000000020"/>
+      <tagref hlink="_0000000500000005"/>
    </person>
-    <person handle="_0000002500000025" change="1472505121" id="I0002">
+    <person handle="_0000002600000026" change="1" id="I0002">
      <gender>F</gender>
      <name type="Birth Name">
        <first>Mrs</first>
        <surname>Tester</surname>
      </name>
-      <eventref hlink="_0000002600000026" role="Primary"/>
      <eventref hlink="_0000002700000027" role="Primary"/>
-      <parentin hlink="_0000001600000016"/>
-      <noteref hlink="_0000002800000028"/>
-      <noteref hlink="_0000002a0000002a"/>
-      <citationref hlink="_0000002900000029"/>
+      <eventref hlink="_0000002800000028" role="Primary"/>
+      <parentin hlink="_0000001700000017"/>
+      <noteref hlink="_0000002900000029"/>
+      <noteref hlink="_0000002b0000002b"/>
+      <citationref hlink="_0000002a0000002a"/>
+      <tagref hlink="_0000000500000005"/>
    </person>
-    <person handle="_0000002b0000002b" change="1472505121" id="I0003">
+    <person handle="_0000002c0000002c" change="1" id="I0003">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Ed</first>
        <surname>Tester</surname>
        <nick>Eddie</nick>
-        <noteref hlink="_0000002c0000002c"/>
+        <noteref hlink="_0000002d0000002d"/>
      </name>
-      <eventref hlink="_0000002d0000002d" role="Primary"/>
      <eventref hlink="_0000002e0000002e" role="Primary"/>
+      <eventref hlink="_0000002f0000002f" role="Primary"/>
      <lds_ord type="baptism">
        <dateval val="-005-05-05"/>
        <temple val="SLAKE"/>
-        <place hlink="_0000002f0000002f"/>
-        <noteref hlink="_0000003000000030"/>
-        <noteref hlink="_0000003300000033"/>
-        <citationref hlink="_0000003200000032"/>
+        <place hlink="_0000003000000030"/>
+        <noteref hlink="_0000003100000031"/>
+        <noteref hlink="_0000003400000034"/>
+        <citationref hlink="_0000003300000033"/>
      </lds_ord>
-      <childof hlink="_0000001600000016"/>
-      <personref hlink="_0000003400000034" rel="">
-        <noteref hlink="_0000003500000035"/>
+      <childof hlink="_0000001700000017"/>
+      <personref hlink="_0000003500000035" rel="">
+        <noteref hlink="_0000003600000036"/>
      </personref>
-      <noteref hlink="_0000003700000037"/>
-      <citationref hlink="_0000003600000036"/>
+      <noteref hlink="_0000003800000038"/>
+      <citationref hlink="_0000003700000037"/>
+      <tagref hlink="_0000000500000005"/>
    </person>
-    <person handle="_0000003400000034" change="1472505121" id="I0004">
+    <person handle="_0000003500000035" change="1" id="I0004">
      <gender>U</gender>
      <name type="Birth Name">
        <first>George</first>
        <surname>Testee</surname>
-        <noteref hlink="_0000003800000038"/>
+        <noteref hlink="_0000003900000039"/>
      </name>
-      <citationref hlink="_0000003900000039"/>
+      <citationref hlink="_0000003a0000003a"/>
+      <tagref hlink="_0000000500000005"/>
    </person>
  </people>
  <families>
-    <family handle="_0000001600000016" change="1472505121" id="F0001">
+    <family handle="_0000001700000017" change="1" id="F0001">
      <rel type="Unknown"/>
-      <father hlink="_0000000d0000000d"/>
-      <mother hlink="_0000002500000025"/>
-      <eventref hlink="_0000003a0000003a" role="Family"/>
-      <childref hlink="_0000002b0000002b"/>
-      <noteref hlink="_0000003d0000003d"/>
+      <father hlink="_0000000e0000000e"/>
+      <mother hlink="_0000002600000026"/>
+      <eventref hlink="_0000003b0000003b" role="Family"/>
+      <childref hlink="_0000002c0000002c"/>
      <noteref hlink="_0000003e0000003e"/>
-      <noteref hlink="_0000004300000043"/>
-      <citationref hlink="_0000003c0000003c"/>
-      <citationref hlink="_0000004200000042"/>
+      <noteref hlink="_0000003f0000003f"/>
+      <noteref hlink="_0000004400000044"/>
+      <citationref hlink="_0000003d0000003d"/>
+      <citationref hlink="_0000004300000043"/>
+      <tagref hlink="_0000000500000005"/>
    </family>
  </families>
  <citations>
-    <citation handle="_0000001f0000001f" change="1472505121" id="C0000">
+    <citation handle="_0000002000000020" change="1" id="C0000">
      <confidence>2</confidence>
      <sourceref hlink="_0000000400000004"/>
    </citation>
-    <citation handle="_0000002300000023" change="1472505121" id="C0001">
+    <citation handle="_0000002400000024" change="1" id="C0001">
      <confidence>2</confidence>
      <sourceref hlink="_0000000400000004"/>
    </citation>
-    <citation handle="_0000002900000029" change="1472505121" id="C0002">
+    <citation handle="_0000002a0000002a" change="1" id="C0002">
      <confidence>2</confidence>
      <sourceref hlink="_0000000400000004"/>
    </citation>
-    <citation handle="_0000003200000032" change="1472505121" id="C0003">
+    <citation handle="_0000003300000033" change="1" id="C0003">
      <confidence>2</confidence>
-      <sourceref hlink="_0000003100000031"/>
+      <sourceref hlink="_0000003200000032"/>
    </citation>
-    <citation handle="_0000003600000036" change="1472505121" id="C0004">
+    <citation handle="_0000003700000037" change="1" id="C0004">
      <confidence>2</confidence>
      <sourceref hlink="_0000000400000004"/>
    </citation>
-    <citation handle="_0000003900000039" change="1472505121" id="C0005">
+    <citation handle="_0000003a0000003a" change="1" id="C0005">
      <confidence>2</confidence>
      <sourceref hlink="_0000000400000004"/>
    </citation>
-    <citation handle="_0000003c0000003c" change="1472505122" id="C0006">
+    <citation handle="_0000003d0000003d" change="1" id="C0006">
      <confidence>2</confidence>
-      <sourceref hlink="_0000003b0000003b"/>
+      <sourceref hlink="_0000003c0000003c"/>
    </citation>
-    <citation handle="_0000004200000042" change="1472505122" id="C0007">
+    <citation handle="_0000004300000043" change="1" id="C0007">
      <dateval val="1900-12-31"/>
      <page>42</page>
      <confidence>0</confidence>
-      <noteref hlink="_0000003f0000003f"/>
      <noteref hlink="_0000004000000040"/>
      <noteref hlink="_0000004100000041"/>
-      <sourceref hlink="_0000003b0000003b"/>
+      <noteref hlink="_0000004200000042"/>
+      <sourceref hlink="_0000003c0000003c"/>
    </citation>
  </citations>
  <sources>
-    <source handle="_0000000400000004" change="1472505121" id="S0000">
+    <source handle="_0000000400000004" change="1" id="S0000">
      <stitle>Import from imp_notetest.ged</stitle>
      <spubinfo>Tom Tester 2016</spubinfo>
      <noteref hlink="_0000000200000002"/>
-      <noteref hlink="_0000000500000005"/>
      <noteref hlink="_0000000600000006"/>
+      <noteref hlink="_0000000700000007"/>
      <srcattribute type="Approved system identification" value="GEDitCOM"/>
      <srcattribute type="Name of software product" value="GEDitCOM"/>
      <srcattribute type="Version number of software product" value="2.9.4"/>
@@ -192,71 +200,72 @@
      <srcattribute type="Submission: Submitter" value="@SUBMITTER@"/>
      <srcattribute type="Submission: Family file" value="NameOfFamilyFile"/>
      <reporef hlink="_0000000100000001" medium="Unknown"/>
-      <reporef hlink="_0000000b0000000b" medium="Unknown"/>
+      <reporef hlink="_0000000c0000000c" medium="Unknown"/>
    </source>
-    <source handle="_0000003100000031" change="1472505121" id="SOURCE1">
+    <source handle="_0000003200000032" change="1" id="SOURCE1">
      <stitle>@SOURCE1@</stitle>
    </source>
-    <source handle="_0000003b0000003b" change="1472505122" id="S0001">
+    <source handle="_0000003c0000003c" change="1" id="S0001">
      <stitle>Note Test file Source: Tester</stitle>
-      <noteref hlink="_0000004600000046"/>
      <noteref hlink="_0000004700000047"/>
-      <reporef hlink="_0000004400000044" medium="Book">
-        <noteref hlink="_0000004500000045"/>
+      <noteref hlink="_0000004800000048"/>
+      <reporef hlink="_0000004500000045" medium="Book">
+        <noteref hlink="_0000004600000046"/>
      </reporef>
    </source>
  </sources>
  <places>
-    <placeobj handle="_0000001300000013" change="1472505121" id="P0000" type="Address">
+    <placeobj handle="_0000001400000014" change="1" id="P0000" type="Address">
      <ptitle>123 main, Norwalk, Ohio, USA</ptitle>
      <pname value="123 main, Norwalk, Ohio, USA"/>
      <location street="123 main, Norwalk, Ohio, USA"/>
-      <noteref hlink="_0000001100000011"/>
      <noteref hlink="_0000001200000012"/>
+      <noteref hlink="_0000001300000013"/>
    </placeobj>
-    <placeobj handle="_0000002f0000002f" change="1472505121" id="P0001" type="Unknown">
+    <placeobj handle="_0000003000000030" change="1" id="P0001" type="Unknown">
      <ptitle>Salt Lake City</ptitle>
      <pname value="Salt Lake City"/>
    </placeobj>
  </places>
  <objects>
-    <object handle="_0000001e0000001e" change="979250406" id="M1">
+    <object handle="_0000001f0000001f" change="979250406" id="M1">
      <file src="photo.jpg" mime="image/jpeg" description="Tom Tester's photo"/>
      <attribute type="Media-Type" value="Film"/>
      <attribute type="RIN" value="123456"/>
      <attribute type="REFN" value="98765">
-        <noteref hlink="_0000002200000022"/>
+        <noteref hlink="_0000002300000023"/>
      </attribute>
-      <noteref hlink="_0000002400000024"/>
-      <citationref hlink="_0000002300000023"/>
+      <noteref hlink="_0000002500000025"/>
+      <citationref hlink="_0000002400000024"/>
+      <tagref hlink="_0000000500000005"/>
    </object>
  </objects>
  <repositories>
-    <repository handle="_0000000100000001" change="1472505121" id="R0000">
+    <repository handle="_0000000100000001" change="1" id="R0000">
      <rname>Business that produced the product: RSAC Software</rname>
      <type>GEDCOM data</type>
    </repository>
-    <repository handle="_0000000b0000000b" change="1472505121" id="R0001">
+    <repository handle="_0000000c0000000c" change="1" id="R0001">
      <rname>SUBM (Submitter): (@SUBMITTER@) John A. Tester</rname>
      <type>GEDCOM data</type>
      <address>
      </address>
-      <noteref hlink="_0000000900000009"/>
      <noteref hlink="_0000000a0000000a"/>
-      <noteref hlink="_0000000c0000000c"/>
+      <noteref hlink="_0000000b0000000b"/>
+      <noteref hlink="_0000000d0000000d"/>
    </repository>
-    <repository handle="_0000004400000044" change="1472505122" id="R0002">
+    <repository handle="_0000004500000045" change="1" id="R0002">
      <rname>The Testers repository</rname>
      <type>Library</type>
-      <noteref hlink="_0000004800000048"/>
      <noteref hlink="_0000004900000049"/>
+      <noteref hlink="_0000004a0000004a"/>
    </repository>
  </repositories>
  <notes>
-    <note handle="_0000000200000002" change="1472505121" id="N0000" type="Source Note">
+    <note handle="_0000000200000002" change="1" id="N0000" type="Source Note">
      <text>Header note</text>
    </note>
-    <note handle="_0000000300000003" change="1472505121" id="N0001" type="GEDCOM import">
+    <note handle="_0000000300000003" change="1" id="N0001" type="GEDCOM import">
      <text>Records not imported into HEAD (header):

 Line ignored as not understood                                      Line    18: 2 TEST Header Note
@@ -266,13 +275,14 @@ Skipped subordinate line                                            Line    20:
        <range start="0" end="327"/>
      </style>
    </note>
-    <note handle="_0000000500000005" change="1472505121" id="N0002" type="Source Note">
+    <note handle="_0000000600000006" change="1" id="N0002" type="Source Note">
      <text>Submission Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000000600000006" change="979250406" id="N0003" type="Source Note">
+    <note handle="_0000000700000007" change="979250406" id="N0003" type="Source Note">
      <text>Submission xref note</text>
    </note>
-    <note handle="_0000000700000007" change="1472505121" id="N0004" type="GEDCOM import">
+    <note handle="_0000000800000008" change="1" id="N0004" type="GEDCOM import">
      <text>Records not imported into Top Level:

 Line ignored as not understood                                      Line    26: 2 TEST Submission Note
@@ -283,7 +293,7 @@ Line ignored as not understood                                      Line    29:
        <range start="0" end="425"/>
      </style>
    </note>
-    <note handle="_0000000800000008" change="1472505121" id="N0005" type="GEDCOM import">
+    <note handle="_0000000900000009" change="1" id="N0005" type="GEDCOM import">
      <text>Records not imported into NOTE Gramps ID N0003:

 Tag recognized but not supported                                    Line    32: 1 RIN Submission Note RIN
@@ -295,13 +305,14 @@ Line ignored as not understood                                      Line    39:
        <range start="0" end="586"/>
      </style>
    </note>
-    <note handle="_0000000900000009" change="1472505121" id="N0006" type="Repository Note">
+    <note handle="_0000000a0000000a" change="1" id="N0006" type="Repository Note">
      <text>Submitter Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000000a0000000a" change="1472505121" id="N0007" type="Repository Note">
+    <note handle="_0000000b0000000b" change="1" id="N0007" type="Repository Note">
      <text>Submitter xref note</text>
    </note>
-    <note handle="_0000000c0000000c" change="1472505121" id="N0008" type="GEDCOM import">
+    <note handle="_0000000d0000000d" change="1" id="N0008" type="GEDCOM import">
      <text>Records not imported into SUBM (Submitter): (@SUBMITTER@) John A. Tester:

 Line ignored as not understood                                      Line    43: 2 TEST Submitter Note
@@ -312,37 +323,44 @@ Line ignored as not understood                                      Line    46:
        <range start="0" end="460"/>
      </style>
    </note>
-    <note handle="_0000001000000010" change="1472505121" id="N0009" type="Event Note">
+    <note handle="_0000001100000011" change="1" id="N0009" type="Event Note">
      <text>Birth Event note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000001100000011" change="1472505121" id="N0010" type="Place Note">
+    <note handle="_0000001200000012" change="1" id="N0010" type="Place Note">
      <text>Location Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000001200000012" change="1472505121" id="N0011" type="Place Note">
+    <note handle="_0000001300000013" change="1" id="N0011" type="Place Note">
      <text>Location Note 2</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000001500000015" change="1472505121" id="N0012" type="Event Note">
+    <note handle="_0000001600000016" change="1" id="N0012" type="Event Note">
      <text>Death Event xref note</text>
    </note>
-    <note handle="_0000001700000017" change="1472505121" id="N0013" type="Person Note">
+    <note handle="_0000001800000018" change="1" id="N0013" type="Person Note">
      <text>FAMS Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000001800000018" change="1472505121" id="N0014" type="Person Note">
+    <note handle="_0000001900000019" change="1" id="N0014" type="Person Note">
      <text>FAMS Note 2</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000001900000019" change="1472505121" id="N0015" type="Person Note">
+    <note handle="_0000001a0000001a" change="1" id="N0015" type="Person Note">
      <text>Tom Tester xref note</text>
    </note>
-    <note handle="_0000001a0000001a" change="1472505121" id="N0016" type="Person Note">
+    <note handle="_0000001b0000001b" change="1" id="N0016" type="Person Note">
      <text>Tom Tester Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000001b0000001b" change="1472505121" id="N0017" type="Media Note">
+    <note handle="_0000001c0000001c" change="1" id="N0017" type="Media Note">
      <text>Media Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000001c0000001c" change="979250406" id="N0018" type="Media Note">
+    <note handle="_0000001d0000001d" change="979250406" id="N0018" type="Media Note">
      <text>Media xref note</text>
    </note>
-    <note handle="_0000002000000020" change="1472505121" id="N0019" type="GEDCOM import">
+    <note handle="_0000002100000021" change="1" id="N0019" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0001:

 Empty note ignored                                                  Line    54: 2 NOTE 
@@ -369,7 +387,7 @@ Skipped subordinate line                                            Line    91:
        <range start="0" end="2009"/>
      </style>
    </note>
-    <note handle="_0000002100000021" change="1472505121" id="N0020" type="GEDCOM import">
+    <note handle="_0000002200000022" change="1" id="N0020" type="GEDCOM import">
      <text>Records not imported into NOTE Gramps ID N0018:

 Tag recognized but not supported                                    Line   103: 1 RIN 123456
@@ -383,10 +401,10 @@ Skipped subordinate line                                            Line   112:
        <range start="0" end="741"/>
      </style>
    </note>
-    <note handle="_0000002200000022" change="1472505121" id="N0021" type="REFN-TYPE">
+    <note handle="_0000002300000023" change="1" id="N0021" type="REFN-TYPE">
      <text>Who knows REFN TYPE</text>
    </note>
-    <note handle="_0000002400000024" change="1472505121" id="N0022" type="GEDCOM import">
+    <note handle="_0000002500000025" change="1" id="N0022" 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>
@@ -394,10 +412,11 @@ Could not import photo.jpg                                          Line   114:
        <range start="0" end="164"/>
      </style>
    </note>
-    <note handle="_0000002800000028" change="979250406" id="N0023" type="Person Note">
+    <note handle="_0000002900000029" change="979250406" id="N0023" type="Person Note">
      <text>Family Spouse reference Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000002a0000002a" change="1472505121" id="N0024" type="GEDCOM import">
+    <note handle="_0000002b0000002b" change="1" id="N0024" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0002:

 Empty note ignored                                                  Line   132: 2 NOTE 
@@ -406,19 +425,22 @@ Skipped subordinate line                                            Line   133:
        <range start="0" end="248"/>
      </style>
    </note>
-    <note handle="_0000002c0000002c" change="979250406" id="N0025" type="General">
+    <note handle="_0000002d0000002d" change="979250406" id="N0025" type="General">
      <text>Name note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003000000030" change="1472505121" id="N0026" type="LDS Note">
+    <note handle="_0000003100000031" change="1" id="N0026" type="LDS Note">
      <text>Place note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003300000033" change="1472505122" id="N0027" type="LDS Note">
+    <note handle="_0000003400000034" change="1" id="N0027" type="LDS Note">
      <text>LDS xref note</text>
    </note>
-    <note handle="_0000003500000035" change="979250406" id="N0028" type="Association Note">
+    <note handle="_0000003600000036" change="979250406" id="N0028" type="Association Note">
      <text>Association link note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003700000037" change="1472505121" id="N0029" type="GEDCOM import">
+    <note handle="_0000003800000038" change="1" id="N0029" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0003:

 Empty note ignored                                                  Line   141: 2 NOTE 
@@ -430,25 +452,29 @@ Skipped subordinate line                                            Line   168:
        <range start="0" end="538"/>
      </style>
    </note>
-    <note handle="_0000003800000038" change="979250406" id="N0030" type="General">
+    <note handle="_0000003900000039" change="979250406" id="N0030" type="General">
      <text>Just for association</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003d0000003d" change="1472505122" id="N0031" type="Family Note">
+    <note handle="_0000003e0000003e" change="1" id="N0031" type="Family Note">
      <text>Family xref note</text>
    </note>
-    <note handle="_0000003e0000003e" change="979250406" id="N0032" type="Family Note">
+    <note handle="_0000003f0000003f" change="979250406" id="N0032" type="Family Note">
      <text>Family note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003f0000003f" change="1472505122" id="N0033" type="Citation">
+    <note handle="_0000004000000040" change="1" id="N0033" type="Citation">
      <text>Citation Data Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004000000040" change="1472505122" id="N0034" type="Source text">
+    <note handle="_0000004100000041" change="1" id="N0034" type="Source text">
      <text>A sample text from a source of this family</text>
    </note>
-    <note handle="_0000004100000041" change="979250406" id="N0035" type="Citation">
+    <note handle="_0000004200000042" change="979250406" id="N0035" type="Citation">
      <text>A note this citation is on the FAMILY record.</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004300000043" change="1472505122" id="N0036" type="GEDCOM import">
+    <note handle="_0000004400000044" change="1" id="N0036" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0001:

 Line ignored as not understood                                      Line   183: 2 TEST Family Note
@@ -461,13 +487,15 @@ Line ignored as not understood                                      Line   196:
        <range start="0" end="645"/>
      </style>
    </note>
-    <note handle="_0000004500000045" change="979250406" id="N0037" type="Repository Reference Note">
+    <note handle="_0000004600000046" change="979250406" id="N0037" type="Repository Reference Note">
      <text>A short note about the repository link.</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004600000046" change="979250406" id="N0038" type="Source Note">
+    <note handle="_0000004700000047" change="979250406" id="N0038" type="Source Note">
      <text>note embedded in the SOURCE Record</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004700000047" change="1472505122" id="N0039" type="GEDCOM import">
+    <note handle="_0000004800000048" change="1" id="N0039" type="GEDCOM import">
      <text>Records not imported into SOUR (source) Gramps ID S0001:

 Line ignored as not understood                                      Line   206: 1 TEST source
@@ -479,10 +507,11 @@ Skipped subordinate line                                            Line   215:
        <range start="0" end="524"/>
      </style>
    </note>
-    <note handle="_0000004800000048" change="1472505122" id="N0040" type="Repository Note">
+    <note handle="_0000004900000049" change="1" id="N0040" type="Repository Note">
      <text>Repository Note</text>
+      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004900000049" change="1472505122" id="N0041" type="GEDCOM import">
+    <note handle="_0000004a0000004a" change="1" id="N0041" type="GEDCOM import">
      <text>Records not imported into REPO (repository) Gramps ID R0002:

 Line ignored as not understood                                      Line   223: 1 TEST Repo
@@ -1,43 +1,82 @@
 0 HEAD
-1 SOUR Gramps
+1 SOUR LEGACY
 2 VERS 3.3.0
-2 NAME Gramps
+2 NAME LEGACY
 1 DATE 27 DEC 2010
 2 TIME 15:35:24
 1 SUBM @SUBM@
-1 FILE gramps33/example/gedcom/sample.ged
+1 SUBN @SUBN@
+1 FILE sample.ged
 1 COPR Copyright (c) 2010 Alex Roitman,,,.
 1 GEDC
 2 VERS 5.5
 2 FORM LINEAGE-LINKED
+2 FORM NOT LINEAGE-LINKED
 1 CHAR UTF-8
+2 VERS 1.1
 1 LANG French
 0 @SUBM@ SUBM
 1 NAME Alex Roitman,,,
 1 ADDR Not Provided
 2 CONT Not Provided
 2 ADR1 Not Provided
+2 NOTE No address provided (note not supported)
+0 @SUBN@ SUBN
+1 TEMP Mormon Temple
+1 ANCE 4
+1 DESC 4
+1 ORDI Yes
+0 @F3@ FAM
+1 HUSB @I24@
+1 WIFE @I0@
+1 MARR
+2 TYPE Marriage of Gustaf Smith, Sr. and Anna Hansdotter
+2 DATE 27 NOV 1885
+2 PLAC Rønne, Bornholm, Denmark
+1 CHIL @I26@
+1 CHIL @I23@
+1 CHIL @I21@
+1 CHIL @I8@
+1 CHIL @I15@
+1 CHIL @I20@
+1 CHIL @I10@
+1 CHAN
+2 DATE 21 DEC 2007
+3 TIME 01:35
+2 SOUR Not really allowed here
+1 RIN 987456321
+1 OBJE
+2 TITL No filename for this one 
 0 @I0@ INDI
 1 NAME Anna /Hansdotter/
 2 GIVN Anna
 2 SURN Hansdotter
+2 SPFX Vrow
+2 SURN Smith
+2 _AKA Anna Smith
+2 _AKA Hanna
+2 NOTE Hans daughter? N0000
 1 SEX F
 1 BIRT
 2 TYPE Birth of Anna Hansdotter
-2 DATE 2 OCT 1864
+2 DATE EST 2 OCT 1864
 2 PLAC Löderup, Malmöhus Län, Sweden
 1 DEAT
 2 TYPE Death of Anna Hansdotter
 2 DATE 29 SEP 1945
 2 PLAC Sparks, Washoe Co., NV
+2 NOTE Her eulogy was great! N0001
 1 FAMS @F3@
 1 CHAN
-2 DATE 21 DEC 2007
+2 DATE 21 DEC 1900
 3 TIME 01:35:26
+1 NOTE Inline note should get ID N0002
+1 _PHOTO @M1@
 0 @I1@ INDI
 1 NAME Keith Lloyd /Smith/
 2 GIVN Keith Lloyd
 2 SURN Smith
+2 NOTE @N7@
 1 SEX M
 1 BIRT
 2 TYPE Birth of Keith Lloyd Smith
@@ -47,6 +86,7 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 NOTE Keith Lloyd Smith inline N0003
 0 @I10@ INDI
 1 NAME Hans Peter /Smith/
 2 GIVN Hans Peter
@@ -66,6 +106,7 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 NOTE Hans Peter Smith inline N0004
 0 @I11@ INDI
 1 NAME Hanna /Smith/
 2 GIVN Hanna
@@ -79,6 +120,7 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 NOTE Hanna Smith inline N0005
 0 @I12@ INDI
 1 NAME Herman Julius /Nielsen/
 2 GIVN Herman Julius
@@ -95,6 +137,7 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 NOTE Herman Julius Nielsen N0006
 0 @I13@ INDI
 1 NAME Evelyn /Michaels/
 2 GIVN Evelyn
@@ -107,10 +150,13 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 NOTE Evelyn Michaels N0007
 0 @I14@ INDI
 1 NAME Marjorie Lee /Smith/
 2 GIVN Marjorie Lee
 2 SURN Smith
+1 NAME Margie
+2 TYPE Nickname
 1 SEX F
 1 BIRT
 2 TYPE Birth of Marjorie Lee Smith
@@ -151,6 +197,16 @@
 2 TYPE Death of Jennifer Anderson
 2 DATE 29 MAY 1985
 2 PLAC San Francisco, San Francisco Co., CA
+1 RESI
+2 DATE 1980
+2 ADDR 459 Main St., The Village, San Francisco, CA, USA
+3 ADR1 456 Main St
+3 ADR1 456 Main St again
+3 ADR2 The Village
+3 CITY San Francisco
+3 CTRY USA
+3 PHON 555-666-7777
+3 STAE CA
 1 FAMS @F14@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -185,6 +241,11 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 SSN 987-555-4444
+2 TYPE first generaton
+2 SOUR @S999@
+3 PAGE SSN docs pg 999
+2 NOTE Person Attribute Note on SSN
 0 @I19@ INDI
 1 NAME Eric Lloyd /Smith/
 2 GIVN Eric Lloyd
@@ -246,18 +307,26 @@
 2 TYPE Birth of Hjalmar Smith
 2 DATE 31 JAN 1893
 2 PLAC Rønne, Bornholm, Denmark
+1 BIRT Y
 1 DEAT
 2 TYPE Death of Hjalmar Smith
 2 DATE 25 SEP 1894
 2 PLAC Rønne, Bornholm, Denmark
+1 DEAT Y
 1 FAMC @F3@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 ALIA @I22@
+1 ALIA James /Smith/
+1 NAME Jimmy Smith
+1 TITL Sir Jimmy Smith
+2 DATE 5 OCT 1874
+2 PLAC Rønne, Bornholm, Denmark
 0 @I22@ INDI
 1 NAME Martin /Smith/
-2 GIVN Martin
 2 SURN Smith
+2 GIVN Martin
 1 SEX M
 1 BIRT
 2 TYPE Birth of Martin Smith
@@ -275,17 +344,29 @@
 1 FAMS @F2@
 1 NOTE @N0002@
 1 CHAN
+1 RESN locked
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
 0 @I23@ INDI
+1 NAME Astrid Shermanna /Augusta/
+2 GIVN Astrid Shermanna
+2 SURN Augusta
+1 NAME Star /Augusta/
+2 GIVN Star
+2 SURN Augusta
+2 TYPE AKA
+2 DATE FROM 1889 TO 1898
 1 NAME Astrid Shermanna Augusta /Smith/
 2 GIVN Astrid Shermanna Augusta
 2 SURN Smith
+2 TYPE MARRIED
+2 NPFX Dr.
 1 SEX F
 1 BIRT
 2 TYPE Birth of Astrid Shermanna Augusta Smith
 2 DATE 31 JAN 1889
 2 PLAC Rønne, Bornholm, Denmark
+2 FAMC @F3@
 1 DEAT
 2 TYPE Death of Astrid Shermanna Augusta Smith
 2 DATE 21 DEC 1963
@@ -318,14 +399,21 @@
 2 DATE 7 DEC 1862
 2 PLAC Gladsax, Kristianstad Län, Sweden
 1 FAMC @F2@
+2 NOTE A FAMC note
+2 PEDI birth
+2 SOUR @S2@
 1 FAMS @F3@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 ASSO @I23@
+2 RELA Friend
+2 SOUR @S2@
 0 @I25@ INDI
 1 NAME Marta /Ericsdotter/
 2 GIVN Marta
 2 SURN Ericsdotter
+2 _MARN Smith
 1 SEX F
 1 BIRT
 2 TYPE Birth of Marta Ericsdotter
@@ -335,6 +423,20 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 FACT Housekeeper
+2 TYPE Skills
+1 CONL
+2 TEMP STOCK code
+2 DATE 1790
+1 ENDL
+2 TEMP Stockholm
+2 DATE 1795
+1 SLGC
+2 TEMP Stockholm, Sweden
+2 DATE 1796
+2 PLAC Sweden
+3 FORM Country
+2 FAMC @F1@
 0 @I26@ INDI
 1 NAME Kirsti Marie /Smith/
 2 GIVN Kirsti Marie
@@ -360,7 +462,7 @@
 1 SEX M
 1 BIRT
 2 TYPE Birth of Ingeman Smith
-2 DATE ABT 1770
+2 DATE ABT @#DGREGORIAN@ 1770
 2 PLAC Sweden
 1 FAMS @F1@
 1 CHAN
@@ -403,11 +505,13 @@
 1 NAME Magnes /Smith/
 2 GIVN Magnes
 2 SURN Smith
-1 SEX M
+1 SSN 987-654-3210
+1 SEX X
 1 BIRT
 2 TYPE Birth of Magnes Smith
 2 DATE 6 OCT 1858
 2 PLAC Simrishamn, Kristianstad Län, Sweden
+2 RIN 789654123
 1 DEAT
 2 TYPE Death of Magnes Smith
 2 DATE 20 FEB 1910
@@ -426,6 +530,8 @@
 2 TYPE Birth of Janice Ann Adams
 2 DATE 26 AUG 1965
 2 PLAC Fremont, Alameda Co., CA
+2 CAUS fooling around
+3 SOUR @S0@
 1 OCCU Retail Manager
 1 _DEG
 2 TYPE Business Management
@@ -495,6 +601,8 @@
 1 NAME Lars Peter /Smith/
 2 GIVN Lars Peter
 2 SURN Smith
+2 _ADPN Jones
+2 _ADPN Pete Jones
 1 SEX M
 1 BIRT
 2 TYPE Birth of Lars Peter Smith
@@ -532,6 +640,8 @@
 2 GIVN Edwin Michael
 2 SURN Smith
 2 SOUR @S1@
+3 DATA
+4 TEXT Record for Edwin Michael Smith
 1 SEX M
 1 BIRT
 2 TYPE Birth of Edwin Michael Smith
@@ -648,7 +758,7 @@
 1 SEX M
 1 BIRT
 2 TYPE Birth of Edwin Willard
-2 DATE ABT 1886
+2 DATE BET @#DHEBREW@ AAV 1886 AND @#DHEBREW@ ELUL 1897
 1 FAMS @F4@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -706,12 +816,19 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 RESI At the boarding school
+2 DATE FROM @#DGREGORIAN@ 1873 TO 1878
+2 PLAC Oronoko, Berrien, Michigan, USA
+1 RESI At the hebrew boarding school
+2 DATE FROM 1873 TO @#DHEBREW@ 1878
+2 PLAC Shemps
+3 FORM home
 0 @F0@ FAM
 1 HUSB @I39@
 1 WIFE @I36@
 1 MARR
 2 TYPE Marriage of Martin Smith and Elna Jefferson
-2 DATE ABT 1816
+2 DATE BET @#DGREGORIAN@ 1816 AND 1817
 2 PLAC Gladsax, Kristianstad Län, Sweden
 1 CHIL @I11@
 1 CHIL @I7@
@@ -725,8 +842,12 @@
 1 WIFE @I25@
 1 MARR
 2 TYPE Marriage of Ingeman Smith and Marta Ericsdotter
-2 DATE ABT 1790
+2 DATE BET 1789 AND @#DHEBREW@ 1790
 2 PLAC Sweden
+2 HUSB
+3 AGE 17
+2 WIFE
+3 AGE 18
 1 CHIL @I39@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -739,9 +860,11 @@
 2 DATE 12 JUL 1986
 2 PLAC Woodland, Yolo Co., CA
 1 CHIL @I35@
+2 _STAT
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 _STAT
 0 @F11@ FAM
 1 HUSB @I3@
 1 WIFE @I28@
@@ -749,9 +872,20 @@
 2 TYPE Marriage of Magnes Smith and Anna Streiffert
 2 DATE 24 AUG 1884
 2 PLAC Rønne, Bornholm, Denmark
+3 MAP
+4 LATI N55.1010
+4 LONG E14.7083
+3 OBJE
+4 FILE Magnes&Anna_smiths_marr_cert.jpg
+3 SOUR @S0@
+2 OBJE
+3 FILE Magnes&Anna_smiths_marr_cert.jpg
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 EVEN Celebration
+2 TYPE MARB
+2 DATE 24 AUG 1883
 0 @F12@ FAM
 1 HUSB @I18@
 1 WIFE @I34@
@@ -765,6 +899,11 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 SLGS
+2 PLAC Sparks, Washoe Co., NV
+1 NCHI 2
+1 OBJE
+2 FILE John&Alice_smiths_marr_cert.jpg
 0 @F13@ FAM
 1 HUSB @I37@
 1 WIFE @I30@
@@ -772,10 +911,18 @@
 2 TYPE Marriage of Edwin Michael Smith and Janice Ann Adams
 2 DATE 27 MAY 1995
 2 PLAC San Ramon, Conta Costa Co., CA
+2 _WITN @I18@
+3 TYPE WITNESS_OF_MARRIAGE
 1 ENGA
 2 TYPE Engagement of Edwin Michael Smith and Janice Ann Adams
 2 DATE 5 OCT 1994
+2 TIME 2:00pm
+2 AGNC Lovely ring presentation
+2 _WITN George Smorge
+2 _PRIV
+2 NOTE Description: Engagement of Edwin Michael Smith and Janice Ann Adams
 2 PLAC San Francisco, San Francisco Co., CA
+2 _UID 123456
 1 CHIL @I5@
 1 CHIL @I2@
 1 CHAN
@@ -787,35 +934,20 @@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 EVEN Common law marriage
+2 TYPE Civil
 0 @F2@ FAM
 1 HUSB @I22@
 1 WIFE @I38@
 1 MARR
 2 TYPE Marriage of Martin Smith and Kerstina Hansdotter
-2 DATE ABT 1856
+2 DATE FROM @#DGREGORIAN@ 1856 TO @#DGREGORIAN@ 1857
 1 CHIL @I3@
 1 CHIL @I9@
 1 CHIL @I24@
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
-0 @F3@ FAM
-1 HUSB @I24@
-1 WIFE @I0@
-1 MARR
-2 TYPE Marriage of Gustaf Smith, Sr. and Anna Hansdotter
-2 DATE 27 NOV 1885
-2 PLAC Rønne, Bornholm, Denmark
-1 CHIL @I26@
-1 CHIL @I23@
-1 CHIL @I21@
-1 CHIL @I8@
-1 CHIL @I15@
-1 CHIL @I20@
-1 CHIL @I10@
-1 CHAN
-2 DATE 21 DEC 2007
-3 TIME 01:35:26
 0 @F4@ FAM
 1 HUSB @I6@
 1 WIFE @I26@
@@ -850,7 +982,7 @@
 0 @F7@ FAM
 1 HUSB @I15@
 1 WIFE @I13@
-1 MARR
+1 MARR Civil Union
 2 TYPE Marriage of Gus Smith and Evelyn Michaels
 2 DATE ABT 1920
 1 CHAN
@@ -866,12 +998,15 @@
 1 CHIL @I19@
 1 CHIL @I1@
 1 CHIL @I29@
+2 ADOP
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 ADDR 123 Main st, Grantville, Virginia, USA
 0 @F9@ FAM
 1 HUSB @I10@
 1 WIFE @I17@
+1 MARR Unmarried
 1 CHIL @I33@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -887,11 +1022,16 @@
 3 TIME 01:35:26
 0 @S1@ SOUR
 1 TITL Birth Certificate
+1 REPO Invalid REPO Name
+2 NOTE Invalid REPO (Name instead of xref)
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+1 TEXT Source text of Birth cert
 0 @S2@ SOUR
 1 TITL Birth Records
+1 REPO
+2 NOTE Invalid REPO (no name)
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
@@ -901,9 +1041,15 @@
 2 CALN CA-123-LL-456_Num/ber
 3 MEDI Film
 1 NOTE @N0005@
+1 ABBR goodstuff
+1 DATA
+2 AGNC NYC Public Library
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
+0 @S4@ SOUR
+1 PERI Our Family Tree
+1 RIN 987456321
 0 @R0002@ REPO
 1 NAME New York Public Library
 1 ADDR 5th Ave at 42 street
@@ -912,13 +1058,27 @@
 2 STAE New York
 2 POST 11111
 2 CTRY USA
+1 CHAN
+2 DATE 01 JAN 2000
+3 TIME 00:00:00
 0 @R0003@ REPO
 1 NAME Aunt Martha's Attic
-1 ADDR 123 Main St
+1 ADDR 123 Main St, Someville, ST, USA
 2 ADR1 123 Main St
+2 ADR2 LittleVillage
 2 CITY Someville
 2 STAE ST
 2 CTRY USA
+2 DATE 25 DEC 1971
+2 SOUR @S0@
+3 DATE 26 DEC 1971
+3 REFN blah blah
+4 TYPE who knows
+3 EVEN housecleaning
+4 ROLE sorter
+3 OBJE
+4 FILE Attic_photo.jpg
+2 NOTE A note on this address
 1 WWW http://library.gramps-project.org
 1 NOTE @N0006@
 0 @N0000@ NOTE Witness name: John Doe
@@ -943,4 +1103,10 @@
 0 @N0004@ NOTE But Aunt Martha still keeps the original!
 0 @N0005@ NOTE The repository reference from the source is important
 0 @N0006@ NOTE Some note on the repo
+0 XXX an unknown token at level 0
+0 SUBM @SUBM@
+0 @S4@ SOUR A weird source (one line) format
+1 @X1@ XXX and unknown token xref definition
 0 TRLR
+
+The end
@@ -1,5 +0,0 @@
-Mismatch on file: imp_vcard.vcf
-Person: I0019  handle=0000001800000018
-  Diff on: Person, primary_name, surname list #2, primary
-    <class 'bool'>: True
-    <class 'bool'>: False
@@ -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,14 +1,127 @@
+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

@@ -703,7 +816,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.
@@ -838,7 +951,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

@@ -915,7 +1028,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,38 @@
 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.1.3
+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/
+X-Python3-Version: >= 3.2

-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,15 +40,22 @@ Depends:
 ${python3:Depends}
 Recommends:
 graphviz,
- 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,58 @@ 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-2017, 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
 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 +112,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,36 +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 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
-	# Remove duplicate license information
-	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE
-	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 = '2016, 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
@@ -11,33 +11,6 @@ GrampsDbBase
   :undoc-members:
   :show-inheritance:

-GrampsDbRead
-====================================
-.. automodule:: gramps.gen.db.read
-   :members:
-   :show-inheritance:
-
-GrampsDbWrite
-====================================
-.. automodule:: gramps.gen.db.write
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-GrampsCursor
-====================================
-.. automodule:: gramps.gen.db.cursor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-BSDDBtxn
-====================================
-.. automodule:: gramps.gen.db.bsddbtxn
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 GrampsDbTxn
 ====================================
 .. automodule:: gramps.gen.db.txn
@@ -45,13 +18,6 @@ GrampsDbTxn
   :undoc-members:
   :show-inheritance:

-GrampsDbUndo
-====================================
-.. automodule:: gramps.gen.db.undoredo
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 DbConst
 ====================================
 .. automodule:: gramps.gen.db.dbconst
@@ -64,15 +30,74 @@ GrampsDbException
   :undoc-members:
   :show-inheritance:

-Upgrade utilities
+GrampsDbUndo
 ====================================
-.. automodule:: gramps.gen.db.upgrade
-   :members:
-   :undoc-members:
-
-Backup
-====================================
-.. automodule:: gramps.gen.db.backup
+.. automodule:: gramps.gen.db.undoredo
   :members:
   :undoc-members:
   :show-inheritance:
+
+Generic
+====================================
+.. automodule:: gramps.gen.db.generic
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+DummyDb
+====================================
+.. automodule:: gramps.gen.db.dummydb
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+#####################################
+The :mod:`gramps.gen.db` bsddb Module
+#####################################
+
+.. automodule:: gramps.plugins.db.bsddb
+
+GrampsDbRead
+====================================
+.. automodule:: gramps.plugins.db.bsddb.read
+   :members:
+   :show-inheritance:
+
+GrampsDbWrite
+====================================
+.. automodule:: gramps.plugins.db.bsddb.write
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+GrampsCursor
+====================================
+.. automodule:: gramps.plugins.db.bsddb.cursor
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+BSDDBtxn
+====================================
+.. automodule:: gramps.plugins.db.bsddb.bsddbtxn
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+#####################################
+The :mod:`gramps.gen.db` dbapi Module
+#####################################
+
+.. automodule:: gramps.plugins.db.dbapi
+
+DBAPI
+====================================
+.. automodule:: gramps.plugins.db.dbapi.dbapi
+   :members:
+   :show-inheritance:
+
+Sqlite
+====================================
+.. automodule:: gramps.plugins.db.dbapi.sqlite
+   :members:
+   :show-inheritance:
@@ -10,3 +10,10 @@ Name
   :members:
   :undoc-members:
   :show-inheritance:
+
+Place
+====================================
+.. automodule:: gramps.gen.display.place
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -53,14 +53,14 @@ CitationBase
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 IndirectCitationBase
 ====================================
 .. autoclass:: IndirectCitationBase
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 DateBase
 ====================================
 .. automodule:: gramps.gen.lib.datebase
@@ -68,7 +68,7 @@ DateBase
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 LdsOrdBase
 ====================================
 .. automodule:: gramps.gen.lib.ldsordbase
@@ -76,7 +76,7 @@ LdsOrdBase
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 LocationBase
 ====================================
 .. automodule:: gramps.gen.lib.locationbase
@@ -84,7 +84,7 @@ LocationBase
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 MediaBase
 ====================================
 .. automodule:: gramps.gen.lib.mediabase
@@ -116,7 +116,7 @@ PrivacyBase
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 RefBase
 ====================================
 .. automodule:: gramps.gen.lib.refbase
@@ -132,7 +132,7 @@ SurnameBase
   :members:
   :undoc-members:
   :show-inheritance:
-      
+
 TagBase
 ====================================
 .. automodule:: gramps.gen.lib.tagbase
@@ -216,7 +216,7 @@ Citation
   :undoc-members:
   :show-inheritance:

-Media Object
+Media
 ====================================
 .. automodule:: gramps.gen.lib.media
 .. autoclass:: Media
@@ -366,7 +366,7 @@ RepoRef
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 *****************************
 Table objects
 *****************************
@@ -487,7 +487,7 @@ EventType
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 EventRoleType
 ==============
 .. automodule:: gramps.gen.lib.eventroletype
@@ -543,7 +543,7 @@ RepositoryType
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 SourceMediaType
 ================
 .. automodule:: gramps.gen.lib.srcmediatype
@@ -557,7 +557,7 @@ StyledTextTagType
   :members:
   :undoc-members:
   :show-inheritance:
-   
+
 UrlType
 ========
 .. automodule:: gramps.gen.lib.urltype
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # update_po - a gramps tool to update translations
 #
@@ -102,8 +102,9 @@ def build():
    # testing stage

    os.system('''%(program)s -b html . _build/html''' % {'program': sphinxCmd})
-    os.system('''%(program)s -b changes . _build/changes''' % {'program': sphinxCmd})
-    os.system('''%(program)s -b linkcheck . _build/linkcheck''' % {'program': sphinxCmd})
+    #os.system('''%(program)s -b changes . _build/changes''' % {'program': sphinxCmd})
+    #os.system('''%(program)s -b linkcheck . _build/linkcheck''' % {'program': sphinxCmd})
+    #os.system('''%(program)s -b devhelp . _build/devhelp''' % {'program': sphinxCmd})

 if __name__ == "__main__":
    main()
@@ -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-08-31" version="5.0.0"/>
+    <created date="2017-08-08" version="5.1.0"/>
    <researcher>
      <resname>Alex Roitman,,,</resname>
    </researcher>
@@ -951,7 +951,7 @@
      <place hlink="_L3WJQCD3US67V2CNZT"/>
      <description>Birth of Garner, Anderson</description>
    </event>
-    <event handle="_a5af0eb7dfb557da07e" change="1284030599" id="E0179">
+    <event handle="_a5af0eb7dfb557da07e" change="1502187535" id="E0179">
      <type>Death</type>
      <dateval val="1887-04-07"/>
      <place hlink="_AKFKQC2N4SM243HCTN"/>
@@ -6262,7 +6262,7 @@
      <dateval val="1842-06-28"/>
      <description>Death of Moreno, Joseph McDowell</description>
    </event>
-    <event handle="_a5af0ec45b25c630e03" change="1284030608" id="E1179">
+    <event handle="_a5af0ec45b25c630e03" change="1502187451" id="E1179">
      <type>Birth</type>
      <dateval val="1911-07-12"/>
      <description>Birth of Thornton, James Arthur</description>
@@ -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">
@@ -15003,7 +15003,7 @@
      <type>Marriage</type>
      <description>Marriage of Johnson, Henry and Sparks, Catherine</description>
    </event>
-    <event handle="_a5af0ed5df832ee65c1" change="1328026859" id="E2815">
+    <event handle="_a5af0ed5df832ee65c1" change="1502187371" id="E2815">
      <type>Marriage</type>
      <dateval val="1875-04-01"/>
      <place hlink="_RF5KQCNJRQY8OGTX2H"/>
@@ -18649,7 +18649,7 @@
      <parentin hlink="_F4CKQCJZ24JRE9Z889"/>
      <citationref hlink="_c140d2472c91aad494f"/>
    </person>
-    <person handle="_14LKQCYZJEAXTS3XX" change="1185438865" id="I1376">
+    <person handle="_14LKQCYZJEAXTS3XX" change="1502187492" id="I1376">
      <gender>F</gender>
      <name type="Birth Name">
        <first>Elizabeth</first>
@@ -18657,6 +18657,7 @@
      </name>
      <eventref hlink="_a5af0ebb003796f79a0" role="Primary"/>
      <eventref hlink="_a5af0ebb0143dab99ff" role="Primary"/>
+      <eventref hlink="_a5af0eb7dfb557da07e" role="Witness"/>
      <childof hlink="_5IUJQCRJY47YQ8PU7N"/>
      <parentin hlink="_I4LKQCOAGPFH4R90A7"/>
      <citationref hlink="_c140d24731407d57b3c"/>
@@ -19904,7 +19905,7 @@
      <childof hlink="_IO5KQC6H0Q6Y517LR9"/>
      <citationref hlink="_c140d24a1fd2319b703"/>
    </person>
-    <person handle="_35WJQC1B7T7NPV8OLV" change="1284030051" id="I0106">
+    <person handle="_35WJQC1B7T7NPV8OLV" change="1502187260" id="I0106">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Robert W.</first>
@@ -19913,6 +19914,11 @@
      <eventref hlink="_a5af0eb74ac73f86aa7" role="Primary"/>
      <eventref hlink="_a5af0eb74ba358391ae" role="Primary"/>
      <eventref hlink="_a5af0eb74c852f7c633" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Witness">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
      <childof hlink="_X3WJQCSF48F6809142"/>
      <parentin hlink="_8OUJQCUVZ0XML7BQLF"/>
      <citationref hlink="_c140d24a27e19bb381a"/>
@@ -21991,13 +21997,14 @@
      <childof hlink="_GCDKQCHI74ZPMI5GDJ"/>
      <citationref hlink="_c140d24f3f8704aa41b"/>
    </person>
-    <person handle="_6G0KQC2UXYC66XDDC2" change="1185438865" id="I0363">
+    <person handle="_6G0KQC2UXYC66XDDC2" change="1502187537" id="I0363">
      <gender>F</gender>
      <name type="Birth Name">
        <first>Miranda Keziah</first>
        <surname>Farmer</surname>
      </name>
      <eventref hlink="_a5af0ec7a76244d962d" role="Primary"/>
+      <eventref hlink="_a5af0eb7dfb557da07e" role="Witness"/>
      <childof hlink="_8NVJQCGMJTCL7E6ZDV"/>
      <citationref hlink="_c140d24f439709d3118"/>
    </person>
@@ -22989,7 +22996,7 @@
      <parentin hlink="_FBVJQCFBI50TW78O49"/>
      <citationref hlink="_c140d2522702664ec52"/>
    </person>
-    <person handle="_8CLKQCT97PJOGREJ7W" change="1185438865" id="I1387">
+    <person handle="_8CLKQCT97PJOGREJ7W" change="1502187387" id="I1387">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Robert</first>
@@ -22997,6 +23004,11 @@
      </name>
      <eventref hlink="_a5af0ebb3737a6ad088" role="Primary"/>
      <eventref hlink="_a5af0ebb39b441e9607" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Clergy">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
      <childof hlink="_5IUJQCRJY47YQ8PU7N"/>
      <parentin hlink="_H6LKQCWVIFNRNGHFVH"/>
      <citationref hlink="_c140d2522d804491375"/>
@@ -23803,7 +23815,7 @@
      <childof hlink="_5DBKQCVAB0XMBEW8R9"/>
      <citationref hlink="_c140d25425874b0b827"/>
    </person>
-    <person handle="_9HUJQC6ONNW8SMSKGQ" change="1185438865" id="I0038">
+    <person handle="_9HUJQC6ONNW8SMSKGQ" change="1502187526" id="I0038">
      <gender>M</gender>
      <name type="Birth Name">
        <first>David</first>
@@ -23812,6 +23824,7 @@
      <eventref hlink="_a5af0ec7eb514c52fbf" role="Primary"/>
      <eventref hlink="_a5af0ec7ec844213b55" role="Primary"/>
      <eventref hlink="_a5af0ec7ed61c743fc8" role="Primary"/>
+      <eventref hlink="_a5af0eb7dfb557da07e" role="Informant"/>
      <childof hlink="_5IUJQCRJY47YQ8PU7N"/>
      <parentin hlink="_3HUJQCK4DH582YUTZG"/>
      <citationref hlink="_c140d2542c764516f13"/>
@@ -24506,7 +24519,7 @@
      <parentin hlink="_8NVJQCGMJTCL7E6ZDV"/>
      <citationref hlink="_c140d2560004fad8df6"/>
    </person>
-    <person handle="_ANLKQCQSQNE5LDZMRC" change="1185438865" id="I1402">
+    <person handle="_ANLKQCQSQNE5LDZMRC" change="1502187434" id="I1402">
      <gender>F</gender>
      <name type="Birth Name">
        <first>Margaret Jane &quot;Maggie&quot;</first>
@@ -24514,6 +24527,7 @@
      </name>
      <eventref hlink="_a5af0ebb7d47a006ee2" role="Primary"/>
      <eventref hlink="_a5af0ebb7e54e14970f" role="Primary"/>
+      <eventref hlink="_a5af0ec45b25c630e03" role="Witness"/>
      <childof hlink="_VDLKQCQQ1ADTJG1D1F"/>
      <parentin hlink="_SNLKQCD0VNJ627062Y"/>
      <citationref hlink="_c140d25607213be35da"/>
@@ -24882,13 +24896,18 @@
      <parentin hlink="_JFYJQCG2KLRQN835JD"/>
      <citationref hlink="_c140d256e3403ba129d"/>
    </person>
-    <person handle="_B3BKQCSV0G3NKSKWDX" change="1185438865" id="I0880">
+    <person handle="_B3BKQCSV0G3NKSKWDX" change="1502187344" id="I0880">
      <gender>F</gender>
      <name type="Birth Name">
        <first>L. J.</first>
        <surname>Blanco</surname>
      </name>
      <eventref hlink="_a5af0ed2cf617169903" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Clergy">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
      <childof hlink="_1BVJQCNTFAGS8273LJ"/>
      <citationref hlink="_c140d256ec4306a51ca"/>
    </person>
@@ -31930,7 +31949,7 @@
      <childof hlink="_UDMKQC5D3A2PXPUGNC"/>
      <citationref hlink="_c140d266ec93334f40f"/>
    </person>
-    <person handle="_MG5KQC6ZKSVO4A63G2" change="1328026883" id="I0624">
+    <person handle="_MG5KQC6ZKSVO4A63G2" change="1502187451" id="I0624">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Raymond E.</first>
@@ -31938,6 +31957,7 @@
      </name>
      <eventref hlink="_a5af0ece8bd1125a1a9" role="Primary"/>
      <eventref hlink="_a5af0ece8d15511ddf9" role="Primary"/>
+      <eventref hlink="_a5af0ec45b25c630e03" role="Informant"/>
      <childof hlink="_9OUJQCBOHW9UEK9CNV"/>
      <citationref hlink="_c140d266f0d5d178784"/>
    </person>
@@ -32336,7 +32356,7 @@
      <parentin hlink="_F4CKQCJZ24JRE9Z889"/>
      <citationref hlink="_c140d267ccb7aef0cd0"/>
    </person>
-    <person handle="_N4DKQCPEMZ7OO62O7J" change="1185438865" id="I0975">
+    <person handle="_N4DKQCPEMZ7OO62O7J" change="1502187308" id="I0975">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Henry</first>
@@ -32345,6 +32365,11 @@
      <eventref hlink="_a5af0ed483738d4ed1e" role="Primary"/>
      <eventref hlink="_a5af0ed484a144d229b" role="Primary"/>
      <eventref hlink="_a5af0ed48605fb6b9eb" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Witness">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
      <parentin hlink="_7PUJQC4PPS4EDIVMYE"/>
      <citationref hlink="_c140d267d2128356d8e"/>
    </person>
@@ -59379,10 +59404,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 +65643,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>
@@ -46,7 +46,7 @@ import re
 from gramps.gen.recentfiles import recent_files
 from gramps.gen.utils.file import rm_tempdir, get_empty_tempdir
 from .clidbman import CLIDbManager, NAME_FILE, find_locker_name
-
+from gramps.gen.db.utils import make_database
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE, BookList
 from .plug import cl_report, cl_book
@@ -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)
@@ -501,11 +503,10 @@ class ArgHandler:
                else:
                    self.imp_db_path = get_empty_tempdir("import_dbdir")
                    dbid = config.get('database.backend')
-                    newdb = self.dbstate.make_database(dbid)
-                    newdb.write_version(self.imp_db_path)
+                    newdb = make_database(dbid)

                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
@@ -77,7 +81,6 @@ Application options
  -y, --yes                              Don't ask to confirm dangerous actions (non-GUI mode only)
  -q, --quiet                            Suppress progress indication output (non-GUI mode only)
  -v, --version                          Show versions
-  -b, --databases                        Show available database backends
 """)

 _USAGE = _("""
@@ -137,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
@@ -154,7 +159,6 @@ class ArgParser:
    -y, --yes                       Don't ask to confirm dangerous actions
    -q, --quiet                     Suppress progress indication output
    -v, --version                   Show versions
-    -b, --databases                 Show available database backends
    -h, --help                      Display the help
    --usage                         Display usage information

@@ -196,6 +200,8 @@ class ArgParser:

        self.open_gui = None
        self.open = None
+        self.username = None
+        self.password = None
        self.exports = []
        self.actions = []
        self.imports = []
@@ -279,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
@@ -292,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
@@ -325,23 +350,6 @@ class ArgParser:
                                            repr(config.data[sect][setting])))
                    print()
                sys.exit(0)
-            elif option in ['-b', '--databases']:
-                default = config.data["database"]["backend"]
-                pmgr = BasePluginManager.get_instance()
-                pmgr.reg_plugins(PLUGINS_DIR, self, None)
-                pmgr.reg_plugins(USER_PLUGINS, self, None, load_on_reg=True)
-                for plugin in pmgr.get_reg_databases():
-                    pdata = pmgr.get_plugin(plugin.id)
-                    mod = pmgr.load_plugin(pdata)
-                    if mod:
-                        database = getattr(mod, pdata.databaseclass)
-                        summary = database.get_class_summary()
-                        print("Database backend ID:",
-                              pdata.id,
-                              "(default)" if pdata.id == default else "")
-                        for key in sorted(summary.keys()):
-                            print("   ", _("%s:") % key, summary[key])
-                sys.exit(0)
            elif option in ['-c', '--config']:
                cfg_name = value
                set_value = False
@@ -48,7 +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.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

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

 #-------------------------------------------------------------------------
 #
@@ -153,14 +155,10 @@ 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 = self.dbstate.make_database(dbid)
+                database = make_database(dbid)
                database.load(dirpath, None, update=False)
                retval = database.get_summary()
                database.close(update=False)
@@ -170,12 +168,19 @@ class CLIDbManager:
            retval = {_("Unavailable"): "locked"}
        retval.update({_("Family Tree"): name,
                       _("Path"): dirpath,
-                       _("Database"): dbid,
+                       _("Database"): self.get_backend_name_from_dbid(dbid),
                       _("Last accessed"): time_val(dirpath)[1],
                       _("Locked?"): self.is_locked(dirpath),
                      })
        return retval

+    def get_backend_name_from_dbid(self, dbid):
+        pmgr = BasePluginManager.get_instance()
+        for plugin in pmgr.get_reg_databases():
+            if plugin.id == dbid:
+                return plugin._name
+        return UNAVAILABLE
+
    def print_family_tree_summaries(self, database_names=None):
        """
        Prints a detailed list of the known family trees.
@@ -183,19 +188,19 @@ class CLIDbManager:
        print(_('Gramps Family Trees:'))
        for item in self.current_names:
            (name, dirpath, path_name, last,
-             tval, enable, stock_id, backend_type, version) = item
+             tval, enable, stock_id, backend_type) = item
            if (database_names is None or
                    any([(re.match("^" + dbname + "$", name) or
                          dbname == name)
                         for dbname in database_names])):
                summary = self.get_dbdir_summary(dirpath, name)
-                print(_("Family Tree \"%s\":") % summary[_("Family Tree")])
+                print(_('Family Tree "%s":') % summary[_("Family Tree")])
                for item in sorted(summary):
                    if item != "Family Tree":
                        # translators: needed for French, ignore otherwise
-                        print(_("   %(item)s: %(summary)s") % {
-                            'item' : item,
-                            'summary' : summary[item]})
+                        print('   ' + _("%(str1)s: %(str2)s"
+                                       ) % {'str1' : item,
+                                            'str2' : summary[item]})

    def family_tree_summary(self, database_names=None):
        """
@@ -205,7 +210,7 @@ class CLIDbManager:
        summary_list = []
        for item in self.current_names:
            (name, dirpath, path_name, last,
-             tval, enable, stock_id, backend_type, version) = item
+             tval, enable, stock_id, backend_type) = item
            if (database_names is None or
                    any([(re.match("^" + dbname + "$", name) or
                          dbname == name)
@@ -227,20 +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"
-                try:
-                    with open(os.path.join(dirpath, "bdbversion.txt")) as file:
-                        version = file.read()
-                except:
-                    version = "(0, 0, 0)"
-                try:
-                    version = ast.literal_eval(version)
-                except:
-                    version = (0, 0, 0)
+                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()
@@ -254,7 +246,7 @@ class CLIDbManager:

                    self.current_names.append(
                        (name, os.path.join(dbdir, dpath), path_name,
-                         last, tval, enable, stock_id, backend_type, version))
+                         last, tval, enable, stock_id, backend_type))

        self.current_names.sort()

@@ -304,11 +296,13 @@ class CLIDbManager:
            name_file.write(title)

        if create_db:
-            # write the version number into metadata
            if dbid is None:
-                dbid = "bsddb"
-            newdb = self.dbstate.make_database(dbid)
-            newdb.write_version(new_path)
+                dbid = config.get('database.backend')
+            newdb = make_database(dbid)
+
+        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)

@@ -356,11 +350,6 @@ class CLIDbManager:
                    # write locally:
                    temp_fp.write(data)
                    url_fp.close()
-                    from  gramps.gen.db.dbconst import BDBVERSFN
-                    versionpath = os.path.join(name, BDBVERSFN)
-                    _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))
@@ -369,14 +358,14 @@ 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 = self.dbstate.make_database(dbid)
+                dbase = make_database(dbid)
                dbase.load(new_path, user.callback)

                import_function = plugin.get_import_function()
@@ -405,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
@@ -48,6 +48,7 @@ from gramps.gen.display.name import displayer as name_displayer
 from gramps.gen.config import config
 from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS
 from gramps.gen.db.dbconst import DBBACKEND
+from gramps.gen.db.utils import make_database
 from gramps.gen.errors import DbError
 from gramps.gen.dbstate import DbState
 from gramps.gen.db.exceptions import (DbUpgradeRequiredError,
@@ -58,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
@@ -130,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
@@ -163,7 +165,7 @@ class CLIDbLoader:
        else:
            dbid = "bsddb"

-        db = self.dbstate.make_database(dbid)
+        db = make_database(dbid)

        self.dbstate.change_database(db)
        self.dbstate.db.disable_signals()
@@ -171,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))
@@ -200,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(
@@ -236,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):
        """
@@ -249,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
        """
@@ -270,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:
@@ -302,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()
@@ -315,9 +315,10 @@ class CLIManager:
        # database is empty, then copy default researcher to DB owner
        if (res.is_empty()
                and not owner.is_empty()
-                and self.dbstate.db.is_empty()):
+                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)
@@ -330,12 +331,14 @@ class CLIManager:
        recent_files(filename, name)
        self.file_loaded = True

-    def do_reg_plugins(self, dbstate, uistate):
+    def do_reg_plugins(self, dbstate, uistate, rescan=False):
        """
        Register the plugins at initialization time.
        """
-        self._pmgr.reg_plugins(PLUGINS_DIR, dbstate, uistate)
+        self._pmgr.reg_plugins(PLUGINS_DIR, dbstate, uistate, rescan=rescan)
        self._pmgr.reg_plugins(USER_PLUGINS, dbstate, uistate, load_on_reg=True)
+        if rescan:  # supports updated plugin installs
+            self._pmgr.reload_plugins()

 def startcli(errors, argparser):
    """
@@ -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
@@ -120,13 +121,13 @@ def _convert_str_to_match_type(str_val, type_val):

        # Search through characters between the brackets
        for char in str_val[1:-1]:
-            if (char == "'" or char == '"') and quote_type == None:
+            if (char == "'" or char == '"') and quote_type is None:
                # This character starts a string
                quote_type = char
            elif char == quote_type:
                # This character ends a string
                quote_type = None
-            elif quote_type == None and char == ",":
+            elif quote_type is None and char == ",":
                # This character ends an entry
                ret_val.append(entry.strip())
                entry = ""
@@ -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"

@@ -398,8 +412,10 @@ class CommandLineReport:
                        father = self.database.get_person_from_handle(fhandle)
                        if father:
                            fname = name_displayer.display(father)
-                    text = "%s:\t%s, %s" % (family.get_gramps_id(),
-                                            fname, mname)
+                    # translators: needed for French, Hebrew and Arabic
+                    text = _("%(id)s:\t%(father)s, %(mother)s"
+                            ) % {'id': family.get_gramps_id(),
+                                 'father': fname, 'mother': mname}
                    id_list.append(text)
                self.options_help[name].append(id_list)
            elif isinstance(option, NoteOption):
@@ -444,7 +460,7 @@ class CommandLineReport:
            else:
                print(_("Unknown option: %s") % option, file=sys.stderr)
                print(_("   Valid options are:") +
-                      ", ".join(list(self.options_dict.keys())),
+                      _(", ").join(list(self.options_dict.keys())), # Arabic OK
                      file=sys.stderr)
                print(_("   Use '%(donottranslate)s' to see description "
                        "and acceptable values"
@@ -496,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:
@@ -525,7 +550,7 @@ class CommandLineReport:
            else:
                print(_("Ignoring unknown option: %s") % opt, file=sys.stderr)
                print(_("   Valid options are:"),
-                      ", ".join(list(self.options_dict.keys())),
+                      _(", ").join(list(self.options_dict.keys())), # Arabic OK
                      file=sys.stderr)
                print(_("   Use '%(donottranslate)s' to see description "
                        "and acceptable values"
@@ -663,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,
@@ -77,14 +77,13 @@ class Test(unittest.TestCase):
    # This tests the fix for bug #1331-1334
    # read trivial gedcom input, write gedcom output
    def test2_exec_CLI(self):
-        pyexec = sys.executable
        ifile = min1r
        ofile = out_ged
-        gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
-        process = subprocess.Popen("%s %s" % (pyexec, gcmd),
+        gcmd = [sys.executable, "Gramps.py", "-i", ifile, "-e", ofile]
+        process = subprocess.Popen(gcmd,
                                   stdin=subprocess.PIPE,
                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE, shell=True)
+                                   stderr=subprocess.PIPE)
        result_str, err_str = process.communicate()
        self.assertEqual(process.returncode, 0,
                         "executed CLI command %r" % gcmd)
@@ -110,14 +109,13 @@ class Test(unittest.TestCase):
                f.write("garbage")

        # ~same as test 2
-        pyexec = sys.executable
        ifile = min1r
        ofile = out_ged
-        gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
-        process = subprocess.Popen("%s %s" % (pyexec, gcmd),
+        gcmd = [sys.executable, "Gramps.py", "-i", ifile, "-e", ofile]
+        process = subprocess.Popen(gcmd,
                                   stdin=subprocess.PIPE,
                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE, shell=True)
+                                   stderr=subprocess.PIPE)
        result_str, err_str = process.communicate()
        self.assertEqual(process.returncode, 0,
                         "executed CLI command %r" % gcmd)
@@ -23,7 +23,6 @@

 import unittest
 from .. import user
-from ...gen.test.user_test import TestUser
 import sys

 try:
@@ -38,6 +37,12 @@ except:
    MOCKING = False
    print ("Mocking disabled", sys.exc_info()[0:2])

+class TestUser:
+    TITLE = "Testing prompt"
+    MSG = "Choices are hard. Nevertheless, please choose!"
+    ACCEPT = "To be"
+    REJECT = "Not to be"
+
 class TestUser_prompt(unittest.TestCase):
    def setUp(self):
        self.real_user = user.User()
@@ -44,12 +44,13 @@ _SPINNER = ['|', '/', '-', '\\']
 # User class
 #
 #-------------------------------------------------------------------------
-class User(user.User):
+class User(user.UserBase):
    """
    This class provides a means to interact with the user via CLI.
-    It implements the interface in :class:`.gen.user.User`
+    It implements the interface in :class:`.gen.user.UserBase`
    """
-    def __init__(self, callback=None, error=None, auto_accept=False, quiet=False,
+    def __init__(self, callback=None, error=None,
+                 auto_accept=False, quiet=False,
                 uistate=None, dbstate=None):
        """
        Init.
@@ -57,7 +58,7 @@ class User(user.User):
        :param error: If given, notify_error delegates to this callback
        :type error: function(title, error)
        """
-        user.User.__init__(self, callback, error, uistate, dbstate)
+        user.UserBase.__init__(self, callback, error, uistate, dbstate)
        self.steps = 0;
        self.current_step = 0;
        self._input = input
@@ -145,14 +146,14 @@ class User(user.User):
                m = message,
                y = accept_text,
                n = reject_text)
-        print (text, file = self._fileout) # TODO python3 add flush=True
+        print (text, file = self._fileout) # TODO: python 3.3 add flush=True
        try:
            reply = self._input()
        except EOFError:
            reply = ""
-        ### Trun response into True/False:
+        ### Turn response into True/False:
        if reply == "":
-            return default
+            return default == accept_label
        elif reply == accept_label:
            return True
        else:
@@ -168,7 +169,7 @@ class User(user.User):
        :type warning: str
        :returns: none
        """
-        self._fileout.write("%s %s" % (title, warning))
+        self._fileout.write("%s\n%s\n" % (title, warning))

    def notify_error(self, title, error=""):
        """
@@ -23,7 +23,7 @@
 #

 """
-This package implements access to GRAMPS configuration.
+This package implements access to Gramps configuration.
 """

 #---------------------------------------------------------------
@@ -133,11 +133,11 @@ register('behavior.addmedia-relative-path', False)
 register('behavior.autoload', False)
 register('behavior.avg-generation-gap', 20)
 register('behavior.betawarn', False)
-register('behavior.check-for-updates', 0)
-register('behavior.check-for-update-types', ["new"])
-register('behavior.last-check-for-updates', "1970/01/01")
-register('behavior.previously-seen-updates', [])
-register('behavior.do-not-show-previously-seen-updates', True)
+register('behavior.check-for-addon-updates', 0)
+register('behavior.check-for-addon-update-types', ["new"])
+register('behavior.last-check-for-addon-updates', "1970/01/01")
+register('behavior.previously-seen-addon-updates', [])
+register('behavior.do-not-show-previously-seen-addon-updates', True)
 register('behavior.date-about-range', 50)
 register('behavior.date-after-range', 50)
 register('behavior.date-before-range', 50)
@@ -155,12 +155,16 @@ register('behavior.translator-needed', True)
 register('behavior.use-tips', False)
 register('behavior.welcome', 100)
 register('behavior.web-search-url', 'http://google.com/#&q=%(text)s')
-register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps50")
+register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps51")

 register('database.backend', 'bsddb')
 register('database.compress-backup', True)
-register('database.autobackup', True) ## make backup when exiting, if there are changes
+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],
@@ -181,66 +185,26 @@ register('geography.show_cross', False)
 register('geography.path', "")
 register('geography.use-keypad', True)

-register('interface.address-height', 450)
-register('interface.address-width', 650)
-register('interface.attribute-height', 350)
-register('interface.attribute-width', 600)
-register('interface.child-ref-height', 450)
-register('interface.child-ref-width', 600)
-register('interface.citation-height', 450)
-register('interface.citation-sel-height', 450)
-register('interface.citation-sel-width', 600)
-register('interface.citation-width', 600)
-register('interface.clipboard-height', 300)
-register('interface.clipboard-width', 300)
+# note that other calls to "register" are done in realtime (when
+# needed), for instance to four 'interface.clipboard' variables --
+# so do a recursive grep for "setup_configs" to see all the (base) names
 register('interface.dont-ask', False)
 register('interface.view-categories',
         ["Dashboard", "People", "Relationships", "Families",
          "Ancestry", "Events", "Places", "Geography", "Sources",
          "Citations", "Repositories", "Media", "Notes"])
-register('interface.edit-filter-width', 500)
-register('interface.edit-filter-height', 420)
-register('interface.edit-rule-width', 600)
-register('interface.edit-rule-height', 450)
-register('interface.event-height', 450)
-register('interface.event-ref-height', 450)
-register('interface.event-ref-width', 600)
-register('interface.event-sel-height', 450)
-register('interface.event-sel-width', 600)
-register('interface.event-width', 600)
-register('interface.family-height', 500)
-register('interface.family-sel-height', 450)
-register('interface.family-sel-width', 600)
-register('interface.family-width', 700)
 register('interface.filter', False)
-register('interface.filter-editor-width', 400)
-register('interface.filter-editor-height', 350)
 register('interface.fullscreen', False)
 register('interface.grampletbar-close', False)
+register('interface.grampletbar-freeze', False)
 register('interface.ignore-gexiv2', False)
 register('interface.ignore-pil', False)
 register('interface.ignore-osmgpsmap', False)
-register('interface.lds-height', 450)
-register('interface.lds-width', 600)
-register('interface.location-height', 250)
-register('interface.location-width', 600)
 register('interface.main-window-height', 500)
 register('interface.main-window-horiz-position', 15)
 register('interface.main-window-vert-position', 10)
 register('interface.main-window-width', 775)
 register('interface.mapservice', 'OpenStreetMap')
-register('interface.media-height', 450)
-register('interface.media-ref-height', 450)
-register('interface.media-ref-width', 600)
-register('interface.media-sel-height', 450)
-register('interface.media-sel-width', 600)
-register('interface.media-width', 650)
-register('interface.name-height', 350)
-register('interface.name-width', 600)
-register('interface.note-height', 500)
-register('interface.note-sel-height', 450)
-register('interface.note-sel-width', 600)
-register('interface.note-width', 700)
 register('interface.open-with-default-viewer', False)
 register('interface.pedview-layout', 0)
 register('interface.pedview-show-images', True)
@@ -248,38 +212,13 @@ register('interface.pedview-show-marriage', False)
 register('interface.pedview-tree-size', 5)
 register('interface.pedview-tree-direction', 2)
 register('interface.pedview-show-unknown-people', False)
-register('interface.person-height', 550)
-register('interface.person-ref-height', 350)
-register('interface.person-ref-width', 600)
-register('interface.person-sel-height', 450)
-register('interface.person-sel-width', 600)
-register('interface.person-width', 750)
-register('interface.place-height', 450)
 register('interface.place-name-height', 100)
 register('interface.place-name-width', 450)
-register('interface.place-ref-height', 450)
-register('interface.place-ref-width', 600)
-register('interface.place-sel-height', 450)
-register('interface.place-sel-width', 600)
-register('interface.place-width', 650)
-register('interface.repo-height', 450)
-register('interface.repo-ref-height', 450)
-register('interface.repo-ref-width', 600)
-register('interface.repo-sel-height', 450)
-register('interface.repo-sel-width', 600)
-register('interface.repo-width', 650)
 register('interface.sidebar-text', True)
 register('interface.size-checked', False)
-register('interface.source-height', 450)
-register('interface.source-ref-height', 450)
-register('interface.source-ref-width', 600)
-register('interface.source-sel-height', 450)
-register('interface.source-sel-width', 600)
-register('interface.source-width', 600)
 register('interface.statusbar', 1)
 register('interface.toolbar-on', True)
-register('interface.url-height', 150)
-register('interface.url-width', 600)
+register('interface.toolbar-text', False)
 register('interface.view', True)
 register('interface.surname-box-height', 150)
 register('interface.treemodel-cache-size', 1000)
@@ -291,10 +230,13 @@ register('paths.report-directory', USER_HOME)
 register('paths.website-directory', USER_HOME)
 register('paths.website-cms-uri', '')
 register('paths.website-cal-uri', '')
+register('paths.website-extra-page-uri', '')
+register('paths.website-extra-page-name', '')
 register('paths.quick-backup-directory', USER_HOME)
 register('paths.quick-backup-filename',
         "%(filename)s_%(year)d-%(month)02d-%(day)02d.%(extension)s")

+register('preferences.quick-backup-include-mode', False)
 register('preferences.date-format', 0)
 register('preferences.calendar-format-report', 0)
 register('preferences.cprefix', 'C%04d')
@@ -309,11 +251,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"))
@@ -334,22 +273,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', '')
@@ -364,6 +306,9 @@ register('researcher.researcher-state', '')
 register('plugin.hiddenplugins', [])
 register('plugin.addonplugins', [])

+if __debug__: # enable a simple CLI test to see if the datestrings exist
+    register('test.january', _("localized lexeme inflections||January"))
+
 #---------------------------------------------------------------
 #
 # Upgrade Conversions go here.
@@ -384,7 +329,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
@@ -41,9 +41,9 @@ import uuid
 #-------------------------------------------------------------------------
 from .git_revision import get_git_revision
 from .constfunc import get_env_var
-from gramps.version import VERSION, VERSION_TUPLE, major_version
-from gramps.gen.utils.resourcepath import ResourcePath
-from gramps.gen.utils.grampslocale import GrampsLocale
+from ..version import VERSION, VERSION_TUPLE, major_version
+from .utils.resourcepath import ResourcePath
+from .utils.grampslocale import GrampsLocale

 #-------------------------------------------------------------------------
 #
@@ -59,8 +59,8 @@ PROGRAM_NAME = "Gramps"
 #-------------------------------------------------------------------------
 URL_HOMEPAGE = "http://gramps-project.org/"
 URL_MAILINGLIST = "http://sourceforge.net/mail/?group_id=25770"
-URL_BUGHOME = "http://bugs.gramps-project.org"
-URL_BUGTRACKER = "http://bugs.gramps-project.org/bug_report_page.php"
+URL_BUGHOME = "http://gramps-project.org/bugs"
+URL_BUGTRACKER = "http://gramps-project.org/bugs/bug_report_page.php"
 URL_WIKISTRING = "http://gramps-project.org/wiki/index.php?title="
 URL_MANUAL_PAGE = "Gramps_%s_Wiki_Manual" % major_version
 URL_MANUAL_DATA = '%s_-_Entering_and_editing_data:_detailed' % URL_MANUAL_PAGE
@@ -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")
@@ -134,7 +135,7 @@ USER_DIRLIST = (USER_HOME, HOME_DIR, VERSION_DIR, ENV_DIR, TEMP_DIR, THUMB_DIR,
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))

 sys.path.insert(0, ROOT_DIR)
-git_revision = get_git_revision(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
@@ -217,7 +218,7 @@ GTK_GETTEXT_DOMAIN = 'gtk30'
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG = "© 2001-2006 Donald N. Allingham\n" \
-                "© 2007-2016 The Gramps Developers"
+                "© 2007-2018 The Gramps Developers"
 COMMENTS = _("Gramps\n (Genealogical Research and Analysis "
             "Management Programming System)\n"
             "is a personal genealogy program.")
@@ -253,6 +254,7 @@ NO_GIVEN = "(%s)" % _("given-name|none")
 ARABIC_COMMA = "،"
 ARABIC_SEMICOLON = "؛"
 DOCGEN_OPTIONS = 'Docgen Options'
+COLON = _(':') # translators: needed for French, ignore otherwise

 #-------------------------------------------------------------------------
 #
@@ -265,7 +267,6 @@ LONGOPTS = [
    "class=",
    "config=",
    "debug=",
-    "databases",
    "display=",
    "disable-sound",
    "disable-crash-dialog",
@@ -289,6 +290,8 @@ LONGOPTS = [
    "oaf-ior-fd=",
    "oaf-private",
    "open=",
+    "username=",
+    "password=",
    "create=",
    "options=",
    "screen=",
@@ -300,12 +303,11 @@ LONGOPTS = [
    "remove=",
    "usage",
    "version",
-    "qml",
    "yes",
    "quiet",
 ]

-SHORTOPTS = "O:C:i:e:f:a:p:d:c:r:blLthuv?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')

@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2004-2007  Donald N. Allingham
+# Copyright (C) 2017       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
@@ -29,11 +30,16 @@ Class handling language-specific selection for date parser and displayer.
 #-------------------------------------------------------------------------
 import logging

+#-------------------------------------------------------------------------
+#
+# Gramps modules
+#
+#-------------------------------------------------------------------------
 from ..const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
 # import prerequisites for localized handlers
 from ._datehandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY,
-                          register_datehandler)
+                           locale_tformat, main_locale)
 from . import _datestrings

 # Import all the localized handlers
@@ -69,12 +75,13 @@ from . import _date_zh_TW
 # Initialize global parser
 try:
    if LANG in LANG_TO_PARSER:
-        parser = LANG_TO_PARSER[LANG]()
+        parser = LANG_TO_PARSER[LANG](plocale=glocale)
    else:
-        parser = LANG_TO_PARSER[LANG_SHORT]()
+        parser = LANG_TO_PARSER[LANG_SHORT](plocale=glocale)
 except:
-    logging.warning(_("Date parser for '%s' not available, using default") % LANG)
-    parser = LANG_TO_PARSER["C"]()
+    logging.warning(
+        _("Date parser for '%s' not available, using default") % LANG)
+    parser = LANG_TO_PARSER["C"](plocale=glocale)

 # Initialize global displayer
 try:
@@ -85,26 +92,32 @@ except:

 try:
    if LANG in LANG_TO_DISPLAY:
-        displayer = LANG_TO_DISPLAY[LANG](val)
+        displayer = LANG_TO_DISPLAY[LANG](val, blocale=glocale)
    else:
-        displayer = LANG_TO_DISPLAY[LANG_SHORT](val)
+        displayer = LANG_TO_DISPLAY[LANG_SHORT](val, blocale=glocale)
 except:
-    logging.warning(_("Date displayer for '%s' not available, using default") % LANG)
-    displayer = LANG_TO_DISPLAY["C"](val)
+    logging.warning(
+        _("Date displayer for '%s' not available, using default") % LANG)
+    displayer = LANG_TO_DISPLAY["C"](val, blocale=glocale)


 # Import utility functions
 from ._dateutils import *
-from ._grampslocale import (codeset, tformat)

+# set GRAMPS_RESOURCES then: python3 -m gramps.gen.datehandler.__init__
 if __name__ == "__main__":
    from ._datedisplay import DateDisplay
    m = 0
-    for l,d in LANG_TO_DISPLAY.items():
-        if len(l) != 2:
+    date_handlers = sorted(LANG_TO_DISPLAY.items())
+    for l,d in date_handlers:
+        if len(l) != 2 and l not in ('zh_TW'): # Chinese has two date_handlers
            continue
+        if l.upper() == l and (l.lower(),d) in date_handlers:
+            continue # don't need to see the upper-case variant also
        m = max(m, len(d.formats))
-        print("{}: {} {} own dg: {}".format(
+        print("{}: {} {} own-f:{} own-dc:{} own-dg:{}".format(
            l, len(d.formats), d.formats,
+            d.formats != DateDisplay.formats,
+            d._display_calendar != DateDisplay._display_calendar,
            d._display_gregorian != DateDisplay._display_gregorian))
    print("MAX: ", m)
@@ -39,6 +39,7 @@ from ..lib.date import Date
 from ._dateparser import DateParser
 from ._datedisplay import DateDisplay
 from ._datehandler import register_datehandler
+from ..const import ARABIC_COMMA

 #-------------------------------------------------------------------------
 #
@@ -123,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)

 #-------------------------------------------------------------------------
 #
@@ -202,10 +203,32 @@ class DateDisplayAR(DateDisplay):
            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)

+    def dd_dformat01(self, date_val):
+        """
+        numerical -- for Arabic dates
+        """
+        value = DateDisplay.dd_dformat01(self, date_val)
+        return value.replace(',', ARABIC_COMMA)
+
+    def dd_dformat02(self, date_val, inflect, long_months):
+        """
+        month_name day, year -- for Arabic dates
+        """
+        value = DateDisplay.dd_dformat02(self, date_val, inflect, long_months)
+        return value.replace(',', ARABIC_COMMA)
+
+    def dd_dformat03(self, date_val, inflect, short_months):
+        """
+        month_abbreviation day, year -- for Arabic dates
+        """
+        value = DateDisplay.dd_dformat03(self, date_val, inflect, short_months)
+        return value.replace(',', ARABIC_COMMA)
+
 #-------------------------------------------------------------------------
 #
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('ar_AR', 'ar', 'Arabic', 'arabic'),
+register_datehandler(
+    ('ar_EG', 'ar_AR', 'ar', 'Arabic', 'arabic', ('%d %b, %Y',)),
    DateParserAR, DateDisplayAR)
@@ -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)

 #-------------------------------------------------------------------------
 #
@@ -305,10 +305,31 @@ class DateDisplayBG(DateDisplay):
            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)

+    def dd_dformat01(self, date_val):
+        """
+        numerical -- for Bulgarian dates
+        """
+        if date_val[3]:
+            return self.display_iso(date_val)
+        else:
+            if date_val[0] == date_val[1] == 0:
+                return 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
+                value = value.replace('%b', str(date_val[1]))
+                if date_val[0] == 0: # ignore the zero day and its delimiter
+                    i_day = value.find('%e') # Bulgarian uses %e and not %d
+                    value = value.replace(value[i_day:i_day+3], '')
+                value = value.replace('%e', str(date_val[0]))
+                value = value.replace('%Y', str(abs(date_val[2])))
+                return value.replace('-', '/')
+
 #-------------------------------------------------------------------------
 #
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('bg_BG', 'bg', 'bulgarian', 'Bulgarian'),
+register_datehandler(
+    ('bg_BG', 'bg', 'bulgarian', 'Bulgarian', ('%e.%m.%Y',)),
    DateParserBG, DateDisplayBG)
@@ -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)

 #-------------------------------------------------------------------------
 #
@@ -193,4 +193,7 @@ class DateDisplayCA(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('ca_ES', 'ca', 'català', 'Catalan', 'ca_FR', 'ca_AD', 'ca_IT'), DateParserCA, DateDisplayCA)
+register_datehandler(
+    ('ca_ES', 'ca', 'català', 'Catalan',
+     'ca_FR', 'ca_AD', 'ca_IT', ('%d/%m/%Y',)),
+    DateParserCA, DateDisplayCA)
@@ -49,142 +49,14 @@ class DateParserCZ(DateParser):
    """
    Converts a text string into a Date object
    """
-    month_to_int = DateParser.month_to_int

-    month_to_int["leden"] = 1
-    month_to_int["ledna"] = 1
-    month_to_int["lednu"] = 1
-    month_to_int["led"] = 1
-    month_to_int["I"] = 1
-    month_to_int["i"] = 1
-
-    month_to_int["únor"] = 2
-    month_to_int["února"] = 2
-    month_to_int["únoru"] = 2
-    month_to_int["ún"] = 2
-    month_to_int["II"] = 2
-    month_to_int["ii"]  = 2
-
-    month_to_int["březen"] = 3
-    month_to_int["března"] = 3
-    month_to_int["březnu"] = 3
-    month_to_int["bře"] = 3
-    month_to_int["III"] = 3
-    month_to_int["iii"]  = 3
-
-    month_to_int["duben"] = 4
-    month_to_int["dubna"] = 4
-    month_to_int["dubnu"] = 4
-    month_to_int["dub"] = 4
-    month_to_int["IV"]  = 4
-    month_to_int["iv"]  = 4
-
-    month_to_int["květen"] = 5
-    month_to_int["května"] = 5
-    month_to_int["květnu"] = 5
-    month_to_int["V"]  = 5
-    month_to_int["v"]  = 5
-
-    month_to_int["červen"] = 6
-    month_to_int["června"] = 6
-    month_to_int["červnu"] = 6
-    month_to_int["čer"] = 6
-    month_to_int["vi"]  = 6
-
-    month_to_int["červenec"]  = 7
-    month_to_int["července"]  = 7
-    month_to_int["červenci"]  = 7
-    month_to_int["čvc"]  = 7
-    month_to_int["VII"]  = 7
-    month_to_int["vii"]  = 7
-
-    month_to_int["srpen"]  = 8
-    month_to_int["srpna"]  = 8
-    month_to_int["srpnu"]  = 8
-    month_to_int["srp"]  = 8
-    month_to_int["VIII"]  = 8
-    month_to_int["viii"]  = 8
-
-    month_to_int["září"]  = 9
-    month_to_int["zář"]  = 9
-    month_to_int["IX"]  = 9
-    month_to_int["ix"]  = 9
-
-    month_to_int["říjen"]  = 10
-    month_to_int["října"]  = 10
-    month_to_int["říjnu"]  = 10
-    month_to_int["říj"]  = 10
-    month_to_int["X"]  = 10
-    month_to_int["x"]  = 10
-
-    month_to_int["listopad"]  = 11
-    month_to_int["listopadu"]  = 11
-    month_to_int["lis"]  = 11
-    month_to_int["XI"]  = 11
-    month_to_int["xi"]  = 11
-
-    month_to_int["prosinec"]  = 12
-    month_to_int["prosince"]  = 12
-    month_to_int["prosinci"]  = 12
-    month_to_int["pro"]  = 12
-    month_to_int["XII"]  = 12
-    month_to_int["xii"]  = 12
-
-    modifier_to_int = {
-        'před'   : Date.MOD_BEFORE,
-        'do'     : Date.MOD_BEFORE,
-        'po'     : Date.MOD_AFTER,
-        'asi'    : Date.MOD_ABOUT,
-        'kolem'  : Date.MOD_ABOUT,
-        'přibl.' : Date.MOD_ABOUT,
-        }
-
-    calendar_to_int = {
-        'gregoriánský'  : Date.CAL_GREGORIAN,
-        'greg.'         : Date.CAL_GREGORIAN,
-        'g'             : Date.CAL_GREGORIAN,
-        'juliánský'     : Date.CAL_JULIAN,
-        'jul.'          : Date.CAL_JULIAN,
-        'j'             : Date.CAL_JULIAN,
-        'hebrejský'     : Date.CAL_HEBREW,
-        'hebr.'         : Date.CAL_HEBREW,
-        'h'             : Date.CAL_HEBREW,
-        'islámský'      : Date.CAL_ISLAMIC,
-        'isl.'          : Date.CAL_ISLAMIC,
-        'i'             : Date.CAL_ISLAMIC,
-        'francouzský republikánský'    : Date.CAL_FRENCH,
-        'fr.'           : Date.CAL_FRENCH,
-        'perský'        : Date.CAL_PERSIAN,
-        'per.'          : Date.CAL_PERSIAN,
-        'p'             : Date.CAL_PERSIAN,
-        'švédský'       : Date.CAL_SWEDISH,
-        'sve.'          : Date.CAL_SWEDISH,
-        's'             : Date.CAL_SWEDISH,
-        }
-
-    quality_to_int = {
-        'přibližně'  : Date.QUAL_ESTIMATED,
-        'odhadem'    : Date.QUAL_ESTIMATED,
-        'odh.'       : Date.QUAL_ESTIMATED,
-        'vypočteno'  : Date.QUAL_CALCULATED,
-        'vypočtené'  : Date.QUAL_CALCULATED,
-        'vyp.'       : Date.QUAL_CALCULATED,
-        }
-
-    # bug 9739 _grampslocale.py gets '%-d.%-m.%Y' and makes it be '%/d.%/m.%Y'
-    fmt = DateParser.fmt.replace('/', '') # so counteract that
-
-    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(
-            "(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)",
-            re.IGNORECASE)
-        self._range = re.compile(
-            "(mezi)\s+(?P<start>.+)\s+(a)\s+(?P<stop>.+)",
-            re.IGNORECASE)
+    bce = ["před naším letopočtem", "před Kristem",
+           "př. n. l.", "př. Kr."] + DateParser.bce

+    def dhformat_changed(self):
+        """ Allow overriding so a subclass can modify it """
+        # bug 9739 grampslocale.py gets '%-d.%-m.%Y' -- makes it be '%/d.%/m.%Y'
+        self.dhformat = self.dhformat.replace('/', '') # so counteract that

 #-------------------------------------------------------------------------
 #
@@ -195,87 +67,21 @@ class DateDisplayCZ(DateDisplay):
    """
    Czech language date display class.
    """
-    long_months = ( "", "leden", "únor", "březen", "duben", "květen",
-                    "červen", "červenec", "srpen", "září", "říjen",
-                    "listopad", "prosinec" )
-
-    short_months = ( "", "led", "úno", "bře", "dub", "kvě", "čer",
-                     "čvc", "srp", "zář", "říj", "lis", "pro" )
-
-    calendar = (
-        "", "juliánský", "hebrejský",
-        "francouzský republikánský", "perský", "islámský",
-        "švédský"
-        )
-
-    _mod_str = ("", "před ", "po ", "kolem ", "", "", "")
-
-    _qual_str = ("", "přibližně ", "vypočteno ")
-
-    bce = ["před naším letopočtem", "před Kristem",
-           "př. n. l.", "př. Kr."] + DateParser.bce
-
-    formats = (
-        "ISO (rrrr-mm-dd)",
-        "numerický",
-        "měsíc den, Rok",
-        "měs den, Rok",
-        "den. měsíc rok",
-        "den. měs rok"
-        )
-        # this must agree with DateDisplayEn's "formats" definition
-        # (since no locale-specific _display_gregorian exists, here)

    display = DateDisplay.display_formatted

-    # bug 9537 _grampslocale.py gets '%-d.%-m.%Y' and makes it be '%/d.%/m.%Y'
-    _tformat =  DateDisplay._tformat.replace('/', '') # so counteract that
+    def formats_changed(self):
+        """ Allow overriding so a subclass can modify """

-    def orig_display(self, date): # unused: only here for historical reference
-        """
-        Return a text string representing the date.
-        """
-        mod = date.get_modifier()
-        cal = date.get_calendar()
-        qual = date.get_quality()
-        start = date.get_start_date()
-        newyear = date.get_new_year()
+        # bug 9537 grampslocale.py gets '%-d.%-m.%Y' -- makes it be '%/d.%/m.%Y'
+        self.dhformat = self.dhformat.replace('/', '') # so counteract that

-        qual_str = self._qual_str[qual]
-
-        if mod == Date.MOD_TEXTONLY:
-            return date.get_text()
-        elif start == Date.EMPTY:
-            return ""
-#        elif mod == Date.MOD_NONE:
-#            date_decl_string = self.display_cal[cal](start)
-#            date_decl_string = date_decl_string.replace("den ", "dna ")
-#            date_decl_string = date_decl_string.replace("or ", "ora ")
-#            date_decl_string = date_decl_string.replace("en ", "na ")
-#            date_decl_string = date_decl_string.replace("ad ", "adu ")
-#            date_decl_string = date_decl_string.replace("ec ", "ce ")
-#            return date_decl_string
-        elif mod == Date.MOD_SPAN:
-            dat1 = self.display_cal[cal](start)
-            dat2 = self.display_cal[cal](date.get_stop_date())
-            scal = self.format_extras(cal, newyear)
-            return "%s%s %s %s %s%s" % (qual_str, 'od', dat1,
-                                        'do', dat2, scal)
-        elif mod == Date.MOD_RANGE:
-            dat1 = self.display_cal[cal](start)
-            dat2 = self.display_cal[cal](date.get_stop_date())
-            scal = self.format_extras(cal, newyear)
-            return "%s%s %s %s %s%s" % (qual_str, 'mezi',
-                                        dat1, 'a', dat2, scal)
-        else:
-            text = self.display_cal[date.get_calendar()](start)
-            scal = self.format_extras(cal, newyear)
-            return "%s%s%s%s" % (qual_str, self._mod_str[mod],
-                                 text, scal)

 #-------------------------------------------------------------------------
 #
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(("cs", "CS", "cs_CZ", "Czech"), DateParserCZ, DateDisplayCZ)
+register_datehandler(
+    ("cs_CZ", "cs", "CS", "Czech", ('%-d.%-m.%Y',)),
+    DateParserCZ, DateDisplayCZ)
@@ -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)

 #-------------------------------------------------------------------------
 #
@@ -176,4 +177,6 @@ class DateDisplayDa(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('da_DK', 'da', 'dansk', 'Danish'), DateParserDa, DateDisplayDa)
+register_datehandler(
+    ('da_DK', 'da', 'dansk', 'Danish', ('%d-%m-%Y',)),
+    DateParserDa, DateDisplayDa)
@@ -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
        """
@@ -237,7 +310,7 @@ class DateDisplayDE(DateDisplay):
                if date_val[0] == date_val[1] == 0:
                    value = str(date_val[2])
                else:
-                    value = self._tformat.replace('%m', str(date_val[1]))
+                    value = self.dhformat.replace('%m', str(date_val[1]))
                    value = value.replace('%d', str(date_val[0]))
                    value = value.replace('%Y', str(date_val[2]))
        elif self.format == 2:
@@ -321,6 +394,7 @@ class DateDisplayDE(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('de_DE', 'german', 'German', 'de_AT', 'de_CH',
-                      'de_LI', 'de_LU', 'de_BE', 'de'),
-                     DateParserDE, DateDisplayDE)
+register_datehandler(
+    ('de_DE', 'german', 'German', 'de_AT', 'de_CH',
+     'de_LI', 'de_LU', 'de_BE', 'de', ('%d.%m.%Y',)),
+    DateParserDE, DateDisplayDE)
@@ -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
        """
@@ -242,5 +242,6 @@ class DateDisplayEL(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('el_GR', 'el_CY', 'el', 'Greek', 'greek'),
+register_datehandler(
+    ('el_GR', 'el_CY', 'el', 'Greek', 'greek', ('%d/%m/%Y',)),
    DateParserEL, DateDisplayEL)
@@ -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)

 #-------------------------------------------------------------------------
 #
@@ -177,4 +177,6 @@ class DateDisplayES(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('es_ES', 'es', 'spanish', 'Spanish'), DateParserES, DateDisplayES)
+register_datehandler(
+    ('es_ES', 'es', 'spanish', 'Spanish', ('%d/%m/%Y',)),
+    DateParserES, DateDisplayES)
--- a/Show More
+++ b/Show More