8683: keep support for XML v1.7.0

Now, xmllint passes '--dtdvalid' and '--relaxng'

.get_packages_list.py

@@ -1,11 +0,0 @@
-import os
-
-from distutils2.util import find_packages
-
-exclude_list = ('src.gui.glade', 'src.guiQML', 'src.guiQML.views', 'src.images', 'src.plugins',
-                'src.webapp', 'src.webapp.grampsdb', 'src.webapp.grampsdb.templatetags', 'src.webapp.grampsdb.view', )
-
-packages = sorted(find_packages(exclude=exclude_list))
-
-for package in packages:
-    print("            '%s'," % package)

.gitignore

@@ -2,11 +2,20 @@
 *.py[cod]
 
 # Distutils
+MANIFEST
 build/
-sdist/
+dist/
 
 # Gramps
-gramps/data/tips.xml
-gramps/gen/const.py
+data/tips.xml
 gramps/plugins/lib/holidays.xml
 po/.intltool-merge-cache
+docs/_build/
+
+# Editing
+tags
+*.swp
+
+# Testing
+test/data
+gramps/webapp/grampsdb/fixtures/initial_data.json

.travis.yml

@@ -0,0 +1,29 @@
+# After changing this file, check it on:
+#   http://lint.travis-ci.org/
+
+
+language: c
+#python:
+#    - 3.3
+#    - 3.4
+
+install:
+    - git clone --depth=50 --branch=maintenance/gramps42 git://github.com/gramps-project/gramps.git gramps-project/gramps
+    - cd gramps-project/gramps 
+    - time sudo apt-get update
+    - travis_retry sudo apt-get install gir1.2-pango gir1.2-gtk xdg-utils librsvg2-common libglib2.0-dev intltool 
+    - travis_retry sudo apt-get install python3-gobject python3-gi python3-cairo python3-gi-cairo python3-bsddb3 python3-dev python3-nose
+
+    - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3
+    - travis_retry sudo pip3 install Django==1.7
+    - travis_retry sudo pip3 install pyicu==1.8
+    - travis_retry sudo pip3 install mock
+    - python3 setup.py build
+
+#before_script:
+#    - sudo Xvfb :99 -ac &
+#    - export DISPLAY=:99
+
+script:
+    -  mkdir -p /home/travis/.gramps/grampsdb/
+    -  DJANGO_SETTINGS_MODULE=gramps.webapp.settings nosetests3 --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  gramps

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

FAQ

@@ -1,4 +1,4 @@
-**** This is GRAMPS Frequently Asked Questions ****
+**** This is Gramps Frequently Asked Questions ****
 
 The questions below frequently come up in mailing list discussions and forums.
 This list is by no means complete. If you would like to add questions/answers 
@@ -9,23 +9,23 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net
 
 ==General==
 
- 1. What is GRAMPS?
+ 1. What is Gramps?
 
  2. Where do I get it and how much does it cost?
 
- 3. Does GRAMPS exist in other languages?
+ 3. Does Gramps exist in other languages?
 
  4. How do I keep backups?
 
  5. Does Gramps support Unicode fonts? In particular, does it support non-Roman Unicode fonts?
 
- 6. What is needed to install GRAMPS under Linux, Solaris, or FreeBSD?
+ 6. What is needed to install Gramps under Linux, Solaris, or FreeBSD?
 
  7. Does it work with Windows (tm)?
 
  8. Does it work with the Mac?
 
- 9. What are the Minimum Specs to run GRAMPS?
+ 9. What are the Minimum Specs to run Gramps?
 
 ==Preferences==
 
@@ -33,43 +33,43 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net
 
 ==Collaboration-Portability==
 
- 11. Is GRAMPS compatible with other genealogical software?
+ 11. Is Gramps compatible with other genealogical software?
 
- 12. Can GRAMPS read files created by GenApp X?
+ 12. Can Gramps read files created by GenApp X?
 
- 13. Can GRAMPS write files readable by GenApp X?
+ 13. Can Gramps write files readable by GenApp X?
 
- 14. What standards does GRAMPS support?
+ 14. What standards does Gramps support?
 
- 15. How do I import data from another genealogy program into GRAMPS?
+ 15. How do I import data from another genealogy program into Gramps?
 
- 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.
+ 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.
 
 ==Reports==
 
- 17. Can GRAMPS print a genealogical tree for my family?
+ 17. Can Gramps print a genealogical tree for my family?
 
- 18. In what formats can GRAMPS output its reports?
+ 18. In what formats can Gramps output its reports?
 
  19. How can I change the default language in reports?
 
- 20. Is GRAMPS compatible with the Internet?
+ 20. Is Gramps compatible with the Internet?
 
  21. Can I create custom reports/filters/whatever?
 
  22. Why are non-latin characters displayed as garbage in PDF/PS reports?
 
- 23. I would like to contribute to GRAMPS by writing my favorite report.
+ 23. I would like to contribute to Gramps by writing my favorite report.
 
-==Database - GRAMPS file formats==
+==Database - Gramps file formats==
 
- 24. What is the maximum database size (bytes) GRAMPS can handle?
+ 24. What is the maximum database size (bytes) Gramps can handle?
 
- 25. How many people can GRAMPS database handle? 
+ 25. How many people can Gramps database handle? 
 
  26. My database is really big. Is there a way around loading all the data into memory?
 
- 27. Can I run GRAMPS from a database on a NFS share?
+ 27. Can I run Gramps from a database on a NFS share?
 
  28. Why is the database format not portable?
 
@@ -77,123 +77,116 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net
 
  29. I found a bug and I want it fixed right now! What do I do?
 
- 30. GRAMPS should be a .... type of application
+ 30. Gramps should be a .... type of application
 
-==GRAMPS Webhosting ==
-
- 31. How can I publish web sites generated by GRAMPS?
-
- 32. How do I submit my pages to the GRAMPS library site (http://library.gramps-project.org)?
-
- 33. After I upload my Family Web Page to library.gramps-project.org, is the password used for write privileges only or read privileges?
-
- 34. Do I view the Family Web Page with a url into my browser? Or through a link on a list of Family Web Pages on the GRAMPS-Project.org site?
+==Gramps Webhosting ==
 
+ 31. How can I publish web sites generated by Gramps?
 
 
 **** Questions and answers ****
 
 ==General==
 
-1. What is GRAMPS?
+1. What is Gramps?
 
-GRAMPS is the Genealogical Research and Analysis Management Program System. 
+Gramps is the Genealogical Research and Analysis Management Program System. 
 In other words, it is a personal genealogy program letting you store, edit, 
 and research genealogical data using the powers of your computer. 
 
 
 2. Where do I get it and how much does it cost?
 
-GRAMPS can be downloaded from http://sf.net/projects/gramps at no charge. 
-GRAMPS is an Open Source project covered by the GNU General Public License. 
+Gramps can be downloaded from http://sf.net/projects/gramps at no charge. 
+Gramps is an Open Source project covered by the GNU General Public License. 
 You have full access to the source code and are allowed to distribute the 
 program and source code freely. 
 
 
-3. Does GRAMPS exist in other languages?
+3. Does Gramps exist in other languages?
 
-Yes, at the moment GRAMPS is translated in 15 languages
+Yes, at the moment Gramps is translated in 15 languages
 
 
 4. How do I keep backups?
 
-Use a recent version of GRAMPS! From 2.2.5 onwards there is an automatic backup utility.
-It is extremely important to keep backups of your data, and keep them in a safe place. GRAMPS has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit menu->Preferences->General), GRAMPS will keep a backup of your database on exit. You can copy this backup file from time to time to a save location (eg a usb stick). 
+Use a recent version of Gramps! From 2.2.5 onwards there is an automatic backup utility.
+It is extremely important to keep backups of your data, and keep them in a safe place. Gramps has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit menu->Preferences->General), Gramps will keep a backup of your database on exit. You can copy this backup file from time to time to a save location (eg a usb stick). 
 
-Note: The .gramps files are compressed. Clicking them will open GRAMPS. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
-Do not keep backups in GEDCOM. Not all information GRAMPS stores can be written in the GEDCOM. Hence, an export/import operation GRAMPS --> GEDCOM --> GRAMPS, will mean you lose data. Use the .gramps file format for backups!
+Note: The .gramps files are compressed. Clicking them will open Gramps. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
+Do not keep backups in GEDCOM. Not all information Gramps stores can be written in the GEDCOM. Hence, an export/import operation Gramps --> GEDCOM --> Gramps, will mean you lose data. Use the .gramps file format for backups!
 Do not keep backups in GRDB format. GRDB is a database, which might be computer dependent (read, not working on a different PC). Small damage to a GRDB file can also not be repaired. Use the .gramps file format for backups!
 
 
 5. Does Gramps support Unicode fonts? In particular, does it support non-Roman Unicode fonts?
 
-Yes. GRAMPS works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or openoffice.
+Yes. Gramps works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or openoffice.
 
 ==Installation==
 
-6. What is needed to install GRAMPS under Linux, Solaris, or FreeBSD?
+6. What is needed to install Gramps under Linux, Solaris, or FreeBSD?
 
