Add files via upload

Fixes #11973

.gitignore

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

.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

@@ -72,7 +72,7 @@ install:
 # by the automatic git checkout.
 
 # Download Sean Ross-Ross's Pure Python module containing a framework to
-# manipulate and analyze python ast�s and bytecode. This is loaded to 
+# manipulate and analyze python ast�s and bytecode. This is loaded to
 # /home/travis/build/gramps-project/gramps/meta
 # FIXME: This should be loaded from the release directory at
 # https://pypi.python.org/pypi/meta
@@ -95,11 +95,11 @@ before_script:
 # set GRAMPS_RESOURCES for locale, data,image and documentation
  - export GRAMPS_RESOURCES=.
 # Install addons
- - mkdir -p ~/.gramps/gramps50/plugins/
- - wget https://github.com/gramps-project/addons/raw/master/gramps50/download/CliMerge.addon.tgz
- - tar -C ~/.gramps/gramps50/plugins -xzf CliMerge.addon.tgz
- - wget https://github.com/gramps-project/addons/raw/master/gramps50/download/ExportRaw.addon.tgz
- - tar -C ~/.gramps/gramps50/plugins -xzf ExportRaw.addon.tgz
+ - mkdir -p ~/.gramps/gramps51/plugins/
+ - wget https://github.com/gramps-project/addons/raw/master/gramps51/download/CliMerge.addon.tgz
+ - tar -C ~/.gramps/gramps51/plugins -xzf CliMerge.addon.tgz
+ - wget https://github.com/gramps-project/addons/raw/master/gramps51/download/ExportRaw.addon.tgz
+ - tar -C ~/.gramps/gramps51/plugins -xzf ExportRaw.addon.tgz
 
 script:
 # Ignore the virtualenv entirely. Use nosetests3, python3 (3.4.0) and coverage

AUTHORS

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

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: 

MANIFEST.in

@@ -1,5 +1,5 @@
-include ChangeLog
 include AUTHORS
+include ChangeLog
 include COPYING
 include FAQ
 include Gramps.py
@@ -10,11 +10,9 @@ include RELEASE_NOTES
 include TODO
 include CONTRIBUTING
 include TestPlan.txt
-recursive-include bash *
 recursive-include data *
 recursive-include debian *
 recursive-include docs *
-recursive-include example *
 recursive-include gramps *
 recursive-include help *
 recursive-include images *

README.md

@@ -10,8 +10,8 @@ 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)
@@ -103,6 +103,23 @@ The following packages are optional:
 
  More font support in the reports
 
+* **geocodeglib**
+
+ 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
 ------------------------------------------------
 

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.
 
@@ -59,7 +61,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: black;
     margin: 0px;
     background-color: #EEE;
@@ -67,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;
@@ -75,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
 ----------------------------------------------------- */
@@ -205,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 {
@@ -367,7 +473,15 @@ table.eventlist tbody tr td.ColumnSources {
     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;
 }
@@ -384,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;
 }
@@ -404,6 +515,12 @@ div#SourceDetail {
 #Contact #city:after {
     content: ",";
 }
+@media only screen and (max-width: 1080px) {
+    #Contact,
+    #Contact #GalleryDisplay img {
+        max-width: 100%;
+    }
+}
 
 /* Download
 ----------------------------------------------------- */
@@ -413,20 +530,29 @@ 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;
 }
 .subsection {
     clear: both;
-    overflow: visible;
+    overflow: hidden;
 }
 .subsection p {
     margin: 0px;
@@ -449,12 +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;
     width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -462,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;
 }
@@ -469,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
 ----------------------------------------------------- */
@@ -532,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
 ----------------------------------------------------- */
@@ -221,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 {
@@ -270,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 {
@@ -578,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;
 }
@@ -627,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;
@@ -679,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;
 }
 
@@ -813,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;
@@ -927,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;
 }
@@ -1094,6 +1337,7 @@ div.Residence table.infolist tr td {
     float: left;
     width: 130px;
     text-align: center;
+    background-color: white;
 }
 #indivgallery div.thumbnail a {
     display: block;
@@ -1117,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
 ----------------------------------------------------- */

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.
 
@@ -59,7 +61,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: black;
     margin: 0px;
     background-color: #454;
@@ -67,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;
@@ -75,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
 ----------------------------------------------------- */
@@ -209,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 {
@@ -413,7 +524,15 @@ table.eventlist tbody tr td.ColumnSources {
     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;
 }
@@ -430,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;
 }
@@ -463,20 +579,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: visible;
+    overflow: hidden;
 }
 .subsection p {
     margin: 0px;
@@ -499,12 +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;
     width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -512,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;
 }
@@ -519,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
 ----------------------------------------------------- */
@@ -577,6 +762,7 @@ a.familymap {
 #footer {
     clear: both;
     color: #E0E6E0;
+    font-size: 80%;
     padding-top: 1em;
     background-color: #9DBF9D;
     border-top: solid 1px #454;
@@ -604,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.
 
@@ -67,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;
@@ -75,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
 ----------------------------------------------------- */
@@ -207,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 {
@@ -406,7 +512,15 @@ table.eventlist tbody tr td.ColumnSources {
     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;
 }
@@ -423,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;
 }
@@ -456,20 +567,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: visible;
+    overflow: hidden;
 }
 .subsection p {
     margin: 0px;
@@ -492,12 +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;
     width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -505,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;
 }
@@ -512,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
 ----------------------------------------------------- */
@@ -575,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.
 
@@ -59,7 +61,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: #36220B;
     margin: 0px;
     background-color: #FFE09F;
@@ -67,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;
@@ -75,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
 ----------------------------------------------------- */
@@ -207,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 {
@@ -406,6 +512,13 @@ table.eventlist tbody tr td.ColumnSources {
     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;
@@ -423,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;
 }
@@ -456,13 +566,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;
@@ -492,12 +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;
     width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -505,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;
 }
@@ -512,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
 ----------------------------------------------------- */
@@ -575,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.
 
@@ -59,7 +62,7 @@ the page.
 
 body {
     font-family: sans-serif;
-    font-size: 90%;
+    font-size: 100%;
     color: black;
     margin: 0px;
     background-color: #EAEEF4;
@@ -67,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;
@@ -75,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
 ----------------------------------------------------- */
@@ -207,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 {
@@ -406,6 +513,13 @@ table.eventlist tbody tr td.ColumnSources {
     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;
@@ -423,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;
 }
@@ -456,20 +567,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: visible;
+    overflow: hidden;
 }
 .subsection p {
     margin: 0px;
@@ -492,12 +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;
     width: 130px;
     font-size: smaller;
     text-align: center;
     margin: 0.8em 0.5em;
+    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
     margin-left: 15px;
@@ -505,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;
 }
@@ -512,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
 ----------------------------------------------------- */
@@ -575,6 +755,7 @@ a.familymap {
 }
 #footer > * {
     background-color: #EAEEF4;
+    font-size: 80%;
 }
 #footer p#createdate {
     float: left;

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.
 
@@ -62,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: 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;
@@ -82,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
 -----------------------------------------------------------------*/
@@ -204,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 {
@@ -361,6 +468,13 @@ table.eventlist tbody tr td.ColumnSources {
     margin: 0px auto;
     display:block;
     border: solid 1px #7D5925;
+    height: auto;
+}
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
 }
 
 /*    Sources
@@ -376,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;
@@ -402,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;
@@ -428,9 +557,32 @@ 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;
@@ -441,6 +593,7 @@ div#families table.fixed_subtables table.eventlist th:last-child {
     font-size: smaller;
     text-align: center;
     margin: 0.5em;
+    background-color: white;
 }
 #indivgallery img {
     border: solid 1px #7D5925;
@@ -449,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
 -----------------------------------------------------------------*/
@@ -501,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
 -----------------------------------------------------------------*/

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.
 
@@ -82,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;
@@ -100,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;
@@ -254,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 {
@@ -634,6 +747,13 @@ table.eventlist tbody tr td.ColumnSources {
 }
 #GalleryDisplay img {
     margin:0 auto;
+    height: auto;
+}
+
+@media only screen and (max-width: 1600px) {
+    #GalleryDisplay img {
+        max-width: 100%;
+    }
 }
 #GalleryDetail div#summaryarea{
     margin:0;
@@ -679,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;
@@ -697,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;
@@ -779,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;
@@ -926,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;
 }
@@ -934,6 +1084,41 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
     float:left;
     width:130px;
     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;
@@ -957,6 +1142,9 @@ 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
 ----------------------------------------------------- */
@@ -1070,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;

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;
@@ -52,8 +50,8 @@ Females     Web_Gender_Female.png
 }
 #treeContainer div.boxbg {
     position:absolute;
-    margin:0;
-    padding:0;
+    margin:0px;
+    padding:0px;
     background:none;
 }
 #treeContainer div.boxbg a,
@@ -61,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;
@@ -105,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/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/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/exp_sample.gramps

@@ -1278,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"/>

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.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/exp_sample_ged.ged

@@ -1,12 +1,12 @@
 0 HEAD
 1 SOUR Gramps
-2 VERS 5.0.1
+2 VERS 5.1.2
 2 NAME Gramps
-1 DATE 7 NOV 2018
-2 TIME 16:03:33
+1 DATE 7 JAN 2020
+2 TIME 13:39:43
 1 SUBM @SUBM@
 1 FILE C:\Users\prc\AppData\Roaming\gramps\temp\exp_sample_ged.ged
-1 COPR Copyright (c) 2018 Alex Roitman,,,.
+1 COPR Copyright (c) 2020 Alex Roitman,,,.
 1 GEDC
 2 VERS 5.5.1
 2 FORM LINEAGE-LINKED
@@ -629,8 +629,12 @@
 2 TYPE Birth of Lloyd Smith
 2 DATE 13 MAR 1935
 2 PLAC San Francisco, San Francisco Co., CA
+1 ADOP Y
+2 FAMC @F0009@
+3 ADOP HUSB
 1 FAMC @F0009@
-2 PEDI birth
+2 _FREL Adopted
+2 _MREL Foster
 1 FAMS @F0008@
 1 CHAN
 2 DATE 4 SEP 2016
@@ -885,7 +889,7 @@
 0 @I0046@ INDI
 1 NAME Tom /Von Tester y tested/
 2 GIVN Tom
-2 SPFX Von, 
+2 SPFX Von
 2 SURN Tester y, tested
 2 NICK TesterNickname
 1 SEX M
@@ -907,7 +911,7 @@
 2 DATE I think 1970 to 1971
 2 PLAC San Francisco, San Francisco Co., CA
 1 SLGC
-2 DATE EST ABT 1999
+2 DATE ABT 1999
 2 FAMC @F0016@
 2 TEMP DENVE
 2 PLAC Denver, Denver Co., CO, Denver Co., Colorado, USA
@@ -1040,7 +1044,7 @@
 2 SURN Tester
 1 SEX M
 1 FAMC @F0016@
-2 PEDI Unknown
+2 PEDI Sponsored
 1 CHAN
 2 DATE 29 OCT 2016
 3 TIME 16:27:59
@@ -1420,8 +1424,8 @@
 0 @N0018@ NOTE Another Citation Note
 0 @N0019@ NOTE A bad photo for sure
 0 @O0000@ OBJE
-1 FILE c:\users\prc\workspace\grampsm\main\data\tests\O0.jpg
-2 FORM jpeg
+1 FILE d:\users\prc\documents\gramps\data\tests\O0.jpg
+2 FORM jpg
 2 TITL Michael O'Toole 2015-11
 1 NOTE @N0019@
 1 CHAN

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.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="2017-05-30" version="5.0.0-alpha1"/>
+    <created date="2019-03-05" version="5.0.2"/>
     <researcher>
     </researcher>
   </header>
@@ -66,9 +66,10 @@
     <object handle="_0000000300000003" change="1" id="O0000">
       <file src="test_emb_55.jpg" mime="image/jpeg" description="Multimedia link embedded form v5.5"/>
       <noteref hlink="_0000000200000002"/>
+      <noteref hlink="_0000000b0000000b"/>
     </object>
     <object handle="_0000000400000004" change="548708291" id="M1">
-      <file src="" mime="" description="Multimedia link to linked form v5.5 blob"/>
+      <file src="" mime="image/jpeg" description="Multimedia link to linked form v5.5 blob"/>
       <attribute type="REFN" value="Ref12345M1">
         <noteref hlink="_0000001200000012"/>
       </attribute>
@@ -117,7 +118,7 @@
       <citationref hlink="_0000002700000027"/>
     </object>
     <object handle="_0000000c0000000c" change="1" id="O0002">
-      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="unknown" description="Multimedia link embedded form v5.5 URL"/>
+      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="text/html" description="Multimedia link embedded form v5.5 URL"/>
       <noteref hlink="_0000000b0000000b"/>
     </object>
     <object handle="_0000000d0000000d" change="1" id="M7">
@@ -129,7 +130,7 @@
       <noteref hlink="_0000002900000029"/>
     </object>
     <object handle="_0000001500000015" change="1" id="M2">
-      <file src="" mime="" description="2nd blob Multimedia link to linked form v5.5 blob"/>
+      <file src="" mime="image/jpeg" description="2nd blob Multimedia link to linked form v5.5 blob"/>
       <noteref hlink="_0000001600000016"/>
     </object>
   </objects>

data/tests/imp_notetest_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-10-23" version="5.0.0-alpha1"/>
+    <created date="2019-07-30" version="5.0.2"/>
     <researcher>
       <resname>John A. Tester</resname>
     </researcher>
@@ -26,27 +26,23 @@
       <type>Death</type>
       <noteref hlink="_0000001600000016"/>
     </event>
-    <event handle="_0000001e0000001e" change="1" id="E0003">
-      <type>Who knows OBJE REFN TYPE</type>
-      <description>REFN</description>
-    </event>
-    <event handle="_0000002700000027" change="1" id="E0004">
+    <event handle="_0000002700000027" change="1" id="E0003">
       <type>Birth</type>
       <dateval val="1901-06-15"/>
     </event>
-    <event handle="_0000002800000028" change="1" id="E0005">
+    <event handle="_0000002800000028" change="1" id="E0004">
       <type>Death</type>
       <dateval val="1975-07-05"/>
     </event>
-    <event handle="_0000002e0000002e" change="1" id="E0006">
+    <event handle="_0000002e0000002e" change="1" id="E0005">
       <type>Birth</type>
       <dateval val="1922-06-15"/>
     </event>
-    <event handle="_0000002f0000002f" change="1" id="E0007">
+    <event handle="_0000002f0000002f" change="1" id="E0006">
       <type>Death</type>
       <dateval val="1994-07-05"/>
     </event>
-    <event handle="_0000003b0000003b" change="1" id="E0008">
+    <event handle="_0000003b0000003b" change="1" id="E0007">
       <type>TEST</type>
       <description>family</description>
     </event>
@@ -61,10 +57,11 @@
       <eventref hlink="_0000000f0000000f" role="Primary"/>
       <eventref hlink="_0000001000000010" role="Primary"/>
       <eventref hlink="_0000001500000015" role="Primary"/>
-      <eventref hlink="_0000001e0000001e" role="Primary"/>
       <objref hlink="_0000001f0000001f"/>
       <attribute type="RIN" value="123456 Person"/>
-      <attribute type="REFN" value="98765 for PERSON"/>
+      <attribute type="REFN" value="98765 for PERSON">
+        <noteref hlink="_0000001e0000001e"/>
+      </attribute>
       <url  href="http://homepages.rootsweb.com/~pmcbride/gedcom/55gctoc.htm" type="Web Home" description="GEDCOM 5.5 documentation web site"/>
       <parentin hlink="_0000001700000017"/>
       <noteref hlink="_0000001800000018"/>
