Update Gramps & dependencies for 5.1.6 release.

Fixes #012884

.gitattributes

@@ -13,3 +13,6 @@
 *.ged -text
 *.GED -text
 *.csv -text
+*.DEF -text
+*.IXI -text
+*.REM -text

.github/workflows/gramps-ci.yml

@@ -0,0 +1,77 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2022       Nick Hall
+#
+# 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.
+
+name: Gramps CI
+
+on:
+  push:
+    branches: [ maintenance/gramps51 ]
+  pull_request:
+    branches: [ maintenance/gramps51 ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install gir1.2-pango-1.0
+        sudo apt-get install gir1.2-gtk-3.0
+        sudo apt-get install xdg-utils
+        sudo apt-get install librsvg2-common
+        sudo apt-get install libglib2.0-dev
+        sudo apt-get install intltool
+        sudo apt-get install python3-gi
+        sudo apt-get install python3-cairo
+        sudo apt-get install python3-gi-cairo
+        sudo apt-get install python3-bsddb3
+        sudo apt-get install python3-dev
+        sudo apt-get install python3-nose
+        sudo apt-get install python3-mock
+        sudo apt-get install python3-icu
+        sudo apt-get install python3-coverage
+        sudo apt-get install python3-jsonschema
+        sudo apt-get install libxml2-utils
+        sudo apt-get install python3-lxml
+        sudo apt-get install python-libxml2
+        sudo apt-get install zlib1g-dev
+        sudo apt-get install python3-setuptools
+    - name: Install addons
+      run: |
+        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
+    - name: Build
+      run: |
+        python3 setup.py build
+    - name: Run unit test suite
+      run: |
+        python3 setup.py test
+    - name: Trailing whitespace check
+      run: |
+        if git --no-pager grep --color -n --full-name '[    ]$' -- \*.py; then
+          echo "ERROR - Trailing whitespace found in source file(s)";
+          exit 1;
+        fi

.gitignore

@@ -23,5 +23,8 @@ test/data
 Thumbs.db
 ehthumbs.db
 
+# IDE
+.idea/
+
 # Glade temp files
 *~

.mailmap

@@ -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>

.pylintrc

@@ -126,10 +126,10 @@ class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
 class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
 
 # Regular expression matching correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
+function-rgx=(([a-z_][a-z0-9_]{2,30})|(_T_))$
 
 # Naming hint for function names
-function-name-hint=[a-z_][a-z0-9_]{2,30}$
+function-name-hint=(([a-z_][a-z0-9_]{2,30})|(_T_))$
 
 # Regular expression matching correct inline iteration names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$

.travis.yml

@@ -1,112 +0,0 @@
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2015-2015  Doug Blank
-# Copyright (C) 2016       DaAwesomeP
-# Copyright (C) 2016       QuLogic
-# Copyright (C) 2016       Tim G L Lyons
-#
-# 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.
-
-# After changing this file, check it on:
-#   http://lint.travis-ci.org/
-
-sudo: required
-dist: trusty
-language: python
-python:
- - 3.3 # This is irrelevant, because the virtualenv is not used at all
-
-# FIXME: The minimum requirement for Gramps is Python 3.2, so a test environment
-# for Python 3.2 should be added to this environment which is Python 3.3. It
-# will not be possible to run coverage under Python 3.2, because coverage is
-# Python 3.3 (or above) only.
-
-addons:
-  apt:
-    packages:
-    - gir1.2-pango-1.0
-    - gir1.2-gtk-3.0
-    - xdg-utils
-    - librsvg2-common
-    - libglib2.0-dev
-    - intltool
-    # - python3-gobject Provided by python3-gi
-    - python3-gi
-    - python3-cairo
-    - python3-gi-cairo
-    - python3-bsddb3
-    - python3-dev
-    - python3-nose
-    - python3-mock
-    - python3-pyicu
-    - python3-coverage
-
-before_install:
-
-install:
-# The working directory is set to /home/travis/build/gramps-project/gramps
-# by the automatic git checkout.
-
-# Download Sean Ross-Ross's Pure Python module containing a framework to
-# manipulate and analyze python ast<73>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
- - git clone -b master https://github.com/srossross/meta
-
-# Build Gramps package. This seems to copy everything to
-# /home/travis/build/scripts-3.3
- - python setup.py build
-
-before_script:
-# Create the Gramps database directory.
- - mkdir -p ~/.gramps/grampsdb/
-# set PYTHONPATH so the directly installed module (meta) is picked up from
-# /home/travis/build/gramps-project/gramps/meta
- - 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"
-# set GRAMPS_RESOURCES for locale, data,image and documentation
- - export GRAMPS_RESOURCES=.
-
-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
-# FIXME: This should have run from the current directory, rather than from
-# gramps, because there is some test code in that directory.
-
-# give an error for any trailing whitespace
- - if git --no-pager grep --color -n --full-name '[ 	]$' -- \*.py; then
-     echo "ERROR - Trailing whitespace found in source file(s)";
-     exit 1;
-   fi
-
-after_success:
-# apt-get installs python3-coverage, but codecov only invokes coverage, so make
-# a link
- - sudo ln /usr/bin/python3-coverage /usr/bin/coverage
-
-# We have to use the bash script because the apt-get coverage does not install
-# codecov. If we used pip to install codecov, it would run inside the
-# virtualenv, and that doesn't work. Change the path to ensure that codecov
-# picks up coverage from /usr/bin, rather than from
-# /home/travis/virtualenv/python3.3.6/bin/
- - PATH=/usr/bin:$PATH bash <(curl -s https://codecov.io/bash)

AUTHORS

@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 
 
 Alex Roitman shura@gramps-project.org
@@ -65,6 +64,8 @@ Martin Hawlisch martin.hawlisch@gmx.de
 
 Nick Hall nick__hall@hotmail.com
 
+Paul Culley paulr2787@gmail.com
+
 Peter Landgren peter.talken@telia.com
 
 Raphael Ackermann raphael.ackermann@gmail.com

CONTRIBUTING

@@ -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

ChangeLog

@@ -0,0 +1,174 @@
+2023-06-29  Nick Hall <nick-h@gramps-project.org>
+
+	* docs/conf.py, gramps/gen/const.py: Update copyright date
+
+2023-05-13  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/plugins/webreport/media.py: Narrative web: problem with
+	small pictures.  Fixes #012884
+
+2023-05-09  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/plugins/view/familyview.py: Implement the "<CTRL>J" for the
+	family view Fixes #012882
+
+2022-07-11  Jon Schewe <jpschewe@mtu.net>
+
+	* gramps/plugins/webreport/basepage.py: Avoid application crash on
+	invalid user input If the user inputs an invalid date this change keeps the application
+	from crashing when such a date is found. The invalid date
+	information is reported to the user in the log.  Fixes #12658.
+
+2023-05-13  Nick Hall <nick-h@gramps-project.org>
+
+	* gramps/plugins/export/exportgedcom.py: Fix export where private
+	citations are excluded
+
+2022-06-01  prculley <paulr2787@gmail.com>
+
+	* gramps/plugins/tool/eventcmp.py: Fix Event compare tool to display
+	enclosed places properly
+
+2022-06-08  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/gui/viewmanager.py: Check that view exists before calling
+	post_create method Avoids 'NoneType' object has no attribute 'post_create' error.  Fixes #12638
+
+2022-06-15  Jingxuan He <LostBenjamin@users.noreply.github.com>
+
+	* gramps/plugins/webreport/webcal.py: Fix a wrong operator bug in
+	the web calendar report
+
+2022-10-08  Himanshu Gohel <1551217+hgohel@users.noreply.github.com>
+
+	* gramps/gen/plug/docgen/treedoc.py: Revert "Enclose tree report
+	image path and file name in braces" Fixes #12437 by reverting commit
+	75921ceaf40f3ced597d99c43794b98f81e49957 due to reports of
+	regression where processing of the generated TeX file fails due to
+	bad path specificiation for image files.  Change was introduced in bug fix for #10495.  Bugs #12437 and #12697 reported the regression and confirmed that
+	reverting the change fixes the regression.
+
+2022-10-22  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/plugins/lib/maps/geography.py: Geography View: Fix number
+	of arguments in add_bookmark method add_bookmark() takes 2 positional arguments but 3 were given Fixes #12718
+
+2022-12-08  GaryGriffin <genealogy@garygriffin.net>
+
+	* gramps/plugins/lib/libsubstkeyword.py: Use date-specific place in
+	report substitution variables Fix place title in graphical reports which have user-defined display
+	formats to use date-specific alternate name.  This impacts Ancestor Tree, Descendant Tree, and Family Descendant
+	Tree.  Fixes #12763.
+
+2022-12-27  John Ralls <jralls@ceridwen.us>
+
+	* gramps/grampsapp.py, gramps/gui/aboutdialog.py,
+	gramps/gui/logger/_errorreportassistant.py,
+	gramps/plugins/db/bsddb/bsddbtxn.py,
+	gramps/plugins/db/bsddb/cursor.py, gramps/plugins/db/bsddb/read.py,
+	gramps/plugins/db/bsddb/summary.py,
+	gramps/plugins/db/bsddb/test/cursor_test.py,
+	gramps/plugins/db/bsddb/undoredo.py,
+	gramps/plugins/db/bsddb/upgrade.py,
+	gramps/plugins/db/bsddb/write.py, gramps/plugins/gramplet/leak.py,
+	mac/patches/gramps-berkeleydb.patch: Try to import berkeleydb if
+	bsddb3 isn't found.  berkelydb is usable for python >= 3.6 and required for python >=
+	3.10. See https://www.jcea.es/programacion/pybsddb.htm.
+
+2023-02-12  Vincent Smeets <Vincent.VSmeets@GMail.com>
+
+	* gramps/plugins/docgen/htmldoc.py: HtmlDoc: Create a unique
+	filename for cropped images
+
+2022-10-24  D.A.Lordemann <LordemannD@gmail.com>
+
+	* gramps/plugins/export/exportgedcom.py: Fix corrupted NOTE tag in
+	Gedcom export Remove Python2 code obsoleted by Python3, which was corrupting
+	GEDCOM export of Gramps Notes text that includes multi-byte utf-8
+	characters.  Fixes #12709.
+
+2022-09-27  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/gui/viewmanager.py: Fix IndexError that sometimes occurs
+	when changing view This occurs when restarting Gramps.  Fixes #12636, #12304, #12429, #12623, #12695.
+
+2023-03-18  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/gen/proxy/referencedbyselection.py,
+	gramps/gui/widgets/styledtexteditor.py,
+	gramps/plugins/lib/libhtmlbackend.py: Fix crash when invalid note
+	link Fixes #012854
+
+2023-04-17  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/gui/utils.py: Tags with color names don't work in pedigree
+	views Color tags work correctly in all views except in pedigree views.
+	These views modify colors: ...   context.set_source_rgba(*(self.bordercolor[:3] + (0.4,))) ... and  context.set_source_rgb(*self.bgcolor[:3]) As it works everywhere except in these views, I think it is a bug
+	even if we cannot enter color names in tags Fixes #012866
+
+2023-04-05  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/gui/views/treemodels/eventmodel.py: Crash when invalid
+	event date
+
+2023-04-04  SNoiraud <Serge.Noiraud@free.fr>
+
+	* gramps/gui/listmodel.py: ListModel: Only the first level is
+	managed When we use checkboxes in columns.  The path was converted to int.
+	Why ? But when we have multiple level, the path format is "x:y" for
+	two levels, "x:y:z" for three levels, etc
+
+2023-03-07  Nick Hall <nick-h@gramps-project.org>
+
+	* .github/workflows/gramps-ci.yml: Update Gramps CI workflow to run
+	on Ubuntu 20.04 Ubuntu 18.04 became fully unsupported on 1 Dec 2022.
+
+2022-12-27  John Ralls <jralls@ceridwen.us>
+
+	* mac/gramps.modules: mac: Patch bsddb to use berkeleydb instead of
+	bsddb3 module.
+
+2022-12-27  John Ralls <jralls@ceridwen.us>
+
+	* mac/gramps.modules, mac/patches/berkeleydb-4.8-mutex.patch: Mac
+	build: Patch berkeleydb configure to work on Apple Silicon.
+
+2022-12-26  John Ralls <jralls@ceridwen.us>
+
+	* mac/gramps.modules: [mac] Update Exiv2 download URL, moved to
+	github.
+
+2022-12-24  John Ralls <jralls@ceridwen.us>
+
+	* mac/Info.plist, mac/gramps.bundle, mac/gramps.modules: Repackage
+	Gramps 5.1.5 with Gtk updates fixing use on macOS 13 Ventura.
+
+2022-03-08  Nick Hall <nick-h@gramps-project.org>
+
+	* gramps/plugins/lib/librecords.py: Fix spouse's name and underlined
+	call names in records Fixes #12391
+
+2022-03-16  Nick Hall <nick-h@gramps-project.org>
+
+	* .github/workflows/gramps-ci.yml: Fix package installation failures
+	in CI
+
+2019-12-09  Sam Manzi <manzi.sam@gmail.com>
+
+	* gramps/gen/utils/grampslocale.py: Update INCOMPLETE_TRANSLATIONS * Remove: he * Add: zh_HK, zh_TW
+
+2022-02-12  Ross Gammon <rossgammon@debian.org>
+
+	* debian/changelog, debian/copyright,
+	debian/patches/fix-probably_alive_test.patch, debian/patches/series: 
+	Update Debian folder after 5.1.5 release
+
+2022-02-05  John Ralls <jralls@ceridwen.us>
+
+	* mac/Info.plist, mac/gramps.modules: Package Gramps 5.1.5 for
+	macOS.
+
+2022-02-05  Nick Hall <nick-h@gramps-project.org>
+
+	* Bump to 5.1.6
+

FAQ

@@ -133,7 +133,7 @@ Gramps is a [http://en.wikipedia.org/wiki/Gtk GTK] application. Gramps needs to
 
 The Linux Genealogy CD can function as a live CD that you boot directly from. You can then run Linux and Gramps off the CD, even if your computer is entirely Windows.
 
-An experimental Windows installer is available, however we do not have the manpower to offer support for Windows. A windows mailing list is available however and we do do our best to solve windows related problems.
+An Windows installer is available for 32 and 64 bit versions of windows from Windows versions 7 through 10. As with all other support, we do do our best to solve windows related problems.
 
 
 8. Does it work with the Mac?
@@ -145,7 +145,7 @@ This present version of Gramps (2.2.x) does not appear to have been ported by th
 
 9. What are the Minimum Specs to run Gramps?
 
-We would recommend at least an 800x600 video display. For Gramps 2.0, the memory requirements have been reduced, and Gramps can run quite efficiently on a 256MB system, holding considerably more people. A system with 512MB should be able to hold around 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.
+We would recommend at least an 800x600 video display. For Gramps 5.x, Gramps can run quite efficiently on a 3GB memory system. A system with that much RAM should be able to hold more than 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.
 
 
 ==Preferences==
@@ -181,7 +181,7 @@ The nice thing about standards is that there never is a shortage of them. Gramps
 
 15. How do I import data from another genealogy program into Gramps?
 
-The best way is to create a new gramps database file (.grdb), and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it. 
+The best way is to create a new gramps database file, and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it. 
 
 
 16. Can I install Gramps on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.
@@ -315,7 +315,7 @@ gramps-devel@lists.sf.net :-)
 The next best thing would be to submit a good bug report. This can be done in
 one of the two ways: (1) send your report to gramps-bugs@lists.sf.net
 or (2) file your report with the bug tracker system at 
-http://bugs.gramps-project.org (this function is also 
+https://gramps-project.org/bugs/ (this function is also 
 available by selecting "Help->Report a bug" from gramps main menu). 
 
 A good bug report would include: 
@@ -355,4 +355,3 @@ Since Gramps generates HTML pages, you can upload the pages to your personal web
 
 **** End of Gramps Frequently Asked Questions ****
 
-$Id$

INSTALL

@@ -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

LICENSE

@@ -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.

MANIFEST.in

@@ -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 *

README.md

@@ -1,5 +1,8 @@
-The Gramps Project ( https://gramps-project.org ) [![Build Status](https://travis-ci.org/gramps-project/gramps.svg?branch=master)](https://travis-ci.org/gramps-project/gramps)[![codecov.io](https://codecov.io/github/gramps-project/gramps/coverage.svg?branch=master)](https://codecov.io/github/gramps-project/gramps?branch=master)
+The Gramps Project ( https://gramps-project.org )
 ===================
+[![GitHub CI](https://github.com/gramps-project/gramps/actions/workflows/gramps-ci.yml/badge.svg?event=push&branch=maintenance/gramps51)](https://github.com/gramps-project/gramps/actions/workflows/gramps-ci.yml?query=branch%3Amaintenance%2Fgramps51)
+[![codecov.io](https://codecov.io/github/gramps-project/gramps/coverage.svg?branch=maintenance/gramps51)](https://app.codecov.io/gh/gramps-project/gramps/branch/maintenance%2Fgramps51)
+
 We strive to produce a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.
 
 Please read the **COPYING** file first.
@@ -10,20 +13,21 @@ 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/
+* **Python** 3.3 or greater - The programming language used by Gramps. https://www.python.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 +46,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**
 
@@ -62,12 +66,16 @@ The following packages are **STRONGLY RECOMMENDED** to be installed:
  sorting is done through built-in libraries. PyICU is
  fairly widely available through the package managers of
  distributions. See http://pyicu.osafoundation.org/
- (These are Python bindings for the ICU package. 
+ (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** 
+* **gtkspell**
 
  Enable spell checking in the notes. Gtkspell depends on
  enchant. A version of gtkspell with gobject introspection
@@ -77,12 +85,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 +106,22 @@ 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
+ ...
+
+* **fontconfig**
+
+ Python bindings of fontconfig are required for displaying
+ genealogical symbols
 
 Optional packages required by Third-party Addons
 ------------------------------------------------
@@ -116,9 +134,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 )
 

RELEASE_NOTES

@@ -1,4 +1,3 @@
-$Id$
 
 UNSTABLE Gramps 4.0.0 Beta2 release.
 

data/authors.xml

@@ -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>

data/css/GeoView.css

@@ -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; 
-}
-

data/css/Web_Basic-Ash.css

@@ -21,6 +21,8 @@ Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
+Copyright 2018 Theo van Rijn
+Copyright (C) 2019      Serge Noiraud
 
 This file is part of the GRAMPS program.
 
@@ -50,7 +52,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
 ------------------------------------------------------------------------------------------------ 
@@ -60,7 +61,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: black;
     margin: 0px;
     background-color: #EEE;
@@ -68,6 +69,13 @@ body {
 body > div {
     clear: both;
 }
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
+}
 .content {
     background-color: white;
     border-top: solid 1px #999;
@@ -76,9 +84,19 @@ body > div {
     float: right;
     margin: 2em;
 }
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
+}
 .fullclear {
     clear: both;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
 
 /* General Text
 ----------------------------------------------------- */
@@ -87,6 +105,12 @@ h1 {
     font-weight: bold;
     padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
     font-size: large;
     padding-left: 15px;
@@ -104,6 +128,7 @@ p#description {
 a {
     color: black;
     text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
     text-decoration: underline;
@@ -199,6 +224,93 @@ div#alphanav ul li a:hover {
     color: white;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        background-color: #EEE;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -325,6 +437,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -357,7 +473,15 @@ table.IndividualList td.ColumnSurname {
     margin: 0px auto;
     display: block;
     border: solid 1px #999;
+    height: auto;
 }
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
+
 #GalleryDetail h3 {
     text-align: center;
 }
@@ -374,13 +498,10 @@ div#SourceDetail {
     overflow: hidden;
 }
 #Contact #summaryarea {
-    width: 50em;
-    margin: 2em auto;
-    padding: 3em;
     background-color: #EEE;
     border: solid 1px #999;
 }
-#Contact img {
+#Contact #GalleryDisplay img {
     float: right;
     border: solid 1px #999;
 }
@@ -394,6 +515,12 @@ div#SourceDetail {
 #Contact #city:after {
     content: ",";
 }
+@media only screen and (max-width: 1080px) {
+    #Contact,
+    #Contact #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
 
 /* Download
 ----------------------------------------------------- */
@@ -403,13 +530,22 @@ div#SourceDetail {
 
 /* Subsection
 ----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
+#Home #GalleryDisplay, #Introduction #GalleryDisplay {
     float: right;
     margin: 1em;
+}
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img {
+    display: block;
     max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay img {
+        margin: 0 auto;
+        max-width: 100%;
+    }
 }
 #Home p, #Introduction p {
     padding-left: 15px;
@@ -439,13 +575,33 @@ div#families table.attrlist td.ColumnType {
 
 /* Subsection : Gallery
 ----------------------------------------------------- */
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #indivgallery .thumbnail {
     float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -453,6 +609,40 @@ div#families table.attrlist td.ColumnType {
      *          first thumnail on each next row should also have a margin-left
      *          of 15 px. */
 }
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
+}
 #indivgallery img {
     border: solid 1px #999;
 }
@@ -460,6 +650,9 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
     display: none; */
 }
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* Subsection : Narrative
 ----------------------------------------------------- */
@@ -523,6 +716,7 @@ a.familymap {
 }
 #footer > * {
     background-color: #EEE;
+    font-size: 80%;
 }
 #footer p#createdate {
     float: left;

