Improve/harmonise error handling for missing template (even though missing template should never occur).

svn: r23195

.gitignore

@@ -2,11 +2,11 @@
 *.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

Gramps.py

@@ -1,3 +1,4 @@
+#! /usr/bin/env python
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -26,5 +27,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

MANIFEST.in

@@ -11,34 +11,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 gramps/guiQML
-prune gramps/webapp
-
-# Remove Makefiles used by autotools
-global-exclude Makefile*
+#prune gramps/webapp

NEWS

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

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,11 +1,14 @@
-"UNSTABLE Gramps 4.0.0 Alpha2 release.
+$Id$
 
-This is a technology preview to allow plugin writers and packagers-installer 
-writers to update their plugins and scripts. This release is not production 
-ready, so use for testing!"
+UNSTABLE Gramps 4.0.0 Beta2 release.
 
-It is recommended to use Gramps 4.0.0 with python 3.2 so as to be ready 
-for the future (python 2.7 works though). 
+This is a technology preview to allow distribution packagers (and plugin
+writers) to update their scripts (and plugins). This release is not
+production ready, so only use it for testing!
+
+It is recommended that Gramps 4.0.0 be used with python 2.7 since many
+dependent packages do not yet have python 3 versions.  A determined person
+can probably download their sources and build them, however.
 
 The dependencies for Gramps 4.0.0 are _completely_ different than 3.4 due 
 to the switch to GObject introspection, and the removal of autotools. So 

data/evidencestyle/README