@@ -270,7 +267,8 @@
 
 Line ignored as not understood                                      Line    18: 2 TEST Header Note
 Empty note ignored                                                  Line    19: 1 NOTE 
-Skipped subordinate line                                            Line    20: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line    20: 2 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="327"/>
       </style>
@@ -288,7 +286,8 @@ Skipped subordinate line                                            Line    20:
 Line ignored as not understood                                      Line    26: 2 TEST Submission Note
 Empty note ignored                                                  Line    27: 1 NOTE 
 Skipped subordinate line                                            Line    28: 2 TEST Empty Note
-Line ignored as not understood                                      Line    29: 1 TEST submission</text>
+Line ignored as not understood                                      Line    29: 1 TEST submission
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="425"/>
       </style>
@@ -300,7 +299,8 @@ Tag recognized but not supported                                    Line    32:
 Tag recognized but not supported                                    Line    33: 1 REFN Submission Note REFN
 Skipped subordinate line                                            Line    34: 2 TYPE Submission Note REFN TYPE
 Tag recognized but not supported                                    Line    35: 1 SOUR Submission note source
-Line ignored as not understood                                      Line    39: 1 TEST on XREF Note</text>
+Line ignored as not understood                                      Line    39: 1 TEST on XREF Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="586"/>
       </style>
@@ -318,7 +318,8 @@ Line ignored as not understood                                      Line    39:
 Line ignored as not understood                                      Line    43: 2 TEST Submitter Note
 Empty note ignored                                                  Line    44: 1 NOTE 
 Skipped subordinate line                                            Line    45: 2 TEST Empty Note
-Line ignored as not understood                                      Line    46: 1 TEST Submitter</text>
+Line ignored as not understood                                      Line    46: 1 TEST Submitter
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="460"/>
       </style>
@@ -360,7 +361,10 @@ Line ignored as not understood                                      Line    46:
     <note handle="_0000001d0000001d" change="979250406" id="N0018" type="Media Note">
       <text>Media xref note</text>
     </note>
-    <note handle="_0000002100000021" change="1" id="N0019" type="GEDCOM import">
+    <note handle="_0000001e0000001e" change="1" id="N0019" type="REFN-TYPE">
+      <text>Who knows OBJE REFN TYPE</text>
+    </note>
+    <note handle="_0000002100000021" change="1" id="N0020" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0001:
 
 Empty note ignored                                                  Line    54: 2 NOTE 
@@ -382,12 +386,14 @@ Empty note ignored                                                  Line    85:
 Skipped subordinate line                                            Line    86: 3 TEST Empty Note
 Line ignored as not understood                                      Line    88: 3 TEST 123456 Note
 Empty note ignored                                                  Line    90: 2 NOTE 
-Skipped subordinate line                                            Line    91: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line    91: 3 TEST Empty Note
+Line ignored as not understood                                      Line    94: 2 TEST REFN
+</text>
       <style name="fontface" value="Monospace">
-        <range start="0" end="2009"/>
+        <range start="0" end="2101"/>
       </style>
     </note>
-    <note handle="_0000002200000022" change="1" id="N0020" type="GEDCOM import">
+    <note handle="_0000002200000022" change="1" id="N0021" type="GEDCOM import">
       <text>Records not imported into NOTE Gramps ID N0018:
 
 Tag recognized but not supported                                    Line   103: 1 RIN 123456
@@ -396,85 +402,89 @@ Skipped subordinate line                                            Line   105:
 Tag recognized but not supported                                    Line   109: 2 NOTE Note on a change on a note!!!
 Skipped subordinate line                                            Line   110: 3 CHAN 
 Skipped subordinate line                                            Line   111: 4 DATE 2001-01-11
-Skipped subordinate line                                            Line   112: 5 TIME 16:00:06</text>
+Skipped subordinate line                                            Line   112: 5 TIME 16:00:06
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="741"/>
       </style>
     </note>
-    <note handle="_0000002300000023" change="1" id="N0021" type="REFN-TYPE">
+    <note handle="_0000002300000023" change="1" id="N0022" type="REFN-TYPE">
       <text>Who knows REFN TYPE</text>
     </note>
-    <note handle="_0000002500000025" change="1" id="N0022" type="GEDCOM import">
+    <note handle="_0000002500000025" change="1" id="N0023" type="GEDCOM import">
       <text>Records not imported into OBJE (multi-media object) Gramps ID M1:
 
-Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg</text>
+Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="164"/>
       </style>
     </note>
-    <note handle="_0000002900000029" change="979250406" id="N0023" type="Person Note">
+    <note handle="_0000002900000029" change="979250406" id="N0024" type="Person Note">
       <text>Family Spouse reference Note</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000002b0000002b" change="1" id="N0024" type="GEDCOM import">
+    <note handle="_0000002b0000002b" change="1" id="N0025" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0002:
 
 Empty note ignored                                                  Line   132: 2 NOTE 
-Skipped subordinate line                                            Line   133: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line   133: 3 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="248"/>
       </style>
     </note>
-    <note handle="_0000002d0000002d" change="979250406" id="N0025" type="General">
+    <note handle="_0000002d0000002d" change="979250406" id="N0026" type="General">
       <text>Name note</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000003100000031" change="1" id="N0026" type="LDS Note">
+    <note handle="_0000003100000031" change="1" id="N0027" type="LDS Note">
       <text>Place note</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000003400000034" change="1" id="N0027" type="LDS Note">
+    <note handle="_0000003400000034" change="1" id="N0028" type="LDS Note">
       <text>LDS xref note</text>
     </note>
-    <note handle="_0000003600000036" change="979250406" id="N0028" type="Association Note">
+    <note handle="_0000003600000036" change="979250406" id="N0029" type="Association Note">
       <text>Association link note</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000003800000038" change="1" id="N0029" type="GEDCOM import">
+    <note handle="_0000003800000038" change="1" id="N0030" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0003:
 
 Empty note ignored                                                  Line   141: 2 NOTE 
 Skipped subordinate line                                            Line   142: 3 TEST Empty Note
 Line ignored as not understood                                      Line   163: 3 TEST Accociation note
 Empty note ignored                                                  Line   167: 2 NOTE 
-Skipped subordinate line                                            Line   168: 3 TEST Empty Note</text>
+Skipped subordinate line                                            Line   168: 3 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="538"/>
       </style>
     </note>
-    <note handle="_0000003900000039" change="979250406" id="N0030" type="General">
+    <note handle="_0000003900000039" change="979250406" id="N0031" type="General">
       <text>Just for association</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000003e0000003e" change="1" id="N0031" type="Family Note">
+    <note handle="_0000003e0000003e" change="1" id="N0032" type="Family Note">
       <text>Family xref note</text>
     </note>
-    <note handle="_0000003f0000003f" change="979250406" id="N0032" type="Family Note">
+    <note handle="_0000003f0000003f" change="979250406" id="N0033" type="Family Note">
       <text>Family note</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004000000040" change="1" id="N0033" type="Citation">
+    <note handle="_0000004000000040" change="1" id="N0034" type="Citation">
       <text>Citation Data Note</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004100000041" change="1" id="N0034" type="Source text">
+    <note handle="_0000004100000041" change="1" id="N0035" type="Source text">
       <text>A sample text from a source of this family</text>
     </note>
-    <note handle="_0000004200000042" change="979250406" id="N0035" type="Citation">
+    <note handle="_0000004200000042" change="979250406" id="N0036" type="Citation">
       <text>A note this citation is on the FAMILY record.</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004400000044" change="1" id="N0036" type="GEDCOM import">
+    <note handle="_0000004400000044" change="1" id="N0037" type="GEDCOM import">
       <text>Records not imported into FAM (family) Gramps ID F0001:
 
 Line ignored as not understood                                      Line   183: 2 TEST Family Note
@@ -482,41 +492,44 @@ Empty note ignored                                                  Line   187:
 Skipped subordinate line                                            Line   188: 2 TEST Empty Note
 Line ignored as not understood                                      Line   190: 2 TEST citation
 Line ignored as not understood                                      Line   194: 3 TEST Citation Data
-Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note</text>
+Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="645"/>
       </style>
     </note>
-    <note handle="_0000004600000046" change="979250406" id="N0037" type="Repository Reference Note">
+    <note handle="_0000004600000046" change="979250406" id="N0038" type="Repository Reference Note">
       <text>A short note about the repository link.</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004700000047" change="979250406" id="N0038" type="Source Note">
+    <note handle="_0000004700000047" change="979250406" id="N0039" type="Source Note">
       <text>note embedded in the SOURCE Record</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004800000048" change="1" id="N0039" type="GEDCOM import">
+    <note handle="_0000004800000048" change="1" id="N0040" type="GEDCOM import">
       <text>Records not imported into SOUR (source) Gramps ID S0001:
 
 Line ignored as not understood                                      Line   206: 1 TEST source
 Empty note ignored                                                  Line   208: 2 NOTE 
 Skipped subordinate line                                            Line   209: 3 TEST Empty Note
 Empty note ignored                                                  Line   214: 1 NOTE 
-Skipped subordinate line                                            Line   215: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line   215: 2 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="524"/>
       </style>
     </note>
-    <note handle="_0000004900000049" change="1" id="N0040" type="Repository Note">
+    <note handle="_0000004900000049" change="1" id="N0041" type="Repository Note">
       <text>Repository Note</text>
       <tagref hlink="_0000000500000005"/>
     </note>
-    <note handle="_0000004a0000004a" change="1" id="N0041" type="GEDCOM import">
+    <note handle="_0000004a0000004a" change="1" id="N0042" type="GEDCOM import">
       <text>Records not imported into REPO (repository) Gramps ID R0002:
 
 Line ignored as not understood                                      Line   223: 1 TEST Repo
 Empty note ignored                                                  Line   224: 1 NOTE 
-Skipped subordinate line                                            Line   225: 2 TEST Empty Note</text>
+Skipped subordinate line                                            Line   225: 2 TEST Empty Note
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="340"/>
       </style>

data/tests/imp_sample.ged

@@ -50,9 +50,9 @@
 0 @I0@ INDI
 1 NAME Anna /Hansdotter/
 2 GIVN Anna
+2 SURN Hansdotter, Smith
+2 SPFX Vrow, huh
 2 SURN Hansdotter
-2 SPFX Vrow
-2 SURN Smith
 2 _AKA Anna Smith
 2 _AKA Hanna
 2 NOTE Hans daughter? N0000
@@ -83,6 +83,8 @@
 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

data/tests/imp_sample.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-10-24" version="5.0.0-alpha1"/>
+    <created date="1999-12-25" version="5.1.3"/>
     <researcher>
       <resname>Alex Roitman,,,</resname>
       <resaddr>Not Provided</resaddr>
@@ -163,6 +163,7 @@
     </event>
     <event handle="_0000005500000055" change="1" id="E0026">
       <type>Birth</type>
+      <description>No Date Information</description>
     </event>
     <event handle="_0000005600000056" change="1" id="E0027">
       <type>Death</type>
@@ -616,7 +617,8 @@
       <gender>F</gender>
       <name type="Birth Name">
         <first>Anna</first>
-        <surname prefix="Vrow">Smith</surname>
+        <surname prefix="Vrow">Hansdotter</surname>
+        <surname prim="0">Smith</surname>
         <noteref hlink="_0000001100000011"/>
       </name>
       <name alt="1" type="Also Known As">
@@ -1132,7 +1134,7 @@
       <mother hlink="_000000b6000000b6"/>
       <eventref hlink="_000000e3000000e3" role="Family"/>
       <childref hlink="_0000004800000048" mrel="Adopted" frel="Adopted"/>
-      <childref hlink="_0000001900000019"/>
+      <childref hlink="_0000001900000019" mrel="Foster" frel="Adopted"/>
       <childref hlink="_0000007b0000007b" mrel="Adopted" frel="Adopted"/>
       <noteref hlink="_000000e4000000e4"/>
     </family>
@@ -1300,7 +1302,7 @@
       </reporef>
     </source>
     <source handle="_0000008500000085" change="1" id="S0000">
-      <stitle>@S0@</stitle>
+      <stitle>Marriage Certificae</stitle>
       <noteref hlink="_000000e7000000e7"/>
       <reporef hlink="_000000e6000000e6" callno="what-321-ever" medium="Photo"/>
     </source>
@@ -1456,13 +1458,13 @@
       <noteref hlink="_000000f9000000f9"/>
     </object>
     <object handle="_000000d1000000d1" change="1" id="O0001">
-      <file src="Magnes&amp;Anna_smiths_marr_cert.jpg" mime="unknown" description="Magnes&amp;Anna_smiths_marr_cert.jpg"/>
+      <file src="Magnes&amp;Anna_smiths_marr_cert.jpg" mime="image/jpeg" description="Magnes&amp;Anna_smiths_marr_cert.jpg"/>
     </object>
     <object handle="_000000d8000000d8" change="1" id="O0002">
-      <file src="John&amp;Alice_smiths_marr_cert.jpg" mime="unknown" description="John&amp;Alice_smiths_marr_cert.jpg"/>
+      <file src="John&amp;Alice_smiths_marr_cert.jpg" mime="image/jpeg" description="John&amp;Alice_smiths_marr_cert.jpg"/>
     </object>
     <object handle="_000000f1000000f1" change="1" id="O0003">
-      <file src="Attic_photo.jpg" mime="unknown" description="Attic_photo.jpg"/>
+      <file src="Attic_photo.jpg" mime="image/jpeg" description="Attic_photo.jpg"/>
     </object>
   </objects>
   <repositories>
@@ -1506,7 +1508,8 @@
     <note handle="_0000000100000001" change="1" id="N0000" type="GEDCOM import">
       <text>Records not imported into HEAD (header):
 
-GEDCOM FORM not supported                                           Line    14: 2 FORM NOT LINEAGE-LINKED</text>
+GEDCOM FORM not supported                                           Line    14: 2 FORM NOT LINEAGE-LINKED
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="148"/>
       </style>
@@ -1514,7 +1517,8 @@ GEDCOM FORM not supported                                           Line    14:
     <note handle="_0000000200000002" change="1" id="N0001" type="GEDCOM import">
       <text>Records not imported into SUBM (Submitter): (@SUBM@) Alex Roitman,,,:
 
-Line ignored as not understood                                      Line    23: 2 NOTE No address provided (note not supported)</text>
+Line ignored as not understood                                      Line    23: 2 NOTE No address provided (note not supported)
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="199"/>
       </style>
@@ -1523,7 +1527,8 @@ Line ignored as not understood                                      Line    23:
       <text>Records not imported into FAM (family) Gramps ID F0003:
 
 Line ignored as not understood                                      Line    46: 2 SOUR Not really allowed here
-Filename omitted                                                    Line    48: 1 OBJE</text>
+Filename omitted                                                    Line    48: 1 OBJE 
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="256"/>
       </style>
@@ -1561,8 +1566,9 @@ Filename omitted                                                    Line    48:
     <note handle="_0000003d0000003d" change="1" id="N0012" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0016:
 
-Warn: ADDR overwritten                                              Line   204: 3 ADR1 456 Main St again
-ADDR element ignored '459 Main St.'                                 Line   202: 2 ADDR 459 Main St., The Village, San Francisco, CA, USA</text>
+Warn: ADDR overwritten                                              Line   206: 3 ADR1 456 Main St again
+ADDR element ignored '459 Main St.'                                 Line   204: 2 ADDR 459 Main St., The Village, San Francisco, CA, USA
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="304"/>
       </style>