data/css/Web_Basic-Blue.css

@@ -3,6 +3,8 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
+# Copyright (C) 2018      Theo van Rijn
+# Copyright (C) 2019      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
@@ -72,6 +74,13 @@ img {
 .thumbnail a:hover {
     background: none;
 }
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
+}
 .content {
     background-color: #FFF;
     color: #000;
@@ -94,6 +103,10 @@ img {
     width: 96px;
     margin: 0 auto;
 }
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
+}
 .fullclear {
     width: 100%;
     height: 1px;
@@ -101,6 +114,12 @@ img {
     padding: 0;
     clear: both;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
 
 /* General Text
 ----------------------------------------------------- */
@@ -134,7 +153,6 @@ h5, h6 {
     margin:1.3em 0 .5em 1em;
 }
 p#description {
-    max-width: 800px;
     margin: 0;
     padding: 1em 20px;
     text-indent: 30px;
@@ -222,6 +240,55 @@ p#user_header {
     margin-right: 10px;
 }
 
+/* Navigation
+----------------------------------------------------- */
+div#nav, #subnavigation {
+    border: solid 1px #EEE; /* needed by IE7 */
+    background-color: #13A926;
+}
+#subnavigation ul {
+    overflow: hidden;
+}
+div#nav ul, #subnavigation ul {
+    list-style: none;
+    margin: 0px;
+    padding-left: 15px;
+}
+#subnavigation ul {
+    border-bottom: solid 1px #999;
+}
+div#nav ul li, #subnavigation ul li {
+    float: left;
+}
+div#nav ul li a, #subnavigation ul li a {
+    display: block;
+    font-size: smaller;
+    font-weight: bold;
+    padding: 5px;
+    border-bottom: solid 1px #EEE;
+}
+div#nav ul li a:hover, #subnavigation ul li a:hover {
+    text-decoration: none;
+    background-color: #CCC;
+    border-bottom: solid 1px black;
+}
+div#nav ul li.CurrentSection a {
+    position: relative;
+    top: 1px;
+    border: solid 1px #999;
+    border-bottom-style: none;
+    background-color: white;
+}
+#nav ul li.CurrentSection a:hover {
+    background-color: #903;
+}
+
+/* Webcal
+----------------------------------------------------- */
+#subnavigation ul li.CurrentSection a {
+    background-color: white;
+}
+
 /* Footer
 ----------------------------------------------------- */
 div#footer {
@@ -271,6 +338,129 @@ div#footer p#copyright img {
     padding: 0;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+/* Alphabet Navigation
+----------------------------------------------------- */
+div#alphanav {
+    background-color: #EEE;
+}
+div#alphanav ul {
+    list-style: none;
+    border-width: 2px 0px 4px 0px;
+    border-style: solid;
+    border-color: black;
+    margin: 0px;
+    padding-left: 15px;
+    /* float container stretch, see www.quirksmode.org/css/clearing.html */
+    overflow: hidden;
+}
+div#alphanav ul li {
+    float: left;
+    font-size: larger;
+    font-weight: bold;
+}
+div#alphanav ul li:after {
+    content: " |";
+}
+div#alphanav ul li a {
+    display: block;
+    padding: 4px 8px;
+    line-height: 100%;
+    float: left;
+
+}
+div#alphanav ul li a:hover {
+    text-decoration: none;
+    background-color: black;
+    color: white;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        /* position: absolute; */
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        background-color: #13A926;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table.infolist {
@@ -289,10 +479,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 +538,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 +680,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%;
@@ -583,6 +769,26 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate {
     margin: 0;
     padding: 0;
 }
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #Gallery table.infolist tbody tr td {
     border-bottom: dashed 1px #000;
 }
@@ -632,7 +838,15 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate {
 }
 #GalleryDisplay img {
     margin: 0 auto;
+    height: auto;
 }
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
+
 #GalleryDetail div#summaryarea{
     margin: 0;
     padding: 2em 0 0 0;
@@ -684,48 +898,51 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
 /* Contact
 ------------------------------------------------- */
 #Contact #summaryarea {
-    width: 500px;
-    margin: 0 auto;
-    padding: 3em;
     border: double 4px #000;
     background-color: #BCEAF6;
 }
-#Contact #summaryarea img {
+#Contact #summaryarea #GalleryDisplay img {
     float: right;
     margin: 0;
 }
-#researcher {
+@media only screen and (max-width: 1080px) {
+    #Contact, #Contact #summaryarea #researcher,
+    #Contact #summaryarea #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
+
+#Contact #summaryarea #researcher {
     font: normal 1.5em/1.4em serif;
     margin-top: .3em;
 }
-#researcher h3 {
+#Contact #summaryarea #researcher h3 {
     font: normal 1.2em/1.4em serif;
     padding: 0;
     text-align: left;
 }
-#researcher span {
-    float: left;
+#Contact #summaryarea #researcher span {
     display: block;
     font: normal .9em/1.4em serif;
     margin-right: .4em;
 }
-#streetaddress {
+#Contact #summaryarea #streetaddress {
     width: 100%;
 }
-#locality, .locality {
+#Contact #summaryarea #locality, .locality {
     display: block;
     width: 100%;
 }
-#city:after {
+#Contact #summaryarea #city:after {
     content: ",";
 }
-#country {
+#Contact #summaryarea #country {
     clear: left;
 }
-#email {
+#Contact #summaryarea #email {
     clear: left;
 }
-#email a {
+#Contact #summaryarea #email a {
     text-decoration: none;
 }
 
@@ -818,17 +1035,29 @@ div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
 
 /* Subsections
 ----------------------------------------------------- */
-#Home, #Introduction, #Contact {
-    padding: 2em 0 3em 0;
+#Home #GalleryDisplay, #Introduction #GalleryDisplay,
+                       #Contact #GalleryDisplay {
+    float: right;
+    margin: 0;
+    border: 0px;
+}
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+                       #Contact #GalleryDisplay img {
+    display: block;
+    max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay img {
+        margin: 0 auto;
+        max-width: 100%;
+    }
 }
 #Home p, #Introduction p {
     margin: 0 20px 1em 20px;
 }
-#Home img, #Introduction img {
-    float: right;
-    margin: 0;
-    padding: 0 20px 3em 2em;
-}
 #Home a, #Introduction a, #Contact a {
     color: #000;
     text-decoration: none;
@@ -932,6 +1161,15 @@ div#families {
     margin: 0;
     padding: 0;
 }
+div#families .infolist h4 {
+    font: bold 1.2em sans-serif;
+    color: #FFF;
+    padding: 0px 0px 0px 20px;
+    border-width: 4px 0px 4px 0px;
+    border-style: solid;
+    border-color: #00029D;
+    background-color: #13A926;
+}
 div#families table.infolist tbody tr.BeginFamily {
     border-top: solid 1px #000;
 }
@@ -1098,8 +1336,8 @@ div.Residence table.infolist tr td {
     margin: 0;
     float: left;
     width: 130px;
-    height: 150px;
     text-align: center;
+    background-color: white;
 }
 #indivgallery div.thumbnail a {
     display: block;
@@ -1107,6 +1345,7 @@ div.Residence table.infolist tr td {
     padding: 0;
     text-decoration: none;
     cursor: pointer;
+    word-wrap: break-word;
 }
 #indivgallery div.thumbnail a img {
     padding: 0;
@@ -1122,6 +1361,43 @@ div.Residence table.infolist tr td {
     margin: 0 auto;
     padding: 0;
 }
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
+}
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* Subsections : Narrative
 ----------------------------------------------------- */
@@ -1130,9 +1406,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

data/css/Web_Basic-Cypress.css

@@ -21,6 +21,8 @@ Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
+Copyright 2018 Theo van Rijn
+Copyright (C) 2019      Serge Noiraud
 
 This file is part of the GRAMPS program.
 
@@ -50,7 +52,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
 ------------------------------------------------------------------------------------------------ 
@@ -60,7 +61,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: black;
     margin: 0px;
     background-color: #454;
@@ -68,6 +69,13 @@ body {
 body > div {
     clear: both;
 }
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
+}
 .content {
     background-color: white;
     border-top: solid 1px #7C8F7C;
@@ -76,9 +84,19 @@ body > div {
     float: right;
     margin: 2em;
 }
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
+}
 .fullclear {
     clear: both;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
 
 /* General Text
 ----------------------------------------------------- */
@@ -87,6 +105,12 @@ h1 {
     font-weight: bold;
     padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
     font-size: large;
     padding-left: 15px;
@@ -104,6 +128,7 @@ p#description {
 a {
     color: black;
     text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
     background-color: #9DBF9D;
@@ -203,6 +228,98 @@ div#alphanav ul li a:hover {
     color: white;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        color: #454;
+        background-color: #E0E6E0;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+    .nav.responsive li#CurrentSection a {
+        color: #454;
+        background-color: white;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -368,6 +485,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -403,7 +524,15 @@ table.IndividualList td.ColumnSurname {
     margin: 0px auto;
     display: block;
     border: solid 1px #7C8F7C;
+    height: auto;
 }
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
+
 #GalleryDetail h3 {
     text-align: center;
 }
@@ -420,13 +549,10 @@ div#SourceDetail {
     overflow: hidden;
 }
 #Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
     background-color: #E0E6E0;
     border: solid 1px #7C8F7C;
 }
-#Contact img {
+#Contact #summaryarea #GalleryDisplay img {
     float: right;
     border: solid 1px #7C8F7C;
 }
@@ -453,13 +579,24 @@ div#SourceDetail {
 
 /* Subsection
 ----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
+#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
     float: right;
-    margin: 1em;
+    margin: 0;
+    border: 0px;
+}
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+      #Contact #GalleryDisplay img {
+    display: block;
     max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay img {
+        margin: 0 auto;
+        max-width: 100%;
+    }
 }
 #Home p, #Introduction p {
     padding-left: 15px;
@@ -489,13 +626,33 @@ div#families table.attrlist td.ColumnType {
 
 /* Subsection : Gallery
 ----------------------------------------------------- */
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #indivgallery .thumbnail {
     float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -503,6 +660,40 @@ div#families table.attrlist td.ColumnType {
      *          first thumnail on each next row should also have a margin-left
      *          of 15 px. */
 }
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
+}
 #indivgallery img {
     border: solid 1px #7C8F7C;
 }