-GRAMPS is a [http://en.wikipedia.org/wiki/Gtk GTK] application. GRAMPS needs to have the [http://en.wikipedia.org/wiki/Pygtk pygtk] libraries installed on the system. As long as these libraries are installed, GRAMPS should function. It will operate under the GNOME desktop, KDE desktop, or any other desktop. If the GNOME bindings for Python are installed on the system, GRAMPS will have additional functionality. The GRAMPS project recommends version 2.8 or higher of GTK.
+Gramps is a [http://en.wikipedia.org/wiki/Gtk GTK] application. Gramps needs to have the [http://en.wikipedia.org/wiki/Pygtk pygtk] libraries installed on the system. As long as these libraries are installed, Gramps should function. It will operate under the GNOME desktop, KDE desktop, or any other desktop. If the GNOME bindings for Python are installed on the system, Gramps will have additional functionality. The Gramps project recommends version 2.8 or higher of GTK.
 
 
 7. Does it work with Windows (tm)?
 
-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.
+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.
 
 
 8. Does it work with the Mac?
 
-The Fink project has ported some older versions of GRAMPS to OS X (tm). The Mac OS X port is not directly supported by the GRAMPS project, primarily because none of the GRAMPS developers have access to Mac OS X and because OS X is not Free Software.
+The Fink project has ported some older versions of Gramps to OS X (tm). The Mac OS X port is not directly supported by the Gramps project, primarily because none of the Gramps developers have access to Mac OS X and because OS X is not Free Software.
 
-This present version of GRAMPS (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages. 
+This present version of Gramps (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages. 
 
 
-9. What are the Minimum Specs to run GRAMPS?
+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 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.
 
 
 ==Preferences==
 
 10. Can I change the dates in reports to 'day month year'
 
-Yes, change in the preferences ("Edit->Preferences") the date for GRAMPS to the required format (eg YYYY-MM-DD or day mont year), and make the report. Your global date preferences will be used.
+Yes, change in the preferences ("Edit->Preferences") the date for Gramps to the required format (eg YYYY-MM-DD or day mont year), and make the report. Your global date preferences will be used.
 
 
 ==Collaboration-Portability==
 
-11. Is GRAMPS compatible with other genealogical software?
+11. Is Gramps compatible with other genealogical software?
 
-GRAMPS makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. We have import and export filters that enable GRAMPS to read and write GEDCOM files.
+Gramps makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. We have import and export filters that enable Gramps to read and write GEDCOM files.
 
-It is important to understand that the GEDCOM standard is poorly implemented -- virtually every genealogical software has its own "flavor" of GEDCOM. As we learn about new flavor, the import/export filters can be created very quickly. However, finding out about the unknown flavors requires user feedback. Please feel free to inform us about any GEDCOM flavor not supported by GRAMPS, and we will do our best to support it!
+It is important to understand that the GEDCOM standard is poorly implemented -- virtually every genealogical software has its own "flavor" of GEDCOM. As we learn about new flavor, the import/export filters can be created very quickly. However, finding out about the unknown flavors requires user feedback. Please feel free to inform us about any GEDCOM flavor not supported by Gramps, and we will do our best to support it!
 
 
-12. Can GRAMPS read files created by GenApp X?
+12. Can Gramps read files created by GenApp X?
 
 See above.
 
 
-13. Can GRAMPS write files readable by GenApp X?
+13. Can Gramps write files readable by GenApp X?
 
 See above.
 
 
-14. What standards does GRAMPS support?
+14. What standards does Gramps support?
 
-The nice thing about standards is that there never is a shortage of them. GRAMPS is tested to support the following flavors of GEDCOM: GEDCOM5.5, Brother's Keeper, Family Origins, Family Tree Maker, Ftree, GeneWeb, Legacy, Personal Ancestral File, Pro-Gen, Reunion, and Visual Genealogie.
+The nice thing about standards is that there never is a shortage of them. Gramps is tested to support the following flavors of GEDCOM: GEDCOM5.5, Brother's Keeper, Family Origins, Family Tree Maker, Ftree, GeneWeb, Legacy, Personal Ancestral File, Pro-Gen, Reunion, and Visual Genealogie.
 
 
-15. How do I import data from another genealogy program into 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. 
 
 
-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.
+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.
 
-While GRAMPS can generate web sites, it does not provide a web interface that allows for editing. If this is a requirement, then [http://geneweb.org GeneWeb] or [http://phpgedview.sourceforge.net PhpGedView] are programs more likely to meet your needs. However, you may wish to ask yourself the following questions:
+While Gramps can generate web sites, it does not provide a web interface that allows for editing. If this is a requirement, then [http://geneweb.org GeneWeb] or [http://phpgedview.sourceforge.net PhpGedView] are programs more likely to meet your needs. However, you may wish to ask yourself the following questions:
 * Do I really want relatives or other people to directly edit my genealogy database?
 * Do I implicitly trust, without verification, any data that people may enter?
 * Do these people have the same understanding of good genealogy practice that I have?
@@ -204,7 +197,7 @@ You may also want to consider the effects of possible downtime of your site if y
 
 ==Reports==
 
-17. Can GRAMPS print a genealogical tree for my family?
+17. Can Gramps print a genealogical tree for my family?
 
 Yes. Different people have different ideas of what a genealogical tree is. 
 Some think of it as a chart going from the distant ancestor and listing 
@@ -212,12 +205,12 @@ all his/her descendants and their families. Others think it should be a
 chart going from the person back in time, listing the ancestors and their 
 families. Yet other people think of a table, text report, etc. 
 
-GRAMPS can produce any of the above, and many more different charts and 
+Gramps can produce any of the above, and many more different charts and 
 reports. Moreover, the plugin architechture enables users (you) to create 
 their own plugins which could be new reports, charts, or research tools. 
 
 
-18. In what formats can GRAMPS output its reports?
+18. In what formats can Gramps output its reports?
 
 Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and GraphViz formats.
 
@@ -227,11 +220,11 @@ Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical
 The reports are in the language of your linux installation. You can change it by installing extra language packs, see [Howto: Change the language of reports] on wiki.
 
 
-20. Is GRAMPS compatible with the Internet?
+20. Is Gramps compatible with the Internet?
 
-GRAMPS can store web addresses and direct your browser to them. It can import
+Gramps can store web addresses and direct your browser to them. It can import
 data that you download from the Internet. It can export data that you could 
-send over the Internet. GRAMPS is familiar with the standard file formats 
+send over the Internet. Gramps is familiar with the standard file formats 
 widely used on the Internet (e.g. JPEG, PNG, and GIF images, MP3, OGG, and 
 WAV sound files, QuickTime, MPEG, and AVI movie files, etc). Other than that, 
 there is little that a genealogical program can do with the Internet :-) 
@@ -241,7 +234,7 @@ there is little that a genealogical program can do with the Internet :-)
 
 Yes. There are many levels of customization. One is creating or modifying 
 the templates used for the reports. This gives you some control over 
-the fonts, colors, and some layout of the reports. You can also use GRAMPS 
+the fonts, colors, and some layout of the reports. You can also use Gramps 
 controls in the report dialogs to tell what contents should be used for a 
 particular report. In addition to this, you have an ability to create your 
 own filters -- this is useful in selecting people based on criteria set 
@@ -253,47 +246,47 @@ knowledge of programming in Python.
 
 22. Why are non-latin characters displayed as garbage in PDF/PS reports?
 
-This is a limitation of the built-in fonts of PS and PDF formats. To print non-Latin text, use the Print... in the format selection menu of the report dialog. This will use the gnome-print backend, which supports PS and PDF creation, as well as direct printing. (Note: you might need to install gnome-print separately as it is not required for GRAMPS).
+This is a limitation of the built-in fonts of PS and PDF formats. To print non-Latin text, use the Print... in the format selection menu of the report dialog. This will use the gnome-print backend, which supports PS and PDF creation, as well as direct printing. (Note: you might need to install gnome-print separately as it is not required for Gramps).
 
 If you only have Latin text, the PDF option will produce a smaller PDF compared to that created by gnome-print, simply because no font information will be embedded.
 
 
-23. I would like to contribute to GRAMPS by writing my favorite report.
+23. I would like to contribute to Gramps by writing my favorite report.
     How do I do that?
 
-The easiest way to contribute to reports, filters, tools, etc. is to copy an existing GRAMPS report, filter, or tool. If you can create what you want by modifying existing code -- great! If your idea does not fit into the logic of any existing GRAMPS tool, you will need to write your own plugin from scratch. Help is available on the [Developers Portal] on wiki, or on the developers mailing list: gramps-devel@lists.sourceforge.net.
+The easiest way to contribute to reports, filters, tools, etc. is to copy an existing Gramps report, filter, or tool. If you can create what you want by modifying existing code -- great! If your idea does not fit into the logic of any existing Gramps tool, you will need to write your own plugin from scratch. Help is available on the [Developers Portal] on wiki, or on the developers mailing list: gramps-devel@lists.sourceforge.net.
 
-To test your work in progress, you may save your plugin under $HOME/.gramps/plugins directory and it should be found and imported on startup. The correctly written plugin will register itself with GRAMPS, create menu item, and so on.
+To test your work in progress, you may save your plugin under $HOME/.gramps/plugins directory and it should be found and imported on startup. The correctly written plugin will register itself with Gramps, create menu item, and so on.
 
-If you are happy with your plugin and would like to contribute your code back to the GRAMPS project, you are very welcome to do so by contacting us at gramps-devel@lists.sourceforge.net
+If you are happy with your plugin and would like to contribute your code back to the Gramps project, you are very welcome to do so by contacting us at gramps-devel@lists.sourceforge.net
 
 
-==Database - GRAMPS file formats==
+==Database - Gramps file formats==
 
-24. What is the maximum database size (bytes) GRAMPS can handle?
+24. What is the maximum database size (bytes) Gramps can handle?
 
-GRAMPS has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, GRAMPS no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system and the cache size used for BSDDB database access. With common memory sizes these days, GRAMPS should have no problem using databases with tens of thousands of people.
+Gramps has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system and the cache size used for BSDDB database access. With common memory sizes these days, Gramps should have no problem using databases with tens of thousands of people.
 
 
-25. How many people can GRAMPS database handle? 
+25. How many people can Gramps database handle? 
 
-See above. Again, this is dependent on how much memory you have, see [GRAMPS Performance] on wiki.
+See above. Again, this is dependent on how much memory you have, see [Gramps Performance] on wiki.
 
 
 26. My database is really big. Is there a way around loading all the data into memory?
 
-Starting with 2.0.0 release, GRAMPS no longer loads all data into memory, which allows it to work with a much larger database than before. The fileformat used is .grdb which means gramps database.
+Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. The fileformat used is .grdb which means gramps database.
 
 
-27. Can I run GRAMPS from a database on a NFS share?
+27. Can I run Gramps from a database on a NFS share?
 
 Yes you can.
 
 
 28. Why is the database format not portable?
 
-The biggest issue with GRAMPS portability lies with 'transactions'. With
-GRAMPS 2.2, we added support for atomic transactions to protect data.
+The biggest issue with Gramps portability lies with 'transactions'. With
+Gramps 2.2, we added support for atomic transactions to protect data.
 With atomic transactions, multiple changes are committed as a single
 unit. Either all the changes make it, or none of the changes make it.
 You are never left in a situation with a partial set of changes. A side
@@ -341,41 +334,25 @@ If the above explanations seem vague, please follow this link:
 http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
 
 
-30. GRAMPS should be a .... type of application
+30. Gramps should be a .... type of application
 
-The surest way to see it happen is to get it done by yourself. Since GRAMPS is free/open source, nobody prevents you from taking all of the code and continuing its development in whatever direction you see fit. In doing so, you may consider giving your new project another name to avoid confusion with the continuing GRAMPS development. If you would like the GRAMPS project to provide advice, expertise, filters, etc., we will gladly cooperate with your new project, to ensure compatibility or import/export options to your new format of a project.
+The surest way to see it happen is to get it done by yourself. Since Gramps is free/open source, nobody prevents you from taking all of the code and continuing its development in whatever direction you see fit. In doing so, you may consider giving your new project another name to avoid confusion with the continuing Gramps development. If you would like the Gramps project to provide advice, expertise, filters, etc., we will gladly cooperate with your new project, to ensure compatibility or import/export options to your new format of a project.
 
-If, however, you would like the GRAMPS project to adopt your strategy, you would need to convince GRAMPS developers that your strategy is good for GRAMPS and superior to the present development strategy.
+If, however, you would like the Gramps project to adopt your strategy, you would need to convince Gramps developers that your strategy is good for Gramps and superior to the present development strategy.
                                                                                 
-HINT: if GRAMPS developers are still not convinced after about three
+HINT: if Gramps developers are still not convinced after about three
 messages sent to gramps-devel, maybe you are better off on your own
 rather than with a company of retards who can't fully realize the
 potential of your great idea :-)
 
 
-==GRAMPS Webhosting ==
+==Gramps Webhosting ==
 
-31. How can I publish web sites generated by GRAMPS?
+31. How can I publish web sites generated by Gramps?
 
-Since GRAMPS generates HTML pages, you can upload the pages to your personal web site. If you do not have a personal web site, and still wish to have your pages available on the internet, the GRAMPS project can provide space for you at the http://library.gramps-project.org, see the [webhosting article] on wiki.
+Since Gramps generates HTML pages, you can upload the pages to your personal web site. If you do not have a personal web site, and still wish to have your pages available on the internet.
 
 
-32. How do I submit my pages to the GRAMPS library site (http://library.gramps-project.org)?
-
-If you wish to submit pages to the GRAMPS library site, you will need to contact the GRAMPS project, typically by sending a message to the gramps-users mailing list. You will then be given a username and password that will allow you to upload your files to the site. After you upload the files (in a gzip'ed tar file), the GRAMPS project will install the pages for you on the site.
-
-
-33. After I upload my Family Web Page to library.gramps-project.org, is the password used for write privileges only or read privileges?
-
-In order to prevent abuse of the library.gramsp-project.org site, the password given allows uploads only. If you wish to have a username and password combination to restrict read access to your pages, you will need to contact the GRAMPS project, and we could set this up for you. However, the read and write accounts will be separate accounts.
-
-
-34. Do I view the Family Web Page with a url into my browser? Or through a link on a list of Family Web Pages on the GRAMPS-Project.org site?
-
-The main page on the library.gramps-project.org site will contain an index of the available family sites. However, there will be a unique URL for each site as well.
-
-
-
-**** End of GRAMPS Frequently Asked Questions ****
+**** End of Gramps Frequently Asked Questions ****
 
 $Id$

Gramps.py

@@ -1,3 +1,4 @@
+#! /usr/bin/env python3
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -15,16 +16,16 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #
 
-# $Id$
-
 """
 This is a stub to start Gramps. It is provided for the sole reason of being
 able to run gramps from the source directory without setting PYTHONPATH
 
 From this position, import gramps works great
 """
+import os
+os.environ['GRAMPS_RESOURCES'] = os.path.dirname(os.path.abspath(__file__))
 import gramps.grampsapp as app
 app.main()

INSTALL

@@ -1,49 +1,55 @@
-$Id$
-
 This file contains some useful details on the installation from source code
-for GRAMPS. It does not cover installation of a pre-built binary package.
+for Gramps. It does not cover installation of a pre-built binary package.
 For that use your package manager, the rest is already done by the packager.
 
 Uninstall old version
 ---------------------
-If you do a source install in the same place of an existing install,
+If you do a source install in the same place as an existing install,
 you need to remove the old version first. You can delete the old
-version by deleting the installed directories (for example,
-        /usr/share/gramps
+version by deleting the installed directories. For example, if your installation prefix is /usr/local, remove the following:
+        /usr/local/share/gramps
         /usr/local/lib/pythonx.x/site-packages/gramps
+If you installed with a package manager you might instead need to remove
         /usr/local/lib/pythonx.x/dist-packages/gramps
-        /usr/lib/pythonx.x/site-packages/gramps
-        /usr/lib/pythonx.x/dist-packages/gramps
-    where pythonx.x is python2.7 or whatever version you installed gramps with.
-Also remove the gramps .egg files that are installed along the gramps directory.
 
-If you don't know the list of all files that Gramps installed, you can reinstall
-it with the --record option, and take a look at the list this produces (so
-python setup.py install --record grampsfiles.txt
+replacing pythonx.x with the python version you used, e.g. python3.4.
+Also remove any gramps .egg files that are installed along with the gramps
+directory and the file /usr/local/bin/gramps.
 
-GRAMPS is a python application, so loading happens on reading the
+
+If you don't know the list of all files that Gramps installed, you can
+reinstall it with the --record option, and take a look at the list this
+produces (so python setup.py install --record grampsfiles.txt
+
+Gramps is a python application, so loading happens on reading the
 files, meaning that files of a previous version that are no longer
 present in the new version can still be loaded, making the new install
 unstable!
 
 distutils install
 -----------------
-We do not check all dependencies of Gramps, see README for a 
-list of all required and optional dependencies. On running Gramps, errors will
-be returned if dependencies are missing.
-
-If you are building from released tarball, you should be able to just
-run 
+We do not check all dependencies of Gramps, see README for a list of
+all required and optional dependencies. Missing dependencies will
+result in runtime errors.
 
+To build and install, whether from a tarball or git repo:
    python setup.py build
-   python setup.py install
+   sudo python setup.py install
 
-where the last must be done as root. You can work with Gramps if you only build
-it by pointing the PYTHONPATH to the build directory, but things like MIME type
-and desktop entries will not be created then.
+You can avoid using sudo for the install step by specifying a prefix to which you have write priviledge. The default is /usr/local, which is usually owned by root. You can learn of more options with
+   python setup.py --help
+
+One can use gramps from the command line without installing it by
+setting the following environment variables, but that won't provide
+things like MIME type and desktop entries.
+
+   export PYTHONPATH="/top/grampsdir/gramps:$PYTHONPATH"
+   export GRAMPS_RESOURCES="/top/grampsdir"
+
+See below for ways to invoke Gramps.
 
 Typical install directories in linux (ubuntu) are:
-  * /usr/local/lib/python2.7/dist-packages/gramps/  : the gramps python module
+  * /usr/local/lib/python3.4/dist-packages/gramps/  : the gramps python module
   * /usr/local/share/mime-info    : mime info so gramps opens files automatically
   * /usr/local/share/icons/gnome  : our icons
   * /usr/local/share/doc/gramps   : documentation, also example .gramps and .gedcom
@@ -56,41 +62,35 @@ Typical install directories in linux (ubuntu) are:
 Running Gramps
 --------------
 Gramps is python only, so no compilation is needed, you can even run gramps
-from the source directory. 
+from the source directory.
 
  a) You installed Gramps, then you can run it with the command
 
-     gramps 
+     gramps
 
  b) You installed Gramps, and want to start it from the PYTHONPATH. In this
     case use the command:
 
      python -c 'from gramps.grampsapp import main; main()'
 
-   The executable 'gramps' in /usr/local/bin or /usr/bin from a) does 
+   The executable 'gramps' in /usr/local/bin or /usr/bin from a) does
    this for you.
 
  b) You downloaded the Gramps source code to a directory, and want to run it.
-    First, copy/rename the gramps/gen/const.py.in to gramps/gen/const.py. 
-    Edit this file if needed. Now you can start Gramps from the source code
-    directory with
+    You can start Gramps from the source code directory with
 
      python Gramps.py
 
+    See gramps/gen/const.py how Gramps finds its resource directories in case
+    you encounter problems.
 
 Custom directory installation
 -------------------------------------
-If you would like to install GRAMPS without being root, or in an 
+If you would like to install Gramps without being root, or in an
 alternative location on windows, supply the --root argument to setup.py
 
 For example:
    python setup.py install --root ~/test
-   or
-   python setup.py install --root ~/test --enable-packager-mode
-
-The last option, --enable-packager-mode, is needed if you want to disable
-execution of post-install mime processing. If you don't have root/admin 
-access, this will be needed
 
 Packager's issues
 ------------------
@@ -99,3 +99,8 @@ To create a source distribution run:
 
    python setup.py sdist
 
+If Gramps is built outside of the source tree in a temporary location (e.g. when
+packaging for a distribution), the --resourcepath option can be used to specify
+the path to the installed location of the Gramps resources (e.g. /usr/share):
+
+   python setup.py install --resourcepath=/usr/share

LICENSE

@@ -3,7 +3,7 @@
 
 
  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

MANIFEST.in

@@ -1,6 +1,7 @@
 include AUTHORS
 include COPYING
 include FAQ
+include Gramps.py
 include INSTALL
 include LICENSE
 include MANIFEST.in
@@ -11,34 +12,21 @@ include TestPlan.txt
 recursive-include data *
 recursive-include debian *
 recursive-include docs *
+recursive-include gramps *
 recursive-include help *
+recursive-include images *
 recursive-include mac *
 recursive-include po *
-recursive-include gramps *
 recursive-include test *
 recursive-include windows *
 
 # Remove files created in the build
-exclude data/gramps.desktop
-exclude data/gramps.keys
-exclude data/gramps.xml
-recursive-exclude data/man *.1
-recursive-exclude data/man *.1.gz
-exclude gramps/const.py
-exclude gramps/data/tips.xml
+exclude data/tips.xml
 exclude gramps/plugins/lib/holidays.xml
-exclude po/*.gmo
 exclude po/.intltool-merge-cache
-exclude po/stamp-it
-exclude po/POTFILES
 global-exclude *.pyc
-global-exclude *.py~
 global-exclude *.pyo
-global-exclude *.bak
 
 # Remove directories which should not be included in the distribution
-prune src/guiQML
-prune src/webapp
-
-# Remove Makefiles used by autotools
-global-exclude Makefile*
+prune gramps/guiQML
+#prune gramps/webapp

NEWS

@@ -1,3 +1,454 @@
+Version 4.2.0,
+* New date and language fields on place name
+* Review on GtkBuilder, fix some Gtk3 warnings and move from deprecated methods
+* Change icons and buttons handling methods
+* Enhanced Place Editor and new Place Name editor
+* New widget: use own interactive-search
+* Ability to import kml data into Geography views
+* Enhancement for removing multiple selected items from Views (action group)
+* Add drag support on more Views, Selectors and Editors
+* Add right-click "Copy all" to ListModel and all QuickTables
+* Review Alternate Place handling and edition
+* New 'Place' configuration keys set by user (settings)
+* New filter rule: is enclosed by
+* Consistency on Privacy option for reports
+* Consistency on "Name-format" options for reports
+* Add DeferredFilter class (a subclass of GenericFilter)
+* New textual Report: Links on Notes
+* Fix alphabetic index and toc bug in books
+* Enhancements on Style Editor
+* Enhancements on End Notes into textual reports
+* Changes on Individuals complete textual report
+* Changes on Ancestors Tree draw report: Include Siblings
+* Add name-format option, and deferred translation on Records report
+* Add deferred translation on Timeline draw report
+* Enable attributes gramplet on Source and Citation Views
+* New place locations gramplet
+* Optimizations around index, Flat and TreeView models
+* Enhanced samples files
+* All importers return now an ImportInfo object
+* Experimental gwplus (geneweb) import file format support
+* Remove experimental HTML renderer view
+* New test scripts
+* New Date handler for Japanese
+* Review on Slovenian and Czech Date Handlers
+* Implement both "traditional" and "simplfied" Chinese (translations and dates)
+* Serbian review
+
+2015-05-01
+Version 4.1.3, "Thou shalt not count to five", a maintenance release.
+* Fix db upgrade failure
+* GtkDialog mapped without a transient parent
+* [Gedcom} SUBN and SUBM record handling
+* [Gedcom] Import/export round trip causes lost information
+* [Gedcom] Entering a witness to an event such as marriage might be ignored
+* [Gedcom] Gramps can't import estim. date period exported by itself
+* [Gedcom] 1/4 and 1/2 ANSEL characters not supported on importing ANSEL
+* [Gedcom] Importing file containing multibyte UTF-8 characters fails
+* [Gedcom] Import fails for ANSI file under python 3
+* [Gedcom] Failure importing ANSEL encoded gedcom file.
+* [Gedcom] Characters ignored on a Gedcom encoded ANSI (cp1252 West Europe, USA)
+* [Gedcom] NameError in importer
+* [Gedcom] Event address is lost on import, i.e. disconnected from event
+* Crash on geneweb export with python3
+* GuiColorOption missing avail-changed event handler
+* Bad generation of [timeline report] ODT files since 4.0.0
+* Fix bad handle in explanation note for unknown event
+* Fix spurious generation of empty 'Alternative Name' in place.merge()
+* Support creating directories in various scenarios
+* Attempting to add a bookmark causes an error
+* Long series of "unhandled exception" popup boxes while doing a check & repair
+* Crash when trying to link existing place as an enclosing place using P0001 number
+* HTML view fails to load
+* Relationship Graph crashes
+* Python3 needs new_subpixbuf not subpixbuf
+* Regression: running gramps from crontab fails
+* tag_map is not initialized
+* Some labels now fit better on citations sidebar filter
+* Event columns in web narrative are too narrow
+* Problem by start program (launcher)
+* Translation string missing in Not Related tool for help and close button
+* Date format month/year is not well reported at editing time [in Italian]
+* Fix unknown gender relationships handler for the french locale
+* Fix a handle type bug on sidebar filter
+* Tidy up About dialog
+* Cleanup on some man files
+* Convert some remaining unicode literals
+* Fix mac menubar setting
+* Enable python3 to run po/update_po.py
+* Updated translations: cs, de, fr, is, nl
+
+2015-02-28
+Version 4.1.2, "That's no ordinary rabbit", a maintenance release.
+* Error converting python2 utf-8 strings to python3 str when loading data from database
+* Removing a parent place from a place leaves a dangling reference
+* Error during checking the database
+* Stubborn blank space in database won't be removed, fix removing rows in flat list views
+* Database upgrade fails if default media path is not set
+* Error converting database after upgrade to Gramps 4.1.1
+* Error in a single place within the places section
+* Entries from the add-or-choose selector of Place/Source/Media/Note cannot be dragged
+* Enclosing places tab should work like other similar tabs, new place reference editor
+* Association editor refuses dropped persons
+* Error on opening twice an object from clipboard
+* Incorrect spacing in export assistant file chooser
+* New Event types are saved as a disordered list
+* Always display main participants
+* Place titles can now be generated on-the-fly by a place displayer, default is still to use the place title field
+* GEDCOM import of embedded notes attached to media does not work
+* Crash on Ancestry.com .ged import; consistent.
+* Errors handling owner/submitter information in GEDCOM files.
+Only import researcher from GEDCOM or XML if the family tree was originally empty.
+* GEDCOM export does not export media attached to citations.
+* The fanchart view crashes if max generation is set to 1 away.
+* Sidebar Filters do not match placetypes in new placeview, two new filter rules (HasTitle, HasData)
+* Fix bug when family has no parents
+* Fix bad handle in explanation note for unknown event
+* Some labels now fit better on citations sidebar filter
+* Views in Geography should not always use the last option set by the user
+* Request for keyboard-controlled zoom on Geography view
+* Error geography view - Displaying main menu
+* Configure screen needs a file selector to select directory for "offline mode" files
+* Filter panel on geography view displays improperly
+* Detailed descendant report crashes, bibliography (citations)
+* Can't disable box shadow in SVG descendant tree
+* Descendant tree graphical report, syntax error in svg output
+* Regression: Complete Individual report has partially-untranslated output
+* Events Page in Narrative Report not working
+* Gramps freeze after defining a report style with German cm values
+* Various problems with docgen.TextDoc.add_media_object
+* Report event attribute name is not translated
+* Records Gramplet uses wrong text
+* Closing detached gramplet causes python to crash
+* Cannot reduce size of gramplets detached from a gramplet bar
+* Gramplets don't fill window when detached from dashboard
+* ImageMetadata doesn't show metadata
+* typo on GLib call, used by an addon only
+* Fix error setting gramplet tab label
+* Check for active person in session log gramplet
+* Spurious spaces in CLI List Family Trees, tab delimited output.
+Print statements changed to assemble the whole line before output.
+* Gtk3 warning and custom undoableentry widget, see bugzilla_id 644927
+* Warnings: deprecated Gtk properties and errors loading theme icon.
+Fix: database manager dialog is inconsistent for older gtk+3 versions.
+Warnings: deprecated Gtk properties and errors loading theme icon.
+Fix: Error loading theme icon 'gtk-apply'
+* gramps fails to start with gtk+-3.13.3
+* Places in data.gramps are not in the new Place hierarchy
+* Upgrade the version of some dependencies for Mac OS and Windows OS.
+* Keywords entry in gramps.desktop does not work
+* 'Available Gramps Updates for Addons' window not on top
+* Some text not translatable in context menu fancharts
+* Fix for Unit test
+* date inflections in _datehandler.py, update for Ukrainian, Russian, Croatian
+* Better support for Serbian and Turkish locales
+* New translation: Icelandic
+* Re-enable Turkish support after a major review. Thank you Uğur.
+* Updated translations: cs, de, eo, fi, fr, hr, hu, it, nb, nn, ru, sk, sr, sv, uk, zh_CN
+
+2014-10-24
+Version 4.1.1, "MachineThatGoes...Ping!", a maintenance release.
+* Fix custom place types in the place editor
+* Allow place type combobox to receive focus.
+* Store custom place types in the metadata table
+* Fix place type for places without a main location
+* Fix bug adding parent places to a new place
+* Prevent user creating a cycle in the place hierarchy
+* Avoid infinite loop when place cycle encountered
+* Prevent creation of a place cycle when merging
+* Fix error when no place is selected
+* Check that a place has been selected when saving.
+* Use the standard place selection widget to be consistent.
+* Add a new Top Level place through the Place Reference Editor
+* Fix backlinks code in place report
+* Backlinks for places can now also be places as well as events.
+* Fix check and repair tool for empty placerefs
+* Update location utilities to work with proxies
+* Place report does not run
+* Update place details gramplet
+* Locations are now displayed in a new separate gramplet.
+* Add check for empty handle in gramplets
+* Check DB lock on the recent opened trees list
+* Sidebarfilter gramplet does not fit well into People, Events or Media views
+* Fix new event default type considering existing events with *default* role
+* Rebuild secondary indexes after database upgrade
+* Importing gedcom files containing multibyte UTF-8 characters fails
+* Ahnentafel Report did not use Christening Date if no Birth Date
+* [Narweb:] Missing webpage for media under some circumstances
+* Fix narrated web report with gendex option enabled
+* Tweak to "default" CSS choice for the narrated web report
+* Invalid link for Merge citation Help button
+* Fix 'todo' gramplet
+* Fix path when using drag & drop to add media
+* Limit the number of generations displayed in the ancestor gramplet
+* Export of a subset of the tree failed
+* Fix issues in python3, and bytes-string mismatch with ICU
+* Fix url/uri handling with non-ascii characters under linux and mac
+* Fix name format on graphical reports
+* Fix name format on textual reports
+* Better GUI support for embeded custom attributes list on media object
+* Better keys for search under linux shells (.desktop file)
+* 'Unknown' person in detailed ancestor report can not be translated
+* Translations don't show in many labels
+* Ensure python text domain gets the right encoding.
+* Translate some punctuation marks
+* Various fixes around Geography and osmgpsmap
+* Allow gramplets to be displayed in the dashboard only
+* Update FSF address
+* Add Arabic-script, Islamic-date, Thai script, Married Name and more dates examples
+* Fix on czech date handler for calculated and estimated dates
+* Enhance Serbian date handler to handle Cyrillic dates
+* Simplify Canadian Ash Wednesday holiday
+* Re-enable Esperanto support (for non-Windows OS only) after a large review
+* New translation: Serbian
+* Various fixes in German and Czech
+* Updated translations: ar, cs, de, fi, fr, it, sv
+
+2014-06-15
+Version 4.1.0, the "Name go in book", new major release.
+* GEP 006: Better Place handling
+* New Tags support on Event, Place, Repository, Source, and Citation
+* Source/Citation Data becomes Attributes
+* Add optional support for checksum on Media object
+* New place hierarchies model
+* By default, you can choose navigator modes with a drop down.
+* New Place editor
+* Enhanced MediaReference Editor
+* Some debug tools move to new gramplets
+* Full Python 3 support
+* New functions and widgets related to Place and Media selections
+* Enhancements on to_struct()
+* New methods on Date handlers
+* Better support on translation for inflection rules
+
+2014-05-22
+Version 4.0.4, "Not the comfy chair", a maintenance release.
+* Upgrade to db version 17 fails in Python 3 due to use of iteritems
+* Database corrupted - TypeError: unhashable type: 'list'
+* Fix bug in abandon changes and quit
+* Consistency on create_id method
+* Better handling for non-ASCII characters on database-path
+* Better support for ANSEL characters
+* 'Display as' field in Name Editor reverts to Preferences default
+* Fix vcard date converter
+* View does not communicate over proxy server with autorisation
+* Enhanced Bookmark support
+* Event gramplet filter does not have field for primary role,
+* New HasDayOfWeek filter rule
+* Error when leaving a Gramps type field blank in an editor
+* Fix creation of events with same Gramps-ID
+* Crash when opening details of a person
+* Fix spacing on dialogs for some recent linux distribution
+* date editor and Date class allow e.g. Hebrew dates with newyear (Mar25)
+* Fix crash in fan chart view when scrolling
+* Poor contrast mouse on mouse over
+* Drag and drop only one data into Editors tabs
+* Enhancements and consitency on events gramplet, selector and view
+* Sometimes says 'no data exists for note' when saving
+* Enhanced Citation Editor
+* Do not always raise errors when some plugins are hidden
+* Remove hover selection from embedded lists
+* Fix update of active object after merge
+* Cleanup on warnings and messages around locale directory
+* Media Editor error if Path value was changed to a non existing file
+* Register history objects at startup
+* Avoid dumb encoding error when compiling gpr file
+* Work around Py2Cairo
+* Given Name Cloud Gramplet splits up given names into words
+* Users should not be allowed to edit and delete 'default' style into Style Editor
+* Filename Decoding Error in Graphical Reports
+* Missing closing bracket in Web_Basic-Spruce.css
+* Reorder tool: global name 'gen' is not defined
+* Fix start in East Asian language, force UTF-8 locale on Mac
+* Fix apple_collation
+* Spelling messages at random cause hang for a few seconds.
+* Media viewer list crashes during start if one try to select an entry where the media isn't available
+* 'Available Gramps Updates for Addons' window not on top
+* HTML View fails to load
+* Paper names and Styles values are now translated
+* Sort failure using glocale.sort_key
+* Improve support for collation variants
+* Translate some punctuation marks
+* Fix unit tests and python3 issues
+* Fix Relationships handler for Portuguese
+* Updated translations: ar, cs, de, fi, fr, he, it, lt, nb, nl, pl, pt_BR, ru, sv, uk
+
+2014-01-27
+Version 4.0.3, "It's tomorrow, ask me now", a maintenance release.
+* Fix copy via context menu on Views into Charts Category
+* Fix Tab sequence in Name Editor
+* Fix citations gramplet into media view
+* Fix unhandled exception when inspecting media
+* Fix Citation sidebar filter for python3
+* Fix add link to a "Html code" note
+* Fix message on backup dialog
+* Fix space for selection lists
+* Fix spell with myspell and LANG
+* Fix changes root cursor to hand
+* Recent file parser now gives the file location
+* Fix vertical overflows on check and repair-tool dialog
+* Fix custom key/value (data item) on Database difference report
+* Fix unhandled exception in media exif information under Windows OS
+* Fix person selector in searchfilter under Windows OS
+* Starting Gramps without console is now possible under Windows OS
+* Specific OS handling
+* Common fixes and changes with 3.4.7.
+* Updated translations: ca, de, fi, fr, ru
+
+2013-11-08
+Version 4.0.2, "Welcome to our humble abode", a maintenance release.
+* Citation merge works better for all objects with citations
+* Fixed citations attached to family events
+* Fixed several crashes, hangs, and data corruption scenarios
+* Fixed bugs in determining whether a person is alive, potentially resolving private data leak via export or report
+* Fixed bugs on proxies
+* VCF export/import now support gender information
+* Several bugs with filtering fixed, most filters now support regular expressions
+* Fixed bug in Hebrew calendar date calculations
+* Fix some regressions on GEDCOM file format export and enhancement on CONT/CONC handling
+* Multiple fixes and improvements on gramplets
+* Multiple fixes in the narrated website and web calendar reports
+* Enhancements on date and calendar
+* Some fixes and improvements of the webapp
+* Fix on Database Differences module
+* Enhancements of the citation tree view (Sources category)
+* Improvements on User classes
+* Polish and consistency on Gramps XML export
+* Bump XML schema to 1.5.1
+* Fixed several long-standing problems with report generation
+* Better support of RTL locales (Arabic, Hebrew, etc.) in GUI
+* Better support for selected lang on some reports
+* Better way for displaying missing dependencies
+* Better Spell support
+* Platform-specific fixes for Mac and Windows
+* Add printing functionality for all geography views
+* New date handlers for Arabic and Greek
+* Translation updates (ar, cs, de, fr, lt, nb, nl, ru, sv) and translation-related fixes
+* Repaired and enhanced tests broken since 3.3.x, resulting in overall reliability improvements
+* Add a support for AppData
+
+2013-06-24
+Version 4.0.1, the "What is washing when we are on the verge of a great scientific breakthrough?", a maintenance release.
+* Gtk3: fix menu on person editor and Geography views, convert deprecated code for the indicator in entryfield
+* Gedcom: Fix crash on export when there are addresses, fix space on ID
+* Disallow bookmarking a source in the Citation Tree View
+* Better RTL support on Pedigreeview and position for gramplets
+* Fix bad scaling in address editor
+* Fix crash on ancestor chart report
+* Fix navigation issues with selected line
+* Fix size of the 'Tip of the day' dialog
+* Fix right-click on tables in Quick Views
+* Fix cursor corruption on Pedigree view
+* Improvements when exporting via CLI
+* Reports: Various fixes on dialogs, output file formats and cleanup on error messages
+* MacOS: Fix bad filename on Gramps URL, osm-gps-map revision, image paths, resource-path file, maclocale
+* Move the HTML resources from gramps/plugins/webstuff to Data and Images
+* Alternate Names in Person Details Gramplet (patch by Heinz Brinker)
+* New holidays, date and relationship handlers for Ukrainian
+* Enhancements for testing localized Relationship handlers (contribution by Fedir)
+* More names and events on data.gramps sample
+* Translations updated: cs, de, es, fr, hu, nb, nl, ru, uk, and new support for Arabic
+
+2013-05-21
+Version 4.0.0, the "The Miracle of Birth", new major release.
+* GEP 8: code reorganization
+* GEP 26: Replace make
+* GEP 29: Gtk 3 support
+* GEP 31: Python 3 support
+* Completely reworked localization handling
+* The Gramplet view has been renamed Dashboard. This to avoid an overload of the word Gramplet, and to make it more clear to new users what can be expected in this view
+* GTK 3 uses new themes, so users not on Gnome must set a nice GTK 3 theme to fully appreciate Gramps 4.0. Install a GTK 3 theme and set it. If Gramps looks ugly, you made an error in this step.
+* Different sidebar navigators can be installed
+* New Ancestor Fan Chart View and Descendant Fan Chart View, which offer a lot of insight in your family tree on a small space. Direct printing is available from these views.
+* All wizards are reworked, so the exporter dialog, help and bug report dialog are different from version 3.4, but offer the same functions
+* New To Do Gramplets listing all To Do Notes
+* More reports support output in a different language than the interface language
+* Narrative Web has been reworked to make it more stable.
+
+2013-05-15
+Version 3.4.4 of Gramps! "The Ministry of Silly Names", a maintenance release.
+* infinite recursion bug in narrative web generation
+* protection on family trees when using version 3.4 and 4.0 on the same PC (road to 4.0)
+* merging notes of media with citations now works
+* crash during Calculate Preview of a filtered XML export
+* fix annoying errors on navigation related to citations gramplet and tag object.
+* listing the Family Trees can corrupt them.
+* various fix around handling Gedcom file format
+* fix citations and sources import on ProGen format 
+* better date handling and better alternate translation support on some textual reports according to locale under windows 
+* avoid Errors when setting wrong value as markup for invalid dates (Preferences)
+* fix paragraph layout on PDF format or print output
+* New: New-Zealand holidays
+* Polish and backport code on XML import (road to 4.0)
+* Regular expression rules now use search rather than match, fix design issues on regex filter rules
+* Disable/Enable indent spouse on descendants tree
+* fix regular expressions on Place filter rule
+* consistency on cli arguments (road to 4.0)
+* fix call of non-existant process on references proxy, enhanced tests on proxy filter
+* fix NarWeb creation via cli for some non-english locales
+* Various updated translations: ca, de, fr, it, nl, pt_BR, ru, sv, uk
+
+2013-03-19
+Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenance release.
+* Sorting (both in the main display window, and particularly in Narrative Web output) now uses PyICU (if that module is available). Inclusion of PyICU is 'strongly recommended'. This resolves a number of bugs particularly related to sorting of non-Latin characters, and sorting on MS Windows and Mac OS X. Some changes have been made in Narrative Web to support contractions for alphabetic indices.
+* The automatic Addon checking and download now works once again (the location used in Gramps 3.4.2 and before had been changed, so the the automatic process was no longer working).
+* Import from Pro-Gen has been updated (at last) to take account of the change to Citations (in 3.4.0)
+* Import and Export of address fields in GEDCOM has been improved so that the round-trip works properly. 
+* GEDCOM Repositories not imported correctly from FTM for Windows and Heredis.
+* Fixes to a number of errors in filtering notes.
+* Fix some errors in determining whether someone is alive (e.g. for filtering out alive people).
+* Make availability of GraphViz settings depend on output format
+* Improve the descriptions and tooltip for GraphViz aspect ratio option
+* Fixed update problems with citation bottombar gramplet (bug #6336)
+* Fixed Open Document Text output in Book report (bug #6457)
+* A number of changes to Narrative Web:
+** Media objects attached to Marriage events and Sources are not included in Narrative Web Site 
+** restructure the families index so families are indexed under both spouses, and the family name is normalised
+** separate out Families section in individual and families pages so individual page links to the family page and family page links to both people
+** normalise links to families so the link is only displayed if the family page is present, and the gid is included when appropriate
+** remove highlighting of media subregions except in the media pages (it was confusing and not very well implemented)
+** include people whose surname is absent in the individual, surname and families indexes
+** html_escape names and surnames
+** always display media thumbnails for first image in Gallery list (in some cases they were suppressed if they had been displayed at the top of the page)
+** change partner and parent columns in families index to improve the layout of the HTML and put the comma between multiple partners in the right place
+** use event description (where present) instead of just event type in back references
+** fix bug in the way obj_dict and bkref_dict were initialised
+** fix missing document.png for missing media
+** fixed problems that bibliography ignores media attached to citations, so if that is the only 'interesting' thing about the citation, the citation media is not output
+** Replaced person link routine with one that takes into account whether there is a page for the person.
+** Included repository reference media type and call number in the 'Repositories' section of the relevant source instead of the Repository page.
+** Implemented a generalised back reference function to display the 'References' section of all pages. This recursively displays references till one is found for which a page exists.
+** Removed list of people and families from heading of the event pages as these are now in the 'References' section.
+** Fixed bug "0005968: Narrated Web Site not copying Source Citations files such as jpg or pdf docs to web site
+** Fixed bug "0005946 GRAMPS failed to insert jpeg image into proper place for an event" by displaying a thumbnail for citation media in the 'Source References' section (with a link to the media page) 
+** Tidy up media pages - remove unused parameters, use list of media items generated in first pass. Should fix bugs 2365, 5905 and 6009.
+** Tidy up sources pages - fix numbering of repositories, remove unused parameters, fix title of individual source pages
+** Bug: reset NarrWeb navigation menu layout when style sheet doesn't support it
+** Change Source Pages to use the list of sources generated by the first pass that finds objects to be output, and simplify references section on the Source page to use the references passed to it.
+** Fix option to suppress Gramps ID (bug #6237)
+* a number of technical changes to Narrative Web
+** Removed a lot of redundant code and parameters (mainly connected with the old way of determining the objects to be included in the report).
+** Movement of some large chunks of code within the source file and some initial work towards GEPS 022: Narrative Website Refactor. Functionality should be unchanged. 
+** Moved routines for calculating objects to be output so they can be part of default list building classes.
+* Various updated translations: da, de, es, fr, it, nb, nl, pt_BR, pt_PT, sv, uk
+
+2012-10-28
+Version 3.4.2 -- the "We're all individuals!" bug fix release.
+* Some fixes on NarrativeWeb report
+* Some fixes on book report
+* Improvement on database path interface and user's preferences
+* Consistency on Name display and regex support
+* Some platform-specific fixes for Windows system environment
+* Better support for media links on Gedcom file format
+* Fix possible incorrect family relations on Gedcom file format
+* Various fixes on citation records
+* Fix and improve places handling on Geography views
+* Fix on command line arguments
+* Consistency on PDF file format
+* New language: Greek
+* Various updated translations
+* Changelog: http://www.gramps-project.org/bugs/changelog_page.php?version_id=32
+
 2012-08-23
 Version 3.4.1 -- The "A tiger? In Africa?!" bug fix release.
 Mention in the release that upgrading is advised for two critical issues:

README

@@ -1,74 +1,91 @@
 Please read the COPYING file first.
-If building from source, also read the INSTALL file (at least through the
-"SUPER-SHORT VERSION") before going further.
+
+Please read the INSTALL file if you intend to build from source.
 
 Requirements
 --------------------------------
 The following packages *MUST* be installed in order for Gramps to work:
-   Python 2.7 or greater, Python 3.2 or greater (python version cannot be mixed)
-   GTK 3.0 or greater
+   Python 3.2 or greater
+   GTK 3.10 or greater
    pygobject 3.3.2 or greater
+   cairo, pango, pangocairo with introspection bindings (the gi packages)
    librsvg2 (svg icon view)
    xdg-utils
+   bsddb3
 
 The following package is needed for full translation of the interface
 to your language:
-   language-pack-gnome-xx 
-                    Translation of GTK elements to your language, with             
-                    xx your language code eg for Dutch you need
+   language-pack-gnome-xx
+                    Translation of GTK elements to your language, with
+                    xx your language code; e.g. for Dutch you need
                     language-pack-gnome-nl. The translation of the
-                    Gramps strings is included with the source code.
+                    Gramps strings is included with the gramps source.
 
 
 The following packages are *STRONGLY RECOMMENDED* to be installed:
-   osmgpsmap        Used to show maps in the geography view. 
+
+   osmgpsmap        Used to show maps in the geography view.
+                    It may be osmgpsmap, osm-gps-map, or python-osmgpsmap,
+                    but the Python bindings for this must also be present.
                     Without this the GeoView will not be active, see
-                    http://gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual_-_Main_Window#Geography_Category
-                    The package is named osmgpsmap, osm-gps-map
-                    or python-osmgpsmap. Or obtain it from: http://nzjrs.github.com/osm-gps-map/
+                    http://gramps-project.org/wiki/index.php?title=Gramps_4.1_Wiki_Manual_-_Main_Window#Geography_Category
+
    GraphViz         Enable creation of graphs using GraphViz engine.
-                    Without this no beautiful graphs can be created.
+                    Without this, three reports cannot be run.
                     Obtain it from: http://www.graphviz.org
-   pyexiv2          Enables Gramps to manage Exif metadata embedded in your
-                    media. Gramps needs version 0.1.3 or greater.
-                    Obtain it from: http://tilloy.net/dev/pyexiv2/download.html  
+
+   PyICU            Improves localised sorting in Gramps. In particular, this
+                    applies to sorting in the various views and in the
+                    Narrative Web output. It is particularly helpful for
+                    non-Latin characters, for non-English locales and on MS
+                    Windows and Mac OS X platforms. If it is not available,
+                    sorting is done through built-in libraries. PyICU is
+                    fairly widely available through the package managers of
+                    distributions. See http://pyicu.osafoundation.org/
+                    (These are Python bindings for the ICU package.)
 
 The following packages are optional
-   gtkspell         Enable spell checking in the notes. Gtkspell depends on 
+
+   gtkspell         Enable spell checking in the notes. Gtkspell depends on
                     enchant. A version of gtkspell with gobject introspection
                     is needed, so minimally version 3.0.0
 
+   rcs              The GNU Revision Control System (RCS) can be used to manage
+                    multiple revisions of your family trees. See info at
+                    http://www.gramps-project.org/wiki/index.php?title=Gramps_4.1_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
+                    Only rcs is needed, NO python bindings are required
+
+   PIL              Python Image Library is needed to crop
+                    images and also to convert non-JPG images to
+                    JPG so as to include them in LaTeX output.
+                    (For Python3 a different source may be needed,
+                    python-imaging or python-pillow or python3-pillow)
+
+   GExiv2           Enables Gramps to manage Exif metadata embedded in your
+                    media. Gramps needs version 0.5 or greater.
+                    See http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion#GExiv2_for_Image_metadata
+
    ttf-freefont     More font support in the reports
 
-   gir-webkit       GObject introspection data of WebKit is required for the
-                    hidden view 'Htmlview', which allows websites to be opened in
-                    Gramps. Users can unhide the view in the plugin manager. 
-                    A html renderer must be installed to use the view.
-                    !! PACKAGERS, Test if on your distribution
-                    webkit and Gramps is stable. If you obtain crashes, patch 
-                    src/plugins/view/htmlrenderer.py and
-                    src/plugins/view/geoview.gpr.py, so as to remove:
-                       from gi.repository import WebKit as webkit
+   gir-webkit       Required for the (user-downloadable) HtmlView plugin
 
-   goocanvas2:
-                    Required for the Graphview plugin
+   goocanvas2       Required for the (user-downloadable) GraphView plugin
 
+No longer needed in 4.1:
+   ?
 No longer needed in 4.0:
-   pygoocanvas, pygtk
+   pygoocanvas, pygtk, pyexiv2
 No longer needed in 3.3:
    python-enchant Enchant
 No longer needed in 3.2:
    python glade bindings
 No longer needed in 3.1:
-   yelp             Gnome help browser. At the moment no help is shipped
+   yelp             Gnome help browser. No offline help is shipped see Gramps website for User manual
 
-Remark: There is a conflict when using python-gnome2 in Ubuntu. This is evident
-        with the error: TypeError: Error when calling the metaclass bases
-                                   metaclass conflict
 
 Documentation
 ---------------------------------
-The User Manual is now maintained on the gramps website,
+The User Manual is maintained on the Gramps website,
 http://www.gramps-project.org/wiki/index.php?title=User_manual
 
 --------------------------------

RELEASE_NOTES

@@ -1,24 +1,13 @@
-Gramps 3.2 Release Notes
+Major enhancements in Gramps 4.2.0:
 
-General Improvements
+* GEP 36: GEPS 036: Extended Alternative Place Name Handling:
+https://gramps-project.org/wiki/index.php?title=GEPS_036:_Extended_Alternative_Place_Name_Handling
 
-* New Plugin System
-In the Help Menu -> Menu Status, all available plugins are visible. All plugins can be hidden, saving resources and hiding options you do not need. Eg: You don't use the Pedigree View? Hide it in the Plugin Status, and it will not be present anymore. You don't use vcard export? Hide it in the Plugin Status, and it will not be offered anymore.
+* GEP interactive search: own interactive-search box.
 
-* Faster
-Many under the hood improvements have occurred that should improve perfamance enormously. Yes, new features are present to use all your processing power, but they are all implemented as plugins that can be hidden. Eg: Insert of a person in a 30000 people family tree took 4sec on 1.4Ghz PC in 3.1, Now it is done in milliseconds.
+* Speedup on Tree and Flat Views
 
-*New Views
-There are new views, and some views have been greatly improved
-  - People view can now be sorted on the columns
-  - A Place treeview is present, nicely grouping your places under country groups
-  - GeoView has left it's beta status behind and shows your data on an 
-    online map (Openstreetmap or google maps, fast internet connection required)
-  - Help Menu -> Extra Reports/Tools open a webpage with downloadable extra views
+More info in the manual 
+http://www.gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_What%27s_new%3F
 
-
-Other Improvements
-
-* Styled Notes now in most output formats that support styles, eg in the web report
-* New languages
-* Select language in which report should be created (only present now in some reports)
+Everybody is invited to update the manual to make it current!

data/authors.xml

@@ -1,142 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <authors xmlns:html="http://www.w3.org/1999/xhtml">
- <author uid="rshura" title="author">
+ <author title="author">
   Alex Roitman &lt;<html:a href="mailto:shura@gramps-project.org">shura@gramps-project.org</html:a>&gt;
  </author>
- <author uid="asleinius" title="contributor">
+ <author title="contributor">
   Arturas Sleinius &lt;<html:a href="mailto:asleinius@users.sourceforge.net">asleinius@users.sourceforge.net</html:a>&gt;
  </author>
- <author uid="bmcage" title="author">
+ <author title="author">
   Benny Malengier &lt;<html:a href="mailto:benny.malengier@gramps-project.org">benny.malengier@gramps-project.org</html:a>&gt;
  </author>
- <author uid="borilg" title="contributor">
+ <author title="contributor">
   Boril Gourinov &lt;<html:a href="mailto:boril.gourinov@gmail.com">boril.gourinov@gmail.com</html:a>&gt;
  </author>
- <author uid="pez4brian" title="author">
+ <author title="author">
   Brian Matherly &lt;<html:a href="mailto:brian@gramps-project.org">brian@gramps-project.org</html:a>&gt;
  </author>
- <author uid="dallingham" title="author">
+ <author title="author">
   Don Allingham &lt;<html:a href="mailto:don@gramps-project.org">don@gramps-project.org</html:a>&gt;
  </author>
- <author uid="dpeterso" title="author">
+ <author title="author">
   Donald A. Peterson &lt;<html:a href="mailto:"></html:a>&gt;
  </author>
- <author uid="dsblank" title="author">
+ <author title="author">
   Doug Blank &lt;<html:a href="mailto:doug.blank@gmail.com">doug.blank@gmail.com</html:a>&gt;
  </author>
- <author uid="eerot" title="contributor">
+ <author title="contributor">
   Eero Tamminen &lt;<html:a href="mailto:eerot@users.sourceforge.net">eerot@users.sourceforge.net</html:a>&gt;
  </author>
- <author uid="erikdrgm" title="contributor">
+ <author title="contributor">
   Erik De Richter &lt;<html:a href="mailto:erikdrgm@users.sourceforge.net">erikdrgm@users.sourceforge.net</html:a>&gt;
  </author>
- <author uid="espenbe" title="contributor">
+ <author title="contributor">
   Espen Berg &lt;<html:a href="mailto:espenbe@gmail.com">espenbe@gmail.com</html:a>&gt;
  </author>
- <author uid="gburto01" title="contributor">
+ <author title="contributor">
   Gary Burton &lt;<html:a href="mailto:gary.burton@zen.co.uk">gary.burton@zen.co.uk</html:a>&gt;
  </author>
  <author uid="gbritton" title="contributor">
   Gerald Britton &lt;<html:a href="mailto:gerald.britton@gmail.com">gerald.britton@gmail.com</html:a>&gt;
  </author>
- <author uid="jgsack" title="contributor">
+ <author title="contributor">
   James G Sack &lt;<html:a href="mailto:jgsack@san.rr.com">jgsack@san.rr.com</html:a>&gt;
  </author>
- <author uid="has_no_svn_access" title="contributor">
+ <author title="contributor">
   Janne Kovesjärvi &lt;<html:a href="mailto:janne.kovesjarvi@gmail.com">janne.kovesjarvi@gmail.com</html:a>&gt;
  </author>
- <author uid="has_no_svn_access" title="contributor">
+ <author title="contributor">
   Jason Simanek &lt;<html:a href="mailto:jsimanek@gmail.com">jsimanek@gmail.com</html:a>&gt;
  </author>
- <author uid="romjerome" title="contributor">
+ <author title="contributor">
   Jérôme Rapinat &lt;<html:a href="mailto:romjerome@yahoo.fr">romjerome@yahoo.fr</html:a>&gt;
  </author>
- <author uid="jcreus" title="contributor">
+ <author title="contributor">
   Joan Creus &lt;<html:a href="mailto:joan.creus@gmail.com">joan.creus@gmail.com</html:a>&gt;
  </author>
- <author uid="josip" title="contributor">
+ <author title="contributor">
   Josip Pisoj &lt;<html:a href="mailto:josip@pisoj.com">josip@pisoj.com</html:a>&gt;
  </author>
- <author uid="jsanchez" title="contributor">
+ <author title="contributor">
   Julio Sánchez &lt;<html:a href="mailto:julio.sanchez@gmail.com">julio.sanchez@gmail.com</html:a>&gt;
  </author>
- <author uid="keesb" title="contributor">
+ <author title="contributor">
   Kees Bakker &lt;<html:a href="mailto:kees.bakker@xs4all.nl">kees.bakker@xs4all.nl</html:a>&gt;
  </author>
- <author uid="kdorichev" title="contributor">
+ <author title="contributor">
   Konstantin Dorichev &lt;<html:a href="mailto:kdorichev@gmail.com">kdorichev@gmail.com</html:a>&gt;
  </author>
- <author uid="has_no_svn_access" title="contributor">
+ <author title="contributor">
   Lubo Vasko &lt;<html:a href="mailto:pgval@inMail.sk">pgval@inMail.sk</html:a>&gt;
  </author>
- <author uid="ltosky" title="contributor">
+ <author title="contributor">
   Luigi Toscano &lt;<html:a href="mailto:luigi.toscano@tiscali.it">luigi.toscano@tiscali.it</html:a>&gt;
  </author>
- <author uid="has_no_svn_access" title="contributor">
+ <author title="contributor">
   Luiz Gonzaga dos Santos Filho &lt;<html:a href="mailto:lfilho@gmail.com">lfilho@gmail.com</html:a>&gt;
  </author>
- <author uid="has_no_svn_access" title="contributor">
+ <author title="contributor">
   Łukasz Rymarczyk &lt;<html:a href="mailto:yenidai@poczta.onet.pl">yenidai@poczta.onet.pl</html:a>&gt;
  </author>
- <author uid="m_d_n" title="contributor">
+ <author title="contributor">
   Michiel Nauta &lt;<html:a href="mailto:m.d.nauta@hetnet.nl">m.d.nauta@hetnet.nl</html:a>&gt;
  </author>
- <author uid="leonhaeuser" title="contributor">
+ <author title="contributor">
   Mirko Leonhäuser &lt;<html:a href="mailto:mirko@leonhaeuser.de">mirko@leonhaeuser.de</html:a>&gt;
  </author>
- <author uid="has_no_svn_access" title="contributor">
+ <author title="contributor">
   Morten Bo Johansen &lt;<html:a href="mailto:mbj@spamcop.net">mbj@spamcop.net</html:a>&gt;
  </author>
- <author uid="loshawlos" title="author">
+ <author title="author">
   Martin Hawlisch &lt;<html:a href="mailto:martin.hawlisch@gmx.de">martin.hawlisch@gmx.de</html:a>&gt;
  </author>
- <author uid="nick-h" title="contributor">
+ <author title="contributor">
   Nick Hall &lt;<html:a href="mailto:nick__hall@hotmail.com">nick__hall@hotmail.com</html:a>&gt;
  </author>
- <author uid="ldnp" title="contributor">
+ <author title="contributor">
   Peter Landgren &lt;<html:a href="mailto:peter.talken@telia.com">peter.talken@telia.com</html:a>&gt;
  </author>
- <author uid="acraphae" title="contributor">
+ <author title="contributor">
   Raphael Ackermann &lt;<html:a href="mailto:raphael.ackermann@gmail.com">raphael.ackermann@gmail.com</html:a>&gt;
  </author>
- <author uid="hippy" title="author">
+ <author title="author">
   Richard Taylor &lt;<html:a href="mailto:rjt-gramps@thegrindstone.me.uk">rjt-gramps@thegrindstone.me.uk</html:a>&gt;
  </author>
- <author uid="noirauds" title="contributor">
+ <author title="contributor">
   Serge Noiraud &lt;<html:a href="mailto:Serge.Noiraud@free.fr">Serge.Noiraud@free.fr</html:a>&gt;
  </author>
- <author uid="has_no_svn_access" title="contributor">
+ <author title="contributor">
   Sigmund Lorentsen &lt;<html:a href="mailto:sigmund.lorentsen@tele2.no">sigmund.lorentsen@tele2.no</html:a>&gt;
  </author>
- <author uid="betula" title="contributor">
+ <author title="contributor">
   Stefan Bjork &lt;<html:a href="mailto:betula@users.sourceforge.net">betula@users.sourceforge.net</html:a>&gt;
  </author>
- <author uid="s_charette" title="contributor">
+ <author title="contributor">
   Stéphane Charette &lt;<html:a href="mailto:stephanecharette@gmail.com">stephanecharette@gmail.com</html:a>&gt;
  </author>
- <author uid="twaugh" title="author">
+ <author title="author">
   Tim Waugh &lt;<html:a href="mailto:twaugh@redhat.com">twaugh@redhat.com</html:a>&gt;
  </author>
- <author uid="vassilii" title="contributor">
+ <author title="contributor">
   Vassilii Khachaturov &lt;<html:a href="mailto:vassilii@tarunz.org">vassilii@tarunz.org</html:a>&gt;
  </author>
- <author uid="matlas" title="contributor">
+ <author title="contributor">
   Zdeněk Hataš &lt;<html:a href="mailto:zdenek.hatas@gmail.com">zdenek.hatas@gmail.com</html:a>&gt;
  </author>
-<author uid="robhealey1" title="author">
+<author title="author">
   Rob G. Healey &lt;<html:a href="mailto:robhealey1@gmail.com">robhealey1@gmail.com</html:a>&gt;
 </author>
- <author uid="zfoldvar" title="contributor">
+ <author title="contributor">
   Zsolt Foldvari &lt;<html:a href="mailto:zfoldvar@users.sourceforge.net">zfoldvar@users.sourceforge.net</html:a>&gt;
  </author>
- <author uid="ander882" title="contributor">
+ <author title="contributor">
   Craig J. Anderson &lt;<html:a href="mailto:ander882@hotmail.com">ander882@hotmail.com</html:a>&gt;
  </author>
- <author uid="kulath" title="author">
+ <author title="author">
   Tim G L Lyons &lt;<html:a href="mailto:tim.g.lyons@gmail.com">tim.g.lyons@gmail.com</html:a>&gt;
  </author>
- <author uid="jralls" title="author">
+ <author title="author">
   John Ralls &lt;<html:a href="mailto:jralls@ceridwen.us">jralls@ceridwen.us</html:a>&gt;
  </author>
 </authors>

data/css/GeoView.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 ----------------------------------------------------------------------------

data/css/Web_Basic-Blue.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id: Web_Basic-Blue.css 15540 2010-06-07 16:32:00Z robhealey1 $
 #

data/css/Web_Basic-Cypress.css

@@ -248,6 +248,14 @@ table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
 td.ColumnLetter, td.ColumnRowLabel {
     font-weight: bold;
 }
+/* bug #8213 testing by Stephane, 2014-12-6 */
+td.ColumnEvent, td.ColumnDate {
+    white-space: nowrap;
+}
+td.ColumnPlace, td.ColumnDescription {
+    width: 20%
+}
+/* end of customizations by Stephane */
 td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
     font-size: 90%;
 }

data/css/Web_Basic-Spruce.css

@@ -514,6 +514,7 @@ i + div.grampsstylednote p {
 }
 div.grampsstylednote p {
     margin-bottom: 0.5em;
+}
 
 /* Subsection : Family Map
 ----------------------------------------------------- */

data/css/Web_Citations-Outline.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 ******************************************************

data/css/Web_DropDown-Menus.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #

data/css/Web_Fade-Menus.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #

data/css/Web_Horizontal-Menus.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 ******************************************************

data/css/Web_Vertical-Menus.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 **************************************************************************************************

data/css/Web_Visually.css

@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 **************************************************************************************************

data/css/ancestortree.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id: $
 #

data/css/behaviour.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 **************************************************************************************************

data/css/narrative-maps.css

@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #

data/gramps.appdata.xml.in

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+<id type="desktop">gramps.desktop</id>
+<licence>CC0</licence>
+<description>
+<_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.</_p>
+<_p>It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.</_p>
+<_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
+</description>
+<url type="homepage">http://gramps-project.org/</url>
+<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>
+</screenshots>
+</application>

data/gramps.desktop.in

@@ -8,5 +8,6 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Office;
+_Keywords=Genealogy;Family History;Research;Family Tree;GEDCOM;
 MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml;
 Exec=gramps %F

data/gramps_canonicalize.xsl

@@ -16,7 +16,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
  $Id$

data/grampsxml.dtd

@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2001       Graham J. Williams
 # Copyright (C) 2000-2007  Donald N. Allingham
-# Copyright (C) 2010-2011  Nick Hall
+# Copyright (C) 2010-2014  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,21 +19,21 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # $Id$
 -->
 
 <!--
-    This is the Document Type Definition file for v1.5.0
+    This is the Document Type Definition file for v1.7.1
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
-                "http://gramps-project.org/xml/1.5.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
+                "http://gramps-project.org/xml/1.7.1/grampsxml.dtd"
                 [...]>
 -->
 
@@ -62,7 +62,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                     citations?, sources?, places?, objects?, repositories?,
                     notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.7.1/">
 
 
 <!--    ************************************************************
@@ -122,6 +122,7 @@ GENDER has values of M, F, or U.
 
 <!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
                   (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
+<!-- (Unknown|Also Know As|Birth Name|Married Name|Other Name) -->
 <!ATTLIST name    
         alt       (0|1) #IMPLIED
         type      CDATA #IMPLIED
@@ -138,6 +139,8 @@ GENDER has values of M, F, or U.
 <!ELEMENT familynick (#PCDATA)>
 <!ELEMENT group      (#PCDATA)>
 <!ELEMENT surname    (#PCDATA)>
+<!-- (Unknown|Inherited|Given|Taken|Patronymic|Matronymic|Feudal|
+Pseudonym|Patrilineal|Matrilineal|Occupation|Location) -->
 <!ATTLIST surname
         prefix      CDATA #IMPLIED
         prim        (1|0) #IMPLIED
@@ -196,12 +199,13 @@ FAMILY
 <!ELEMENT mother EMPTY>
 <!ATTLIST mother hlink IDREF #REQUIRED>
 
+<!-- (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) -->
 <!ELEMENT childref (citationref*,noteref*)>
 <!ATTLIST childref
         hlink IDREF #REQUIRED
         priv  (0|1) #IMPLIED
-        mrel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
-        frel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
+        mrel  CDATA #IMPLIED
+        frel  CDATA #IMPLIED
 >
 
 <!ELEMENT type (#PCDATA)>
@@ -215,7 +219,8 @@ EVENT
 <!ELEMENT events (event)*>
 
 <!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
-                 description?, attribute*, noteref*, citationref*, objref*)>
+                 description?, attribute*, noteref*, citationref*, objref*,
+                 tagref*)>
 <!ATTLIST event 
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -229,7 +234,7 @@ SOURCES
 
 <!ELEMENT sources (source)*>
 <!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
-                  noteref*, objref*, data_item*, reporef*)>
+                  noteref*, objref*, srcattribute*, reporef*, tagref*)>
 <!ATTLIST source
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -247,16 +252,25 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?, coord?, location*, objref*, url*, noteref*,
-                    citationref*)>
+<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
+                    objref*, url*, noteref*, citationref*, tagref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
         priv      (0|1) #IMPLIED
         change    CDATA #REQUIRED
+        type      CDATA #REQUIRED
+>
+
+<!ELEMENT pname (daterange|datespan|dateval|datestr)?>
+
+<!ATTLIST pname
+        lang CDATA #IMPLIED
+        value CDATA #REQUIRED
 >
 
 <!ELEMENT ptitle (#PCDATA)>
+<!ELEMENT code (#PCDATA)>
 
 <!ELEMENT coord EMPTY>
 <!ATTLIST coord
@@ -296,6 +310,7 @@ OBJECTS
 <!ATTLIST file
         src         CDATA #REQUIRED
         mime        CDATA #REQUIRED
+        checksum    CDATA #IMPLIED
         description CDATA #REQUIRED
 >
 
@@ -305,7 +320,7 @@ REPOSITORIES
 
 <!ELEMENT repositories (repository)*>
 
-<!ELEMENT repository (rname, type, address*, url*, noteref*)>
+<!ELEMENT repository (rname, type, address*, url*, noteref*, tagref*)>
 <!ATTLIST repository
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -367,8 +382,8 @@ CITATIONS
 
 <!ELEMENT citations (citation)*>
 
-<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence?,
-                    noteref*, objref*, data_item*, sourceref)>
+<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
+                    noteref*, objref*, srcattribute*, sourceref, tagref*)>
 <!ATTLIST citation
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -493,6 +508,13 @@ SHARED ELEMENTS
         value   CDATA   #REQUIRED
 >
 
+<!ELEMENT srcattribute EMPTY>
+<!ATTLIST srcattribute
+        priv    (0|1)   #IMPLIED
+        type    CDATA   #REQUIRED
+        value   CDATA   #REQUIRED
+>
+
 <!ELEMENT place EMPTY>
 <!ATTLIST place hlink IDREF #REQUIRED>
 
@@ -513,6 +535,11 @@ SHARED ELEMENTS
         priv (0|1)  #IMPLIED
 >
 
+<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?)>
+<!ATTLIST placeref
+        hlink IDREF #REQUIRED
+>
+
 <!ELEMENT region EMPTY>
 <!ATTLIST region
         corner1_x  CDATA #REQUIRED

data/grampsxml.rng

@@ -4,7 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
-# Copyright (C) 2010-2011  Nick Hall
+# Copyright (C) 2010-2014  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Written by Alex Roitman
 
-# $Id$
 -->
 
 <!--
@@ -32,7 +31,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.5.0/"
+  ns="http://gramps-project.org/xml/1.7.1/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -211,16 +210,7 @@
   </define>
 
   <define name="child-rel">
-    <choice>
-      <value>Birth</value>
-      <value>Adopted</value>
-      <value>Stepchild</value>
-      <value>Sponsored</value>
-      <value>Foster</value>
-      <value>None</value>
-      <value>Other</value>
-      <value>Unknown</value>
-    </choice>
+    <text/>
   </define>
 
   <define name="name-content">
@@ -231,13 +221,7 @@
     <optional><attribute name="priv">
         <ref name="priv-content"/>
     </attribute></optional>
-    <optional><attribute name="type"><choice>
-        <value>Unknown</value>
-        <value>Also Known As</value>
-        <value>Birth Name</value>
-        <value>Married Name</value>
-        <value>Other Name</value>
-    </choice></attribute></optional>
+    <optional><attribute name="type"><text/></attribute></optional>
     <optional><attribute name="sort"><text/></attribute></optional>
     <optional><attribute name="display"><text/></attribute></optional>
     <optional><element name="first"><text/></element></optional>
@@ -266,20 +250,7 @@
     <value>1</value>
     <value>0</value>
     </choice></attribute></optional>
-    <optional><attribute name="derivation"><choice>
-    <value>Unknown</value>
-    <value>Inherited</value>
-    <value>Given</value>
-    <value>Taken</value>
-    <value>Patronymic</value>
-    <value>Matronymic</value>
-    <value>Feudal</value>
-    <value>Pseudonym</value>
-    <value>Patrilineal</value>
-    <value>Matrilineal</value>
-    <value>Occupation</value>
-    <value>Location</value>
-    </choice></attribute></optional>
+    <optional><attribute name="derivation"><text/></attribute></optional>
     <optional><attribute name="connector"><text/></attribute></optional>
   </define>
 
@@ -428,26 +399,31 @@
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="citation-content">
     <ref name="primary-object"/>
     <optional><ref name="date-content"/></optional>
     <optional><element name="page"><text/></element></optional>
-    <optional><element name="confidence"><text/></element></optional>
+    <element name="confidence"><text/></element>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="data_item">
-        <attribute name="key"><text/></attribute>
-        <attribute name="value"><text/></attribute>
+    <zeroOrMore><element name="srcattribute">
+        <ref name="srcattribute-content"/>
     </element></zeroOrMore>
     <element name="sourceref">
         <ref name="sourceref-content"/>
     </element>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="source-content">
@@ -462,22 +438,32 @@
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="data_item">
-        <attribute name="key"><text/></attribute>
-        <attribute name="value"><text/></attribute>
+    <zeroOrMore><element name="srcattribute">
+        <ref name="srcattribute-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="reporef">
         <ref name="reporef-content"/>
     </element></zeroOrMore>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="place-content">
     <ref name="primary-object"/>
+    <attribute name="type"><text/></attribute>
     <optional><element name="ptitle"><text/></element></optional>
+    <oneOrMore><element name="pname">
+        <ref name="placename-content"/>
+    </element></oneOrMore>
+    <optional><element name="code"><text/></element></optional>
     <optional><element name="coord">
         <attribute name="long"><text/></attribute>
         <attribute name="lat"><text/></attribute>
     </element></optional>
+    <zeroOrMore><element name="placeref">
+        <ref name="placeref-content"/>
+    </element></zeroOrMore>
     <zeroOrMore><element name="location">
         <optional><attribute name="street"><text/></attribute></optional>
         <optional><attribute name="locality"><text/></attribute></optional>
@@ -501,6 +487,9 @@
     <zeroOrMore><element name="citationref">
         <ref name="citationref-content"/>
     </element></zeroOrMore>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="object-content">
@@ -508,7 +497,8 @@
     <element name="file">
         <attribute name="src"><text/></attribute>
         <attribute name="mime"><text/></attribute>
-        <attribute name="description"><text/></attribute>
+        <optional><attribute name="checksum"><text/></attribute></optional>
+        <optional><attribute name="description"><text/></attribute></optional>
     </element>
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
@@ -538,6 +528,9 @@
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="bookmark-content">
@@ -680,6 +673,14 @@
         <ref name="noteref-content"/>
     </element></zeroOrMore>
   </define>
+  
+  <define name="srcattribute-content">
+    <optional><attribute name="priv">
+        <ref name="priv-content"/>
+    </attribute></optional>
+    <attribute name="type"><text/></attribute>
+    <attribute name="value"><text/></attribute>
+  </define>
 
   <define name="url-content">
       <optional><attribute name="priv">
@@ -744,6 +745,17 @@
     <text/>
   </define>
 
+  <define name="placename-content">
+    <attribute name="value"><text/></attribute>
+    <optional><attribute name="lang"><text/></attribute></optional>
+    <optional><ref name="date-content"/></optional>
+  </define>
+
+  <define name="placeref-content">
+    <attribute name="hlink"><data type="IDREF"/></attribute>
+    <optional><ref name="date-content"/></optional>
+  </define>
+
   <define name="tagref-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
   </define>