@@ -1573,7 +1579,8 @@ ADDR element ignored '459 Main St.'                                 Line   202:
     <note handle="_0000004700000047" change="1" id="N0014" type="GEDCOM import">
       <text>Records not imported into INDI (individual) Gramps ID I0018:
 
-Tag recognized but not supported                                    Line   245: 2 TYPE first generaton</text>
+Tag recognized but not supported                                    Line   247: 2 TYPE first generaton
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="165"/>
       </style>
@@ -1604,7 +1611,8 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo
     <note handle="_000000cf000000cf" change="1" id="N0021" type="GEDCOM import">
       <text>Records not imported into FAM (family) Gramps ID F0010:
 
-Tag recognized but not supported                                    Line   863: 2 _STAT</text>
+Tag recognized but not supported                                    Line   865: 2 _STAT 
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="146"/>
       </style>
@@ -1612,8 +1620,9 @@ Tag recognized but not supported                                    Line   863:
     <note handle="_000000d4000000d4" change="1" id="N0022" type="GEDCOM import">
       <text>Records not imported into FAM (family) Gramps ID F0011:
 
-Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   878: 3 OBJE 
-Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   881: 2 OBJE</text>
+Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   880: 3 OBJE 
+Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   883: 2 OBJE 
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="233"/>
       </style>
@@ -1621,7 +1630,8 @@ Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   8
     <note handle="_000000d9000000d9" change="1" id="N0023" type="GEDCOM import">
       <text>Records not imported into FAM (family) Gramps ID F0012:
 
-Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   905: 1 OBJE</text>
+Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   907: 1 OBJE 
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="145"/>
       </style>
@@ -1629,7 +1639,8 @@ Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   9
     <note handle="_000000e4000000e4" change="1" id="N0024" type="GEDCOM import">
       <text>Records not imported into FAM (family) Gramps ID F0008:
 
-Tag recognized but not supported                                    Line  1005: 1 ADDR 123 Main st, Grantville, Virginia, USA</text>
+Tag recognized but not supported                                    Line  1007: 1 ADDR 123 Main st, Grantville, Virginia, USA
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="183"/>
       </style>
@@ -1652,8 +1663,9 @@ Tag recognized but not supported                                    Line  1005:
     <note handle="_000000ee000000ee" change="1" id="N0030" type="GEDCOM import">
       <text>Records not imported into SOUR (source) Gramps ID S0003:
 
-Tag recognized but not supported                                    Line  1045: 1 DATA 
-Skipped subordinate line                                            Line  1046: 2 AGNC NYC Public Library</text>
+Tag recognized but not supported                                    Line  1047: 1 DATA 
+Skipped subordinate line                                            Line  1048: 2 AGNC NYC Public Library
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="252"/>
       </style>
@@ -1667,9 +1679,10 @@ Skipped subordinate line                                            Line  1046:
     <note handle="_000000f5000000f5" change="1" id="N0033" type="GEDCOM import">
       <text>Records not imported into REPO (repository) Gramps ID R0003:
 
-REFN ignored                                                        Line  1075: 3 REFN blah blah
-Skipped subordinate line                                            Line  1076: 4 TYPE who knows
-Could not import Attic_photo.jpg                                    Line  1079: 3 OBJE</text>
+REFN ignored                                                        Line  1077: 3 REFN blah blah
+Skipped subordinate line                                            Line  1078: 4 TYPE who knows
+Could not import Attic_photo.jpg                                    Line  1081: 3 OBJE 
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="344"/>
       </style>
@@ -1677,7 +1690,8 @@ Could not import Attic_photo.jpg                                    Line  1079:
     <note handle="_000000f6000000f6" change="1" id="N0034" type="GEDCOM import">
       <text>Records not imported into Top Level:
 
-Unknown tag                                                         Line  1106: 0 XXX an unknown token at level 0</text>
+Unknown tag                                                         Line  1108: 0 XXX an unknown token at level 0
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="152"/>
       </style>
@@ -1685,12 +1699,13 @@ Unknown tag                                                         Line  1106:
     <note handle="_000000f8000000f8" change="1" id="N0035" type="GEDCOM import">
       <text>Records not imported into Top Level:
 
-Unknown tag                                                         Line  1109: 1 @X1@ XXX and unknown token xref definition</text>
+Unknown tag                                                         Line  1111: 1 @X1@ XXX and unknown token xref definition
+</text>
       <style name="fontface" value="Monospace">
         <range start="0" end="163"/>
       </style>
     </note>
-    <note handle="_000000f9000000f9" change="1477325896" id="N0036" type="General">
+    <note handle="_000000f9000000f9" change="1591544255" id="N0036" type="General">
       <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
     </note>
   </notes>

debian/changelog

@@ -1,3 +1,47 @@
+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

debian/control

@@ -10,7 +10,7 @@ Build-Depends-Indep:
  python3-all,
  python3-setuptools,
  python3-nose,
- gir1.2-gtk-3.0 (>= 3.10.0),
+ gir1.2-gtk-3.0 (>= 3.12.0),
  python3-gi (>= 3.12.0),
  python3-gi-cairo,
  python3-bsddb3,
@@ -21,11 +21,10 @@ Build-Depends-Indep:
  python3-nose-exclude
 Build-Depends:
  debhelper (>= 11)
-Standards-Version: 4.1.3
+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/
-X-Python3-Version: >= 3.2
 
 Package: gramps
 Architecture: all
@@ -42,7 +41,9 @@ Recommends:
  graphviz,
  gir1.2-gexiv2-0.10,
  gir1.2-osmgpsmap-1.0,
- python3-icu
+ python3-icu,
+ gir1.2-geocodeglib-1.0,
+ python3-fontconfig
 Suggests:
  fonts-freefont-ttf,
  gir1.2-goocanvas-2.0,

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: Gramps
 Source: https://gramps-project.org
 
 Files: *
-Copyright: 2000-2007, Alex Roitman
+Copyright: 2000-2007, 2020 Alex Roitman
            2000-2002, Bruce J. DeGrasse
            2000-2008, Donald N. Allingham
            2000-2007, Martin Hawlisch
@@ -12,12 +12,12 @@ Copyright: 2000-2007, Alex Roitman
            2001-2017, Free Software Foundation, Inc.
            2001, Graham J. Williams
            2001, Jesper Zedlitz
-           2001-2018, The Gramps Project
+           2001-2019, The Gramps Project
            2002, Gary Shao
            2003-2006, Josiah Carlson
            2004-2006, Eero Tamminen
            2004-2013, Julio Sánchez
-           2005-2017, Serge Noiraud
+           2005-2019, Serge Noiraud
            2006-2012, Brian G. Matherly
            2006, 2008-2011, Kees Bakker           
            2006-2008, Steve Hall
@@ -64,7 +64,7 @@ Copyright: 2000-2007, Alex Roitman
            2011, Helge Herz
            2011, 2013 John Ralls
            2011, 2016 Matt Keenan
-           2011-2017, Paul Franklin
+           2011-2018, Paul Franklin
            2012, lcc
            2012, 2014, Mathieu MD
            2012, Nicolas Adenis-Lamarre
@@ -81,11 +81,17 @@ Copyright: 2000-2007, Alex Roitman
            2015, Detlef Wolz
            2016, Allen Crider
            2016, DaAwesomeP