@@ -510,6 +701,9 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
     display: none; */
 }
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* Subsection : Narrative
 ----------------------------------------------------- */
@@ -568,6 +762,7 @@ a.familymap {
 #footer {
     clear: both;
     color: #E0E6E0;
+    font-size: 80%;
     padding-top: 1em;
     background-color: #9DBF9D;
     border-top: solid 1px #454;
@@ -595,7 +790,7 @@ a.familymap {
 /* Overwritten
 ----------------------------------------------------- */
 body#FamilyMap {
-    background-color: #E0E6E0 ! important;
+    background-color: #454 ! important;
 }
 
 /* Calendar Styles

data/css/Web_Basic-Lilac.css

@@ -21,6 +21,8 @@ Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
+Copyright 2018 Theo van Rijn
+Copyright (C) 2019      Serge Noiraud
 
 This file is part of the GRAMPS program.
 
@@ -50,7 +52,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
 ------------------------------------------------------------------------------------------------ 
@@ -68,6 +69,13 @@ body {
 body > div {
     clear: both;
 }
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
+}
 .content {
     background-color: #FAFAFF;
     border-top: solid 1px #669;
@@ -76,9 +84,19 @@ body > div {
     float: right;
     margin: 2em;
 }
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
+}
 .fullclear {
     clear: both;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
 
 /* General Text
 ----------------------------------------------------- */
@@ -87,6 +105,12 @@ h1 {
     font-weight: bold;
     padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
     font-size: large;
     padding-left: 15px;
@@ -105,6 +129,7 @@ p#description {
 a {
     color: black;
     text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
     background-color: #E0E0E9
@@ -201,6 +226,93 @@ div#alphanav ul li a:hover {
     color: #FAFAFF;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        background-color: #669;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -361,6 +473,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -396,7 +512,15 @@ table.IndividualList td.ColumnSurname {
     margin: 0px auto;
     display: block;
     border: solid 1px #669;
+    height: auto;
 }
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
+
 #GalleryDetail h3 {
     text-align: center;
 }
@@ -413,13 +537,10 @@ div#SourceDetail {
     overflow: hidden;
 }
 #Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
     background-color: #E0E0E9;
     border: solid 1px #669;
 }
-#Contact img {
+#Contact #summaryarea #GalleryDisplay img {
     float: right;
     border: solid 1px #669;
 }
@@ -446,13 +567,24 @@ div#SourceDetail {
 
 /* Subsection
 ----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
+#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
     float: right;
-    margin: 1em;
+    margin: 0;
+    border: 0px;
+}
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+      #Contact #GalleryDisplay img {
+    display: block;
     max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay img {
+        margin: 0 auto;
+        max-width: 100%;
+    }
 }
 #Home p, #Introduction p {
     padding-left: 15px;
@@ -482,13 +614,33 @@ div#families table.attrlist td.ColumnType {
 
 /* Subsection : Gallery
 ----------------------------------------------------- */
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #indivgallery .thumbnail {
     float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -496,6 +648,40 @@ div#families table.attrlist td.ColumnType {
      *          first thumnail on each next row should also have a margin-left
      *          of 15 px. */
 }
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
+}
 #indivgallery img {
     border: solid 1px #669;
 }
@@ -503,6 +689,9 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
     display: none; */
 }
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* Subsection : Narrative
 ----------------------------------------------------- */
@@ -566,6 +755,7 @@ a.familymap {
 }
 #footer > * {
     background-color: #E0E0E9;
+    font-size: 80%;
 }
 #footer p#createdate {
     float: left;

data/css/Web_Basic-Peach.css

@@ -21,6 +21,8 @@ Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
+Copyright 2018 Theo van Rijn
+Copyright (C) 2019      Serge Noiraud
 
 This file is part of the GRAMPS program.
 
@@ -50,7 +52,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
 ------------------------------------------------------------------------------------------------ 
@@ -60,7 +61,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: #36220B;
     margin: 0px;
     background-color: #FFE09F;
@@ -68,6 +69,13 @@ body {
 body > div {
     clear: both;
 }
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
+}
 .content {
     background-color: #FFFBE7;
     border-top: solid 1px #8C581C;
@@ -76,9 +84,19 @@ body > div {
     float: right;
     margin: 2em;
 }
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
+}
 .fullclear {
     clear: both;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
 
 /* General Text
 ----------------------------------------------------- */
@@ -87,6 +105,12 @@ h1 {
     font-weight: bold;
     padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
     font-size: large;
     padding-left: 15px;
@@ -105,6 +129,7 @@ p#description {
 a {
     color: #36220B;
     text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
     background-color: #FFE09F
@@ -201,6 +226,93 @@ div#alphanav ul li a:hover {
     color: #FFFBE7;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        background-color: #FFC35E;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -361,6 +473,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -396,6 +512,13 @@ table.IndividualList td.ColumnSurname {
     margin: 0px auto;
     display: block;
     border: solid 1px #EA8414;
+    height: auto;
+}
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
 }
 #GalleryDetail h3 {
     text-align: center;
@@ -413,13 +536,10 @@ div#SourceDetail {
     overflow: hidden;
 }
 #Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
     background-color: #FFE09F;
     border: solid 1px #EA8414;
 }
-#Contact img {
+#Contact #summaryarea #GalleryDisplay img {
     float: right;
     border: solid 1px #EA8414;
 }
@@ -446,20 +566,31 @@ div#SourceDetail {
 
 /* Subsection
 ----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
+#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
     float: right;
-    margin: 1em;
+    margin: 0;
+    border: 0px;
+}
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+      #Contact #GalleryDisplay img {
+    display: block;
     max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay img {
+        margin: 0 auto;
+        max-width: 100%;
+    }
 }
 #Home p, #Introduction p {
     padding-left: 15px;
 }
 .subsection {
     clear: both;
-    overflow: hidden;
+    overflow: visible;
 }
 .subsection p {
     margin: 0px;
@@ -482,13 +613,33 @@ div#families table.attrlist td.ColumnType {
 
 /* Subsection : Gallery
 ----------------------------------------------------- */
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #indivgallery .thumbnail {
     float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -496,6 +647,40 @@ div#families table.attrlist td.ColumnType {
      *          first thumnail on each next row should also have a margin-left
      *          of 15 px. */
 }
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
+}
 #indivgallery img {
     border: solid 1px #8C581C;
 }
@@ -503,6 +688,9 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
     display: none; */
 }
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* Subsection : Narrative
 ----------------------------------------------------- */
@@ -566,6 +754,7 @@ a.familymap {
 }
 #footer > * {
     background-color: #FFE09F;
+    font-size: 80%;
 }
 #footer p#createdate {
     float: left;

data/css/Web_Basic-Spruce.css

@@ -21,6 +21,9 @@ Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
+Copyright 2018 Theo van Rijn
+Copyright (C) 2019      Serge Noiraud
+
 
 This file is part of the GRAMPS program.
 
@@ -50,7 +53,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
 ------------------------------------------------------------------------------------------------ 
@@ -60,7 +62,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: black;
     margin: 0px;
     background-color: #EAEEF4;
@@ -68,6 +70,13 @@ body {
 body > div {
     clear: both;
 }
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
+}
 .content {
     background-color: #FFF;
     border-top: solid 1px #7CA3DD;
@@ -76,9 +85,19 @@ body > div {
     float: right;
     margin: 2em;
 }
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
+}
 .fullclear {
     clear: both;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
 
 /* General Text
 ----------------------------------------------------- */
@@ -87,6 +106,12 @@ h1 {
     font-weight: bold;
     padding-left: 15px;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
     font-size: large;
     padding-left: 15px;
@@ -105,6 +130,7 @@ p#description {
 a {
     color: black;
     text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
     background-color: #EAEEF4
@@ -201,6 +227,93 @@ div#alphanav ul li a:hover {
     color: #FFF;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        background-color: #EEE;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -361,6 +474,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
@@ -396,6 +513,13 @@ table.IndividualList td.ColumnSurname {
     margin: 0px auto;
     display: block;
     border: solid 1px #7CA3DD;
+    height: auto;
+}
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
 }
 #GalleryDetail h3 {
     text-align: center;
@@ -413,13 +537,10 @@ div#SourceDetail {
     overflow: hidden;
 }
 #Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
     background-color: #EAEEF4;
     border: solid 1px #7CA3DD;
 }
-#Contact img {
+#Contact #summaryarea #GalleryDisplay img {
     float: right;
     border: solid 1px #7CA3DD;
 }
@@ -446,13 +567,24 @@ div#SourceDetail {
 
 /* Subsection
 ----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
+#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
     float: right;
-    margin: 1em;
+    margin: 0;
+    border: 0px;
+}
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+      #Contact #GalleryDisplay img {
+    display: block;
     max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay img {
+        margin: 0 auto;
+        max-width: 100%;
+    }
 }
 #Home p, #Introduction p {
     padding-left: 15px;
@@ -482,13 +614,33 @@ div#families table.attrlist td.ColumnType {
 
 /* Subsection : Gallery
 ----------------------------------------------------- */
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #indivgallery .thumbnail {
     float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -496,6 +648,40 @@ div#families table.attrlist td.ColumnType {
      *          first thumnail on each next row should also have a margin-left
      *          of 15 px. */
 }
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
+}
 #indivgallery img {
     border: solid 1px #7CA3DD;
 }
@@ -503,6 +689,9 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
     display: none; */
 }
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* Subsection : Narrative
 ----------------------------------------------------- */
@@ -566,6 +755,7 @@ a.familymap {
 }
 #footer > * {
     background-color: #EAEEF4;
+    font-size: 80%;
 }
 #footer p#createdate {
     float: left;

data/css/Web_Citations-Outline.css

@@ -25,7 +25,6 @@ GRAMPS Cascading Style Sheet
 Style Name: Web_Citations-Outline.css
 ******************************************************
 
-# $Id$
 
     Source Citations Outline styles
 ------------------------------------------------------ */

data/css/Web_DropDown-Menus.css

@@ -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

data/css/Web_Fade-Menus.css

@@ -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

data/css/Web_Horizontal-Menus.css

@@ -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

data/css/Web_Mainz.css

@@ -19,6 +19,8 @@ Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
+Copyright 2018 Theo van Rijn
+Copyright (C) 2019      Serge Noiraud
 
 This file is part of the GRAMPS program.
 
@@ -54,7 +56,6 @@ Middle                  images/Web_Mainz_Mid.png
 Middle Light            images/Web_Mainz_MidLight.png
 ----------------------------------------------------------------------------
 
-# $Id$
 
  NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
@@ -63,19 +64,30 @@ General Elements
 -----------------------------------------------------------------*/
 body {
     font-family: Georgia, serif;
-    font-size: 90%;
+    font-size: 100%;
     color: #7D5925;
     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;
-    padding: 0px 1.5em;
+}
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
 }
 .content {
     padding: 1.5em 1.5em;
+    overflow: auto;
+    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
+}
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
 }
 div.snapshot div.thumbnail {
     text-align: center;
@@ -83,6 +95,13 @@ div.snapshot div.thumbnail {
 div.snapshot a {
     display: inline;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 
 /* General Text
 -----------------------------------------------------------------*/
@@ -91,6 +110,12 @@ h1 {
     font-style: italic;
     margin-left: 2em;
 }
+h2 {
+    display:block;
+    margin:0;
+    padding:0;
+    text-align: center;
+}
 h3 {
     font-size: xx-large;
     font-weight: normal;
@@ -114,6 +139,7 @@ h4 {
 a {
     color: #7D5925;
     text-decoration: none;
+    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
     background-color: #FFFFE7;
@@ -144,7 +170,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;
@@ -198,6 +224,93 @@ div#alphanav ul li a:hover {
     color: white;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        background-color: #D8C19F;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 -----------------------------------------------------------------*/
 table {
@@ -307,6 +420,10 @@ table#SortByCount thead th.ColumnQuantity a:after {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 -----------------------------------------------------------------*/
 #GalleryNav {
@@ -351,6 +468,13 @@ table#SortByCount thead th.ColumnQuantity a:after {
     margin: 0px auto;
     display:block;
     border: solid 1px #7D5925;
+    height: auto;
+}
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
 }
 
 /*    Sources
@@ -366,7 +490,7 @@ div#SourceDetail {
     padding-bottom: 0px;
     margin: 0px;
 }
-#Contact img {
+#Contact #summaryarea #GalleryDisplay img {
     display: block;
     margin: 0px auto 1em auto;
     border: solid 1px #7D5925;
@@ -392,16 +516,31 @@ div#SourceDetail {
 
 /* SubSection
 -----------------------------------------------------------------*/
-#Home img, #Introduction img {
+#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
+    float: right;
+    margin-left: 10px;
+    margin-right: 10px;
+}
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+      #Contact #GalleryDisplay {
     display: block;
-    margin: 1em auto;
     max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay {
+        margin: 0 auto;
+        max-width: 100%;
+    }
 }
 #Home a, #Introduction a, #Contact a {
     color: black;
 }
 .subsection {
     clear: both;
+    overflow: hidden;
 }
 .subsection p {
     margin: 0px;
@@ -418,20 +557,43 @@ div#families table.fixed_subtables table.eventlist th:first-child {
 div#families table.fixed_subtables table.eventlist th:last-child {
     width: 5em;
 }
+div#families .infolist h4 {
+    text-align: left;
+}
 
 /* SubSection : Gallery
 -----------------------------------------------------------------*/
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #indivgallery {
     /* float container stretch, see www.quirksmode.org/css/clearing.html */
     overflow: hidden;
 }
 #indivgallery .thumbnail {
     float: left;
-    max-width: 130px;
-    max-height: 150px;
+    width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.5em;
+    background-color: white;
 }
 #indivgallery img {
     border: solid 1px #7D5925;
@@ -440,6 +602,43 @@ div#families table.fixed_subtables table.eventlist th:last-child {
 /* ## remove this line and the comment markers from the line below to hide the description in Individual Gallery
     display: none; */
 }
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
+}
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* SubSection : Narrative
 -----------------------------------------------------------------*/
@@ -492,20 +691,32 @@ div.grampsstylednote p {
 -----------------------------------------------------------------*/
 #footer {
     clear: both;
+    overflow: hidden;
+    width: 100%;
     background: url(../images/Web_Mainz_MidLight.png) #FFF2C6;
-    border-top: dashed 1px #7D5925;
     font-family: sans-serif;
 }
 #footer p#createdate {
     float: left;
     width: 50%;
     text-align: left;
+    margin-left: 10px;
 }
 #footer p#copyright {
     float: right;
     width: 40%;
     text-align: right;
 }
+#footer p#copyright img {
+    float: right;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    vertical-align: middle;
+}
+#footer > * {
+    font-size: 80%;
+    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6;
+}
 
 /* Overwritten
 -----------------------------------------------------------------*/
@@ -524,7 +735,6 @@ div#map_canvas {
 table.calendar {
     table-layout: fixed;
     empty-cells: show;
-    width: 950px;
     margin: 0px auto;
     background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
 }

data/css/Web_Nebraska.css

@@ -19,6 +19,8 @@ Go to <http://gramps-project.org/> to learn more!
 Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
+Copyright 2018 Theo van Rijn
+Copyright (C) 2019      Serge Noiraud
 
 This file is part of the GRAMPS program.
 
@@ -45,7 +47,6 @@ gray                #696969
 green               #5D835F
 --------------------------------------------------------------------------------------------
 
-# $Id$
 
  NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
@@ -83,10 +84,21 @@ img {
 .thumbnail a:hover {
     background:none;
 }
+#outerwrapper {
+    margin: 5px auto;
+    width: 98%;
+}
+#outerwrapper > div {
+    clear: both;
+}
 .content {
     padding-top: 1cm;
     background-color:#FFF;
 }