@@ -0,0 +1,18 @@
+* Original evidence_style templates are provided in the public domain courtesy of
+  John H. Yates (see more info on http://jytangledweb.org/genealogy/evidencestyle )
+
+* Several fixes done in the csv file which I believe were errors
+
+* Run
+
+  $ python evidencefield.py
+
+  to generate two files with python code usable in srcattrtype.py in Gramps.
+
+* If in the future one wants to insert _NEW_ evidence styles, add them at the 
+  bottom of the csv file, generate the data, and copy to srcattrtype.py
+
+* CAREFUL: When adding or changing things, DON'T change the type of already 
+  released versions in Gramps! That means the integer indexes used must remain
+  the same! If only styles are added at the bottom and no lines removed, 
+  this should not be a problem.

data/evidencestyle/evidencefieldgenerator.py

@@ -0,0 +1,469 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2013  Benny Malengier
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+# $Id$
+
+"""
+This module parses the evidence csv file and generates the code we need in
+Gramps to use the evidence style.
+"""
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+import csv
+
+
+#-------------------------------------------------------------------------
+#
+# Code
+#
+#-------------------------------------------------------------------------
+csvfilename = "evidence_style.csv"
+NRCOL = 0
+CATCOL = 1
+CATTYPECOL = 2
+TYPECOL = 3
+DESCRCOL= 4
+CITETYPECOL = 5
+IDENTCOL = 6
+LDELCOL = 7  # left delimiter
+FIELDCOL = 8
+LABELCOL = 9
+RDELCOL = 10 # right delimiter
+GEDCOMCOL = 11
+SHORTERCOL = 12
+STYLECOL = 13
+PRIVACYCOL = 14
+OPTCOL = 15
+HINTCOL = 16
+TOOLTIPCOL = 17
+
+CITE_TYPES = {'F': 'REF_TYPE_F', 'L': 'REF_TYPE_L', 'S': 'REF_TYPE_S'}
+GEDCOMFIELDS = {'A': 'GED_AUTHOR', 'T': 'GED_TITLE', 
+                'P': 'GED_PUBINF', 'D': 'GED_DATE'}
+SHORTERALG = {'LOC': 'SHORTERALG_LOC', 'YEAR': 'SHORTERALG_YEAR',
+              'ETAL': 'SHORTERALG_ETAL', 'REV.': 'SHORTERALG_REVERT_TO_DOT'}
+STYLES = {'Quoted': 'STYLE_QUOTE', 'Italics': 'STYLE_EMPH',
+          'QuotedCont': 'STYLE_QUOTECONT', 'Bold': 'STYLE_BOLD'}
+
+#already defined srcattrtypes
+KNOWN_FIELDS = ['EVEN_REC', 'EVEN_CITED', 'EVEN_ROLE', 'GEN_BY', 'REPOSITORY',
+        'REPOSITORY_ADDRESS', 'REPOSITORY_SHORT_VERSION', 'REPOSITORY_CALL_NUMBER',
+        'DATE']
+
+DEFAULT_HINTS = {
+    "ACT": "Public Law 12-98",
+    "ADDRESS": "Broadway Avenue, New York",
+    "AFFILIATION": "Agent of Gramps Software",
+    "AUTHOR": "Doe, D.P. & Cameron, E.",
+    "AUTHOR_LOCATION": "Chicago",
+    "BOOK": "The big example Gramps manual",
+    "CASE": "B. Malengier versus N. Hall",
+    "CEMETERY": "Greenwich Cemetery Office",
+    "CHAPTER": "The first office of T. Rooseveld",
+    "CHAPTER_PAGES": "24-55",
+    "COLLECTION": "Bruges Lace Collection",
+    "COLUMN": "col. 3",
+    "COMPILER": "T. Da Silva",
+    "CREATION_DATE": "13 Aug 1965",
+    "CREATOR": "P. Picasso",
+    "CREDIT_LINE": "Based on unnamed document lost in fire",
+    "DATE": "17 Sep 1745",
+    "DATE_ACCESSED": "18 Jun 2013",
+    "DATE_RANGE": "2003-6",
+    "DESCRIPTION": "The lace has inscriptions with names of nobility",
+    "DISTRICT": "Enumeration district (ED) 14",
+    "DIVISION": "Peterburg Post Office, or Portland, ward 4",
+    "EDITION": "Second Edition",
+    "EDITOR": "Hoover, J.E.",
+    "FILE": "Membership application J. Rapinat",
+    "FILE_DATE": "15 Jan 1870",
+    "FILE_LOCATION": "Accession 7, Box 3",
+    "FILE_NO": "1243-EB-98",
+    "FILE_UNIT": "Letters to George Washington",
+    "FILM_ID": "T345",
+    "FILM_PUBLICATION_PLACE": "Kansas City",
+    "FILM_PUBLISHER": "NY Genealogy Association",
+    "FILM_TYPE": "FHL microfilm",
+    "FORMAT": "Digital Images, or Database, or Cards, ...",
+    "FRAME": "frames 387-432",
+    "GROUP": "Miami Patent Office",
+    "HOUSEHOLD": "dwelling 345, family 654",
+    "ID": "I50-68, or 1910 U.S. census, or ...",
+    "INSTITUTION": "Sorbonne University",
+    "INTERVIEWER": "Materley, B.",
+    "ISSUE_DATE": "Jun 2004",
+    "ISSUE_RANGE": "145-394, scattered issues",
+    "ITEM_OF_INTEREST": "entry for G. Galileo, or Doe Household, or A. Einstein Grave ...",
+    "JURISDICTION": "Jackson County, Alabama",
+    "LOCATION": "Istanbul",
+    "NUMBER": "2, or Record Group 34, or ...",
+    "NUMBER_6TOTAL9": "5",
+    "ORIGINAL_REPOSITORY": "National Archives",
+    "ORIGINAL_REPOSITORY_LOCATION": "Washington, D.C.",
+    "ORIGINAL_YEAR": "1966",
+    "PAGE": "5; or 4,6-8, ...",
+    "PAGE_RANGE": "1-13",
+    "PART": "Part 3",
+    "PLACE_CREATED": "London",
+    "POSITION": "written in the left margin, or second row, 3th line",
+    "POSTING_DATE": "5 Jul 1799",
+    "PROFESSIONAL_CREDENTIALS": "Prof.; or Dr. ...",
+    "PROVENANCE": "add provenance of the material",
+    "PUBLICATION_FORMAT": "CD-ROM or eprint or ...",
+    "PUBLICATION_PLACE": "Berlin",
+    "PUBLICATION_TITLE": "Title of Blog, Newsletter, DVD, ...",
+    "PUBLICATION_YEAR": "2014",
+    "PUBLISHER": "Springer",
+    "PUB_INFO": "Springer, Berlin, 2014",
+    "RECIPIENT": "J. Ralls",
+    "RELATIONSHIP": "Paul's uncle and brother of Erik",
+    "REPORT_DATE": "3 May 1999",
+    "RESEARCH_COMMENT": "Descriptive detail or provenance or research analysis conclusion, ...",
+    "RESEARCH_PROJECT": "Tahiti Natives",
+    "ROLL": "176, or rolls 145-160",
+    "SCHEDULE": "population schedule or slave schedule or ...",
+    "SECTION": "1890 section or ER patients or ...",
+    "SERIES": "Carnival County Records",
+    "SERIES_NO": "series 34-38",
+    "SESSION": "2nd session",
+    "SHEET_NO": "sheet 13-C",
+    "SUBJECT": "D. Copernicus and close family",
+    "SUBSERIES": "",
+    "SUBTITLE": "Subtitle of article or magazine ...",
+    "TERM": "June Term 1934 or 13th Congress or Reagan Office or ...",
+    "TIMESTAMP": "min. 34-36",
+    "TITLE": "Diary Title, Message Title, Bible Name, Article Title, ...",
+    "TRANSLATION": "A translated version, typically of the title",
+    "TYPE": "Letter",
+    "URL_6DIGITAL_LOCATION9": "http://gramps-project.org/blog",
+    "VOLUME": "4",
+    "VOLUME_INFO": "5 volumes",
+    "WEBSITE": "gramps-project.org",
+    "WEBSITE_CREATOR_OR_OWNER": "Family Historians Inc",
+    "YEAR": "1888",
+    "YEAR_ACCESSED": "2013",
+}
+
+DEFAULT_TOOLTIPS = {
+    "ACT": "A statute or law name passed by a legislature",
+    "ADDRESS": "Store address information. Set Private if needed! Give"
+        " information from lowest to highest level separated by comma's",
+    "AFFILIATION": "A relevant affiliation that might influence data in the source",
+    "AUTHOR": "Give names in following form: 'FirstAuthorSurname, Given Names & SecondAuthorSurname, Given Names'."
+            " Like this Gramps can parse the name and shorten as needed.",
+    "AUTHOR_LOCATION": "City where author resides or wrote.",
+    "BOOK": "Title of the Book",
+    "CASE": "Dispute between opposing parties in a court of law.",
+    "CEMETERY": "Name of cemetery or cemetery office with sources.",
+    "CHAPTER": "",
+    "CHAPTER_PAGES": "The pages in the chapter.",
+    "COLLECTION": "",
+    "COLUMN": "",
+    "COMPILER": "The name of the person who compiled the source.",
+    "CREATION_DATE": "",
+    "CREATOR": "The name of the creator of the artifact.",
+    "CREDIT_LINE": "Acknowledgement of writers and contributors",
+    "DATE": "",
+    "DATE_ACCESSED": "",
+    "DATE_RANGE": "The range of years which are present in the source.",
+    "DESCRIPTION": "Some important detail of the source.",
+    "DISTRICT": "District as handled by Census",
+    "DIVISION": "The subdivision of a larger group that is handled in the source.",
+    "EDITION": "",
+    "EDITOR": "The Editor of a multi-author book.",
+    "FILE": "The title of a specific file in a source.",
+    "FILE_DATE": "Date of submitting the document to a clerk or court.",
+    "FILE_LOCATION": "Accession method to the file",
+    "FILE_NO": "Number to indicate a file",
+    "FILE_UNIT": "A grouping unit for a number of files in a source.",
+    "FILM_ID": "ID of a Microfilm.",
+    "FILM_PUBLICATION_PLACE": "",
+    "FILM_PUBLISHER": "",
+    "FILM_TYPE": "The type of the microfilm.",
+    "FORMAT": "The format of the source.",
+    "FRAME": "What frames in the source are relevant.",
+    "GROUP": "A larger grouping to which the source belongs.",
+    "HOUSEHOLD": "Household of interest on a census.",
+    "ID": "ID to identify the source or citation part",
+    "INSTITUTION": "Institution that issued the source.",
+    "INTERVIEWER": "",
+    "ISSUE_DATE": "Date the source was issued.",
+    "ISSUE_RANGE": "A range of magazine, journal, ... issues covered in the source",
+    "ITEM_OF_INTEREST": "Specific part, item, or person of interest in the source",
+    "JURISDICTION": "Area with a set of laws under the control of a system of courts or government entity."
+            " Enter this from lowest to highest relevant jurisdiction, separated by comma's.",
+    "LOCATION": "City that is relevant.",
+    "NUMBER": "A number.",
+    "NUMBER_6TOTAL9": "The maximum of entities available.",
+    "ORIGINAL_REPOSITORY": "Name of the repository where the original is stored.",
+    "ORIGINAL_REPOSITORY_LOCATION": "Address or only city of the repository where the original is stored.",
+    "ORIGINAL_YEAR": "Year the original source was published/created",
+    "PAGE": "The page or page(s) relevant for the citation",
+    "PAGE_RANGE": "The range of the pages in the source. The page given for"
+            " a citation must be in this range.",
+    "PART": "",
+    "PLACE_CREATED": "",
+    "POSITION": "Where in or on the source the citation piece can be found.",
+    "POSTING_DATE": "",
+    "PROFESSIONAL_CREDENTIALS": "",
+    "PROVENANCE": "Where the material originated from.",
+    "PUBLICATION_FORMAT": "",
+    "PUBLICATION_PLACE": "",
+    "PUBLICATION_TITLE": "",
+    "PUBLICATION_YEAR": "",
+    "PUBLISHER": "",
+    "PUB_INFO": "Publication Information, such as city and year of publication, name of publisher, ...",
+    "RECIPIENT": "The person to who the letter is addressed.",
+    "RELATIONSHIP": "The relationship of the author to the person of interest that is the subject.",
+    "REPORT_DATE": "Date the report was written/submitted.",
+    "RESEARCH_COMMENT": "Descriptive detail or provenance or research analysis conclusion, ...",
+    "RESEARCH_PROJECT": "The genealogical or scientific research project.",
+    "ROLL": "The Microfilm role.",
+    "SCHEDULE": "The census schedule (the type of census table) used, eg population schedule or slave schedule. or ...",
+    "SECTION": "The section or subgroup under which filed, eg 'Diplomatic correspondance, 1798-1810'",
+    "SERIES": "",
+    "SERIES_NO": "",
+    "SESSION": "The number of the meeting or series of connected meetings devoted "
+        "by a legislature to a single order of business, program, agenda, or announced purpose.",
+    "SHEET_NO": "Number of a census sheet.",
+    "SUBJECT": "",
+    "SUBSERIES": "",
+    "SUBTITLE": "",
+    "TERM": "Reference to the time a person/group/parliament is in office or session.",
+    "TIMESTAMP": "Indication of the time in audio or video where the relevant fragment can be found.",
+    "TITLE": "",
+    "TRANSLATION": "A translated version, typically of the title",
+    "TYPE": "",
+    "URL_6DIGITAL_LOCATION9": "Detailed internet address of the content",
+    "VOLUME": "",
+    "VOLUME_INFO": "Information about the volumes, eg the amount of volumes.",
+    "WEBSITE": "The main internet address.",
+    "WEBSITE_CREATOR_OR_OWNER": "Organization or person behind a website.",
+    "YEAR": "",
+    "YEAR_ACCESSED": "",
+}
+
+
+nr = -1
+cat = ''
+cattype = ''
+type = ''
+descr = ''
+cite_type = ''
+ident = ''
+
+TYPE2CITEMAP = {}
+FIELDTYPEMAP = {}
+FIELDS_SHORT = []
+index = 100
+indexval = 10
+first = True
+
+with open(csvfilename, 'rb') as csvfile:
+   reader = csv.reader(csvfile, delimiter=';')
+   for row in reader:
+        if first:
+            #skip first row with headers
+            first=False
+            continue
+
+        if row[CATCOL]:
+            cat = row[CATCOL].strip()
+            if cat.startswith('EE '):
+                cat = cat[3:]
+                EE = True
+            else:
+                EE = False
+            cattype = row[CATTYPECOL].strip()
+            types = row[TYPECOL].strip()
+            descr = row[DESCRCOL].strip()
+            source_type = row[IDENTCOL].strip()
+            if descr:
+                source_descr = '%s - %s - %s (%s)' % (cat, cattype, types, descr)
+                if not EE:
+                    source_descr_code = "_('%(first)s - %(sec)s - %(third)s (%(fourth)s)') % { "\
+                        " 'first': _('" + cat + "'),"\
+                        " 'sec': _('" + cattype + "'),"\
+                        " 'third': _('" + types + "'),"\
+                        " 'fourth': _('" + descr + "')}"
+                else:
+                    source_descr_code = "_('EE %(first)s - %(sec)s - %(third)s (%(fourth)s)') % { "\
+                        " 'first': _('" + cat + "'),"\
+                        " 'sec': _('" + cattype + "'),"\
+                        " 'third': _('" + types + "'),"\
+                        " 'fourth': _('" + descr + "')}"
+            else:
+                source_descr = '%s - %s - %s' % (cat, cattype, types)
+                if not EE:
+                    source_descr_code = "_('%(first)s - %(sec)s - %(third)s') % { "\
+                        " 'first': _('" + cat + "'),"\
+                        " 'sec': _('" + cattype + "'),"\
+                        " 'third': _('" + types + "')}"
+                else:
+                    source_descr_code = "_('EE %(first)s - %(sec)s - %(third)s') % { "\
+                        " 'first': _('" + cat + "'),"\
+                        " 'sec': _('" + cattype + "'),"\
+                        " 'third': _('" + types + "')}"
+            if source_type in TYPE2CITEMAP:
+                assert TYPE2CITEMAP[source_type] ['descr'] == source_descr, source_type + ' ' + TYPE2CITEMAP[source_type] ['descr'] + ' NOT ' + source_descr
+            else:
+                TYPE2CITEMAP[source_type] = {'REF_TYPE_L': [], 'REF_TYPE_F': [],
+                            'REF_TYPE_S': [], 
+                            'i': indexval, 'descr': source_descr,
+                            'descrcode': source_descr_code}
+                indexval += 1
+            
+        if row[CITETYPECOL]:
+            #new citation type,
+            cite_type = row[CITETYPECOL].strip()
+            if cite_type == 'S':
+                shortcite = True
+            else:
+                shortcite = False
+            cite_type = CITE_TYPES[cite_type]
+        #add field for template to evidence style
+        field = row[FIELDCOL].strip()
+        field_type = field.replace(' ', '_').replace("'","")\
+                     .replace('&','AND').replace('(', '6').replace(')','9')\
+                     .replace('[', '').replace(']','').replace('/', '_OR_')\
+                     .replace(',', '').replace('.', '').replace(':', '')\
+                     .replace('-', '_')
+        field_descr =  field.replace('[', '').replace(']','').lower().capitalize()
+        field_label = row[LABELCOL].strip()
+        field_label = field_label.replace("'", "\\'")
+        if field_type in FIELDTYPEMAP:
+            assert field_descr == FIELDTYPEMAP[field_type][1], 'Problem %s %s %s' % (field_type, field_descr, FIELDTYPEMAP[field_type][1])
+        elif field_type in KNOWN_FIELDS:
+            #no need to add it
+            pass
+        else:
+            FIELDTYPEMAP[field_type] = (index, field_descr)
+            index += 1
+        fielddata = []
+        private = 'False'
+        if  row[PRIVACYCOL].strip():
+            private = 'True'
+        optional = 'False'
+        if  row[OPTCOL].strip():
+            optional = 'True'
+        shorteralg = SHORTERALG.get(row[SHORTERCOL].strip()) or 'EMPTY'
+        gedcommap = GEDCOMFIELDS.get(row[GEDCOMCOL].strip()) or 'EMPTY'
+        style = STYLES.get(row[STYLECOL].strip()) or 'EMPTY'
+        hint = row[HINTCOL]
+        tooltip = row[TOOLTIPCOL]
+        
+        TYPE2CITEMAP[source_type][cite_type] += [(row[LDELCOL], field_type, 
+                        row[RDELCOL], field_label, style, private, optional, 
+                        shorteralg, gedcommap, hint, tooltip)]
+        #if shorttype, we store a type for the short version so user can store
+        #this
+        if shortcite and shorteralg == 'EMPTY':
+            field_type_short = field_type + '_SHORT_VERSION'
+            if field_type_short in FIELDTYPEMAP or field_type_short in KNOWN_FIELDS:
+                pass
+            else:
+                FIELDTYPEMAP[field_type_short] = (index, field_descr + ' (Short)')
+                FIELDS_SHORT.append(field_type_short)
+                index += 1
+
+#now generate the python code we need in source attr types
+code = "    #following fields are generated with evidencefieldgenerator.py\n" \
+       "    #the index starts at 100!\n"
+datamap = "\n    _DATAMAP += [\n"
+allkeys = sorted(FIELDTYPEMAP.keys())
+for field_type in allkeys:
+    code += "    " + field_type + ' = %d\n' % FIELDTYPEMAP[field_type][0]
+    datamap += '        (' + field_type + ', _("' + FIELDTYPEMAP[field_type][1] \
+            +'"), "' + FIELDTYPEMAP[field_type][1] + '"),\n'
+code += "\n    _DATAMAPIGNORE = [\n" 
+for field in FIELDS_SHORT:
+    code += "        " + field + ',\n'
+code += '    ]\n\n' + datamap + '        ]\n'
+
+#now add default hints
+code += "\n    _DEFAULT_HINTS = {\n"
+for key in sorted(DEFAULT_HINTS.keys()):
+    if DEFAULT_HINTS[key]:
+        code += "        " + key +': _("' +  DEFAULT_HINTS[key] + '"),\n'
+code += "    }\n"
+#now add default tooltips
+code += "\n    _DEFAULT_TOOLTIPS = {\n"
+for key in sorted(DEFAULT_TOOLTIPS.keys()):
+    if DEFAULT_TOOLTIPS[key]:
+        code += "        " + key + ': _("' +  DEFAULT_TOOLTIPS[key] + '"),\n'
+code += "    }\n"
+
+with open('srcattrtype_extra.py', 'wb') as srcattrfile:
+    srcattrfile.write(code)
+
+#now generate the python code we need in evidencestyle
+# we have predefined sourcetypes, and these have a template for formatting
+# 
+
+#first an English to internationalized map
+code = "    #SRCTEMPLATE has some predefined values which map to citation styles\n"
+
+datamap = "    _SRCTEMPLATEVAL_MAP = [\n"\
+        "        (UNKNOWN, _('Unknown'), 'Unknown'),\n"
+allkeys = sorted(TYPE2CITEMAP.keys())
+for source_type in allkeys:
+    code += "    " + source_type + ' = %d\n' % TYPE2CITEMAP[source_type]['i']
+    # we use descrcode in to translate string to reduce work for translators
+    datamap += "        (" + source_type + ", " + TYPE2CITEMAP[source_type]['descrcode'] \
+            +", '" + source_type+ "'),\n"
+
+code += '\n    # Localization of the different source types\n'\
+            + datamap + '        ]\n'
+
+code += "\n    #templates for the source types defined\n"\
+        "    # F: Full reference\n"\
+        "    # S: Short reference (if F used once, use S afterwards)\n" \
+        "    # L: List reference (for in bibliography list)\n"
+code += '    EVIDENCETEMPLATES = {\n'
+for source_type in allkeys:
+    code += "        " + source_type + ": {\n"
+    for val in ['REF_TYPE_L', 'REF_TYPE_F', 'REF_TYPE_S']:
+        code += "            " + val + ": [\n"
+        for field in TYPE2CITEMAP[source_type][val]:
+            # field is tuple (row[LDELCOL], field_type, row[RDELCOL], 
+            # field_label, row[STYLECOL]
+            #    , private, optional, shorteralg, gedcommap, hint, tooltip)
+            if field[9]:
+                hint = '_("' + field[9] + '")'
+            else:
+                hint = 'None'
+            if field[10]:
+                tooltip = '_("' + field[10] + '")'
+            else:
+                tooltip = 'None'
+            code += "                ('"+ field[0] + "', SrcAttributeType." + field[1]  + ", _('"\
+                    +field[3] + "'), '"+ field[2] + "', " + field[4] + ", " + field[5] + ", "\
+                    + field[6] + ", " + field[7] + ", " + field[8] + ",\n" \
+                    + "                " +hint + ", " + tooltip + "),\n"
+        code += "                ],\n"
+    code += "        },\n"
+code += "    }\n"
+
+with open('srcattrtype_extraevidence.py', 'wb') as srcattrfile:
+    srcattrfile.write(code)

data/evidencestyle/extract_trans_csv.py

@@ -0,0 +1,98 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2013  Benny Malengier
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+# $Id$
+
+"""
+This module parses the evidence csv file and generates the code we need in
+Gramps to use the evidence style.
+"""
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+import csv
+
+
+#-------------------------------------------------------------------------
+#
+# Code
+#
+#-------------------------------------------------------------------------
+csvfilename = "evidence_style.csv"
+NRCOL = 0
+CATCOL = 1
+CATTYPECOL = 2
+TYPECOL = 3
+DESCRCOL= 4
+CITETYPECOL = 5
+IDENTCOL = 6
+LDELCOL = 7  # left delimiter
+FIELDCOL = 8
+LABELCOL = 9
+RDELCOL = 10 # right delimiter
+GEDCOMCOL = 11
+SHORTERCOL = 12
+STYLECOL = 13
+PRIVACYCOL = 14
+OPTCOL = 15
+HINTCOL = 16
+TOOLTIPCOL = 17
+
+first = True
+
+trans = {}
+with open(csvfilename, 'rb') as csvfile:
+   reader = csv.reader(csvfile, delimiter=';')
+   for row in reader:
+        if first:
+            first=False
+            continue
+        elif row[CATCOL]:
+            cat = row[CATCOL].strip()
+            cattype = row[CATTYPECOL].strip()
+            types = row[TYPECOL].strip()
+            descr = row[DESCRCOL].strip()
+            
+            for val in [cat, cattype, types, descr]:
+                if val and val not in trans:
+                    trans[val] = '_("' + val + '")'
+        val = row[HINTCOL]
+        if val and val not in trans:
+            trans[val] = '_("' + val + '")'
+        val = row[TOOLTIPCOL]
+        if val and val not in trans:
+            trans[val] = '_("' + val + '")'
+        
+           
+
+#now generate the python code we need in source attr types
+code = "#following translations are generated with extract_trans_csv.py\n"
+code += "if False:\n"
+code += "    #these translations will only occur when needed first time!\n" 
+
+allkeys = sorted(trans.keys())
+for field in allkeys:
+    code += "    " + trans[field] + '\n'
+
+with open('csv_trans.py', 'wb') as srcattrfile:
+    srcattrfile.write(code)

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.6.0
     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.6.0//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.6.0//EN"
+                "http://gramps-project.org/xml/1.6.0/grampsxml.dtd"
                 [...]>
 -->
 
@@ -215,7 +215,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
@@ -228,17 +229,16 @@ SOURCES
 -->
 
 <!ELEMENT sources (source)*>
-<!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
-                  noteref*, objref*, data_item*, reporef*)>
+<!ELEMENT source (sname?, stemplate?, sabbrev?,
+                  noteref*, objref*, srcattribute*, reporef*, tagref*)>
 <!ATTLIST source
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
         priv      (0|1) #IMPLIED
         change    CDATA #REQUIRED
 >