-           2016-2017, Paul Culley
+           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
 License: GPL-2+
 
 Files: debian/*

docs/conf.py

@@ -57,7 +57,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Gramps'
-copyright = '2001-2018, The Gramps Project'
+copyright = '2001-2019, 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.

example/gramps/data.gramps

@@ -15,7 +15,7 @@
       <resphone>(555)123-4567</resphone>
       <resemail>anyone@someplace.com</resemail>
     </researcher>
-    <mediapath>{GRAMPS_RESOURCES}/example/gramps</mediapath>
+    <mediapath>{GRAMPS_RESOURCES}/doc/gramps/example/gramps</mediapath>
   </header>
   <tags>
     <tag handle="_c7642d9389b54417e8b" change="1370206720" name="tag1" color="#000000000000" priority="0"/>

example/gramps/example.gramps

@@ -3,11 +3,11 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
   <header>
-    <created date="2018-03-08" version="5.0.0"/>
+    <created date="2017-08-08" version="5.1.0"/>
     <researcher>
       <resname>Alex Roitman,,,</resname>
     </researcher>
-    <mediapath>{GRAMPS_RESOURCES}/example/gramps</mediapath>
+    <mediapath>{GRAMPS_RESOURCES}/doc/gramps/example/gramps</mediapath>
   </header>
   <name-formats>
     <format number="-1" name="SURNAME, Given (Common)" fmt_str="SURNAME, given (common)" active="1"/>
@@ -951,7 +951,7 @@
       <place hlink="_L3WJQCD3US67V2CNZT"/>
       <description>Birth of Garner, Anderson</description>
     </event>
-    <event handle="_a5af0eb7dfb557da07e" change="1284030599" id="E0179">
+    <event handle="_a5af0eb7dfb557da07e" change="1502187535" id="E0179">
       <type>Death</type>
       <dateval val="1887-04-07"/>
       <place hlink="_AKFKQC2N4SM243HCTN"/>
@@ -6262,7 +6262,7 @@
       <dateval val="1842-06-28"/>
       <description>Death of Moreno, Joseph McDowell</description>
     </event>
-    <event handle="_a5af0ec45b25c630e03" change="1284030608" id="E1179">
+    <event handle="_a5af0ec45b25c630e03" change="1502187451" id="E1179">
       <type>Birth</type>
       <dateval val="1911-07-12"/>
       <description>Birth of Thornton, James Arthur</description>
@@ -15003,7 +15003,7 @@
       <type>Marriage</type>
       <description>Marriage of Johnson, Henry and Sparks, Catherine</description>
     </event>
-    <event handle="_a5af0ed5df832ee65c1" change="1328026859" id="E2815">
+    <event handle="_a5af0ed5df832ee65c1" change="1502187371" id="E2815">
       <type>Marriage</type>
       <dateval val="1875-04-01"/>
       <place hlink="_RF5KQCNJRQY8OGTX2H"/>
@@ -18649,7 +18649,7 @@
       <parentin hlink="_F4CKQCJZ24JRE9Z889"/>
       <citationref hlink="_c140d2472c91aad494f"/>
     </person>
-    <person handle="_14LKQCYZJEAXTS3XX" change="1185438865" id="I1376">
+    <person handle="_14LKQCYZJEAXTS3XX" change="1502187492" id="I1376">
       <gender>F</gender>
       <name type="Birth Name">
         <first>Elizabeth</first>
@@ -18657,6 +18657,7 @@
       </name>
       <eventref hlink="_a5af0ebb003796f79a0" role="Primary"/>
       <eventref hlink="_a5af0ebb0143dab99ff" role="Primary"/>
+      <eventref hlink="_a5af0eb7dfb557da07e" role="Witness"/>
       <childof hlink="_5IUJQCRJY47YQ8PU7N"/>
       <parentin hlink="_I4LKQCOAGPFH4R90A7"/>
       <citationref hlink="_c140d24731407d57b3c"/>
@@ -19904,7 +19905,7 @@
       <childof hlink="_IO5KQC6H0Q6Y517LR9"/>
       <citationref hlink="_c140d24a1fd2319b703"/>
     </person>
-    <person handle="_35WJQC1B7T7NPV8OLV" change="1284030051" id="I0106">
+    <person handle="_35WJQC1B7T7NPV8OLV" change="1502187260" id="I0106">
       <gender>M</gender>
       <name type="Birth Name">
         <first>Robert W.</first>
@@ -19913,6 +19914,11 @@
       <eventref hlink="_a5af0eb74ac73f86aa7" role="Primary"/>
       <eventref hlink="_a5af0eb74ba358391ae" role="Primary"/>
       <eventref hlink="_a5af0eb74c852f7c633" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Witness">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
       <childof hlink="_X3WJQCSF48F6809142"/>
       <parentin hlink="_8OUJQCUVZ0XML7BQLF"/>
       <citationref hlink="_c140d24a27e19bb381a"/>
@@ -21991,13 +21997,14 @@
       <childof hlink="_GCDKQCHI74ZPMI5GDJ"/>
       <citationref hlink="_c140d24f3f8704aa41b"/>
     </person>
-    <person handle="_6G0KQC2UXYC66XDDC2" change="1185438865" id="I0363">
+    <person handle="_6G0KQC2UXYC66XDDC2" change="1502187537" id="I0363">
       <gender>F</gender>
       <name type="Birth Name">
         <first>Miranda Keziah</first>
         <surname>Farmer</surname>
       </name>
       <eventref hlink="_a5af0ec7a76244d962d" role="Primary"/>
+      <eventref hlink="_a5af0eb7dfb557da07e" role="Witness"/>
       <childof hlink="_8NVJQCGMJTCL7E6ZDV"/>
       <citationref hlink="_c140d24f439709d3118"/>
     </person>
@@ -22989,7 +22996,7 @@
       <parentin hlink="_FBVJQCFBI50TW78O49"/>
       <citationref hlink="_c140d2522702664ec52"/>
     </person>
-    <person handle="_8CLKQCT97PJOGREJ7W" change="1185438865" id="I1387">
+    <person handle="_8CLKQCT97PJOGREJ7W" change="1502187387" id="I1387">
       <gender>M</gender>
       <name type="Birth Name">
         <first>Robert</first>
@@ -22997,6 +23004,11 @@
       </name>
       <eventref hlink="_a5af0ebb3737a6ad088" role="Primary"/>
       <eventref hlink="_a5af0ebb39b441e9607" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Clergy">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
       <childof hlink="_5IUJQCRJY47YQ8PU7N"/>
       <parentin hlink="_H6LKQCWVIFNRNGHFVH"/>
       <citationref hlink="_c140d2522d804491375"/>
@@ -23803,7 +23815,7 @@
       <childof hlink="_5DBKQCVAB0XMBEW8R9"/>
       <citationref hlink="_c140d25425874b0b827"/>
     </person>
-    <person handle="_9HUJQC6ONNW8SMSKGQ" change="1185438865" id="I0038">
+    <person handle="_9HUJQC6ONNW8SMSKGQ" change="1502187526" id="I0038">
       <gender>M</gender>
       <name type="Birth Name">
         <first>David</first>
@@ -23812,6 +23824,7 @@
       <eventref hlink="_a5af0ec7eb514c52fbf" role="Primary"/>
       <eventref hlink="_a5af0ec7ec844213b55" role="Primary"/>
       <eventref hlink="_a5af0ec7ed61c743fc8" role="Primary"/>
+      <eventref hlink="_a5af0eb7dfb557da07e" role="Informant"/>
       <childof hlink="_5IUJQCRJY47YQ8PU7N"/>
       <parentin hlink="_3HUJQCK4DH582YUTZG"/>
       <citationref hlink="_c140d2542c764516f13"/>
@@ -24506,7 +24519,7 @@
       <parentin hlink="_8NVJQCGMJTCL7E6ZDV"/>
       <citationref hlink="_c140d2560004fad8df6"/>
     </person>
-    <person handle="_ANLKQCQSQNE5LDZMRC" change="1185438865" id="I1402">
+    <person handle="_ANLKQCQSQNE5LDZMRC" change="1502187434" id="I1402">
       <gender>F</gender>
       <name type="Birth Name">
         <first>Margaret Jane &quot;Maggie&quot;</first>
@@ -24514,6 +24527,7 @@
       </name>
       <eventref hlink="_a5af0ebb7d47a006ee2" role="Primary"/>
       <eventref hlink="_a5af0ebb7e54e14970f" role="Primary"/>
+      <eventref hlink="_a5af0ec45b25c630e03" role="Witness"/>
       <childof hlink="_VDLKQCQQ1ADTJG1D1F"/>
       <parentin hlink="_SNLKQCD0VNJ627062Y"/>
       <citationref hlink="_c140d25607213be35da"/>
@@ -24882,13 +24896,18 @@
       <parentin hlink="_JFYJQCG2KLRQN835JD"/>
       <citationref hlink="_c140d256e3403ba129d"/>
     </person>
-    <person handle="_B3BKQCSV0G3NKSKWDX" change="1185438865" id="I0880">
+    <person handle="_B3BKQCSV0G3NKSKWDX" change="1502187344" id="I0880">
       <gender>F</gender>
       <name type="Birth Name">
         <first>L. J.</first>
         <surname>Blanco</surname>
       </name>
       <eventref hlink="_a5af0ed2cf617169903" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Clergy">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
       <childof hlink="_1BVJQCNTFAGS8273LJ"/>
       <citationref hlink="_c140d256ec4306a51ca"/>
     </person>
@@ -31930,7 +31949,7 @@
       <childof hlink="_UDMKQC5D3A2PXPUGNC"/>
       <citationref hlink="_c140d266ec93334f40f"/>
     </person>
-    <person handle="_MG5KQC6ZKSVO4A63G2" change="1328026883" id="I0624">
+    <person handle="_MG5KQC6ZKSVO4A63G2" change="1502187451" id="I0624">
       <gender>M</gender>
       <name type="Birth Name">
         <first>Raymond E.</first>
@@ -31938,6 +31957,7 @@
       </name>
       <eventref hlink="_a5af0ece8bd1125a1a9" role="Primary"/>
       <eventref hlink="_a5af0ece8d15511ddf9" role="Primary"/>
+      <eventref hlink="_a5af0ec45b25c630e03" role="Informant"/>
       <childof hlink="_9OUJQCBOHW9UEK9CNV"/>
       <citationref hlink="_c140d266f0d5d178784"/>
     </person>
@@ -32336,7 +32356,7 @@
       <parentin hlink="_F4CKQCJZ24JRE9Z889"/>
       <citationref hlink="_c140d267ccb7aef0cd0"/>
     </person>
-    <person handle="_N4DKQCPEMZ7OO62O7J" change="1185438865" id="I0975">
+    <person handle="_N4DKQCPEMZ7OO62O7J" change="1502187308" id="I0975">
       <gender>M</gender>
       <name type="Birth Name">
         <first>Henry</first>
@@ -32345,6 +32365,11 @@
       <eventref hlink="_a5af0ed483738d4ed1e" role="Primary"/>
       <eventref hlink="_a5af0ed484a144d229b" role="Primary"/>
       <eventref hlink="_a5af0ed48605fb6b9eb" role="Primary"/>
+      <eventref hlink="_a5af0ed5df832ee65c1" role="Witness">
+        <attribute type="Age" value="23">
+          <citationref hlink="_c140dafeb317af2fd79"/>
+        </attribute>
+      </eventref>
       <parentin hlink="_7PUJQC4PPS4EDIVMYE"/>
       <citationref hlink="_c140d267d2128356d8e"/>
     </person>

gramps/cli/arghandler.py

@@ -47,6 +47,7 @@ from gramps.gen.recentfiles import recent_files
 from gramps.gen.utils.file import rm_tempdir, get_empty_tempdir
 from .clidbman import CLIDbManager, NAME_FILE, find_locker_name
 from gramps.gen.db.utils import make_database
+from gramps.gen.db.dbconst import DBBACKEND
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE, BookList
 from .plug import cl_report, cl_book
@@ -504,6 +505,9 @@ class ArgHandler:
                     self.imp_db_path = get_empty_tempdir("import_dbdir")
                     dbid = config.get('database.backend')
                     newdb = make_database(dbid)
+                    versionpath = os.path.join(self.imp_db_path, str(DBBACKEND))
+                    with open(versionpath, "w") as version_file:
+                        version_file.write(dbid)
 
                 try:
                     self.smgr.open_activate(self.imp_db_path, self.username, self.password)
@@ -619,8 +623,8 @@ class ArgHandler:
                             #import of plugin failed
                             return
                         category = pdata.category
-                        report_class = eval('mod.' + pdata.reportclass)
-                        options_class = eval('mod.' + pdata.optionclass)
+                        report_class = getattr(mod, pdata.reportclass)
+                        options_class = getattr(mod, pdata.optionclass)
                         if category in (CATEGORY_BOOK, CATEGORY_CODE):
                             options_class(self.dbstate.db, name, category,
                                           options_str_dict)
@@ -668,8 +672,8 @@ class ArgHandler:
                             #import of plugin failed
                             return
                         category = pdata.category
-                        tool_class = eval('mod.' + pdata.toolclass)
-                        options_class = eval('mod.' + pdata.optionclass)
+                        tool_class = getattr(mod, pdata.toolclass)
+                        options_class = getattr(mod, pdata.optionclass)
                         tool.cli_tool(dbstate=self.dbstate,
                                       name=name,
                                       category=category,

gramps/cli/argparser.py

@@ -39,15 +39,16 @@ import sys
 import os
 import getopt
 import logging
+import shutil
+from glob import glob
 
 #-------------------------------------------------------------------------
 #
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from gramps.gen.const import LONGOPTS, SHORTOPTS, PLUGINS_DIR, USER_PLUGINS
-from gramps.gen.plug import BasePluginManager
-from gramps.gen.config import config
+from gramps.gen.const import (LONGOPTS, SHORTOPTS, USER_PLUGINS, VERSION_DIR,
+                              HOME_DIR, TEMP_DIR, THUMB_DIR, ENV_DIR, USER_CSS)
 from gramps.gen.utils.cast import get_type_converter
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
@@ -81,6 +82,14 @@ Application options
   -y, --yes                              Don't ask to confirm dangerous actions (non-GUI mode only)
   -q, --quiet                            Suppress progress indication output (non-GUI mode only)
   -v, --version                          Show versions
+  -S, --safe                             Start Gramps in 'Safe mode'
+                                          (temporarily use default settings)
+  -D, --default=[APXFE]                  Reset settings to default;
+                 A - addons are cleared
+                 P - Preferences to default
+                 X - Books are cleared, reports and tool settings to default
+                 F - filters are cleared
+                 E - Everything is set to default or cleared
 """)
 
 _USAGE = _("""
@@ -342,6 +351,7 @@ class ArgParser:
             elif option in ['-t']:
                 self.list_table = True
             elif option in ['-s', '--show']:
+                from gramps.gen.config import config
                 print(_("Gramps config settings from %s:"
                        ) % config.filename)
                 for sect in config.data:
@@ -351,6 +361,7 @@ class ArgParser:
                     print()
                 sys.exit(0)
             elif option in ['-c', '--config']:
+                from gramps.gen.config import config
                 cfg_name = value
                 set_value = False
                 if cfg_name:
@@ -396,6 +407,44 @@ class ArgParser:
                 self.auto_accept = True
             elif option in ['-q', '--quiet']:
                 self.quiet = True
+            elif option in ['-S', '--safe']:
+                cleandbg += [opt_ix]
+            elif option in ['-D', '--default']:
+                def rmtree(path):
+                    if os.path.isdir(path):
+                        shutil.rmtree(path, ignore_errors=True)
+
+                if 'E' in value or 'A' in value:  # clear addons
+                    rmtree(USER_PLUGINS)
+                if 'E' in value or 'P' in value:  # clear ini preferences
+                    for fil in glob(os.path.join(VERSION_DIR, "*.*")):
+                        if "custom_filters.xml" in fil:
+                            continue
+                        os.remove(fil)
+                    # create gramps.ini so config won't load the one from an
+                    # older version of Gramps.
+                    with open(os.path.join(VERSION_DIR, 'gramps.ini'), 'w'):
+                        pass
+                if 'E' in value or 'F' in value:  # clear filters
+                    fil = os.path.join(VERSION_DIR, "custom_filters.xml")
+                    if os.path.isfile(fil):
+                        os.remove(fil)
+                if 'E' in value or 'X' in value:  # clear xml reports/tools
+                    for fil in glob(os.path.join(HOME_DIR, "*.xml")):
+                        os.remove(fil)
+                if 'E' in value or 'Z' in value:  # clear upgrade zips
+                    for fil in glob(os.path.join(HOME_DIR, "*.zip")):
+                        os.remove(fil)
+                if 'E' in value:  # Everything else
+                    rmtree(TEMP_DIR)
+                    rmtree(THUMB_DIR)
+                    rmtree(USER_CSS)
+                    rmtree(ENV_DIR)
+                    rmtree(os.path.join(HOME_DIR, "maps"))
+                    for fil in glob(os.path.join(HOME_DIR, "*")):
+                        if os.path.isfile(fil):
+                            os.remove(fil)
+                sys.exit(0)  # Done with Default
 
         #clean options list
         cleandbg.reverse()

gramps/cli/grampscli.py

@@ -64,6 +64,7 @@ from gramps.gen.db.exceptions import (DbUpgradeRequiredError,
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.utils.config import get_researcher
 from gramps.gen.recentfiles import recent_files
+from gramps.gen.filters import reload_custom_filters
 
 #-------------------------------------------------------------------------
 #
@@ -279,7 +280,7 @@ class CLIManager:
             # Attempt to figure out the database title
             path = os.path.join(filename, "name.txt")
             try:
-                with open(path) as ifile:
+                with open(path, encoding='utf8') as ifile:
                     title = ifile.readline().strip()
             except:
                 title = filename
@@ -373,6 +374,7 @@ def startcli(errors, argparser):
 
     #load the plugins
     climanager.do_reg_plugins(dbstate, uistate=None)
+    reload_custom_filters()
     # handle the arguments
     from .arghandler import ArgHandler
     handler = ArgHandler(dbstate, argparser, climanager)

gramps/cli/plug/__init__.py

@@ -88,9 +88,9 @@ def _convert_str_to_match_type(str_val, type_val):
             return str(str_val)
 
     elif ret_type == int:
-        if str_val.isdigit():
+        try:
             return int(str_val)
-        else:
+        except ValueError:
             print("'%s' is not an integer number" % str_val)
             return 0
 
@@ -519,8 +519,8 @@ class CommandLineReport:
                         self.format = tree_format["class"]
             if self.format is None:
                 # Pick the first one as the default.
-                self.format = tree_format.FORMATS[0]["class"]
-                _chosen_format = tree_format.FORMATS[0]["type"]
+                self.format = treedoc.FORMATS[0]["class"]
+                _chosen_format = treedoc.FORMATS[0]["type"]
         else:
             self.format = None
         if _chosen_format and _format_str:

gramps/gen/config.py

@@ -6,6 +6,7 @@
 # Copyright (C) 2008-2009  Gary Burton
 # Copyright (C) 2009-2012  Doug Blank <doug.blank@gmail.com>
 # Copyright (C) 2011       Tim G L Lyons
+# Copyright (C) 2015-      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
@@ -148,6 +149,7 @@ register('behavior.min-generation-years', 13)
 register('behavior.owner-warn', False)
 register('behavior.pop-plugin-status', False)
 register('behavior.recent-export-type', 3)
+register('behavior.runcheck', False)
 register('behavior.spellcheck', False)
 register('behavior.startup', 0)
 register('behavior.surname-guessing', 0)
@@ -155,9 +157,9 @@ register('behavior.translator-needed', True)
 register('behavior.use-tips', False)
 register('behavior.welcome', 100)
 register('behavior.web-search-url', 'http://google.com/#&q=%(text)s')
-register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps50")
+register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps51")
 
-register('database.backend', 'bsddb')
+register('database.backend', 'sqlite')
 register('database.compress-backup', True)
 register('database.backup-path', USER_HOME)
 register('database.backup-on-exit', True)
@@ -217,6 +219,7 @@ register('interface.sidebar-text', True)
 register('interface.size-checked', False)
 register('interface.statusbar', 1)
 register('interface.toolbar-on', True)
+register('interface.toolbar-text', False)
 register('interface.view', True)
 register('interface.surname-box-height', 150)
 register('interface.treemodel-cache-size', 1000)
@@ -228,6 +231,8 @@ register('paths.report-directory', USER_HOME)
 register('paths.website-directory', USER_HOME)
 register('paths.website-cms-uri', '')
 register('paths.website-cal-uri', '')
+register('paths.website-extra-page-uri', '')
+register('paths.website-extra-page-name', '')
 register('paths.quick-backup-directory', USER_HOME)
 register('paths.quick-backup-filename',
          "%(filename)s_%(year)d-%(month)02d-%(day)02d.%(extension)s")
@@ -236,7 +241,6 @@ register('preferences.quick-backup-include-mode', False)
 register('preferences.date-format', 0)
 register('preferences.calendar-format-report', 0)
 register('preferences.cprefix', 'C%04d')
-register('preferences.alternate-fonthandler', False)
 register('preferences.default-source', False)
 register('preferences.tag-on-import', False)
 register('preferences.tag-on-import-format', _("Imported %Y/%m/%d %H:%M:%S"))
@@ -278,6 +282,10 @@ register('colors.female-dead', ['#feccf0', '#3a292b'])
 register('colors.unknown-alive', ['#f3dbb6', '#75507B'])
 register('colors.unknown-dead', ['#f3dbb6', '#35103b'])
 register('colors.family', ['#eeeeee', '#454545'])
+register('colors.family-married', ['#eeeeee', '#454545'])
+register('colors.family-unmarried', ['#eeeeee', '#454545'])
+register('colors.family-civil-union', ['#eeeeee', '#454545'])
+register('colors.family-unknown', ['#eeeeee', '#454545'])
 register('colors.family-divorced', ['#ffdede', '#5c3636'])
 register('colors.home-person', ['#bbe68a', '#304918'])
 register('colors.border-male-alive', ['#1f4986', '#171d26'])
@@ -302,6 +310,11 @@ register('researcher.researcher-state', '')
 register('plugin.hiddenplugins', [])
 register('plugin.addonplugins', [])
 
+register('utf8.in-use', False)
+register('utf8.available-fonts', [])
+register('utf8.selected-font', "")
+register('utf8.death-symbol', 13)
+
 if __debug__: # enable a simple CLI test to see if the datestrings exist
     register('test.january', _("localized lexeme inflections||January"))
 

gramps/gen/const.py

@@ -104,6 +104,13 @@ elif 'USERPROFILE' in os.environ:
 else:
     USER_HOME = get_env_var('HOME')
     HOME_DIR = os.path.join(USER_HOME, '.gramps')
+ORIG_HOME_DIR = HOME_DIR
+if 'SAFEMODE' in os.environ:
+    if 'USERPROFILE' in os.environ:
+        USER_HOME = get_env_var('USERPROFILE')
+    else:
+        USER_HOME = get_env_var('HOME')
+    HOME_DIR = get_env_var('SAFEMODE')
 
 
 VERSION_DIR = os.path.join(
@@ -138,7 +145,8 @@ sys.path.insert(0, ROOT_DIR)
 git_revision = get_git_revision(ROOT_DIR).replace('\n', '')
 if sys.platform == 'win32' and git_revision == "":
     git_revision = get_git_revision(os.path.split(ROOT_DIR)[1])
-#VERSION += git_revision
+VERSION += git_revision
+#VERSION += "-1"
 
 #
 # Glade files
@@ -217,7 +225,7 @@ GTK_GETTEXT_DOMAIN = 'gtk30'
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG = "© 2001-2006 Donald N. Allingham\n" \
-                "© 2007-2018 The Gramps Developers"
+                "© 2007-2020 The Gramps Developers"
 COMMENTS = _("Gramps\n (Genealogical Research and Analysis "
              "Management Programming System)\n"
              "is a personal genealogy program.")
@@ -266,6 +274,7 @@ LONGOPTS = [
     "class=",
     "config=",
     "debug=",
+    "default=",
     "display=",
     "disable-sound",
     "disable-crash-dialog",
@@ -293,6 +302,7 @@ LONGOPTS = [
     "password=",
     "create=",
     "options=",
+    "safe",
     "screen=",
     "show",
     "sm-client-id=",
@@ -306,7 +316,7 @@ LONGOPTS = [
     "quiet",
 ]
 
-SHORTOPTS = "O:U:P:C:i:e:f:a:p:d:c:r:lLthuv?syq"
+SHORTOPTS = "O:U:P:C:i:e:f:a:p:d:c:r:lLthuv?syqSD:"
 
 GRAMPS_UUID = uuid.UUID('516cd010-5a41-470f-99f8-eb22f1098ad6')
 

gramps/gen/datehandler/__init__.py

@@ -35,6 +35,7 @@ import logging
 # Gramps modules
 #
 #-------------------------------------------------------------------------
+from ..utils.grampslocale import GrampsLocale
 from ..const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
 # import prerequisites for localized handlers
@@ -72,16 +73,20 @@ from . import _date_uk
 from . import _date_zh_CN
 from . import _date_zh_TW
 
+# the following makes sure we use the LC_TIME value for date display & parsing
+dlocale = GrampsLocale(lang=glocale.calendar)
+
+
 # Initialize global parser
 try:
     if LANG in LANG_TO_PARSER:
-        parser = LANG_TO_PARSER[LANG](plocale=glocale)
+        parser = LANG_TO_PARSER[LANG](plocale=dlocale)
     else:
-        parser = LANG_TO_PARSER[LANG_SHORT](plocale=glocale)
+        parser = LANG_TO_PARSER[LANG_SHORT](plocale=dlocale)
 except:
     logging.warning(
         _("Date parser for '%s' not available, using default") % LANG)
-    parser = LANG_TO_PARSER["C"](plocale=glocale)
+    parser = LANG_TO_PARSER["C"](plocale=dlocale)
 
 # Initialize global displayer
 try:
@@ -92,13 +97,13 @@ except:
 
 try:
     if LANG in LANG_TO_DISPLAY:
-        displayer = LANG_TO_DISPLAY[LANG](val, blocale=glocale)
+        displayer = LANG_TO_DISPLAY[LANG](val, blocale=dlocale)
     else:
-        displayer = LANG_TO_DISPLAY[LANG_SHORT](val, blocale=glocale)
+        displayer = LANG_TO_DISPLAY[LANG_SHORT](val, blocale=dlocale)
 except:
     logging.warning(
         _("Date displayer for '%s' not available, using default") % LANG)
-    displayer = LANG_TO_DISPLAY["C"](val, blocale=glocale)
+    displayer = LANG_TO_DISPLAY["C"](val, blocale=dlocale)
 
 
 # Import utility functions

gramps/gen/datehandler/_date_cs.py

@@ -50,6 +50,15 @@ class DateParserCZ(DateParser):
     Converts a text string into a Date object
     """
 
+    quality_to_int = {
+        'přibližně'  : Date.QUAL_ESTIMATED,
+        'odhadem'    : Date.QUAL_ESTIMATED,
+        'odh.'       : Date.QUAL_ESTIMATED,
+        'vypočteno'  : Date.QUAL_CALCULATED,
+        'vypočtené'  : Date.QUAL_CALCULATED,
+        'vyp.'       : Date.QUAL_CALCULATED,
+    }
+
     bce = ["před naším letopočtem", "před Kristem",
            "př. n. l.", "př. Kr."] + DateParser.bce
 
@@ -58,6 +67,17 @@ class DateParserCZ(DateParser):
         # bug 9739 grampslocale.py gets '%-d.%-m.%Y' -- makes it be '%/d.%/m.%Y'
         self.dhformat = self.dhformat.replace('/', '') # so counteract that
 
+    def init_strings(self):
+        DateParser.init_strings(self)
+        self._text2 = re.compile(r'(\d+)?\.?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$'
+                                 % self._mon_str, re.IGNORECASE)
+        self._span = re.compile(
+            r"(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)",
+            re.IGNORECASE)
+        self._range = re.compile(
+            r"(mezi)\s+(?P<start>.+)\s+(a)\s+(?P<stop>.+)",
+            re.IGNORECASE)
+
 #-------------------------------------------------------------------------
 #
 # Czech display

gramps/gen/datehandler/_date_de.py

@@ -51,9 +51,9 @@ class DateParserDE(DateParser):
     # Always add german and austrian name variants no matter what the current
     # locale is
     month_to_int["januar"] = 1
-    month_to_int["jan"]    = 1
+    month_to_int["jan"] = 1
     month_to_int["jänner"] = 1
-    month_to_int["jän"]    = 1
+    month_to_int["jän"] = 1
 
     # Add other common latin,
 
@@ -121,14 +121,14 @@ class DateParserDE(DateParser):
     # local and historical variants
 
     month_to_int["jenner"] = 1
-    month_to_int["feber"]  = 2
-    month_to_int["merz"]  = 3
-    month_to_int["augst"]  = 8
-    month_to_int["7ber"]  = 9
-    month_to_int["8ber"]  = 10
-    month_to_int["9ber"]  = 11
-    month_to_int["10ber"]  = 12
-    month_to_int["xber"]  = 12
+    month_to_int["feber"] = 2
+    month_to_int["merz"] = 3
+    month_to_int["augst"] = 8
+    month_to_int["7ber"] = 9
+    month_to_int["8ber"] = 10
+    month_to_int["9ber"] = 11
+    month_to_int["10ber"] = 12
+    month_to_int["xber"] = 12
 
     # old german names
 

gramps/gen/datehandler/_date_hu.py

@@ -55,7 +55,7 @@ class DateParserHU(DateParser):
     month_to_int["-"]=0   #to make the Zero month to work
 
     month_to_int["január"] = 1
-    month_to_int["jan"]    = 1
+    month_to_int["jan"] = 1
     month_to_int["jan."] = 1
     month_to_int["I"] = 1
 #    month_to_int["i"] = 1
@@ -64,67 +64,67 @@ class DateParserHU(DateParser):
     month_to_int["feb"] = 2
     month_to_int["feb."] = 2
     month_to_int["II"] = 2
-#    month_to_int["ii"]  = 2
+#    month_to_int["ii"] = 2
 
     month_to_int["március"] = 3
     month_to_int["márc"] = 3
     month_to_int["márc."] = 3
     month_to_int["III"] = 3
-#    month_to_int["iii"]  = 3
+#    month_to_int["iii"] = 3
 
     month_to_int["április"] = 4
     month_to_int["ápr"] = 4
     month_to_int["ápr."] = 4
-    month_to_int["IV"]  = 4
-#    month_to_int["iv"]  = 4
+    month_to_int["IV"] = 4
+#    month_to_int["iv"] = 4
 
     month_to_int["május"] = 5
     month_to_int["máj"] = 5
     month_to_int["máj."] = 5
-    month_to_int["V"]  = 5
-#    month_to_int["v"]  = 5
+    month_to_int["V"] = 5
+#    month_to_int["v"] = 5
 
     month_to_int["június"] = 6
     month_to_int["jún"] = 6
     month_to_int["jún."] = 6
-    month_to_int["VI"]  = 6
-#    month_to_int["vi"]  = 6
+    month_to_int["VI"] = 6
+#    month_to_int["vi"] = 6
 
-    month_to_int["július"]  = 7
-    month_to_int["júl"]  = 7
-    month_to_int["júl."]  = 7
-    month_to_int["VII"]  = 7
-#    month_to_int["vii"]  = 7
+    month_to_int["július"] = 7
+    month_to_int["júl"] = 7
+    month_to_int["júl."] = 7
+    month_to_int["VII"] = 7
+#    month_to_int["vii"] = 7
 
-    month_to_int["augusztus"]  = 8
-    month_to_int["aug"]  = 8
-    month_to_int["aug."]  = 8
-    month_to_int["VIII"]  = 8
-#    month_to_int["viii"]  = 8
+    month_to_int["augusztus"] = 8
+    month_to_int["aug"] = 8
+    month_to_int["aug."] = 8
+    month_to_int["VIII"] = 8
+#    month_to_int["viii"] = 8
 
-    month_to_int["szeptember"]  = 9
-    month_to_int["szept"]  = 9
+    month_to_int["szeptember"] = 9
+    month_to_int["szept"] = 9
     month_to_int["szept."] = 9
-    month_to_int["IX"]  = 9
-#    month_to_int["ix"]  = 9
+    month_to_int["IX"] = 9
+#    month_to_int["ix"] = 9
 
-    month_to_int["október"]  = 10
-    month_to_int["okt"]  = 10
-    month_to_int["okt."]  = 10
-    month_to_int["X"]  = 10
-#    month_to_int["x"]  = 10
+    month_to_int["október"] = 10
+    month_to_int["okt"] = 10
+    month_to_int["okt."] = 10
+    month_to_int["X"] = 10
+#    month_to_int["x"] = 10
 
-    month_to_int["november"]  = 11
-    month_to_int["nov"]  = 11
+    month_to_int["november"] = 11
+    month_to_int["nov"] = 11
     month_to_int["nov."] = 11
-    month_to_int["XI"]  = 11
-#    month_to_int["xi"]  = 11
+    month_to_int["XI"] = 11
+#    month_to_int["xi"] = 11
 
-    month_to_int["december"]  = 12
-    month_to_int["dec"]  = 12
-    month_to_int["dec."]  = 12
-    month_to_int["XII"]  = 12
-#    month_to_int["xii"]  = 12
+    month_to_int["december"] = 12
+    month_to_int["dec"] = 12
+    month_to_int["dec."] = 12
+    month_to_int["XII"] = 12
+#    month_to_int["xii"] = 12
 
 
 #-----------------------------------------------------------------------

gramps/gen/datehandler/_date_nl.py

@@ -57,30 +57,30 @@ class DateParserNL(DateParser):
     # Always add dutch and flemish name variants
     # no matter what the current locale is
     month_to_int["januari"] = 1
-    month_to_int["jan"]    = 1
+    month_to_int["jan"] = 1
     # Add other common latin, local and historical variants
     month_to_int["januaris"] = 1
-    month_to_int["feber"]  = 2
-    month_to_int["februaris"]  = 2
-    month_to_int["merz"]  = 3
+    month_to_int["feber"] = 2
+    month_to_int["februaris"] = 2
+    month_to_int["merz"] = 3
     #make sure on all distro mrt and maa are accepted
-    month_to_int["maa"]  = 3
-    month_to_int["mrt"]  = 3
-    month_to_int["aprilis"]  = 4
-    month_to_int["maius"]  = 5
-    month_to_int["junius"]  = 6
-    month_to_int["julius"]  = 7
-    month_to_int["augst"]  = 8
-    month_to_int["7ber"]  = 9
-    month_to_int["7bris"]  = 9
-    month_to_int["8ber"]  = 10
-    month_to_int["8bris"]  = 10
-    month_to_int["9ber"]  = 11
-    month_to_int["9bris"]  = 11
-    month_to_int["10ber"]  = 12
-    month_to_int["10bris"]  = 12
-    month_to_int["xber"]  = 12
-    month_to_int["xbris"]  = 12
+    month_to_int["maa"] = 3
+    month_to_int["mrt"] = 3
+    month_to_int["aprilis"] = 4
+    month_to_int["maius"] = 5
+    month_to_int["junius"] = 6
+    month_to_int["julius"] = 7
+    month_to_int["augst"] = 8
+    month_to_int["7ber"] = 9
+    month_to_int["7bris"] = 9
+    month_to_int["8ber"] = 10
+    month_to_int["8bris"] = 10
+    month_to_int["9ber"] = 11
+    month_to_int["9bris"] = 11
+    month_to_int["10ber"] = 12
+    month_to_int["10bris"] = 12
+    month_to_int["xber"] = 12
+    month_to_int["xbris"] = 12
 
     modifier_to_int = {
         'voor'    : Date.MOD_BEFORE,

gramps/gen/datehandler/_date_pl.py

@@ -54,38 +54,38 @@ class DateParserPL(DateParser):
     month_to_int["styczeń"] = 1
     month_to_int["sty"] = 1
     month_to_int["I"] = 1
-    month_to_int["luty"]  = 2
-    month_to_int["lut"]  = 2
-    month_to_int["II"]  = 2
-    month_to_int["marzec"]  = 3
-    month_to_int["mar"]  = 3
-    month_to_int["III"]  = 3
-    month_to_int["kwiecień"]  = 4
-    month_to_int["kwi"]  = 4
-    month_to_int["IV"]  = 4
-    month_to_int["maj"]  = 5
-    month_to_int["V"]  = 5
-    month_to_int["czerwiec"]  = 6
-    month_to_int["cze"]  = 6
-    month_to_int["VI"]  = 6
-    month_to_int["lipiec"]  = 7
-    month_to_int["lip"]  = 7
-    month_to_int["VII"]  = 7
-    month_to_int["sierpień"]  = 8
-    month_to_int["sie"]  = 8
-    month_to_int["VIII"]  = 8
-    month_to_int["wrzesień"]  = 9
-    month_to_int["wrz"]  = 9
-    month_to_int["IX"]  = 9
-    month_to_int["październik"]  = 10
-    month_to_int["paź"]  = 10
-    month_to_int["X"]  = 10
-    month_to_int["listopad"]  = 11
-    month_to_int["lis"]  = 11
-    month_to_int["XI"]  = 11
-    month_to_int["grudzień"]  = 12
-    month_to_int["gru"]  = 12
-    month_to_int["XII"]  = 12
+    month_to_int["luty"] = 2
+    month_to_int["lut"] = 2
+    month_to_int["II"] = 2
+    month_to_int["marzec"] = 3
+    month_to_int["mar"] = 3
+    month_to_int["III"] = 3
+    month_to_int["kwiecień"] = 4
+    month_to_int["kwi"] = 4
+    month_to_int["IV"] = 4
+    month_to_int["maj"] = 5
+    month_to_int["V"] = 5
+    month_to_int["czerwiec"] = 6
+    month_to_int["cze"] = 6
+    month_to_int["VI"] = 6
+    month_to_int["lipiec"] = 7
+    month_to_int["lip"] = 7
+    month_to_int["VII"] = 7
+    month_to_int["sierpień"] = 8
+    month_to_int["sie"] = 8
+    month_to_int["VIII"] = 8
+    month_to_int["wrzesień"] = 9
+    month_to_int["wrz"] = 9
+    month_to_int["IX"] = 9
+    month_to_int["październik"] = 10
+    month_to_int["paź"] = 10
+    month_to_int["X"] = 10
+    month_to_int["listopad"] = 11
+    month_to_int["lis"] = 11
+    month_to_int["XI"] = 11
+    month_to_int["grudzień"] = 12
+    month_to_int["gru"] = 12
+    month_to_int["XII"] = 12
     # Alternative forms: declined nouns
     month_to_int["stycznia"] = 1
     month_to_int["lutego"] = 2

gramps/gen/datehandler/_date_sr.py

@@ -54,95 +54,95 @@ class DateParserSR(DateParser):
     """
     month_to_int = DateParser.month_to_int
 
-    month_to_int["januar"]  = 1
+    month_to_int["januar"] = 1
     month_to_int["januara"] = 1
-    month_to_int["jan"]     = 1
-    month_to_int["јан"]     = 1
+    month_to_int["jan"] = 1
+    month_to_int["јан"] = 1
     month_to_int["јануара"] = 1
-    month_to_int["јануар"]  = 1
-    month_to_int["i"]       = 1
+    month_to_int["јануар"] = 1
+    month_to_int["i"] = 1
 
-    month_to_int["februar"]  = 2
+    month_to_int["februar"] = 2
     month_to_int["februara"] = 2
-    month_to_int["feb"]      = 2
-    month_to_int["феб"]      = 2
-    month_to_int["фебруар"]  = 2
+    month_to_int["feb"] = 2
+    month_to_int["феб"] = 2
+    month_to_int["фебруар"] = 2
     month_to_int["фебруара"] = 2
-    month_to_int["ii"]       = 2
+    month_to_int["ii"] = 2
 
-    month_to_int["mart"]  = 3
+    month_to_int["mart"] = 3
     month_to_int["marta"] = 3
-    month_to_int["mar"]   = 3
-    month_to_int["мар"]   = 3
-    month_to_int["март"]  = 3
+    month_to_int["mar"] = 3
+    month_to_int["мар"] = 3
+    month_to_int["март"] = 3
     month_to_int["марта"] = 3
-    month_to_int["iii"]   = 3
+    month_to_int["iii"] = 3
 
-    month_to_int["april"]  = 4
+    month_to_int["april"] = 4
     month_to_int["aprila"] = 4
-    month_to_int["apr"]    = 4
-    month_to_int["апр"]    = 4
-    month_to_int["април"]  = 4
+    month_to_int["apr"] = 4
+    month_to_int["апр"] = 4
+    month_to_int["април"] = 4
     month_to_int["априла"] = 4
-    month_to_int["iv"]     = 4
+    month_to_int["iv"] = 4
 
-    month_to_int["maj"]  = 5
+    month_to_int["maj"] = 5
     month_to_int["maja"] = 5
-    month_to_int["мај"]  = 5
+    month_to_int["мај"] = 5
     month_to_int["маја"] = 5
-    month_to_int["v"]    = 5
+    month_to_int["v"] = 5
 
-    month_to_int["jun"]  = 6
+    month_to_int["jun"] = 6
     month_to_int["juna"] = 6
-    month_to_int["јун"]  = 6
+    month_to_int["јун"] = 6
     month_to_int["јуна"] = 6
-    month_to_int["vi"]   = 6
+    month_to_int["vi"] = 6
 
-    month_to_int["jul"]  = 7
+    month_to_int["jul"] = 7
     month_to_int["jula"] = 7
-    month_to_int["јул"]  = 7
+    month_to_int["јул"] = 7
     month_to_int["јула"] = 7
-    month_to_int["vii"]  = 7
+    month_to_int["vii"] = 7
 
-    month_to_int["avgust"]  = 8
+    month_to_int["avgust"] = 8
     month_to_int["avgusta"] = 8
-    month_to_int["avg"]     = 8
-    month_to_int["авг"]     = 8
-    month_to_int["август"]  = 8
+    month_to_int["avg"] = 8
+    month_to_int["авг"] = 8
+    month_to_int["август"] = 8
     month_to_int["августа"] = 8
-    month_to_int["viii"]    = 8
+    month_to_int["viii"] = 8
 
     month_to_int["septembar"] = 9
     month_to_int["septembra"] = 9
-    month_to_int["sep"]       = 9
-    month_to_int["сеп"]       = 9
+    month_to_int["sep"] = 9
+    month_to_int["сеп"] = 9
     month_to_int["септембар"] = 9
     month_to_int["септембра"] = 9
-    month_to_int["ix"]        = 9
+    month_to_int["ix"] = 9
 
-    month_to_int["oktobar"]  = 10
-    month_to_int["oktobra"]  = 10
-    month_to_int["okt"]      = 10
-    month_to_int["окт"]      = 10
-    month_to_int["октобар"]  = 10
-    month_to_int["октобра"]  = 10
-    month_to_int["x"]        = 10
+    month_to_int["oktobar"] = 10
+    month_to_int["oktobra"] = 10
+    month_to_int["okt"] = 10
+    month_to_int["окт"] = 10
+    month_to_int["октобар"] = 10
+    month_to_int["октобра"] = 10
+    month_to_int["x"] = 10
 
-    month_to_int["novembar"]  = 11
-    month_to_int["novembra"]  = 11
-    month_to_int["nov"]       = 11
-    month_to_int["нов"]       = 11
-    month_to_int["новембар"]  = 11
-    month_to_int["новембра"]  = 11
-    month_to_int["xi"]        = 11
+    month_to_int["novembar"] = 11
+    month_to_int["novembra"] = 11
+    month_to_int["nov"] = 11
+    month_to_int["нов"] = 11
+    month_to_int["новембар"] = 11
+    month_to_int["новембра"] = 11
+    month_to_int["xi"] = 11
 
-    month_to_int["decembar"]  = 12
-    month_to_int["decembra"]  = 12
-    month_to_int["dec"]       = 12
-    month_to_int["дец"]       = 12
-    month_to_int["децембар"]  = 12
-    month_to_int["децембра"]  = 12
-    month_to_int["xii"]       = 12
+    month_to_int["decembar"] = 12
+    month_to_int["decembra"] = 12
+    month_to_int["dec"] = 12
+    month_to_int["дец"] = 12
+    month_to_int["децембар"] = 12
+    month_to_int["децембра"] = 12
+    month_to_int["xii"] = 12
 
     modifier_to_int = {
         'pre'    : Date.MOD_BEFORE,

gramps/gen/datehandler/_dateparser.py

@@ -56,7 +56,7 @@ from ._datestrings import DateStrings
 # Top-level module functions
 #
 #-------------------------------------------------------------------------
-_max_days  = [ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ]
+_max_days = [ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ]
 _leap_days = [ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ]
 
 def gregorian_valid(date_tuple):
@@ -400,8 +400,8 @@ class DateParser:
         _ = self._locale.translation.gettext
         self.__init_prefix_tables()
 
-        self._rfc_mon_str  = '(' + '|'.join(list(self._rfc_mons_to_int.keys())) + ')'
-        self._rfc_day_str  = '(' + '|'.join(self._rfc_days) + ')'
+        self._rfc_mon_str = '(' + '|'.join(list(self._rfc_mons_to_int.keys())) + ')'
+        self._rfc_day_str = '(' + '|'.join(self._rfc_days) + ')'
 
         self._bce_str = self.re_longest_first(self.bce)
         self._qual_str = self.re_longest_first(list(self.quality_to_int.keys()))
@@ -409,14 +409,14 @@ class DateParser:
         self._mod_after_str = self.re_longest_first(
             list(self.modifier_after_to_int.keys()))
 
-        self._mon_str  = self.re_longest_first(list(self.month_to_int.keys()))
+        self._mon_str = self.re_longest_first(list(self.month_to_int.keys()))
         self._jmon_str = self.re_longest_first(list(self.hebrew_to_int.keys()))
         self._fmon_str = self.re_longest_first(list(self.french_to_int.keys()))
         self._pmon_str = self.re_longest_first(list(self.persian_to_int.keys()))
         self._imon_str = self.re_longest_first(list(self.islamic_to_int.keys()))
         self._smon_str = self.re_longest_first(list(self.swedish_to_int.keys()))
-        self._cal_str  = self.re_longest_first(list(self.calendar_to_int.keys()))
-        self._ny_str   = self.re_longest_first(list(self.newyear_to_int.keys()))
+        self._cal_str = self.re_longest_first(list(self.calendar_to_int.keys()))
+        self._ny_str = self.re_longest_first(list(self.newyear_to_int.keys()))
 
         self._today_str = self.re_longest_first(self.today + [_("today"),])
 
@@ -911,7 +911,7 @@ class DateParser:
         text = text.strip() # otherwise spaces can make it a bad date
         date.set_text_value(text)
         qual = Date.QUAL_NONE
-        cal  = Date.CAL_GREGORIAN
+        cal = Date.CAL_GREGORIAN
         newyear = Date.NEWYEAR_JAN1
 
         (text, cal, newyear) = self.match_calendar_newyear(text, cal, newyear)

gramps/gen/datehandler/_dateutils.py

@@ -66,7 +66,7 @@ def set_format(value):
     except:
         pass
 
-def set_date(date_base, text) :
+def set_date(date_base, text):
     """
     Set the date of the :class:`.DateBase` instance.
 
@@ -79,7 +79,7 @@ def set_date(date_base, text) :
     """
     parser.set_date(date_base.get_date_object(), text)
 
-def get_date(date_base) :
+def get_date(date_base):
     """
     Return a string representation of the date of the :class:`.DateBase`
     instance.

gramps/gen/db/dbconst.py

@@ -39,36 +39,36 @@ __all__ = ( 'DBPAGE', 'DBMODE', 'DBCACHE', 'DBLOCKS', 'DBOBJECTS', 'DBUNDO',
             "CLASS_TO_KEY_MAP", "KEY_TO_CLASS_MAP", "KEY_TO_NAME_MAP"
         )
 
-DBEXT     = ".db"           # File extension to be used for database files
-DBUNDOFN  = "undo.db"       # File name of 'undo' database
-DBLOCKFN  = "lock"          # File name of lock file
+DBEXT = ".db"           # File extension to be used for database files
+DBUNDOFN = "undo.db"       # File name of 'undo' database
+DBLOCKFN = "lock"          # File name of lock file
 DBRECOVFN = "need_recover"  # File name of recovery file
 BDBVERSFN = "bdbversion.txt"# File name of Berkeley DB version file
 DBBACKEND = "database.txt"  # File name of Database backend file
 SCHVERSFN = "schemaversion.txt"# File name of schema version file
 PCKVERSFN = "pickleupgrade.txt" # Indicator that pickle has been upgrade t Python3
 DBLOGNAME = ".Db"           # Name of logger
-DBMODE_R  = "r"             # Read-only access
-DBMODE_W  = "w"             # Full Read/Write access
-DBPAGE    = 16384           # Size of the pages used to hold items in the database
-DBMODE    = 0o666            # Unix mode for database creation
-DBCACHE   = 0x4000000       # Size of the shared memory buffer pool
-DBLOCKS   = 100000          # Maximum number of locks supported
+DBMODE_R = "r"             # Read-only access
+DBMODE_W = "w"             # Full Read/Write access
+DBPAGE = 16384           # Size of the pages used to hold items in the database
+DBMODE = 0o666            # Unix mode for database creation
+DBCACHE = 0x4000000       # Size of the shared memory buffer pool
+DBLOCKS = 100000          # Maximum number of locks supported
 DBOBJECTS = 100000          # Maximum number of simultaneously locked objects
-DBUNDO    = 1000            # Maximum size of undo buffer
+DBUNDO = 1000            # Maximum size of undo buffer
 ARRAYSIZE = 1000            # The arraysize for a SQL cursor
 
-PERSON_KEY     = 0
-FAMILY_KEY     = 1
-SOURCE_KEY     = 2
-EVENT_KEY      = 3
-MEDIA_KEY      = 4
-PLACE_KEY      = 5
+PERSON_KEY = 0
+FAMILY_KEY = 1
+SOURCE_KEY = 2
+EVENT_KEY = 3
+MEDIA_KEY = 4
+PLACE_KEY = 5
 REPOSITORY_KEY = 6
-REFERENCE_KEY  = 7
-NOTE_KEY       = 8
-TAG_KEY        = 9
-CITATION_KEY   = 10
+REFERENCE_KEY = 7
+NOTE_KEY = 8
+TAG_KEY = 9
+CITATION_KEY = 10
 
 TXNADD, TXNUPD, TXNDEL = 0, 1, 2
 

gramps/gen/db/dummydb.py

@@ -52,7 +52,6 @@ methods should be changed to generate exceptions. Possibly by globally changing
 #
 #-------------------------------------------------------------------------
 import logging
-import os
 import inspect
 from abc import ABCMeta
 from types import FunctionType
@@ -160,10 +159,12 @@ def wrapper(method):
         """
         class_name = args[0].__class__.__name__
         func_name = method.__name__
-        caller_frame = inspect.stack()[1]
+        frame = inspect.currentframe()
+        c_frame = frame.f_back
+        c_code = c_frame.f_code
         LOG.debug('calling %s.%s()... from file %s, line %s in %s',
-                  class_name, func_name, os.path.split(caller_frame[1])[1],
-                  caller_frame[2], caller_frame[3])
+                  class_name, func_name, c_code.co_filename, c_frame.f_lineno,
+                  c_code.co_name)
         return method(*args, **keywargs)
     return wrapped
 
@@ -216,8 +217,9 @@ class DummyDb(M_A_M_B("NewBaseClass", (DbReadBase, Callback, object,), {})):
         """
         Create a new DummyDb instance.
         """
-        DbReadBase.__init__(self)
         Callback.__init__(self)
+        self.basedb = None
+        self.__feature = {} # {"feature": VALUE, ...}
         self.db_is_open = False
         self.readonly = True
         self.name_formats = []

gramps/gen/db/generic.py

@@ -47,6 +47,7 @@ from . import (DbReadBase, DbWriteBase, DbUndo, DBLOGNAME, DBUNDOFN,
                REPOSITORY_KEY, NOTE_KEY, TAG_KEY, TXNADD, TXNUPD, TXNDEL,
                KEY_TO_NAME_MAP, DBMODE_R, DBMODE_W)
 from .utils import write_lock_file, clear_lock_file
+from .exceptions import DbVersionError
 from ..errors import HandleError
 from ..utils.callback import Callback
 from ..updatecallback import UpdateCallback
@@ -534,7 +535,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
         self.undo_history_callback = None
         self.modified = 0
         self.transaction = None
-        self.abort_possible = False
+        self.abort_possible = True
         self._bm_changes = 0
         self.has_changed = False
         self.surname_list = []
@@ -659,6 +660,12 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
 
         self.db_is_open = True
 
+        # Check on db version to see if too new
+        dbversion = int(self._get_metadata('version', default='0'))
+        if dbversion > self.VERSION[0]:
+            self.close()
+            raise DbVersionError(dbversion, 18, self.VERSION[0])
+
     def _close(self):
         """
         Close database backend.
@@ -757,7 +764,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
         if self._directory:
             filepath = os.path.join(self._directory, "name.txt")
             try:
-                with open(filepath, "r") as name_file:
+                with open(filepath, "r", encoding='utf8') as name_file:
                     name = name_file.readline().strip()
             except (OSError, IOError) as msg:
                 LOG.error(str(msg))

gramps/gen/db/txn.py

@@ -78,15 +78,13 @@ class DbTxn(defaultdict):
 
         elapsed_time = time.time() - self.start_time
         if __debug__:
-            caller_frame = inspect.stack()[1]
+            frame = inspect.currentframe()
+            c_frame = frame.f_back
+            c_code = c_frame.f_code
             _LOG.debug("    **** DbTxn %s exited. Called from file %s, "
-                       "line %s, in %s **** %.2f seconds" %
-                       ((hex(id(self)),)+
-                        (os.path.split(caller_frame[1])[1],)+
-                        tuple(caller_frame[i] for i in range(2, 4))+
-                        (elapsed_time,)
-                       )
-                      )
+                       "line %s, in %s **** %.2f seconds",
+                       hex(id(self)), c_code.co_filename, c_frame.f_lineno,
+                       c_code.co_name, elapsed_time)
 
         return False
 
@@ -120,7 +118,7 @@ class DbTxn(defaultdict):
         data = Python list where:
             list element = (handle, data) where:
                 handle = handle (database key) of the object in the transaction
-                data   = pickled representation of the object
+                data = pickled representation of the object
         """
 
         # Conditional on __debug__ because all that frame stuff may be slow

gramps/gen/db/utils.py

@@ -42,6 +42,8 @@ from ..const import PLUGINS_DIR, USER_PLUGINS
 from ..constfunc import win, get_env_var
 from ..config import config
 from .dbconst import DBLOGNAME, DBLOCKFN, DBBACKEND
+from ..const import GRAMPS_LOCALE as glocale
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
@@ -70,12 +72,14 @@ def make_database(plugin_id):
             database = getattr(mod, pdata.databaseclass)
             db = database()
             import inspect
-            caller_frame = inspect.stack()[1]
+            frame = inspect.currentframe()
+            c_frame = frame.f_back
+            c_code = c_frame.f_code
             _LOG.debug("Database class instance created Class:%s instance:%s. "
-                       "Called from File %s, line %s, in %s"
-                       % ((db.__class__.__name__, hex(id(db)))
-                          + (os.path.split(caller_frame[1])[1],)
-                          + tuple(caller_frame[i] for i in range(2, 4))))
+                       "Called from File %s, line %s, in %s",
+                       db.__class__.__name__, hex(id(db)), c_code.co_filename,
+                       c_frame.f_lineno, c_code.co_name)
+
             return db
         else:
             raise Exception("can't load database backend: '%s'" % plugin_id)
@@ -209,8 +213,8 @@ def write_lock_file(name):
         if win():
             user = get_env_var('USERNAME')
             host = get_env_var('USERDOMAIN')
-            if host is None:
-                host = ""
+            if not user:
+                user = _("Unknown")
         else:
             host = os.uname()[1]
             # An ugly workaround for os.getlogin() issue with Konsole

gramps/gen/dbstate.py

@@ -29,7 +29,6 @@ Provide the database state class
 #
 #------------------------------------------------------------------------
 import sys
-import os
 import logging
 import inspect
 
@@ -88,10 +87,12 @@ class DbState(Callback):
         """
         class_name = self.__class__.__name__
         func_name = "is_open"
-        caller_frame = inspect.stack()[1]
+        frame = inspect.currentframe()
+        c_frame = frame.f_back
+        c_code = c_frame.f_code
         _LOG.debug('calling %s.%s()... from file %s, line %s in %s',
-                  class_name, func_name, os.path.split(caller_frame[1])[1],
-                  caller_frame[2], caller_frame[3])
+                   class_name, func_name, c_code.co_filename, c_frame.f_lineno,
+                   c_code.co_name)
         return (self.db is not None) and self.db.is_open()
 
     def change_database(self, database):

gramps/gen/display/name.py

@@ -83,21 +83,21 @@ except ImportError:
 # Constants
 #
 #-------------------------------------------------------------------------
-_FIRSTNAME    = 4
+_FIRSTNAME = 4
 _SURNAME_LIST = 5
-_SUFFIX       = 6
-_TITLE        = 7
-_TYPE         = 8
-_GROUP        = 9
-_SORT         = 10
-_DISPLAY      = 11
-_CALL         = 12
-_NICK         = 13
-_FAMNICK      = 14
-_SURNAME_IN_LIST   = 0
-_PREFIX_IN_LIST    = 1
-_PRIMARY_IN_LIST   = 2
-_TYPE_IN_LIST      = 3
+_SUFFIX = 6
+_TITLE = 7
+_TYPE = 8
+_GROUP = 9
+_SORT = 10
+_DISPLAY = 11
+_CALL = 12
+_NICK = 13
+_FAMNICK = 14
+_SURNAME_IN_LIST = 0
+_PREFIX_IN_LIST = 1
+_PRIMARY_IN_LIST = 2
+_TYPE_IN_LIST = 3
 _CONNECTOR_IN_LIST = 4
 _ORIGINPATRO = NameOriginType.PATRONYMIC
 _ORIGINMATRO = NameOriginType.MATRONYMIC
@@ -570,13 +570,13 @@ class NameDisplay:
                    raw_data[_SUFFIX])
 
         Specific symbols for parts of a name are defined (keywords given):
-        't' : title      = title
-        'f' : given      = given (first names)
-        'l' : surname    = full surname (lastname)
-        'c' : call       = callname
-        'x' : common     = nick name, call, otherwise first first name (common name)
-        'i' : initials   = initials of the first names
-        'm' : primary    = primary surname (main)
+        't' : title = title
+        'f' : given = given (first names)
+        'l' : surname = full surname (lastname)
+        'c' : call = callname
+        'x' : common = nick name, call, otherwise first first name (common name)
+        'i' : initials = initials of the first names
+        'm' : primary = primary surname (main)
         '0m': primary[pre]= prefix primary surname (main)
         '1m': primary[sur]= surname primary surname (main)
         '2m': primary[con]= connector primary surname (main)
@@ -585,11 +585,11 @@ class NameDisplay:
         '1y': patronymic[sur] = surname     "
         '2y': patronymic[con] = connector   "
         'o' : notpatronymic = surnames without pa/matronymic and primary
-        'r' : rest       = non primary surnames
-        'p' : prefix     = list of all prefixes
+        'r' : rest = non primary surnames
+        'p' : prefix = list of all prefixes
         'q' : rawsurnames = surnames without prefixes and connectors
-        's' : suffix     = suffix
-        'n' : nickname   = nick name
+        's' : suffix = suffix
+        'n' : nickname = nick name
         'g' : familynick = family nick name
 
 
@@ -671,13 +671,13 @@ class NameDisplay:
             return "%s %s" % (first,suffix)
 
         Specific symbols for parts of a name are defined (keywords given):
-        't' : title      = title
-        'f' : given      = given (first names)
-        'l' : surname    = full surname (lastname)
-        'c' : call       = callname
-        'x' : common     = nick name, call, or otherwise first first name (common name)
-        'i' : initials   = initials of the first names
-        'm' : primary    = primary surname (main)
+        't' : title = title
+        'f' : given = given (first names)
+        'l' : surname = full surname (lastname)
+        'c' : call = callname
+        'x' : common = nick name, call, or otherwise first first name (common name)
+        'i' : initials = initials of the first names
+        'm' : primary = primary surname (main)
         '0m': primary[pre]= prefix primary surname (main)
         '1m': primary[sur]= surname primary surname (main)
         '2m': primary[con]= connector primary surname (main)
@@ -686,11 +686,11 @@ class NameDisplay:
         '1y': patronymic[sur] = surname     "
         '2y': patronymic[con] = connector   "
         'o' : notpatronymic = surnames without pa/matronymic and primary
-        'r' : rest       = non primary surnames
-        'p' : prefix     = list of all prefixes
+        'r' : rest = non primary surnames
+        'p' : prefix = list of all prefixes
         'q' : rawsurnames = surnames without prefixes and connectors
-        's' : suffix     = suffix
-        'n' : nickname   = nick name
+        's' : suffix = suffix
+        'n' : nickname = nick name
         'g' : familynick = family nick name
 
         """

gramps/gen/display/place.py

@@ -54,11 +54,6 @@ class PlaceFormat:
         self.street = street
         self.reverse = reverse
 
-    def to_xml(self):
-        return ('  <format name="%s" levels="%s" language="%s" '
-                'street="%s" reverse="%s"/>\n' %
-                (self.name, self.levels, self.language,
-                 self.street, self.reverse))
 
 #-------------------------------------------------------------------------
 #
@@ -71,10 +66,13 @@ class PlaceDisplay:
         self.place_formats = []
         self.default_format = config.get('preferences.place-format')
         if os.path.exists(PLACE_FORMATS):
-            self.load_formats()
-        else:
-            pf = PlaceFormat(_('Full'), ':', '', 0, False)
-            self.place_formats.append(pf)
+            try:
+                self.load_formats()
+                return
+            except BaseException:
+                print(_("Error in '%s' file: cannot load.") % PLACE_FORMATS)
+        pf = PlaceFormat(_('Full'), ':', '', 0, False)
+        self.place_formats.append(pf)
 
     def display_event(self, db, event, fmt=-1):
         if not event:
@@ -164,12 +162,20 @@ class PlaceDisplay:
         dom.unlink()
 
     def save_formats(self):
-        with open(PLACE_FORMATS, 'w') as fd:
-            fd.write('<?xml version="1.0" encoding="utf-8"?>\n')
-            fd.write('<place_formats>\n')
-            for fmt in self.place_formats:
-                fd.write(fmt.to_xml())
-            fd.write('</place_formats>\n')
+        doc = xml.dom.minidom.Document()
+        place_formats = doc.createElement('place_formats')
+        doc.appendChild(place_formats)
+        for fmt in self.place_formats:
+            node = doc.createElement('format')
+            place_formats.appendChild(node)
+            node.setAttribute('name', fmt.name)
+            node.setAttribute('levels', fmt.levels)
+            node.setAttribute('language', fmt.language)
+            node.setAttribute('street', str(fmt.street))
+            node.setAttribute('reverse', str(fmt.reverse))
+        with open(PLACE_FORMATS, 'w', encoding='utf-8') as f_d:
+            doc.writexml(f_d, addindent='  ', newl='\n', encoding='utf-8')
+
 
 def _get_offset(value, index):
     if index is not None and value.startswith('p'):

gramps/gen/filters/__init__.py

@@ -22,7 +22,6 @@
 Package providing filtering framework for Gramps.
 """
 
-#SystemFilters = None
 CustomFilters = None
 
 from ..const import CUSTOM_FILTERS
@@ -32,18 +31,10 @@ from ._genericfilter import (GenericFilter, GenericFilterFactory,
 from ._paramfilter import ParamFilter
 from ._searchfilter import SearchFilter, ExactSearchFilter
 
-#def reload_system_filters():
-    #global SystemFilters
-    #SystemFilters = FilterList(SYSTEM_FILTERS)
-    #SystemFilters.load()
-
 def reload_custom_filters():
     global CustomFilters
     CustomFilters = FilterList(CUSTOM_FILTERS)
     CustomFilters.load()
 
-#if not SystemFilters:
-    #reload_system_filters()
-
-if not CustomFilters:
-    reload_custom_filters()
+# if not CustomFilters:  # moved to viewmanager
+    # reload_custom_filters()

gramps/gen/filters/_filterlist.py

@@ -27,7 +27,7 @@
 #-------------------------------------------------------------------------
 from xml.sax import make_parser, SAXParseException
 import os
-import collections
+from collections import abc
 
 #-------------------------------------------------------------------------
 #
@@ -78,7 +78,7 @@ class FilterList:
             plugin_filters = []
             try:
                 for plug in plugins:
-                    if isinstance(plug, collections.Callable):
+                    if isinstance(plug, abc.Callable):
                         plug = plug(namespace)
                     if plug:
                         if isinstance(plug, (list, tuple)):

gramps/gen/filters/_genericfilter.py

@@ -124,6 +124,9 @@ class GenericFilter:
     def get_cursor(self, db):
         return db.get_person_cursor()
 
+    def get_tree_cursor(self, db):
+        return db.get_person_cursor()
+
     def make_obj(self):
         return Person()
 
@@ -133,13 +136,15 @@ class GenericFilter:
     def get_number(self, db):
         return db.get_number_of_people()
 
-    def check_func(self, db, id_list, task, user=None, tupleind=None):
+    def check_func(self, db, id_list, task, user=None, tupleind=None,
+                   tree=False):
         final_list = []
         if user:
             user.begin_progress(_('Filter'), _('Applying ...'),
                                 self.get_number(db))
         if id_list is None:
-            with self.get_cursor(db) as cursor:
+            with (self.get_tree_cursor(db) if tree else
+                  self.get_cursor(db)) as cursor:
                 for handle, data in cursor:
                     person = self.make_obj()
                     person.unserialize(data)
@@ -162,14 +167,15 @@ class GenericFilter:
             user.end_progress()
         return final_list
 
-    def check_and(self, db, id_list, user=None, tupleind=None):
+    def check_and(self, db, id_list, user=None, tupleind=None, tree=False):
         final_list = []
         flist = self.flist
         if user:
             user.begin_progress(_('Filter'), _('Applying ...'),
                                 self.get_number(db))
         if id_list is None:
-            with self.get_cursor(db) as cursor:
+            with (self.get_tree_cursor(db) if tree else
+                  self.get_cursor(db)) as cursor:
                 for handle, data in cursor:
                     person = self.make_obj()
                     person.unserialize(data)
@@ -194,14 +200,17 @@ class GenericFilter:
             user.end_progress()
         return final_list
 
-    def check_or(self, db, id_list, user=None, tupleind=None):
-        return self.check_func(db, id_list, self.or_test, user, tupleind)
+    def check_or(self, db, id_list, user=None, tupleind=None, tree=False):
+        return self.check_func(db, id_list, self.or_test, user, tupleind,
+                               tree=False)
 
-    def check_one(self, db, id_list, user=None, tupleind=None):
-        return self.check_func(db, id_list, self.one_test, user, tupleind)
+    def check_one(self, db, id_list, user=None, tupleind=None, tree=False):
+        return self.check_func(db, id_list, self.one_test, user, tupleind,
+                               tree=False)
 
-    def check_xor(self, db, id_list, user=None, tupleind=None):
-        return self.check_func(db, id_list, self.xor_test, user, tupleind)
+    def check_xor(self, db, id_list, user=None, tupleind=None, tree=False):
+        return self.check_func(db, id_list, self.xor_test, user, tupleind,
+                               tree=False)
 
     def xor_test(self, db, person):
         test = False
@@ -231,7 +240,7 @@ class GenericFilter:
     def check(self, db, handle):
         return self.get_check_func()(db, [handle])
 
-    def apply(self, db, id_list=None, tupleind=None, user=None):
+    def apply(self, db, id_list=None, tupleind=None, user=None, tree=False):
         """
         Apply the filter using db.
         If id_list given, the handles in id_list are used. If not given
@@ -251,7 +260,7 @@ class GenericFilter:
         m = self.get_check_func()
         for rule in self.flist:
             rule.requestprepare(db, user)
-        res = m(db, id_list, user, tupleind)
+        res = m(db, id_list, user, tupleind, tree)
         for rule in self.flist:
             rule.requestreset()
         return res
@@ -315,6 +324,9 @@ class GenericCitationFilter(GenericFilter):
     def get_cursor(self, db):
         return db.get_citation_cursor()
 
+    def get_tree_cursor(self, db):
+        return db.get_citation_cursor()
+
     def make_obj(self):
         return Citation()
 
@@ -332,6 +344,9 @@ class GenericPlaceFilter(GenericFilter):
     def get_cursor(self, db):
         return db.get_place_cursor()
 
+    def get_tree_cursor(self, db):
+        return db.get_place_tree_cursor()
+
     def make_obj(self):
         return Place()
 

gramps/gen/filters/rules/_changedsincebase.py

@@ -48,12 +48,12 @@ class ChangedSinceBase(Rule):
     Rule that checks for primary objects changed since a specific time.
     """
 
-    labels      = [ 'Changed after:', 'but before:' ]
-    name        = 'Objects changed after <date time>'
+    labels = [ 'Changed after:', 'but before:' ]
+    name = 'Objects changed after <date time>'
     description = "Matches object records changed after a specified " \
                     "date/time (yyyy-mm-dd hh:mm:ss) or in range, if a second " \
                     "date/time is given."
-    category    = _('General filters')
+    category = _('General filters')
 
     def add_time(self, date):
         if re.search(r"\d.*\s+\d{1,2}:\d{2}:\d{2}", date):

gramps/gen/filters/rules/_everything.py

@@ -41,8 +41,8 @@ from . import Rule
 class Everything(Rule):
     """Match Everyone."""
 
-    name        = 'Every object'
-    category    = _('General filters')
+    name = 'Every object'
+    category = _('General filters')
     description = 'Matches every object in the database'
 
     def is_empty(self):

gramps/gen/filters/rules/_hasattributebase.py

@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2002-2006  Donald N. Allingham
+# Copyright (C) 2019  Matthias Kemmer
 #
 # 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
@@ -34,6 +35,7 @@ _ = glocale.translation.gettext
 from ...lib.attrtype import AttributeType
 from . import Rule
 
+
 #-------------------------------------------------------------------------
 #
 # HasAttribute
@@ -44,11 +46,11 @@ class HasAttributeBase(Rule):
     Rule that checks for an object with a particular attribute.
     """
 
-    labels      = [ 'Attribute:', 'Value:' ]
-    name        = 'Objects with the <attribute>'
+    labels = ['Attribute:', 'Value:']
+    name = 'Objects with the <attribute>'
     description = "Matches objects with the given attribute " \
-                   "of a particular value"
-    category    = _('General filters')
+                  "of a particular value"
+    category = _('General filters')
     allow_regex = True
 
     def apply(self, db, obj):
@@ -60,5 +62,6 @@ class HasAttributeBase(Rule):
             name_match = attr.get_type() == specified_type
 
             if name_match:
-                return self.match_substring(1, attr.get_value())
+                if self.match_substring(1, attr.get_value()):
+                    return True
         return False

gramps/gen/filters/rules/_hascitationbase.py

@@ -46,12 +46,12 @@ class HasCitationBase(Rule):
     First parameter is [Volume/page, Date, Confidence]
     """
 
-    labels      = [ _('Volume/Page:'),
+    labels = [ _('Volume/Page:'),
                     _('Date:'),
                     _('Confidence:') ]
-    name        = _('Citations matching parameters')
+    name = _('Citations matching parameters')
     description = _("Matches citations with particular parameters")
-    category    = _('Citation/source filters')
+    category = _('Citation/source filters')
     allow_regex = True
 
     def prepare(self, db, user):

gramps/gen/filters/rules/_haseventbase.py

@@ -46,14 +46,14 @@ class HasEventBase(Rule):
     """Rule that checks for an event with a particular value."""
 
 
-    labels      = [ 'Event type:',
+    labels = [ 'Event type:',
                     'Date:',
                     'Place:',
                     'Description:',
                     'Main Participants:' ]
-    name        =  'Events matching parameters'
-    description =  "Matches events with particular parameters"
-    category    = _('Event filters')
+    name = 'Events matching parameters'
+    description = "Matches events with particular parameters"
+    category = _('Event filters')
     allow_regex = True
 
     def prepare(self, db, user):

gramps/gen/filters/rules/_hasgallerybase.py

@@ -42,10 +42,10 @@ from . import Rule
 class HasGalleryBase(Rule):
     """Objects who have Media Object"""
 
-    labels      = [  _('Number of instances:'), _('Number must be:')]
-    name        = 'Object with <count> Media references'
+    labels = [  _('Number of instances:'), _('Number must be:')]
+    name = 'Object with <count> Media references'
     description = "Matches objects with certain number of items in the gallery"
-    category    = _('General filters')
+    category = _('General filters')
 
     def prepare(self, db, user):
         # things we want to do just once, not for every handle

gramps/gen/filters/rules/_hasgrampsid.py

@@ -42,10 +42,10 @@ from . import Rule
 class HasGrampsId(Rule):
     """Rule that checks for an object with a specific Gramps ID."""
 
-    labels      = [ _('ID:') ]
-    name        = 'Object with <Id>'
+    labels = [ _('ID:') ]
+    name = 'Object with <Id>'
     description = "Matches objects with a specified Gramps ID"
-    category    = _('General filters')
+    category = _('General filters')
 
     def apply(self, db, obj):
         """

gramps/gen/filters/rules/_hasldsbase.py

@@ -45,10 +45,10 @@ from . import Rule
 class HasLDSBase(Rule):
     """Rule that checks for object with a LDS event"""
 
-    labels      = [  _('Number of instances:'), _('Number must be:')]
-    name        = 'Objects with LDS events'
+    labels = [  _('Number of instances:'), _('Number must be:')]
+    name = 'Objects with LDS events'
     description = "Matches objects with LDS events"
-    category    = _('General filters')
+    category = _('General filters')
 
     def prepare(self, db, user):
         # things we want to do just once, not for every handle

gramps/gen/filters/rules/_hasnotebase.py

@@ -43,10 +43,10 @@ from . import Rule
 class HasNoteBase(Rule):
     """Objects having notes"""
 
-    labels      = [  _('Number of instances:'), _('Number must be:')]
-    name        = 'Object with notes'
+    labels = [  _('Number of instances:'), _('Number must be:')]
+    name = 'Object with notes'
     description = "Matches objects that have a certain number of notes"
-    category    = _('General filters')
+    category = _('General filters')
 
     def __init__(self, arg, use_regex=False):
         # Upgrade from pre 3.1 HasNote filter, use defaults that correspond

gramps/gen/filters/rules/_hasnoteregexbase.py

@@ -40,11 +40,11 @@ from . import Rule
 class HasNoteRegexBase(Rule):
     """Objects having notes containing <text>."""
 
-    labels      = [ _('Text:')]
-    name        = 'Objects having notes containing <text>'
+    labels = [ _('Text:')]
+    name = 'Objects having notes containing <text>'
     description = ("Matches objects whose notes contain a substring "
                    "or match a regular expression")
-    category    = _('General filters')
+    category = _('General filters')
     allow_regex = True
 
     def apply(self, db, person):

gramps/gen/filters/rules/_hasnotesubstrbase.py

@@ -39,11 +39,11 @@ from . import Rule
 class HasNoteSubstrBase(Rule):
     """People having notes containing <substring>."""
 
-    labels      = [ _('Substring:')]
-    name        = 'Objects having notes containing <substring>'
+    labels = [ _('Substring:')]
+    name = 'Objects having notes containing <substring>'
     description = "Matches objects whose notes contain text matching a " \
                     "substring"
-    category    = _('General filters')
+    category = _('General filters')
 
     def apply(self, db, person):
         notelist = person.get_note_list()

gramps/gen/filters/rules/_hasreferencecountbase.py

@@ -39,10 +39,10 @@ from . import Rule
 class HasReferenceCountBase(Rule):
     """Objects with a reference count of <count>."""
 
-    labels      = [ _('Reference count must be:'), _('Reference count:')]
-    name        = 'Objects with a reference count of <count>'
+    labels = [ _('Reference count must be:'), _('Reference count:')]
+    name = 'Objects with a reference count of <count>'
     description = "Matches objects with a certain reference count"
-    category    = _('General filters')
+    category = _('General filters')
 
 
     def prepare(self, db, user):

gramps/gen/filters/rules/_hassourcebase.py

@@ -43,13 +43,13 @@ class HasSourceBase(Rule):
     """Rule that checks for a source with a particular value"""
 
 
-    labels      = [ 'Title:',
+    labels = [ 'Title:',
                     'Author:',
                     'Abbreviation:',
                     'Publication:' ]
-    name        = 'Sources matching parameters'
+    name = 'Sources matching parameters'
     description = "Matches sources with particular parameters"
-    category    = _('Citation/source filters')
+    category = _('Citation/source filters')
     allow_regex = True
 
     def apply(self,db,source):

gramps/gen/filters/rules/_hassourcecountbase.py

@@ -42,11 +42,11 @@ from . import Rule
 class HasSourceCountBase(Rule):
     """Objects having sources"""
 
-    labels      = [  _('Number of instances:'), _('Number must be:')]
-    name        = 'Objects with <count> sources'
+    labels = [  _('Number of instances:'), _('Number must be:')]
+    name = 'Objects with <count> sources'
     description = "Matches objects that have a certain number of sources " \
                    "connected to it (actually citations are counted)"
-    category    = _('Citation/source filters')
+    category = _('Citation/source filters')
 
     def prepare(self, db, user):
         # things we want to do just once, not for every handle

gramps/gen/filters/rules/_hassourceofbase.py

@@ -42,9 +42,9 @@ from . import Rule
 class HasSourceOfBase(Rule):
     """Rule that checks for objects that have a particular source."""
 
-    labels      = [ _('Source ID:') ]
-    name        = 'Object with the <source>'
-    category    = _('Citation/source filters')
+    labels = [ _('Source ID:') ]
+    name = 'Object with the <source>'
+    category = _('Citation/source filters')
     description = 'Matches objects who have a particular source'
 
     def prepare(self, db, user):

gramps/gen/filters/rules/_hastagbase.py

@@ -46,10 +46,10 @@ class HasTagBase(Rule):
     Rule that checks for an object with a particular tag.
     """
 
-    labels      = [ 'Tag:' ]
-    name        = 'Objects with the <tag>'
+    labels = [ 'Tag:' ]
+    name = 'Objects with the <tag>'
     description = "Matches objects with the given tag"
-    category    = _('General filters')
+    category = _('General filters')
 
     def prepare(self, db, user):
         """

gramps/gen/filters/rules/_hastextmatchingsubstringof.py

@@ -39,13 +39,13 @@ from . import Rule
 class HasTextMatchingSubstringOf(Rule):
     """Rule that checks for string matches in any textual information."""
 
-    labels      = [ 'Substring:',
+    labels = [ 'Substring:',
                     'Case sensitive:',
                     'Regular-Expression matching:']
-    name        = 'Objects with records containing <substring>'
+    name = 'Objects with records containing <substring>'
     description = "Matches objects whose records contain text " \
                    "matching a substring"
-    category    = _('General filters')
+    category = _('General filters')
 
     # FIXME: This needs to be written for an arbitrary object
     # if possible

gramps/gen/filters/rules/_isprivate.py

@@ -37,9 +37,9 @@ from . import Rule
 class IsPrivate(Rule):
     """Objects marked private."""
 
-    name        = 'Objects marked private'
+    name = 'Objects marked private'
     description = "Matches objects that are indicated as private"
-    category    = _('General filters')
+    category = _('General filters')
 
     def apply(self, db, obj):
         return obj.get_privacy()

gramps/gen/filters/rules/_ispublic.py

@@ -34,9 +34,9 @@ _ = glocale.translation.gettext
 class IsPublic(Rule):
     """Objects not marked private."""
 
-    name        = 'Objects not marked private'
+    name = 'Objects not marked private'
     description = "Matches objects that are not indicated as private"
-    category    = _('General filters')
+    category = _('General filters')
 
     def apply(self, db, obj):
         return not obj.get_privacy()

gramps/gen/filters/rules/_matcheseventfilterbase.py

@@ -47,14 +47,14 @@ class MatchesEventFilterBase(MatchesFilterBase):
 
     """
 
-    labels      = ['Event filter name:']
-    name        = 'Objects with events matching the <event filter>'
+    labels = ['Event filter name:']
+    name = 'Objects with events matching the <event filter>'
     description = "Matches objects who have events that match a certain" \
                    " event filter"
-    category    = _('General filters')
+    category = _('General filters')
 
     # we want to have this filter show event filters
-    namespace   = 'Event'
+    namespace = 'Event'
 
     def prepare(self, db, user):
         MatchesFilterBase.prepare(self, db, user)

gramps/gen/filters/rules/_matchesfilterbase.py

@@ -51,10 +51,10 @@ class MatchesFilterBase(Rule):
     Subclasses need to define the namespace class attribute.
 
     """
-    labels      = [_('Filter name:')]
-    name        = 'Objects matching the <filter>'
+    labels = [_('Filter name:')]
+    name = 'Objects matching the <filter>'
     description = "Matches objects matched by the specified filter name"
-    category    = _('General filters')
+    category = _('General filters')
 
     def prepare(self, db, user):
         if gramps.gen.filters.CustomFilters:

gramps/gen/filters/rules/_matchessourceconfidencebase.py

@@ -44,10 +44,10 @@ from . import Rule
 class MatchesSourceConfidenceBase(Rule):
     """Objects with a specific confidence level on 'direct' Source references"""
 
-    labels    = ['Confidence level:']
-    name        = 'Object with at least one direct source >= <confidence level>'
+    labels = ['Confidence level:']
+    name = 'Object with at least one direct source >= <confidence level>'
     description = "Matches objects with at least one direct source with confidence level(s)"
-    category    = _('Citation/source filters')
+    category = _('Citation/source filters')
 
     def apply(self, db, obj):
         required_conf = int(self.list[0])

gramps/gen/filters/rules/_matchessourcefilterbase.py

@@ -44,14 +44,14 @@ class MatchesSourceFilterBase(MatchesFilterBase):
     Rule that checks against another filter.
     """
 
-    labels      = [_('Source filter name:')]
-    name        = 'Objects with source matching the <source filter>'
+    labels = [_('Source filter name:')]
+    name = 'Objects with source matching the <source filter>'
     description = "Matches objects with sources that match the " \
                    "specified source filter name"
-    category    = _('Citation/source filters')
+    category = _('Citation/source filters')
 
     # we want to have this filter show source filters
-    namespace   = 'Source'
+    namespace = 'Source'
 
     def prepare(self, db, user):
         MatchesFilterBase.prepare(self, db, user)

gramps/gen/filters/rules/_regexpidbase.py

@@ -45,11 +45,11 @@ class RegExpIdBase(Rule):
     regular expression.
     """
 
-    labels      = [ _('Text:') ]
-    name        = 'Objects with <Id>'
+    labels = [ _('Text:') ]
+    name = 'Objects with <Id>'
     description = "Matches objects whose Gramps ID contains a substring " \
                    "or matches a regular expression"
-    category    = _('General filters')
+    category = _('General filters')
     allow_regex = True
 
     def apply(self, db, obj):

gramps/gen/filters/rules/_rule.py

@@ -50,9 +50,9 @@ LOG = logging.getLogger(".")
 class Rule:
     """Base rule class."""
 
-    labels      = []
-    name        = ''
-    category    = _('Miscellaneous filters')
+    labels = []
+    name = ''
+    category = _('Miscellaneous filters')
     description = _('No description')
     allow_regex = False
 
@@ -141,8 +141,10 @@ class Rule:
 
     def display_values(self):
         """Return the labels and values of this rule."""
-        l_v = ( '%s="%s"' % (_(self.labels[ix]), self.list[ix])
-                for ix in range(len(self.list)) if self.list[ix] )
+        l_v = ('%s="%s"' % (_(self.labels[ix][0] if
+                              isinstance(self.labels[ix], tuple) else
+                              self.labels[ix]), self.list[ix])
+               for ix in range(len(self.list)) if self.list[ix])
 
         return ';'.join(l_v)
 

gramps/gen/filters/rules/citation/_allcitations.py

@@ -42,5 +42,5 @@ from .._everything import Everything
 class AllCitations(Everything):
     """Matches every citation"""
 
-    name        = _('Every citation')
+    name = _('Every citation')
     description = _('Matches every citation in the database')