+#ThumbnailPreview div.snapshot {
+    float: right;
+    margin: 0;
+}
 .content div.snapshot {
     float:right;
     margin:1.6em;
@@ -101,6 +113,12 @@ img {
 .content div.snapshot div.thumbnail span {
     display:none;
 }
+/* Less whitespace on smaller real estate. */
+@media only screen and (max-width: 1080px) {
+    .content {
+        padding: 0em 0.5em;
+    }
+}
 .fullclear {
     width:100%;
     height:1px;
@@ -115,7 +133,7 @@ h1 {
     font:normal 2em/1.2em serif;
 }
 h2 {
-    display:none;
+    display:block;
 }
 h3 {
     font:normal 2em/1.2em serif;
@@ -139,7 +157,6 @@ h5, h6 {
 
 p#description {
     color:#542;
-    max-width:800px;
     margin:0;
     padding:1em 20px;
     background-color:#FFF;
@@ -256,6 +273,100 @@ div#subnavigation ul li.CurrentSection a {
     border-width: 0 0 1px 0;
 }
 
+/* Responsive navigation */
+a.navIcon {
+    display: none;
+    color: #FFF;
+}
+
+div#header::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+div#nav::after {
+    content: "";
+    clear: both;
+    display: table;
+}
+
+@media only screen and (max-width: 1080px) {
+
+    /* Use less & all realestate on mobiles. */
+    div#outerwrapper {
+        margin: 5px auto;
+        width: 100%;
+    }
+
+    .nav {
+        background: none; /* Works in IE too. */
+/*
+        width: 200px;
+        position: absolute;
+        z-index: 10;
+*/
+    }
+
+    /* Undo some of the #nav styles  - to enable the class .nav */
+    .nav ul, #subnavigation ul {
+        list-style: none;
+        min-width: unset;
+        width: 200px;
+        height: 32px;
+        margin: 0;
+        padding: 0;
+    }
+    .nav ul li, #subnavigation ul li {
+        float: unset;
+        display: unset
+    }
+
+    /* Start with hidden menu options */
+    /* .nav li:not(:first-child) {display: none;} */
+    .nav li {display: none;}
+    .nav ul {display: none;}
+
+    a.navIcon {
+        font-size:1.3em;
+        display: block;
+        margin: 0.1em 0.4em 0.4em 0.4em;
+        float: left;
+    color: #FFF;
+    }
+
+    .nav.responsive {position: absolute; display: block; z-index: 100;}
+    .nav.responsive a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-right: 10px;
+    }
+    .nav.responsive ::after {
+        /* need to remove the "|" when we are in the dropdown menu. */
+        color: #A97;
+        background-color: #A97;
+    }
+    .nav.responsive li {
+        /* float: left; */
+        display: block;
+        text-align: left;
+        background-color: #A97;
+        /* required by IE */
+        float: left;
+        clear: both;
+        width: 200px;
+    }
+
+    div#nav ul, #subnavigation ul {
+        padding-left: 0px;
+    }
+
+    .content {
+        padding: 0em 0.5em;
+    }
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table.infolist {
@@ -278,7 +389,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 +508,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 +689,10 @@ table.relationships tbody tr td.ColumnPartner a:hover {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #Gallery {  }
@@ -633,6 +747,13 @@ table.relationships tbody tr td.ColumnPartner a:hover {
 }
 #GalleryDisplay img {
     margin:0 auto;
+    height: auto;
+}
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
 }
 #GalleryDetail div#summaryarea{
     margin:0;
@@ -678,7 +799,6 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
 /* Contact
 ----------------------------------------------------- */
 #Contact #summaryarea {
-    width:500px;
     margin:0 auto;
     padding:3em;
     background-color:#F1ECE2;
@@ -696,7 +816,6 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
     padding:0;
 }
 #researcher span {
-    float:left;
     display:block;
     font:normal .9em/1.4em serif;
     margin-right:.4em;
@@ -735,7 +854,7 @@ table.download {
     width:100%;
 }
 table.download img {
-    float:center;
+    float:none;
 }
 table.download thead tr th {
     text-align:center;
@@ -778,20 +897,32 @@ table.download td.Modified {
 
 /* Subsections
 ----------------------------------------------------- */
-#Home, #Introduction, #Contact {
-    padding:2em 0 3em 0;
+#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
+    float: right;
+    margin-left: 10px;
+    margin-right: 10px;
 }
+#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+      #Contact #GalleryDisplay img {
+    display: block;
+    max-width: 950px;
+    height: auto;
+    float: right;
+}
+@media only screen and (max-width: 1080px) {
+    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
+          #Contact #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
+
 #Home p, #Introduction p {
     margin:0 20px 1em 20px;
 }
-#Home img, #Introduction img {
-    float:right;
-    margin:0;
-    padding:0 20px 3em 2em;
-}
 #Home a, #Introduction a, #Contact a {
     color: #000;
     text-decoration: none;
+    overflow: hidden;
 }
 div.subsection{
     padding-bottom:.5em;
@@ -925,6 +1056,26 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
 
 /* Subsections : Gallery
 ----------------------------------------------------- */
+#gallery {
+    background-color: green;
+}
+#indivgallery {
+    background-color: white;
+}
+#gallery .gallerycell {
+    float: left;
+    width: 130px;
+    height: 150px;
+    text-align: center;
+    margin: 0;
+    background-color: white;
+    border-top: solid 1px #999;
+    border-right: solid 1px #999;
+}
+#gallery .thumbnail {
+    font-size: smaller;
+    margin: 3em auto;
+}
 #indivgallery h4 {
     margin-bottom:1em;
 }
@@ -932,14 +1083,49 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
     margin:0;
     float:left;
     width:130px;
-    height:150px;
     text-align:center;
+    background-color: white;
+}
+#gallery div.indexno {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+    margin: 0;
+}
+#indivgallery div.date {
+    float: right;
+    width: 1.8em;
+    font-size: large;
+    text-align: center;
+    background-color: #CCC;
+    color: #555;
+}
+#indivgallery .thumbnail ul {
+    font-size: smaller;
+    list-style: none;
+    padding: 0px;
+}
+#indivgallery .thumbnail ul li:first-child {
+    border-style: none;
+}
+#indivgallery .thumbnail ul li {
+    border-top: dashed 1px #CCC;
+    border-top-style: dashed;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+#gallery img {
+    border: solid 1px #999;
 }
 #indivgallery .thumbnail a {
     display:block;
     margin:0;
     padding:0;
     background:none;
+    word-wrap: break-word;
 }
 #indivgallery .thumbnail a img {
     margin:0;
@@ -956,17 +1142,21 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
     margin:0 auto;
     padding:0;
 }
+div.snapshot div.thumbnail {
+    text-align: center;
+}
 
 /* Subsections : Narrative
 ----------------------------------------------------- */
 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
@@ -1068,6 +1258,9 @@ div#pedigree {
     background-color: #542;
     border-top: solid 8px #A97;
 }
+#footer > * {
+    font-size: 80%;
+}
 #footer a, #footer a:visited {
     text-decoration: none;
     color: #C1B398;
@@ -1095,7 +1288,7 @@ div#pedigree {
     margin-right: 10px;
 }
 #footer p#copyright img {
-    margin-right: 10px[
+    margin-right: 10px;
 }
 #user_footer {
     width: 70%;

data/css/Web_Print-Default.css

@@ -41,7 +41,6 @@ black           #000
 white           #FFF
 ---------------------------------------------------------------------------------------------------
 
-# $Id$
 
  NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 

data/css/Web_Visually.css

@@ -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 {

data/css/ancestortree.css

@@ -9,7 +9,7 @@
 # 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, 
+# 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.
@@ -20,10 +20,10 @@
 #
 # $Id: $
 #
-**************************************************************************************************
+*******************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Combined Ancestor Tree Style Sheet
-***************************************************************************************************
+*******************************************************************************
 #
 ===== Ancestor Graph Color Scheme =====
 Males       #BCEAF6
@@ -33,10 +33,8 @@ Unknown     #000
 ===== Web Graphics =====
 Males       Web_Gender_Male.png
 Females     Web_Gender_Female.png
-# ------------------------------------------------------------------------------------------------- */
-
-/* Subsections : Ancestors Tree
------------------------------------------------------ */
+# -------------------------------------------------------------------------- #
+/* Subsections : Ancestors Tree -------------------------------------------- */
 #tree {
     page-break-before:always;
     margin:0;
@@ -45,12 +43,15 @@ Females     Web_Gender_Female.png
 }
 #treeContainer {
     position:relative;
+    display: table-cell;
+    vertical-align: middle;
+    overflow: visible;
     z-index:1;
 }
 #treeContainer div.boxbg {
     position:absolute;
-    margin:0;
-    padding:0;
+    margin:0px;
+    padding:0px;
     background:none;
 }
 #treeContainer div.boxbg a,
@@ -58,41 +59,43 @@ Females     Web_Gender_Female.png
     position:relative;
     z-index:10;
     display:block;
-    font:normal .7em/1.4em sans-serif;
+    font:normal 1.1em/1.4em sans-serif;
     text-align:center;
+    word-break:break-word;
+    word-wrap:break-word;
     text-decoration:none;
     color: #00029D;
-    width:118px;
-    padding:5px 20px 7px 20px;
+    width:280px;
+    min-height: 70px;
     margin-left:16px;
-    background-color: #FFF;
-    border: solid 1px #000;
+    border: solid 2px #000;
+    border-radius: 10px;
 }
 #treeContainer div.boxbg a.noThumb,
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a, 
-#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 a,
 #treeContainer div.AncCol4 span.unlinked {
     margin-top:10px;
+    float: right;
 }
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
-    font-size:1em;
+    font-size:1.3em;
+    word-break:break-word;
+    word-wrap:break-word;
     text-decoration:none;
     color: #00029D;
-    width:190px;
+    width:400px;
     margin-left:-20px;
-    padding:10px 25px 12px 25px;
-    border: solid 2px #000;
+    padding: 0px 0px 0px 40px;
 }
-#treeContainer div.boxbg a:hover, 
-#treeContainer div.AncCol3 a:hover, 
+#treeContainer div.boxbg a:hover,
 #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
+    padding-left: 10px;
 }
 #treeContainer div.AncCol0 a:hover {
     margin-left:12px;
@@ -102,48 +105,73 @@ Females     Web_Gender_Female.png
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px;
-    max-height:65px;
-    margin:0 auto;
-    padding:4px 0;
+    position: absolute;
+    max-width:85px;
+    max-height:75px;
+    left: 3px;
+    top: 3px;
 }
-#treeContainer div.boxbg span.thumbnail img {
-    max-width:80px;
-    max-height:65px;
-    margin:0 auto;
+#treeContainer div.boxbg a.thumbnail table td.img {
+    padding-right: 5px;
 }
-#treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
-    height:80px;
+#treeContainer div.boxbg a.thumbnail:hover table td.img {
+    padding-right: 9px;
 }
-#treeContainer div.AncCol3 span.thumbnail, #treeContainer div.AncCol4 span.thumbnail {
+#treeContainer div.boxbg a.thumbnail table td.name {
+    padding-top:3px;
+    padding-left: 2px;
+    padding-right: 23px;
+    width: 90%;
+}
+#treeContainer div.boxbg a.thumbnail img {
+    margin-left:0px;
+    padding-left: 0px;
+    border-radius: 5px;
+}
+#treeContainer div.boxbg a.thumbnail:hover img {
+    max-height:90%;
+    margin-left:5px;
+    position: absolute;
+    left: 0px;
+    top: 4px;
+    border-radius: 5px;
+}
+#treeContainer div.boxbg table td:first-child, table th:first-child {
+    padding-left: 5px;
+    padding-top: 5px;
+}
+#IndividualDetail div.subsection table tr td:first-child {
+    padding-left: 5px;
+    padding-top: 5px;
+}
+#treeContainer #treeContainer div.AncCol4 span.thumbnail {
     display:none;
 }
 #treeContainer div.boxbg a:hover span.thumbnail {
     display:block;
 }
-
 #treeContainer div.boxbg span.fullname {
     display: none;
 }
-
 #treeContainer div.boxbg span.shortname {
     display: inline;
 }
-
 #treeContainer div.boxbg a:hover span.fullname {
     display: inline;
 }
-
 #treeContainer div.boxbg a:hover span.shortname {
     display: none;
 }
-
-
+#treeContainer div.boxbg a:hover {
+    float: right;
+    margin-top: 10px;
+    border: solid 4px #000;
+}
 #treeContainer div.male a,
 #treeContainer div.male span.unlinked {
     background:url(../images/Web_Gender_Male.png) #BCEAF6 no-repeat top right;
 }
-#treeContainer div.female a, 
+#treeContainer div.female a,
 #treeContainer div.female span.unlinked {
     background:url(../images/Web_Gender_Female.png) #FFC0CB no-repeat top right;
 }

data/css/behaviour.css