-<!ELEMENT stitle   (#PCDATA)>
-<!ELEMENT sauthor  (#PCDATA)>
-<!ELEMENT spubinfo (#PCDATA)>
+<!ELEMENT sname   (#PCDATA)>
+<!ELEMENT stemplate  (#PCDATA)>
 <!ELEMENT sabbrev  (#PCDATA)>
 
 <!--    ************************************************************
@@ -248,7 +248,7 @@ PLACES
 <!ELEMENT places (placeobj)*>
 
 <!ELEMENT placeobj (ptitle?, coord?, location*, objref*, url*, noteref*,
-                    citationref*)>
+                    citationref*, tagref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -305,7 +305,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,14 +367,15 @@ CITATIONS
 
 <!ELEMENT citations (citation)*>
 
-<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence?,
-                    noteref*, objref*, data_item*, sourceref)>
+<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, cname?, confidence?,
+                    noteref*, objref*, srcattribute*, sourceref, tagref*)>
 <!ATTLIST citation
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
         priv      (0|1) #IMPLIED
         change    CDATA #REQUIRED
 >
+<!ELEMENT cname   (#PCDATA)>
 
 <!--    ************************************************************
 BOOKMARKS
@@ -493,6 +494,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>
 

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.6.0/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -160,6 +160,9 @@
         <value>0</value>
         <value>1</value>
     </choice></attribute></optional>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="person-content">
@@ -205,9 +208,6 @@
     <zeroOrMore><element name="citationref">
         <ref name="citationref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="child-rel">
@@ -403,9 +403,6 @@
     <zeroOrMore><element name="citationref">
         <ref name="citationref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="event-content">
@@ -433,7 +430,7 @@
   <define name="citation-content">
     <ref name="primary-object"/>
     <optional><ref name="date-content"/></optional>
-    <optional><element name="page"><text/></element></optional>
+    <optional><element name="cname"><text/></element></optional>
     <optional><element name="confidence"><text/></element></optional>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
@@ -441,9 +438,8 @@
     <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"/>
@@ -452,9 +448,8 @@
 
   <define name="source-content">
     <ref name="primary-object"/>
-    <optional><element name="stitle"><text/></element></optional>
-    <optional><element name="sauthor"><text/></element></optional>
-    <optional><element name="spubinfo"><text/></element></optional>
+    <optional><element name="sname"><text/></element></optional>
+    <optional><element name="stemplate"><text/></element></optional>
     <optional><element name="sabbrev"><text/></element></optional>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
@@ -462,9 +457,8 @@
     <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"/>
@@ -520,9 +514,6 @@
     <zeroOrMore><element name="citationref">
         <ref name="citationref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="repository-content">
@@ -581,9 +572,6 @@
     </choice></attribute></optional>
     <attribute name="type"><text/></attribute>
     <ref name="styledtext"/>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
   </define>
 
   <define name="styledtext">
@@ -680,6 +668,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">

data/man/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man level Makefile for Gramps
-# $Id$
-
-SUBDIRS = fr sv nl pl cs pt_BR
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/conf.py

@@ -48,9 +48,9 @@ copyright = u'2012, Gramps project'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0'
+version = '4.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.0-alpha2'
+release = 'trunk'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

data/man/cs/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/sv level Makefile for Gramps
-# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/cs
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/cs/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/fr/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/fr level Makefile for Gramps
-# $Id$
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/fr
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/fr/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/fr/conf.py

@@ -48,9 +48,9 @@ copyright = u'2012, Gramps project'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0'
+version = '4.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.0-alpha2'
+release = 'trunk'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

data/man/nl/Makefile.am

@@ -1,15 +0,0 @@
-# This is the data/man/nl level Makefile for Gramps
-# $Id: Makefile.am 9819 2008-01-15 15:42:10Z bmcage $
-
-mandir = @mandir@/nl
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/nl/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)
-

data/man/pl/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/sv level Makefile for Gramps
-# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/pl
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/pl/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/pt_BR/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/pt_BR level Makefile for Gramps
-# $Id: Makefile.am 16377 2011-01-13 18:32:42Z matlas $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/pt_BR
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/pt_BR/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/sv/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/sv level Makefile for Gramps
-# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/sv
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/sv/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/update_man.py

@@ -52,11 +52,11 @@ SPHINXBUILD   = 'sphinx-build'
 if sys.platform == 'win32':          
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python.exe')
     sphinxCmd = os.path.join(sys.prefix, 'bin', 'sphinx-build.exe')
-elif sys.platform == 'linux2' or os.name == 'darwin':
+elif sys.platform in ['linux2', 'darwin', 'cygwin']:
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
     sphinxCmd = SPHINXBUILD
 else:
-    print ("ERROR: unknown system, don't know sphinx, ... commands")
+    print ("Update Man ERROR: unknown system, don't know sphinx, ... commands")
     sys.exit(0)
 
 def tests():