update NEWS

svn: r23470

.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,14 @@
 *.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
+
+# Editor
+tags

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.
 

Gramps.py

@@ -26,5 +26,7 @@ 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

@@ -15,11 +15,12 @@ version by deleting the installed directories (for example,
         /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.
+Also remove the gramps .egg files that are installed along with 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
+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

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

@@ -11,34 +11,22 @@ 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/gen/const.py
 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,157 @@
+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,49 +1,87 @@
+$Id$
+
 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.
 
 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)
+   Python 2.7 or greater, Python 3.2 or greater (or both python versions)
    GTK 3.0 or greater
    pygobject 3.3.2 or greater
+   cairo, pango, pangocairo with introspection bindings (the gi packages)
    librsvg2 (svg icon view)
    xdg-utils
+   bsddb3 is required for Python 3.2 (not python 2.7)
 
 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
+                    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. 
+                    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.0_Wiki_Manual_-_Main_Window#Geography_Category
+                    !! PACKAGERS: unfortunately, at the moment (March 2013),
+                    the patches which gramps 4.0 needs osm-gps-map to have
+                    are not yet released (as a new osm-gps-map version). The
+                    osm-gps-map sources must be dated 6 February 2013 (or
+                    later) to have the necessary patches.  You may obtain
+                    it from: http://nzjrs.github.com/osm-gps-map/ or else
+                    http://sourceforge.net/projects/gramps/files/Dependencies
+                    (The necessary version seems to be 0.8 -- or later.)
+
    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 
                     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.0_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
+                    Only rcs is needed, NO python bindings are required
+
+   PIL              Python Image Library is needed to crop
+                    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.)
+
+   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.
+                    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
@@ -51,10 +89,10 @@ The following packages are optional
                        from gi.repository import WebKit as webkit
 
    goocanvas2:
-                    Required for the Graphview plugin
+                    Required for the (user-downloadable) Graphview plugin
 
 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:
@@ -62,9 +100,6 @@ No longer needed in 3.2:
 No longer needed in 3.1:
    yelp             Gnome help browser. At the moment no help is shipped
 
-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
 ---------------------------------

RELEASE_NOTES

@@ -1,24 +1,69 @@
-Gramps 3.2 Release Notes
+$Id$
 
-General Improvements
+Gramps 4.0.0, the "The Miracle of Birth", release.
 
-* 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.
+This is a major release, don't upgrade before verifying your system can run it.
+As one of the very first big ($5.4 million), multi-platform (Linux, 
+Windows, Mac OS X, ...), non-Gnome GTK applications, Gramps makes the 
+jump to GTK 3. At the same time python 2.7 and python 3 are supported, 
+though the last must still be considered experimental. Gramps 4.0 
+further uses distutils for distribution, so the install sequence is changed.
+The Gramps developers have tried to make Gramps 4.0 as identical as 
+possible to 3.4, so no data changes are done, nor are there big interface 
+changes. In other words, a .gramps backup file of version 4.0 will open 
+without problems in Gramps 3.4, giving users the possibility to fully try Gramps 4.0.
+Don't be mistaken though, a huge amount of code is new and changed! 
+In order to bring this release we thank the many developers who helped 
+the GTK support on Mac, Windows and Linux forward. Note however, 
+Gramps 4.0 will only work on a top of a very recent sortware stack. 
+A Windows installer will probably not be available soon. In Linux current 
+distro's don't contain the optional packages in the form Gramps 4.0 needs. 
+All this should make clear you can safely keep using version 3.4 and wait 
+for packagers to catch up. People who cannot upgrade the required components 
+but want to use Gramps 4.0 should use it in Virtualbox.
 
-* 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.
+Major enhancements in Gramps 4.0.0:
 
-*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
+* GEP 8: code reorganization: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization
 
+* GEP 26: Replace make: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build
 
-Other Improvements
+* GEP 29: Gtk 3: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion
 
-* 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)
+* GEP 31: Python 3 support: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
+
+* Completely reworked localization handling
+
+Others changes in Gramps 4.0.0:
+
+* 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.
+
+More info in the manual 
+http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_What%27s_new%3F
+
+Everybody is invited to update the manual to make it current!

data/gramps.appdata.xml.in

@@ -0,0 +1,19 @@
+<?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.
+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.
+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/grampsxml.dtd

@@ -25,15 +25,15 @@
 -->
 
 <!--
-    This is the Document Type Definition file for v1.5.0
+    This is the Document Type Definition file for v1.5.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.5.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.5.1//EN"
+                "http://gramps-project.org/xml/1.5.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.5.1/">
 
 
 <!--    ************************************************************
@@ -367,7 +367,7 @@ CITATIONS
 
 <!ELEMENT citations (citation)*>
 
-<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence?,
+<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
                     noteref*, objref*, data_item*, sourceref)>
 <!ATTLIST citation
         id        CDATA #IMPLIED

data/grampsxml.rng

@@ -32,7 +32,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.5.1/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -434,7 +434,7 @@
     <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>