@@ -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 {

data/css/narrative-maps.css

@@ -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;

data/gramps.appdata.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>gramps.desktop</id>
-  <metadata_license>CC0</metadata_license>
+<component type="desktop-application">
+  <id>org.gramps.gramps</id>
+  <metadata_license>CC0-1.0</metadata_license>
   <name>Gramps</name>
   <summary>Genealogical research program</summary>
 
@@ -11,6 +11,7 @@
     <_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
   </description>
 
+  <launchable type="desktop-id">gramps.desktop</launchable>
   <url type="homepage">https://gramps-project.org/</url>
   <url type="bugtracker">https://gramps-project.org/bugs/</url>
   <url type="help">https://gramps-project.org/wiki/index.php?title=Main_page</url>
@@ -18,11 +19,21 @@
   <developer_name>Gramps Development Team</developer_name>
 
   <screenshots>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/5f/AppData1.png</screenshot>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData2.png</screenshot>
-    <screenshot type="default" width="1226" height="740">http://www.gramps-project.org/wiki/images/e/e9/AppData3.png</screenshot>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData4.png</screenshot>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/50/AppData5.png</screenshot>
+    <screenshot>
+      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/5/5f/AppData1.png</image>
+    </screenshot>
+    <screenshot>
+      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/6/68/AppData2.png</image>
+    </screenshot>
+    <screenshot type="default">
+      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/e/e9/AppData3.png</image>
+    </screenshot>
+    <screenshot>
+      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/6/68/AppData4.png</image>
+    </screenshot>
+    <screenshot>
+      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/5/50/AppData5.png</image>
+    </screenshot>
   </screenshots>
 
   <provides>

data/gramps.xml.in

@@ -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">

data/gramps_canonicalize.xsl

@@ -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"

data/grampsxml.dtd

@@ -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$
 -->
 
 <!--
@@ -252,7 +251,7 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
+<!ELEMENT placeobj (ptitle?, code?, pname+, coord?, placeref*, location*,
                     objref*, url*, noteref*, citationref*, tagref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED

data/grampsxml.rng

@@ -453,10 +453,10 @@
     <ref name="primary-object"/>
     <attribute name="type"><text/></attribute>
     <optional><element name="ptitle"><text/></element></optional>
+    <optional><element name="code"><text/></element></optional>
     <oneOrMore><element name="pname">
         <ref name="placename-content"/>
     </element></oneOrMore>
-    <optional><element name="code"><text/></element></optional>
     <optional><element name="coord">
         <attribute name="long"><text/></attribute>
         <attribute name="lat"><text/></attribute>

data/holidays.xml.in

@@ -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)" />

data/lds.xml

@@ -20,6 +20,9 @@
     <code>SAMOA</code>
     <code>AP</code>
   </temple>
+  <temple name="Arequipa Peru Temple">
+    <code>AREQU</code>
+  </temple>
   <temple name="Asuncion, Paraguay">
     <code>ASUNC</code>
   </temple>
@@ -27,6 +30,9 @@
     <code>ATLAN</code>
     <code>AT</code>
   </temple>
+  <temple name="Barranquilla Colombia Temple">
+    <code>BARRA</code>
+  </temple>
   <temple name="Baton Rouge, Louisiana">
     <code>BROUG</code>
   </temple>
@@ -57,6 +63,9 @@
   <temple name="Bountiful, Utah">
     <code>BOUNT</code>
   </temple>
+  <temple name="Brigham City Utah Temple">
+    <code>BRIGH</code>
+  </temple>
   <temple name="Brisbane, Australia">
     <code>BRISB</code>
   </temple>
@@ -79,8 +88,12 @@
     <code>ALBR</code>
   </temple>
   <temple name="Cebu, Philippines">
+    <code>CEBUP</code>
     <code>CEBU</code>
   </temple>
+  <temple name="Cedar City Utah">
+    <code>CEDAR</code>
+  </temple>
   <temple name="Chicago, Illinois">
     <code>CHICA</code>
     <code>CH</code>
@@ -94,15 +107,18 @@
   <temple name="Colonia Juarez, Chihuahua, Mexico">
     <code>COLJU</code>
   </temple>
-  <temple name="Columbia, South Carolina">
-    <code>COLSC</code>
-  </temple>
   <temple name="Columbia River, Washington">
     <code>CRIVE</code>
   </temple>
+  <temple name="Columbia, South Carolina">
+    <code>COLSC</code>
+  </temple>
   <temple name="Columbus, Ohio">
     <code>COLUM</code>
   </temple>
+  <temple name="Concepción Chile">
+    <code>CONCE</code>
+  </temple>
   <temple name="Copenhagen, Denmark">
     <code>COPEN</code>
   </temple>
@@ -129,6 +145,19 @@
   <temple name="Edmonton, Alberta">
     <code>EDMON</code>
   </temple>
+  <temple name="Endowment House">
+    <code>EHOUS</code>
+    <code>EH</code>
+  </temple>
+  <temple name="Fort Collins Colorado">
+    <code>FORTC</code>
+  </temple>
+  <temple name="Fort Lauderdale Florida">
+    <code>FORTL</code>
+  </temple>
+  <temple name="Fortaleza Brazil">
+    <code>FORTA</code>
+  </temple>
   <temple name="Frankfurt, Germany">
     <code>FRANK</code>
     <code>FR</code>
@@ -191,6 +220,9 @@
     <code>IFALL</code>
     <code>IF</code>
   </temple>
+  <temple name="Indianapolis Indiana">
+    <code>INDIA</code>
+  </temple>
   <temple name="Johannesburg, South Africa">
     <code>JOHAN</code>
     <code>JO</code>
@@ -202,10 +234,14 @@
   <temple name="Kansas City, Missouri">
     <code>KANSA</code>
   </temple>
+  <temple name="Kinshasa Democratic Republic of the Congo">
+    <code>KINSH</code>
+  </temple>
   <temple name="Kona, Hawaii">
     <code>KONA</code>
   </temple>
   <temple name="Kiev, Ukraine">
+    <code>KYIV</code>
     <code>KIEV</code>
   </temple>
   <temple name="Kirtland, Ohio">
@@ -223,6 +259,9 @@
     <code>LIMA</code>
     <code>LI</code>
   </temple>
+  <temple name="Lisbon Portugal">
+    <code>LISBO</code>
+  </temple>
   <temple name="Logan, Utah">
     <code>LOGAN</code>
     <code>LG</code>
@@ -270,6 +309,9 @@
   <temple name="Merida, Mexico">
     <code>MERID</code>
   </temple>
+  <temple name="Meridian Idaho">
+    <code>MIDAH</code>
+  </temple>
   <temple name="Mesa, Arizona">
     <code>ARIZO</code>
     <code>AZ</code>
@@ -325,6 +367,7 @@
     <code>OKLAH</code>
   </temple>
   <temple name="Oquirrh Mountain, Utah">
+    <code>OQUIR</code>
     <code>OMOUN</code>
   </temple>
   <temple name="Orlando, Florida">
@@ -340,6 +383,12 @@
     <code>PAPEE</code>
     <code>TA</code>
   </temple>
+  <temple name="Paris France">
+    <code>PARIS</code>
+  </temple>
+  <temple name="Payson Utah">
+    <code>PAYSO</code>
+  </temple>
   <temple name="Perth, Australia">
     <code>PERTH</code>
   </temple>
@@ -349,6 +398,9 @@
   <temple name="Phoenix, Arizona">
     <code>PHOEN</code>
   </temple>
+  <temple name="Port-au-Prince Haiti">
+    <code>PORTA</code>
+  </temple>
   <temple name="Portland, Oregon">
     <code>PORTL</code>
     <code>PT</code>
@@ -359,6 +411,9 @@
   <temple name="Preston, England">
     <code>PREST</code>
   </temple>
+  <temple name="Provo City Center, Utah">
+    <code>PROCC</code>
+  </temple>
   <temple name="Provo, Utah">
     <code>PROVO</code>
     <code>PV</code>
@@ -385,6 +440,7 @@
     <code>REXBU</code>
   </temple>
   <temple name="Rome, Italy">
+    <code>ROMEI</code>
     <code>ROME</code>
   </temple>
   <temple name="Sacramento, California">
@@ -394,12 +450,6 @@
     <code>SGEOR</code>
     <code>SG</code>
   </temple>
-  <temple name="St. Louis, Missouri">
-    <code>SLOUI</code>
-  </temple>
-  <temple name="St. Paul, Minnesota">
-    <code>SPMIN</code>
-  </temple>
   <temple name="Salt Lake City, Utah">
     <code>SLAKE</code>
     <code>SL</code>
@@ -415,6 +465,7 @@
     <code>SJOSE</code>
   </temple>
   <temple name="San Salvador, El Salvador">
+    <code>SANSA</code>
     <code>SSALV</code>
   </temple>
   <temple name="Santiago, Chile">
@@ -428,6 +479,9 @@
     <code>SPAUL</code>
     <code>SP</code>
   </temple>
+  <temple name="Sapporo Japan">
+    <code>SAPPO</code>
+  </temple>
   <temple name="Seattle, Washington">
     <code>SEATT</code>
     <code>SE</code>
@@ -442,6 +496,15 @@
   <temple name="Spokane, Washington">
     <code>SPOKA</code>
   </temple>
+  <temple name="St. Louis, Missouri">
+    <code>SLOUI</code>
+  </temple>
+  <temple name="St. Paul, Minnesota">
+    <code>SPMIN</code>
+  </temple>
+  <temple name="Star Valley Wyoming">
+    <code>STARV</code>
+  </temple>
   <temple name="Stockholm, Sweden">
     <code>STOCK</code>
     <code>ST</code>
@@ -463,9 +526,15 @@
   <temple name="Tegucigalpa, Honduras">
     <code>TEGUC</code>
   </temple>
+  <temple name="The Gila Valley Arizona">
+    <code>GILAV</code>
+  </temple>
   <temple name="The Hague, Netherlands">
     <code>HAGUE</code>
   </temple>
+  <temple name="Tijuana Mexico">
+    <code>TIJUA</code>
+  </temple>
   <temple name="Tokyo, Japan">
     <code>TOKYO</code>
     <code>TK</code>
@@ -474,16 +543,19 @@
     <code>TORON</code>
     <code>TORNO</code>
     <code>TR</code>
+  </temple>
   <temple name="Trujillo, Peru">
     <code>TRUJI</code>
   </temple>
+  <temple name="Tucson Arizona">
+    <code>TUCSO</code>
   </temple>
   <temple name="Tuxtla Gutierrez, Mexico">
     <code>TGUTI</code>
   </temple>
   <temple name="Twin Falls, Idaho">
-    <code>TFALL</code>
     <code>TWINF</code>
+    <code>TFALL</code>
   </temple>
   <temple name="Vancouver, British Columbia">
     <code>VANCO</code>
@@ -505,10 +577,6 @@
     <code>WINTE</code>
     <code>WQUAR</code>
   </temple>
-  <temple name="Endowment House">
-    <code>EHOUS</code>
-    <code>EH</code>
-  </temple>
   <temple name="President's Office">
     <code>POFFI</code>
     <code>PO</code>

data/tests/PG30-1GB.DEF

@@ -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

data/tests/SAMPLE.DEF

@@ -0,0 +1,2 @@
+\0
+PG30-1GB.DEF

data/tests/SAMPLE.IXI

@@ -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

data/tests/SAMPLE.REM

@@ -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@
+--------------------------------------------------------------------------------

data/tests/exp_sample.gramps

@@ -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">
@@ -1104,7 +1278,7 @@
       <rel type="Unknown"/>
       <father hlink="_0000000b0000000b"/>
       <mother hlink="_0000002600000026"/>
-      <childref hlink="_0000006f0000006f"/>
+      <childref hlink="_0000006f0000006f" frel="Adopted" mrel="Foster"/>
     </family>
     <family handle="_0000001000000010" change="1198222526" id="F0014">
       <rel type="Unknown"/>
@@ -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>

data/tests/exp_sample.gw

@@ -9,6 +9,12 @@ beg
 - h Hans_Peter.8 17/4/1904 #bp Rønne,_Bornholm,_Denmark 29/1/1977 #dp San_Francisco,_San_Francisco_Co.,_CA 
 end
 
+notes Hansdotter Anna.1
+beg
+******************************************************************890123456789
+******************************************************************89 123456789 
+end notes
+
 notes Smith Hjalmar.5
 beg
 BIOGRAPHY
@@ -61,7 +67,7 @@ Some Bold Unicode Characters: ࣶǼЀج⿄㑝&#15691
 Some Italic Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈 
 end notes
 
-fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897  
+fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897 0 
 
 fam Smith Hjalmar.5 +31/10/1927 #mp Reno,_Washoe_Co.,_NV Ohman Marjorie.26 3/6/1903 #bp Denver,_Denver_Co.,_CO,_Denver_Co.,_Colorado,_USA 22/6/1980 #dp Reno,_Washoe_Co.,_NV 
 beg
@@ -98,13 +104,18 @@ beg
 - h Martin.17 1794..1796 #bp Tommarp,_Kristianstad_Län,_Sweden  #dp Sweden 
 end
 
-fam Willard Edwin.42 ~1886  +~1910 Smith Kirsti_Marie.2 
+fam Willard Edwin.42 ~1886 0 +~1910 Smith Kirsti_Marie.2 
 
 fam Smith Magnes.38 +24/8/1884 #mp Rønne,_Bornholm,_Denmark Streiffert Anna.43 23/9/1860 #bp Hoya/Jona/Hoia,_Sweden 2/2/1927 #dp Rønne,_Bornholm,_Denmark 
 
 fam Tester The.14 + Tester Mrs.44 0  
 beg
-- h Tom.45 0  
+- h Tom.45 Von_Tester_y_tested 0  
+-  Fake.46 von_Person 1954 #bp Fremont,_Alameda_Co.,_CA  
+- f Mary.47 0  
+- f Martha.48 0  
+- h John.49 0  
+- h Mark.50 0  
 end
 
 notes Tester Mrs.44

data/tests/exp_sample.vcf

@@ -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
 

data/tests/exp_sample.wft

@@ -1,47 +1,52 @@
-Anna Hansdotter;;;;;2/10/1864-29/9/1945
-Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966
-Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977
-Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821
-Herman Julius Nielsen;;;;;31/8/1889-1945
-Evelyn Michaels;;;;;1897
-Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934
-Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963
-Jennifer Anderson;;;;;5/11/1907-29/5/1985
-Lillie Harriet Jones;;;;;2/5/1910-26/6/1990
-John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932
-Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963
-Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998
-Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959
-Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894
-Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899
-Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963
-Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930
-Marta Ericsdotter;;;;;1775
-Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966
-Ingeman Smith;;;;;1770
-Anna Streiffert;;;;;23/9/1860-2/2/1927
-Craig Peter Smith;Lloyd Smith;Janis Green;;;1966
-Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910
-Janice Ann Adams;;;;;26/8/1965
-Marjorie Ohman;;;;;3/6/1903-22/6/1980
-Darcy Horne;;;;;2/7/1966
-Alice Paula Perkins;;;;;22/11/1933
-Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991
-Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826
-Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935
-Elna Jefferson;;;;;14/9/1800-
-Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961
-Kerstina Hansdotter;;;;;29/11/1832-1908
-Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794-
-Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960
-Janis Elaine Green;;;;;2/12/1935
-Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996
-Edwin Willard;;;;;1886
-Ingar Smith;Martin Smith0;Elna Jefferson;;;1823
-Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975
-Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860
-雪 Ke 柯;Herman Nielsen;Astrid Smith;;;
-The Tester;Lloyd Smith;Janis Green;;;29/12/1954
-Mrs Tester;;;;;
-ピーター リチミシキスイミ;;;;;
-Tom Tester;The Tester;Mrs Tester;;;
+Anna Hansdotter;;;;;2/10/1864-29/9/1945
+Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966
+Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977
+Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821
+Herman Julius Nielsen;;;;;31/8/1889-1945
+Evelyn Michaels;;;;;1897
+Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934
+Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963
+Jennifer Anderson;;;;;5/11/1907-29/5/1985
+Lillie Harriet Jones;;;;;2/5/1910-26/6/1990
+John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932
+Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963
+Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998
+Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959
+Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894
+Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899
+Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963
+Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930
+Marta Ericsdotter;;;;;1775
+Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966
+Ingeman Smith;;;;;1770
+Anna Streiffert;;;;;23/9/1860-2/2/1927
+Craig Peter Smith;Lloyd Smith;Janis Green;;;1966
+Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910
+Janice Ann Adams;;;;;26/8/1965
+Marjorie Ohman;;;;;3/6/1903-22/6/1980
+Darcy Horne;;;;;2/7/1966
+Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935
+Alice Paula Perkins;;;;;22/11/1933
+Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991
+Elna Jefferson;;;;;14/9/1800-
+Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961
+Kerstina Hansdotter;;;;;29/11/1832-1908
+Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794-
+Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826
+Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960
+Janis Elaine Green;;;;;2/12/1935
+Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996
+Edwin Willard;;;;;1886
+Ingar Smith;Martin Smith0;Elna Jefferson;;;1823
+Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975
+Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860
+雪 Ke 柯;Herman Nielsen;Astrid Smith;;;
+ピーター リチミシキスイミ;;;;;
+The Tester;Lloyd Smith;Janis Green;;;29/12/1954
+Mrs Tester;;;;;
+Tom Von Tester y tested;The Tester;Mrs Tester;;;
+Fake von Person, I;The Tester;Mrs Tester;;;1954-
+Mary Tester;The Tester;Mrs Tester;;;
+Martha Tester;The Tester;Mrs Tester;;;
+John Tester;The Tester;Mrs Tester;;;
+Mark Tester;The Tester;Mrs Tester;;;

data/tests/exp_sample_csv.csv

@@ -30,66 +30,65 @@
 [P0014],"Denver, Denver Co., CO","Denver, Denver Co., CO",City,39.7392,104.9903 W,,[P0024],
 
 Person,Surname,Given,Call,Suffix,Prefix,Title,Gender,Birth date,Birth place,Birth source,Baptism date,Baptism place,Baptism source,Death date,Death place,Death source,Burial date,Burial place,Burial source,Note
-[I0030],Adams,Janice Ann,,,,,female,26 Aug 1965,"Fremont, Alameda Co., CA",,,,,,,,,,,
-[I0016],Anderson,Jennifer,,,,,female,5 Nov 1907,"Rønne, Bornholm, Denmark",,,,,29 May 1985,"San Francisco, San Francisco Co., CA",,,,,
-[I0025],Ericsdotter,Marta,,,,,female,about 1775,Sweden,,,,,,,,,,,
-[I0041],Green,Janis Elaine,,,,,female,2 Dec 1935,,,,,,,,,,,,
-[I0000],Hansdotter,Anna,,,,,female,2 Oct 1864,"Löderup, Malmöhus Län, Sweden",,,,,29 Sep 1945,"Sparks, Washoe Co., NV",,,,,
-[I0038],Hansdotter,Kerstina,,,,,female,29 Nov 1832,"Smestorp, Kristianstad Län, Sweden",,,,,before 1908,Sweden,,,,,
-[I0032],Horne,Darcy,,,,,female,2 Jul 1966,"Sacramento, Sacramento Co., CA",,,,,,,,,,,
-[I0036],Jefferson,Elna,,,,,female,14 Sep 1800,"Gladsax, Kristianstad Län, Sweden",,,,,,Sweden,,,,,
-[I0017],Jones,Lillie Harriet,,,,,female,2 May 1910,"Rønne, Bornholm, Denmark",,,,,26 Jun 1990,,,,,,
+[I0030],Adams,Janice Ann,,,,,female,1965-08-26,[P0013],,,,,,,,,,,
+[I0016],Anderson,Jennifer,,,,,female,1907-11-05,[P0003],,,,,1985-05-29,[P0002],,,,,
+[I0025],Ericsdotter,Marta,,,,,female,about 1775,[P0008],,,,,,,,,,,
+[I0041],Green,Janis Elaine,,,,,female,1935-12-02,,,,,,,,,,,,
+[I0000],Hansdotter,Anna,,,,,female,1864-10-02,[P0000],,,,,1945-09-29,[P0001],,,,,
+[I0038],Hansdotter,Kerstina,,,,,female,1832-11-29,[P0019],,,,,before 1908,[P0008],,,,,
+[I0032],Horne,Darcy,,,,,female,1966-07-02,[P0015],,,,,,,,,,,
+[I0036],Jefferson,Elna,,,,,female,1800-09-14,[P0004],,,,,,[P0008],,,,,
+[I0017],Jones,Lillie Harriet,,,,,female,1910-05-02,[P0003],,,,,1990-06-26,,,,,,
 [I0042],Ke 柯,雪,,,,,male,,,,,,,,,,,,,
 [I0013],Michaels,Evelyn,,,,,female,about 1897,,,,,,,,,,,,
-[I0012],Nielsen,Herman Julius,,,,,male,31 Aug 1889,"Rønne, Bornholm, Denmark",,,,,1945,,,,,,
-[I0031],Ohman,Marjorie,,,,,female,3 Jun 1903,"Denver, Denver Co., CO, Denver Co., Colorado, USA",,,,,22 Jun 1980,"Reno, Washoe Co., NV",,,,,
-[I0034],Perkins,Alice Paula,,,,,female,22 Nov 1933,"Sparks, Washoe Co., NV",,,,,,,,,,,
-[I0002],Smith,Amber Marie,,,,,female,12 Apr 1998,"Hayward, Alameda Co., CA",,,,,,,,,,,
-[I0023],Smith,Astrid Shermanna Augusta,,,,,female,31 Jan 1889,"Rønne, Bornholm, Denmark",,,,,21 Dec 1963,"San Francisco, San Francisco Co., CA",,,,,
-[I0020],Smith,Carl Emil,,,,,male,20 Dec 1899,"Rønne, Bornholm, Denmark",,,,,28 Jan 1959,"Reno, Washoe Co., NV",,,,,
-[I0029],Smith,Craig Peter,,,,,male,after 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0037],Smith,Edwin Michael,,,,,male,24 May 1961,"San Jose, Santa Clara Co., CA","Birth, Death and Marriage Records",,,,,,,,,,
-[I0009],Smith,Emil,,,,,male,27 Sep 1860,"Simrishamn, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0019],Smith,Eric Lloyd,,,,Dr.,male,28 Aug 1963,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0015],Smith,Gus,,,,,male,11 Sep 1897,"Rønne, Bornholm, Denmark",,,,,21 Oct 1963,"San Francisco, San Francisco Co., CA",,,,,
-[I0024],Smith,Gustaf,,Sr.,,,male,28 Nov 1862,"Grostorp, Kristianstad Län, Sweden",,,,,before 23 Jul 1930,"Sparks, Washoe Co., NV",,,,,
-[I0011],Smith,Hanna,,,,,female,29 Jan 1821,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0010],Smith,Hans Peter,,,,,male,17 Apr 1904,"Rønne, Bornholm, Denmark",Birth Records,,,,29 Jan 1977,"San Francisco, San Francisco Co., CA",,5 Feb 1977,"San Francisco, San Francisco Co., CA",findagrave.com,
-[I0021],Smith,Hjalmar,,,,,male,31 Jan 1893,"Rønne, Bornholm, Denmark",,,,,25 Sep 1894,"Rønne, Bornholm, Denmark",,,,,
-[I0008],Smith,Hjalmar,,,,,male,7 Apr 1895,"Rønne, Bornholm, Denmark",,3 Jun 1895,"Rønne Bornholm, Denmark",,26 Jun 1975,"Reno, Washoe Co., NV",,,,,
-[I0007],Smith,Ingar,,,,,female,after 1823,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0027],Smith,Ingeman,,,,,male,about 1770,Sweden,,,,,,,,,,,
-[I0004],Smith,Ingeman,,,,,male,29 Jan 1826,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0018],Smith,John Hjalmar,,,,,male,30 Jan 1932,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0001],Smith,Keith Lloyd,,,,,male,11 Aug 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0026],Smith,Kirsti Marie,,,,,female,15 Dec 1886,"Rønne, Bornholm, Denmark",,,,,18 Jul 1966,"San Francisco, San Francisco Co., CA",,,,,
-[I0035],Smith,Lars Peter,,,,,male,16 Sep 1991,"Santa Rosa, Sonoma Co., CA",,,,,,,,,,,
-[I0033],Smith,Lloyd,,,,,male,13 Mar 1935,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0003],Smith,Magnes,,,,,male,6 Oct 1858,"Simrishamn, Kristianstad Län, Sweden",,,,,20 Feb 1910,"Rønne, Bornholm, Denmark",,,,,
-[I0040],Smith,Marjorie Alice,,,,,female,5 Feb 1960,"San Jose, Santa Clara Co., CA",,,,,,,,,,,
-[I0014],Smith,Marjorie Lee,,,,,female,4 Nov 1934,"Reno, Washoe Co., NV",,,,,,,,,,,
-[I0022],Smith,Martin,,,,,male,19 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,23 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,between 1899 and 1905,Sweden,,,,,
-[I0039],Smith,Martin,,,,,male,between 1794 and 1796,"Tommarp, Kristianstad Län, Sweden",,,,,,Sweden,,,,,
-[I0005],Smith,Mason Michael,,,,,male,26 Jun 1996,"Hayward, Alameda Co., CA",,,,,,,,,,,
-[I0028],Streiffert,Anna,,,,,female,23 Sep 1860,"Hoya/Jona/Hoia, Sweden",,,,,2 Feb 1927,"Rønne, Bornholm, Denmark",,,,,
+[I0012],Nielsen,Herman Julius,,,,,male,1889-08-31,[P0003],,,,,1945,,,,,,
+[I0031],Ohman,Marjorie,,,,,female,1903-06-03,[P0014],,,,,1980-06-22,[P0005],,,,,
+[I0034],Perkins,Alice Paula,,,,,female,1933-11-22,[P0001],,,,,,,,,,,
+[I0002],Smith,Amber Marie,,,,,female,1998-04-12,[P0006],,,,,,,,,,,
+[I0023],Smith,Astrid Shermanna Augusta,,,,,female,1889-01-31,[P0003],,,,,1963-12-21,[P0002],,,,,
+[I0020],Smith,Carl Emil,,,,,male,1899-12-20,[P0003],,,,,1959-01-28,[P0005],,,,,
+[I0029],Smith,Craig Peter,,,,,male,after 1966,[P0002],,,,,,,,,,,
+[I0037],Smith,Edwin Michael,,,,,male,1961-05-24,[P0017],"Birth, Death and Marriage Records",,,,,,,,,,
+[I0009],Smith,Emil,,,,,male,1860-09-27,[P0012],,,,,,,,,,,
+[I0019],Smith,Eric Lloyd,,,,Dr.,male,1963-08-28,[P0002],,,,,,,,,,,
+[I0015],Smith,Gus,,,,,male,1897-09-11,[P0003],,,,,1963-10-21,[P0002],,,,,
+[I0024],Smith,Gustaf,,Sr.,,,male,1862-11-28,[P0009],,,,,before 1930-07-23,[P0001],,,,,
+[I0011],Smith,Hanna,,,,,female,1821-01-29,[P0004],,,,,,,,,,,
+[I0010],Smith,Hans Peter,,,,,male,1904-04-17,[P0003],Birth Records,,,,1977-01-29,[P0002],,1977-02-05,[P0002],findagrave.com,
+[I0021],Smith,Hjalmar,,,,,male,1893-01-31,[P0003],,,,,1894-09-25,[P0003],,,,,
+[I0008],Smith,Hjalmar,,,,,male,1895-04-07,[P0003],,1895-06-03,[P0021],,1975-06-26,[P0005],,,,,
+[I0007],Smith,Ingar,,,,,female,after 1823,[P0004],,,,,,,,,,,
+[I0027],Smith,Ingeman,,,,,male,about 1770,[P0008],,,,,,,,,,,
+[I0004],Smith,Ingeman,,,,,male,1826-01-29,[P0004],,,,,,,,,,,
+[I0018],Smith,John Hjalmar,,,,,male,1932-01-30,[P0002],,,,,,,,,,,
+[I0001],Smith,Keith Lloyd,,,,,male,1966-08-11,[P0002],,,,,,,,,,,
+[I0026],Smith,Kirsti Marie,,,,,female,1886-12-15,[P0003],,,,,1966-07-18,[P0002],,,,,
+[I0035],Smith,Lars Peter,,,,,male,1991-09-16,[P0016],,,,,,,,,,,
+[I0033],Smith,Lloyd,,,,,male,1935-03-13,[P0002],,,,,,,,,,,
+[I0003],Smith,Magnes,,,,,male,1858-10-06,[P0012],,,,,1910-02-20,[P0003],,,,,
+[I0040],Smith,Marjorie Alice,,,,,female,1960-02-05,[P0017],,,,,,,,,,,
+[I0014],Smith,Marjorie Lee,,,,,female,1934-11-04,[P0005],,,,,,,,,,,
+[I0022],Smith,Martin,,,,,male,1830-11-19,[P0004],,1830-11-23,[P0004],,between 1899 and 1905,[P0008],,,,,
+[I0039],Smith,Martin,,,,,male,between 1794 and 1796,[P0020],,,,,,[P0008],,,,,
+[I0005],Smith,Mason Michael,,,,,male,1996-06-26,[P0006],,,,,,,,,,,
+[I0028],Streiffert,Anna,,,,,female,1860-09-23,[P0011],,,,,1927-02-02,[P0003],,,,,
 [I0006],Willard,Edwin,,,,,male,about 1886,,,,,,,,,,,,
-[I0043],リチミシキスイミ,ピーター,,,,,male,,,,,,,,,,,,,
 
 Marriage,Husband,Wife,Date,Place,Source,Note
-[F0000],[I0039],[I0036],about 1816,"Gladsax, Kristianstad Län, Sweden",,
-[F0001],[I0027],[I0025],about 1790,Sweden,,
+[F0000],[I0039],[I0036],about 1816,[P0004],,
+[F0001],[I0027],[I0025],about 1790,[P0008],,
 [F0002],[I0022],[I0038],about 1856,,,
-[F0003],[I0024],[I0000],27 Nov 1885,"Rønne, Bornholm, Denmark",,
+[F0003],[I0024],[I0000],1885-11-27,[P0003],,
 [F0004],[I0006],[I0026],about 1910,,,
-[F0005],[I0012],[I0023],30 Nov 1912,"Rønne, Bornholm, Denmark",,
-[F0006],[I0008],[I0031],31 Oct 1927,"Reno, Washoe Co., NV",,
+[F0005],[I0012],[I0023],1912-11-30,[P0003],,
+[F0006],[I0008],[I0031],1927-10-31,[P0005],,
 [F0007],[I0015],[I0013],about 1920,,,
-[F0008],[I0033],[I0041],10 Aug 1958,"San Francisco, San Francisco Co., CA",,
+[F0008],[I0033],[I0041],1958-08-10,[P0002],,
 [F0009],[I0010],[I0017],,,,
-[F0010],[I0019],[I0032],12 Jul 1986,"Woodland, Yolo Co., CA",,
-[F0011],[I0003],[I0028],24 Aug 1884,"Rønne, Bornholm, Denmark",,
-[F0012],[I0018],[I0034],4 Jun 1954,"Sparks, Washoe Co., NV",Marriage Certificae,
-[F0013],[I0037],[I0030],27 May 1995,"San Ramon, Conta Costa Co., CA",,
+[F0010],[I0019],[I0032],1986-07-12,[P0022],,
+[F0011],[I0003],[I0028],1884-08-24,[P0003],,
+[F0012],[I0018],[I0034],1954-06-04,[P0001],Marriage Certificae,
+[F0013],[I0037],[I0030],1995-05-27,[P0023],,
 [F0014],[I0010],[I0016],,,,
 
 Family,Child

data/tests/imp_FTM_16dec2015a-mod1.gramps

@@ -3,41 +3,41 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
   <header>
-    <created date="2016-08-29" version="5.0.0-alpha1"/>
+    <created date="2019-03-13" version="5.0.2"/>
     <researcher>
     </researcher>
   </header>
   <events>
-    <event handle="_0000000500000005" change="1472500305" id="E0000">
+    <event handle="_0000000500000005" change="1" id="E0000">
       <type>Birth</type>
       <dateval val="1816"/>
       <place hlink="_0000000700000007"/>
       <citationref hlink="_0000000600000006"/>
     </event>
-    <event handle="_0000000800000008" change="1472500305" id="E0001">
+    <event handle="_0000000800000008" change="1" id="E0001">
       <type>Residence</type>
       <dateval val="1850"/>
       <place hlink="_0000000a0000000a"/>
       <citationref hlink="_0000000900000009"/>
     </event>
-    <event handle="_0000000b0000000b" change="1472500305" id="E0002">
+    <event handle="_0000000b0000000b" change="1" id="E0002">
       <type>Death</type>
       <datestr val="1850/1860"/>
       <place hlink="_0000000c0000000c"/>
     </event>
-    <event handle="_0000000f0000000f" change="1472500305" id="E0003">
+    <event handle="_0000000f0000000f" change="1" id="E0003">
       <type>Marriage</type>
       <dateval val="1841" type="about"/>
       <place hlink="_0000001000000010"/>
     </event>
-    <event handle="_0000001100000011" change="1472500305" id="E0004">
+    <event handle="_0000001100000011" change="1" id="E0004">
       <type>Marriage</type>
       <dateval val="1847-08"/>
       <place hlink="_0000001200000012"/>
     </event>
   </events>
   <people>
-    <person handle="_0000000100000001" change="1472500305" id="I0278">
+    <person handle="_0000000100000001" change="1" id="I0278">
       <gender>M</gender>
       <name type="Birth Name">
         <first>Andrew</first>
@@ -54,13 +54,13 @@
     </person>
   </people>
   <families>
-    <family handle="_0000000d0000000d" change="1472500305" id="F0073">
+    <family handle="_0000000d0000000d" change="1" id="F0073">
       <rel type="Married"/>
       <father hlink="_0000000100000001"/>
       <eventref hlink="_0000000f0000000f" role="Family"/>
       <childref hlink="_0000000100000001"/>
     </family>
-    <family handle="_0000000e0000000e" change="1472500305" id="F0074">
+    <family handle="_0000000e0000000e" change="1" id="F0074">
       <rel type="Married"/>
       <father hlink="_0000000100000001"/>
       <eventref hlink="_0000001100000011" role="Family"/>
@@ -68,19 +68,19 @@
     </family>
   </families>
   <citations>
-    <citation handle="_0000000400000004" change="1472500305" id="C0000">
+    <citation handle="_0000000400000004" change="1" id="C0000">
       <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
       <confidence>2</confidence>
       <objref hlink="_0000000300000003"/>
       <sourceref hlink="_0000000200000002"/>
     </citation>
-    <citation handle="_0000000600000006" change="1472500305" id="C0001">
+    <citation handle="_0000000600000006" change="1" id="C0001">
       <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
       <confidence>2</confidence>
       <objref hlink="_0000000300000003"/>
       <sourceref hlink="_0000000200000002"/>
     </citation>
-    <citation handle="_0000000900000009" change="1472500305" id="C0002">
+    <citation handle="_0000000900000009" change="1" id="C0002">
       <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
       <confidence>2</confidence>
       <objref hlink="_0000000300000003"/>
@@ -88,7 +88,7 @@
     </citation>
   </citations>
   <sources>
-    <source handle="_0000000200000002" change="1472500305" id="S0029">
+    <source handle="_0000000200000002" change="1" id="S0029">
       <stitle>1850 United States Federal Census</stitle>
       <sauthor>Ancestry.com</sauthor>
       <spubinfo>Name: Ancestry.com Operations, Inc.; Location: Provo, UT, USA; Date: 2009;</spubinfo>
@@ -96,42 +96,43 @@
     </source>
   </sources>
   <places>
-    <placeobj handle="_0000000700000007" change="1472500305" id="P0000" type="Unknown">
+    <placeobj handle="_0000000700000007" change="1" id="P0000" type="Unknown">
       <ptitle>Tennessee, USA</ptitle>
       <pname value="Tennessee, USA"/>
     </placeobj>
-    <placeobj handle="_0000000a0000000a" change="1472500305" id="P0001" type="Unknown">
+    <placeobj handle="_0000000a0000000a" change="1" id="P0001" type="Unknown">
       <ptitle>District 14, Cape Girardeau, Missouri, USA</ptitle>
       <pname value="District 14, Cape Girardeau, Missouri, USA"/>
     </placeobj>
-    <placeobj handle="_0000000c0000000c" change="1472500305" id="P0002" type="Unknown">
+    <placeobj handle="_0000000c0000000c" change="1" id="P0002" type="Unknown">
       <ptitle>Bollinger Co. MO</ptitle>
       <pname value="Bollinger Co. MO"/>
     </placeobj>
-    <placeobj handle="_0000001000000010" change="1472500305" id="P0003" type="Unknown">
+    <placeobj handle="_0000001000000010" change="1" id="P0003" type="Unknown">
       <ptitle>Union Co.?, IL</ptitle>
       <pname value="Union Co.?, IL"/>
     </placeobj>
-    <placeobj handle="_0000001200000012" change="1472500305" id="P0004" type="Unknown">
+    <placeobj handle="_0000001200000012" change="1" id="P0004" type="Unknown">
       <ptitle>Wayne, Missouri, United States</ptitle>
       <pname value="Wayne, Missouri, United States"/>
     </placeobj>
   </places>
   <objects>
-    <object handle="_0000000300000003" change="1472500305" id="M159">
+    <object handle="_0000000300000003" change="1" id="M159">
       <file src="1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="1850 United States Federal Census"/>
       <noteref hlink="_0000001400000014"/>
       <noteref hlink="_0000001500000015"/>
     </object>
-    <object handle="_0000001600000016" change="1472500305" id="M158">
-      <file src="D:/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="D:\Users\PRC\Downloads\1850 United States Federal Census(11)-1.jpg"/>
+    <object handle="_0000001600000016" change="1" id="M158">
+      <file src="/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg"/>
+      <noteref hlink="_0000001700000017"/>
     </object>
-    <object handle="_0000001700000017" change="1472500305" id="M157">
+    <object handle="_0000001800000018" change="1" id="M157">
       <file src="http://1.gravatar.com/avatar/77e02a3c8c665155ad1acaac8c2742e0?s=120&amp;d=mm&amp;r=pg" mime="unknown" description="http://1.gravatar.com/avatar/77e02a3c8c665155ad1acaac8c2742e0?s=120&amp;d=mm&amp;r=pg"/>
     </object>
   </objects>
   <repositories>
-    <repository handle="_0000001300000013" change="1472500305" id="R0001">
+    <repository handle="_0000001300000013" change="1" id="R0001">
       <rname>Ancestry.com</rname>
       <type>Library</type>
       <address>
@@ -140,16 +141,26 @@
     </repository>
   </repositories>
   <notes>
-    <note handle="_0000001400000014" change="1472500305" id="N0000" type="Media Note">
-      <text>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</text>
+    <note handle="_0000001400000014" change="1" id="N0000" type="Media Note">
+      <text>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248 </text>
     </note>
-    <note handle="_0000001500000015" change="1472500305" id="N0001" type="GEDCOM import">
+    <note handle="_0000001500000015" change="1" id="N0001" type="GEDCOM import">
       <text>Records not imported into OBJE (multi-media object) Gramps ID M159:
 
-Could not import 1850 United States Federal Census(11)-1.jpg        Line    70: 1 FILE 1850 United States Federal Census(11)-1.jpg</text>
+Could not import 1850 United States Federal Census(11)-1.jpg        Line    70: 1 FILE 1850 United States Federal Census(11)-1.jpg
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="200"/>
       </style>
     </note>
+    <note handle="_0000001700000017" change="1" id="N0002" type="GEDCOM import">
+      <text>Records not imported into OBJE (multi-media object) Gramps ID M158:
+
+Could not import D:\Users\PRC\Downloads\1850 United States Federa   Line    75: 1 FILE D:\Users\PRC\Downloads\1850 United States Federal Census(11)-1.jpg
+</text>
+      <style name="fontface" value="Monospace">
+        <range start="0" end="223"/>
+      </style>
+    </note>
   </notes>
 </database>

data/tests/imp_MediaTest.ged

@@ -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

data/tests/imp_MediaTest.gramps

@@ -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="2019-03-05" version="5.0.2"/>
     <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,108 @@
       <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"/>
+      <noteref hlink="_0000000b0000000b"/>
     </object>
     <object handle="_0000000400000004" change="548708291" id="M1">
-      <file src="" mime="" description="Multimedia link to linked form v5.5 blob"/>
+      <file src="" mime="image/jpeg" description="Multimedia link to linked form v5.5 blob"/>
       <attribute type="REFN" value="Ref12345M1">
-        <noteref hlink="_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">
-      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="unknown" description="Multimedia link embedded form v5.5 URL"/>
+    <object handle="_0000000c0000000c" change="1" id="O0002">
+      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="text/html" description="Multimedia link embedded form v5.5 URL"/>
       <noteref hlink="_0000000b0000000b"/>
     </object>
-    <object handle="_0000000d0000000d" change="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">
-      <file src="" mime="" description="2nd blob Multimedia link to linked form v5.5 blob"/>
-      <noteref hlink="_0000001400000014"/>
+    <object handle="_0000001500000015" change="1" id="M2">
+      <file src="" mime="image/jpeg" description="2nd blob Multimedia link to linked form v5.5 blob"/>
+      <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 +143,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 +152,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 +186,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 +197,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 +223,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 +249,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 +277,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>

data/tests/imp_PhonFax_dfs.ged

@@ -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

data/tests/imp_PhonFax_dfs.gramps

@@ -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>

data/tests/imp_notetest_dfs.gramps

@@ -3,182 +3,187 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
   <header>
-    <created date="2016-08-29" version="5.0.0-alpha1"/>
+    <created date="2019-07-30" version="5.0.2"/>
     <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">
-      <type>Who knows OBJE REFN TYPE</type>
-      <description>REFN</description>
-    </event>
-    <event handle="_0000002600000026" change="1472505121" id="E0004">
+    <event handle="_0000002700000027" change="1" id="E0003">
       <type>Birth</type>
       <dateval val="1901-06-15"/>
     </event>
-    <event handle="_0000002700000027" change="1472505121" id="E0005">
+    <event handle="_0000002800000028" change="1" id="E0004">
       <type>Death</type>
       <dateval val="1975-07-05"/>
     </event>
-    <event handle="_0000002d0000002d" change="1472505121" id="E0006">
+    <event handle="_0000002e0000002e" change="1" id="E0005">
       <type>Birth</type>
       <dateval val="1922-06-15"/>
     </event>
-    <event handle="_0000002e0000002e" change="1472505121" id="E0007">
+    <event handle="_0000002f0000002f" change="1" id="E0006">
       <type>Death</type>
       <dateval val="1994-07-05"/>
     </event>
-    <event handle="_0000003a0000003a" change="1472505122" id="E0008">
+    <event handle="_0000003b0000003b" change="1" id="E0007">
       <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"/>
+      <objref hlink="_0000001f0000001f"/>
       <attribute type="RIN" value="123456 Person"/>
-      <attribute type="REFN" value="98765 for PERSON"/>
+      <attribute type="REFN" value="98765 for PERSON">
+        <noteref hlink="_0000001e0000001e"/>
+      </attribute>
       <url  href="http://homepages.rootsweb.com/~pmcbride/gedcom/55gctoc.htm" type="Web Home" description="GEDCOM 5.5 documentation web site"/>
-      <parentin hlink="_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,157 +197,174 @@
       <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
 Empty note ignored                                                  Line    19: 1 NOTE 
-Skipped subordinate line                                            Line    20: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line    20: 2 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="327"/>
       </style>
     </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
 Empty note ignored                                                  Line    27: 1 NOTE 
 Skipped subordinate line                                            Line    28: 2 TEST Empty Note
-Line ignored as not understood                                      Line    29: 1 TEST submission</text>
+Line ignored as not understood                                      Line    29: 1 TEST submission
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="425"/>
       </style>
     </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
 Tag recognized but not supported                                    Line    33: 1 REFN Submission Note REFN
 Skipped subordinate line                                            Line    34: 2 TYPE Submission Note REFN TYPE
 Tag recognized but not supported                                    Line    35: 1 SOUR Submission note source
-Line ignored as not understood                                      Line    39: 1 TEST on XREF Note</text>
+Line ignored as not understood                                      Line    39: 1 TEST on XREF Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="586"/>
       </style>
     </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
 Empty note ignored                                                  Line    44: 1 NOTE 
 Skipped subordinate line                                            Line    45: 2 TEST Empty Note
-Line ignored as not understood                                      Line    46: 1 TEST Submitter</text>
+Line ignored as not understood                                      Line    46: 1 TEST Submitter
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="460"/>
       </style>
     </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="_0000001e0000001e" change="1" id="N0019" type="REFN-TYPE">
+      <text>Who knows OBJE REFN TYPE</text>
+    </note>
+    <note handle="_0000002100000021" change="1" id="N0020" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0001:
 
 Empty note ignored                                                  Line    54: 2 NOTE 
@@ -364,12 +386,14 @@ Empty note ignored                                                  Line    85:
 Skipped subordinate line                                            Line    86: 3 TEST Empty Note
 Line ignored as not understood                                      Line    88: 3 TEST 123456 Note
 Empty note ignored                                                  Line    90: 2 NOTE 
-Skipped subordinate line                                            Line    91: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line    91: 3 TEST Empty Note
+Line ignored as not understood                                      Line    94: 2 TEST REFN
+</text>
       <style name="fontface" value="Monospace">
-        <range start="0" end="2009"/>
+        <range start="0" end="2101"/>
       </style>
     </note>
-    <note handle="_0000002100000021" change="1472505121" id="N0020" type="GEDCOM import">
+    <note handle="_0000002200000022" change="1" id="N0021" type="GEDCOM import">
       <text>Records not imported into NOTE Gramps ID N0018:
 
 Tag recognized but not supported                                    Line   103: 1 RIN 123456
@@ -378,77 +402,89 @@ Skipped subordinate line                                            Line   105:
 Tag recognized but not supported                                    Line   109: 2 NOTE Note on a change on a note!!!
 Skipped subordinate line                                            Line   110: 3 CHAN 
 Skipped subordinate line                                            Line   111: 4 DATE 2001-01-11
-Skipped subordinate line                                            Line   112: 5 TIME 16:00:06</text>
+Skipped subordinate line                                            Line   112: 5 TIME 16:00:06
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="741"/>
       </style>
     </note>
-    <note handle="_0000002200000022" change="1472505121" id="N0021" type="REFN-TYPE">
+    <note handle="_0000002300000023" change="1" id="N0022" 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="N0023" type="GEDCOM import">
       <text>Records not imported into OBJE (multi-media object) Gramps ID M1:
 
-Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg</text>
+Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="164"/>
       </style>
     </note>
-    <note handle="_0000002800000028" change="979250406" id="N0023" type="Person Note">
+    <note handle="_0000002900000029" change="979250406" id="N0024" type="Person Note">
       <text>Family Spouse reference Note</text>
+      <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000002a0000002a" change="1472505121" id="N0024" type="GEDCOM import">
+    <note handle="_0000002b0000002b" change="1" id="N0025" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0002:
 
 Empty note ignored                                                  Line   132: 2 NOTE 
-Skipped subordinate line                                            Line   133: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line   133: 3 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="248"/>
       </style>
     </note>
-    <note handle="_0000002c0000002c" change="979250406" id="N0025" type="General">
+    <note handle="_0000002d0000002d" change="979250406" id="N0026" type="General">
       <text>Name note</text>
+      <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000003000000030" change="1472505121" id="N0026" type="LDS Note">
+    <note handle="_0000003100000031" change="1" id="N0027" type="LDS Note">
       <text>Place note</text>
+      <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000003300000033" change="1472505122" id="N0027" type="LDS Note">
+    <note handle="_0000003400000034" change="1" id="N0028" 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="N0029" 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="N0030" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0003:
 
 Empty note ignored                                                  Line   141: 2 NOTE 
 Skipped subordinate line                                            Line   142: 3 TEST Empty Note
 Line ignored as not understood                                      Line   163: 3 TEST Accociation note
 Empty note ignored                                                  Line   167: 2 NOTE 
-Skipped subordinate line                                            Line   168: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line   168: 3 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="538"/>
       </style>
     </note>
-    <note handle="_0000003800000038" change="979250406" id="N0030" type="General">
+    <note handle="_0000003900000039" change="979250406" id="N0031" type="General">
       <text>Just for association</text>
+      <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000003d0000003d" change="1472505122" id="N0031" type="Family Note">
+    <note handle="_0000003e0000003e" change="1" id="N0032" 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="N0033" 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="N0034" 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="N0035" 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="N0036" 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="N0037" type="GEDCOM import">
       <text>Records not imported into FAM (family) Gramps ID F0001:
 
 Line ignored as not understood                                      Line   183: 2 TEST Family Note
@@ -456,38 +492,44 @@ Empty note ignored                                                  Line   187:
 Skipped subordinate line                                            Line   188: 2 TEST Empty Note
 Line ignored as not understood                                      Line   190: 2 TEST citation
 Line ignored as not understood                                      Line   194: 3 TEST Citation Data
-Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note</text>
+Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="645"/>
       </style>
     </note>
-    <note handle="_0000004500000045" change="979250406" id="N0037" type="Repository Reference Note">
+    <note handle="_0000004600000046" change="979250406" id="N0038" type="Repository Reference Note">
       <text>A short note about the repository link.</text>
+      <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004600000046" change="979250406" id="N0038" type="Source Note">
+    <note handle="_0000004700000047" change="979250406" id="N0039" type="Source Note">
       <text>note embedded in the SOURCE Record</text>
+      <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004700000047" change="1472505122" id="N0039" type="GEDCOM import">
+    <note handle="_0000004800000048" change="1" id="N0040" type="GEDCOM import">
       <text>Records not imported into SOUR (source) Gramps ID S0001:
 
 Line ignored as not understood                                      Line   206: 1 TEST source
 Empty note ignored                                                  Line   208: 2 NOTE 
 Skipped subordinate line                                            Line   209: 3 TEST Empty Note
 Empty note ignored                                                  Line   214: 1 NOTE 
-Skipped subordinate line                                            Line   215: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line   215: 2 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="524"/>
       </style>
     </note>
-    <note handle="_0000004800000048" change="1472505122" id="N0040" type="Repository Note">
+    <note handle="_0000004900000049" change="1" id="N0041" type="Repository Note">
       <text>Repository Note</text>
+      <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004900000049" change="1472505122" id="N0041" type="GEDCOM import">
+    <note handle="_0000004a0000004a" change="1" id="N0042" type="GEDCOM import">
       <text>Records not imported into REPO (repository) Gramps ID R0002:
 
 Line ignored as not understood                                      Line   223: 1 TEST Repo
 Empty note ignored                                                  Line   224: 1 NOTE 
-Skipped subordinate line                                            Line   225: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line   225: 2 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="340"/>
       </style>

data/tests/imp_sample.ged

@@ -1,52 +1,94 @@
 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, Smith
+2 SPFX Vrow, huh
 2 SURN Hansdotter
+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
 2 DATE 11 AUG 1966
 2 PLAC San Francisco, San Francisco Co., CA
 1 FAMC @F8@
+2 _FREL Adopted
+2 _MREL Foster
 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 +108,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 +122,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 +139,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 +152,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 +199,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 +243,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 +309,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 +346,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 +401,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 +425,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 +464,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 +507,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 +532,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 +603,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 +642,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 +760,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 +818,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 +844,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 +862,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 +874,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 +901,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 +913,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 +936,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 +984,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 +1000,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 +1024,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 +1043,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 +1060,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 +1105,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

data/tests/imp_vcard.difs

@@ -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

data/tips.xml.in

@@ -57,7 +57,7 @@
 
 <_tip number="29"><b>Show All Checkbutton</b><br/>When adding an existing person as a spouse, the list of people shown is filtered to display only people who could realistically fit the role (based on dates in the database). In case Gramps is wrong in making this choice, you can override the filter by checking the Show All checkbutton.</_tip>
 
-<_tip number="31"><b>Improving Gramps</b><br/>Users are encouraged to request enhancements to Gramps. Requesting an enhancement can be done either through the gramps-users or gramps-devel mailing lists, or by going to http://bugs.gramps-project.org and creating a Feature Request. Filing a Feature Request is preferred but it can be good to discuss your ideas on the email lists.</_tip>
+<_tip number="31"><b>Improving Gramps</b><br/>Users are encouraged to request enhancements to Gramps. Requesting an enhancement can be done either through the gramps-users or gramps-devel mailing lists, or by going to https://gramps-project.org/bugs/ and creating a Feature Request. Filing a Feature Request is preferred but it can be good to discuss your ideas on the email lists.</_tip>
 
 <_tip number="32"><b>Gramps Mailing Lists</b><br/>Want answers to your questions about Gramps? Check out the gramps-users email list. Many helpful people are on the list, so you're likely to get an answer quickly. If you have questions related to the development of Gramps, try the gramps-devel list. You can see the lists by selecting &quot;Help &gt; Gramps Mailing Lists&quot;.</_tip>
 
@@ -91,7 +91,7 @@
 
 <_tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web.</_tip>
 
-<_tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at http://bugs.gramps-project.org</_tip>
+<_tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at https://gramps-project.org/bugs/</_tip>
 
 <_tip number="51"><b>The Gramps Homepage</b><br/>The Gramps homepage is at http://gramps-project.org/</_tip>
 

debian/README.Debian

@@ -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

debian/README.test

@@ -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

debian/changelog

@@ -1,14 +1,188 @@
+gramps (5.1.5-1) unstable; urgency=medium
+
+  * New release
+  * Update copyright file
+  * Drop patch, incorporated upstream
+
+ -- Ross Gammon <rossgammon@debian.org>  Sat, 12 Feb 2022 17:01:21 +0100
+
+gramps (5.1.4-1) unstable; urgency=medium
+
+  * New release
+  * Add new copyrights
+  * Update watch file
+  * Patch probably alive test to fix FTBFS
+
+ -- Ross Gammon <rossgammon@debian.org>  Sun, 15 Aug 2021 18:31:56 +0200
+
+gramps (5.1.3-1) focal; urgency=medium
+
+  * New release
+  * Update debian/copyright for Alex Roitman
+
+ -- Ross Gammon <rosco2@ubuntu.com>  Sun, 16 Aug 2020 20:23:34 +0200
+
+gramps (5.1.2-1) unstable; urgency=medium
+
+  * New release
+
+ -- Ross Gammon <rossgammon@debian.org>  Sat, 11 Jan 2020 19:07:08 +0100
+
+gramps (5.1.1-1) unstable; urgency=medium
+
+  * New release
+  * Add python3-fontconfig to recommends
+
+ -- Ross Gammon <rossgammon@debian.org>  Tue, 17 Sep 2019 15:21:43 +0200
+
+gramps (5.1.0-1) unstable; urgency=medium
+
+  * New release
+  * Update copyrights
+  * Bump gtk+ version to 3.12
+  * Add new geocode-glib dependency
+
+ -- Ross Gammon <rossgammon@debian.org>  Sat, 24 Aug 2019 19:49:27 +0200
+
+gramps (5.0.2-1) unstable; urgency=medium
+
+  * New release
+  * Remove ancient python version field from debian/control
+  * Bump standards version, no changes required
+
+ -- Ross Gammon <rossgammon@debian.org>  Sun, 11 Aug 2019 14:11:35 +0200
+
+gramps (5.0.1-1) unstable; urgency=medium
+
+  * New release
+  * Update copyright file
+
+ -- Ross Gammon <rossgammon@debian.org>  Thu, 20 Dec 2018 20:41:23 +0100
+
+gramps (5.0.0-1) unstable; urgency=medium
+
+  * New Gramps release
+
+ -- Ross Gammon <rossgammon@debian.org>  Wed, 25 Jul 2018 21:19:00 +0200
+
+gramps (5.0.0~rc1-1) unstable; urgency=medium
+
+  * First release candidate for Gramps 5.0
+  * Drop patch applied upstream
+  * Update copyrights
+
+ -- Ross Gammon <rossgammon@debian.org>  Sun, 01 Jul 2018 21:57:10 +0200
+
+gramps (5.0.0~beta1-1) unstable; urgency=medium
+
+  * First beta release of gramps 5.0
+  * Sync debian directory with Debian experimental branch on salsa
+  * Point Vcs URLs at the Gramps Project on Github
+  * Correct spelling in debian/rules, node > nose
+  * Delete gbp.conf, not required as gbp not used to build package
+  * Delete NEWS file, only really applicable in Debian
+  * Fix syntax errors in d/changelog and remove trailing whitespace
+  * Patch person_rules_test.py to remove hard coded build path from
+    import. Fixes FTBFS due to test failure.
+  * Enable extra tests that were failing for alpha3
+
+ -- Ross Gammon <rossgammon@debian.org>  Mon, 19 Feb 2018 19:25:25 +0100
+
+gramps (4.2.8) unstable; urgency=medium
+
+  * Quick bug fix release
+
+ -- Ross Gammon <rossgammon@debian.org>  Sat, 10 Feb 2018 08:30:33 +0100
+
+gramps (5.0.0-alpha3) experimental; urgency=medium
+
+  * New alpha release for Gramps 5.0.0
+
+ -- Ross Gammon <rossgammon@debian.org>  Mon, 04 Sep 2017 16:55:41 +0200
+
+gramps (4.2.6) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.6
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 01 Aug 2017 14:10:19 +0200
+
+gramps (5.0.0-alpha2) experimental; urgency=medium
+
+  * 2nd Alpha release for testing
+
+ -- Ross Gammon <rosco2@ubuntu.com>  Mon, 12 Jun 2017 19:42:39 +0200
+
+gramps (4.2.5) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.5
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Thu, 15 Dec 2016 18:52:08 +0100
+
+gramps (4.2.4) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.4
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Sun, 04 Sep 2016 18:34:49 +0200
+
+gramps (5.0.0-alpha1) UNRELEASED; urgency=medium
+
+  * Alpha stream for Gramps 5.0.0
+
+ -- système <romjerome@yahoo.fr>  Sat, 04 Jun 2016 20:07:14 +0200
+
+gramps (4.2.3) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.3
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Sun, 10 Apr 2016 21:09:19 +0200
+
+gramps (4.2.2) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.2
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 06 Jan 2016 19:38:25 +0100
+
+gramps (4.2.1) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.1
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 13 Oct 2015 05:08:30 +0200
+
+gramps (4.2.0) UNRELEASED; urgency=medium
+
+  * New upstream for Gramps 4.2.0
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Sun, 02 Aug 2015 17:03:37 +0200
+
+gramps (4.1.3) precise; urgency=low
+
+  * New upstream for Gramps 4.1 branch (4.1.3)
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Thu, 30 Apr 2015 18:42:34 +0200
+
+gramps (3.4.9-1) precise; urgency=low
+
+  * New upstream release for 3.4.x branch
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Thu, 30 Apr 2015 16:02:44 +0200
+
+gramps (4.0.4) precise; urgency=low
+
+  * New upsteam for Gramps 4.0.4
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Fri, 23 May 2014 17:07:41 +0200
+
 gramps (4.0.3) precise; urgency=low
 
   * - 4.0.4-git.f08e40 Experimental stream gramps.git
 
  -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 04 Feb 2014 19:49:32 +0100
- 
+
 gramps (4.0.2) precise; urgency=low
 
   * experimental .deb for gramps 4.0.2
-  
--- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100
 
 gramps (4.0.1-2) precise; urgency=low
 
@@ -703,7 +877,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 +1012,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 +1089,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.
 

debian/compat

@@ -1 +1 @@
-9
+11

debian/control

@@ -1,29 +1,37 @@
 Source: gramps
-Section: python
+Section: gnome
 Priority: optional
-Maintainer: Ross Gammon <rossgammon@mail.dk>
+Maintainer: Ross Gammon <rossgammon@debian.org>
 Build-Depends-Indep:
- dh-linktree,
+ dh-python,
  gettext,
  intltool,
  libxml-parser-perl,
  python3-all,
- python3-setuptools
+ python3-setuptools,
+ python3-nose,
+ gir1.2-gtk-3.0 (>= 3.12.0),
+ python3-gi (>= 3.12.0),
+ python3-gi-cairo,
+ python3-bsddb3,
+ python3-lxml,
+ python3-jsonschema,
+ python3-mock,
+ python3-icu,
+ python3-nose-exclude
 Build-Depends:
- dh-python,
- debhelper (>= 9.0.0)
-Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
-Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git
-Homepage: http://www.gramps-project.org/
-X-Python-Version: >= 3.2
+ debhelper (>= 11)
+Standards-Version: 4.4.0
+Vcs-Git: https://github.com/gramps-project/gramps.git
+Vcs-browser: https://github.com/gramps-project/gramps/tree/maintenance/gramps50
+Homepage: https://www.gramps-project.org/
 
-Package: python3-gramps
+Package: gramps
 Architecture: all
 Depends:
  gir1.2-gtk-3.0 (>= 3.10.0),
  librsvg2-2,
- python3-gi,
+ python3-gi (>= 3.12.0),
  python3-gi-cairo,
  python3-bsddb3,
  xdg-utils,
@@ -31,15 +39,24 @@ Depends:
  ${python3:Depends}
 Recommends:
  graphviz,
- libosmgpsmap-1.0-0,
+ gir1.2-gexiv2-0.10,
  gir1.2-osmgpsmap-1.0,
- python3-pyicu
+ python3-icu,
+ gir1.2-geocodeglib-1.0,
+ python3-fontconfig
 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

debian/copyright

@@ -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-2019, 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-2019, 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,66 @@ 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-2022, Nick Hall
            2009, Pander Musubi
            2009, Robert Ham
            2009, Swoon on bug tracker
            2009, Yevgeny Zegzda
-           2010, Gramps
+           2010, 2015 Gramps
            2010, Jakim Friant
            2010, Josip
            2010, lcc & Robert Jerome
            2010-2012, Michiel D. Nauta
-           2010-2013, Tim G L Lyons
-           2010-2011, Vlada Perić
+           2010-2016, Tim G L Lyons
+           2010-2011, 2014, Vlada Perić
            2011, Adam Stein
            2011-2012,  Harald Rosemann
            2011, 2013, Heinz Brinker
            2011, Helge Herz
            2011, 2013 John Ralls
-           2011, Matt Keenan
-           2011-2013, Paul Franklin
-           2012, Mathieu MD
+           2011, 2016 Matt Keenan
+           2011-2018, Paul Franklin
+           2012, lcc
+           2012, 2014, Mathieu MD
            2012, Nicolas Adenis-Lamarre
-           2013, Fedir Zinchuk
-           2013, Oleh Petrivk
-           2013, Vassilii Khachaturov
+           2013, Artem Glebov
+           2011-2016, Fedir Zinchuk
+           2013-2017, Alois Poettker
+           2013-2014, Vassilii Khachaturov
            2013, Zissis Papadopoulos
+           2015, Icelandic translators of Gramps
+           2014, Bastien Jacquet
+           2014, Gerald Kunzmann
+           2015, Fabrice
+           2015, Lajos Nemeséri
+           2015, Detlef Wolz
+           2016, Allen Crider
+           2016, DaAwesomeP
+           2016-2018, Paul Culley
+           2016, QuLogic
+           2016, Tom Samstag
+           2017, Jonathan Biegert
+           2017, Mindaugas Baranauskas
+           2017, Robert Carnell
+           2018, Christophe aka khrys63
+           2018, Paul D.Smith
+           2018, Robin van der Vliet
+           2018, Theo van Rijn
+           2019, Matthias Kemmer
+           2020, Jan Sparreboom
+           2021, Mirko Leonhaeuser
 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 +120,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.

debian/gramps.docs

@@ -0,0 +1 @@
+RELEASE_NOTES

debian/rules

@@ -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

debian/source/format

@@ -1 +1 @@
-1.8
+3.0 (quilt)

debian/source/local-options

@@ -0,0 +1 @@
+unapply-patches

debian/tests/control

@@ -0,0 +1,3 @@
+Tests: gramps-import-export
+Depends: gramps, gzip
+Restrictions: allow-stderr

debian/tests/gramps-import-export

@@ -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"

debian/upstream/metadata

@@ -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

debian/watch

@@ -0,0 +1,6 @@
+version=4
+opts=\
+filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/gramps-project-$1\.tar\.gz/,\
+repacksuffix=~dfsg \
+https://github.com/gramps-project/gramps/tags \
+.*/v?(\d\S+)\.tar\.gz

docs/conf.py

@@ -57,7 +57,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Gramps'
-copyright = '2016, The Gramps Project'
+copyright = '2001-2023, The Gramps Project'
 author = 'Donald N. Allingham'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -65,9 +65,9 @@ author = 'Donald N. Allingham'
 # built documents.
 #
 # The short X.Y version.
-version = '5.0.0'
+version = '5.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '5.0.0-master'
+release = '5.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/gen/gen_db.rst

@@ -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:

docs/gen/gen_display.rst

@@ -10,3 +10,10 @@ Name
    :members:
    :undoc-members:
    :show-inheritance:
+
+Place
+====================================
+.. automodule:: gramps.gen.display.place
+   :members:
+   :undoc-members:
+   :show-inheritance: