SVN reorganisation: Move current maintenance branches

svn: r12908
0002512: [Python 2.6 support] Change sets module by built-in set types
2009-08-07 08:12:15 +00:00 · 2008-12-04 14:33:24 +00:00 · 2008-12-02 13:38:09 +00:00 · 2008-02-27 10:44:52 +00:00 · 2008-02-02 10:35:01 +00:00 · 2008-01-31 17:14:21 +00:00
571 changed files with 123268 additions and 113256 deletions
@@ -1,3 +1,28 @@
+Version 2.2.10 -- the "Lemon Curry?" release
+* fixes for several database corruption issues and crashes (Benny, Gary, Jim)
+* fixes for Gedcom, ANSEL and XML import/export issues (Jim, Benny)
+* translation updates (various: bg, de, fi, fr, lt, nb, nl, no)
+* various small fixes to several reports (Stéphane, Gary, Benny)
+
+Version 2.2.9 -- the "Here's your ninepence" release
+* Many bug fixes & translation update (especially reports)
+* Brazilian Portugese translation (Luiz)
+* Slovenian translation (Bernard)
+* Polish Date module (Piotr)
+* correction of incomplete export to .gramps:  export of media
+  subsection (Benny), datespan support (Alex), bookmark save,
+  keep grampsid number on import (Benny)
+* Some new filters and resolved filter issues (Alex, Brian)
+* Rewrite of the Remove Unused tool (Alex)
+* Critical bookmark bug (James, Benny)
+* Critical gallery bug, with additional Check & Repair functions (Benny)
+
+Version 2.2.8 -- the "You sons of a silly person" release
+* Bug fixes
+
+Version 2.2.7 -- the "Well, I didn't vote for you." release
+* Many, many bug fixes
+
 Version 2.2.6 -- the "Summarize Proust Competition" release
 * Fix report option saving

@@ -7,7 +7,7 @@ Requirements
 The following packages *MUST* be installed in order for Gramps to work:
   Python 2.3 or greater
   Gnome 2.8 or greater
-   PyGTK2 2.4 or greater
+   PyGTK2 2.6 or greater
   Gnome-python 2.6 or greater

 The following packages are *STRONGLY RECOMMENDED* to be installed:
@@ -25,13 +25,15 @@ Please see the documentation for the gnome-doc-utils package to learn
 how this works.

 Current HTML documentation can also be found on the gramps website,
-http://gramps-project.org/index.php?module=pagemaster&PAGE_user_op=view_page&PAGE_id=7
+http://www.gramps-project.org/wiki/index.php?title=User_manual



 Building on non-Linux systems: i18n support and GNU make
 --------------------------------------------------------
 If make fails, use gmake (the name FreeBSD gives to GNU make) instead.
+You might need a patch also. FreeBSD has in ports a patch (  /usr/ports/science/gramps/files)
+you need to apply to po/Makefile.in.in 



@@ -5,34 +5,12 @@
  will not be around forever. We need to adapt to the new GTK method.

 * Add support for formatted notes. We have a start by ripping off code
-  from GPL code from grecipe-manager. - DONE
+  from GPL code from grecipe-manager.

 * Allow for multiple notes. A tabbed interface would be really useful,
  since there are no titles for notes. Not all objects would
  necessarily need multiple notes. Determine which ones should and
-  shouldn't. - DONE
-
-* before release on multiple notes: 
-    --> in note view: only show orphaned notes (notes are NOT in remove 
-          orphaned notes tool which is what we want )
-    --> in note: also public/private on GUI
-    --> on upgrade, the notetype should correspond to the object the note is made
-            from, so notetype SOURCE, SOURCEREF, ... (DONE for GRDB)
-    --> in sourceref: 
-         * remove text tab. 
-         * On import of GEDCOM text tag, or upgrade of < 2.2 database, 
-           create a note with type TRANSCRIPT
-         * On export, do not write the text tag in sourceref, write a note instead
-    --> A GrampsWidget for use in report dialogs to select which notetypes to include 
-        in a report
-    --> Support for multiple notes in all reports.
-    --> Empty text field on Saving Note should throw an error that Note is empty ! (?)
-    --> Undo in Note. Serious editing needs an undo function. Furthermore, the function
-        the Clear icon is unclear: tooltip? Other icon?
-
-* Split views
-
-* Export to spreadsheet, print, CSV of views - DONE
+  shouldn't.

 * Date calculator.  See
  http://sourceforge.net/mailarchive/forum.php?thread_id=3252078&forum_id=1993
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl May need to run automake && aclocal first

 AC_PREREQ(2.57)
-AC_INIT(gramps, 2.3.0, [gramps-bugs@lists.sourceforge.net])
+AC_INIT(gramps, 2.2.11, [gramps-bugs@lists.sourceforge.net])
 AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE(1.6.3)

@@ -12,6 +12,7 @@ AC_CONFIG_MACRO_DIR([m4])
 GNOME_DOC_INIT

 RELEASE=0.SVN$(svnversion -n .)
+dnl RELEASE=0rc1
 dnl RELEASE=1

 VERSIONSTRING=$VERSION
@@ -44,8 +45,14 @@ AM_CONDITIONAL(ENABLE_SK, test "x$packager_mode" = "xfalse" -a "x$enable_scrollk
 AC_SUBST(RELEASE)
 AC_SUBST(VERSIONSTRING)

+dnl These are needed for the full paths for the manual output
+HELPPATH=$(pwd)/help/output
+FONTPATH=/usr/share/fonts/truetype/freefont
+AC_SUBST(HELPPATH)
+AC_SUBST(FONTPATH)
+
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk tr"
+ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk tr sl bg"
 GETTEXT_PACKAGE=gramps
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext package name.])
@@ -70,13 +77,13 @@ def out(line):
    f.close()
 "

-AC_MSG_CHECKING(Python bindings for gtk2.4 (pygtk2>=2.3.4))
+AC_MSG_CHECKING(Python bindings for gtk2.8 (pygtk2>=2.8.0))
 cat > conftest.py <<EOF
 $pygtk_require
 try:
    import gobject
    version = gobject.pygtk_version
-    if version >= (2,3,4):
+    if version >= (2,8,0):
        print_version = '.'.join([[str(i) for i in version]])
        out(print_version)
    else:
@@ -93,7 +100,7 @@ if test NO = "$has_pygtk"
 then
   AC_MSG_ERROR([

-**** The python bindings for gtk 2.4 (pygtk2>=2.3.4) could not be found.])
+**** The python bindings for gtk 2.8 (pygtk2>=2.8.0) could not be found.])
 fi
 AC_MSG_RESULT($has_pygtk)

@@ -116,7 +123,7 @@ rm -f conftest.out conftest.py
 if test NO = "$has_pygnome"
 then
   AC_MSG_ERROR([
-**** The python bindings for gnome 2.0 (gnome2-python) could not be found.])
+**** The python bindings for gnome2 (gnome2-python) could not be found.])
 fi
 AC_MSG_RESULT($has_pygnome)

@@ -194,6 +201,8 @@ AC_CONFIG_FILES([
 po/Makefile.in
 m4/Makefile
 help/Makefile
+help/output/Makefile
+help/output/grampsfop.xconf
 Makefile
 gramps.spec
 gramps.sh
@@ -220,13 +229,8 @@ src/Filters/Rules/Source/Makefile
 src/Filters/Rules/Place/Makefile
 src/Filters/Rules/MediaObject/Makefile
 src/Filters/Rules/Repository/Makefile
-src/Filters/Rules/Note/Makefile
 src/Filters/SideBar/Makefile
 src/DataViews/Makefile
-src/BasicUtils/Makefile
-src/Simple/Makefile
-src/GrampsDbUtils/Makefile
-src/GrampsLocale/Makefile
 src/PluginUtils/Makefile
 src/ReportBase/Makefile
 src/plugins/Makefile
@@ -234,11 +238,6 @@ src/DateHandler/Makefile
 src/data/Makefile
 src/glade/Makefile
 src/images/Makefile
-src/images/scalable/Makefile
-src/images/16x16/Makefile
-src/images/22x22/Makefile
-src/images/48x48/Makefile
-src/data/templates/Makefile
 data/Makefile
 data/man/Makefile
 data/man/fr/Makefile
@@ -8,5 +8,5 @@ Type=Application
 StartupNotify=true
 Categories=GTK;Office;
 X-GNOME-DocPath=gramps/gramps-manual.xml
-MimeType=application/x-gramps;
+MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml
 Exec=gramps %F
@@ -237,18 +237,6 @@
        </locale>
      </schema>

-      <schema>
-        <key>/schemas/apps/gramps/interface/releditbtn</key>
-        <applyto>/apps/gramps/interface/releditbtn</applyto>
-        <owner>gramps</owner>
-        <type>bool</type>
-        <default>0</default>
-        <locale name="C">
-          <short>Display edit buttons in Relationship View</short>
-          <long>This key enables display of edit buttons in Relationship View</long>
-        </locale>
-      </schema>
-
      <schema>
        <key>/schemas/apps/gramps/interface/height</key>
        <applyto>/apps/gramps/interface/height</applyto>
@@ -297,30 +285,6 @@
        </locale>
      </schema>

-      <schema>
-        <key>/schemas/apps/gramps/interface/note-height</key>
-        <applyto>/apps/gramps/interface/note-height</applyto>
-        <owner>gramps</owner>
-        <type>int</type>
-        <default>500</default>
-        <locale name="C">
-          <short>Height of the note editor interface.</short>
-          <long>Specifies the height of the note editor interface.</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/gramps/interface/note-width</key>
-        <applyto>/apps/gramps/interface/note-width</applyto>
-        <owner>gramps</owner>
-        <type>int</type>
-        <default>700</default>
-        <locale name="C">
-          <short>Width of the note editor interface.</short>
-          <long>Specifies the width of the note editor interface.</long>
-        </locale>
-      </schema>
-
      <schema>
        <key>/schemas/apps/gramps/interface/person-height</key>
        <applyto>/apps/gramps/interface/person-height</applyto>
@@ -598,18 +562,6 @@
        </locale>
      </schema>

-      <schema>
-        <key>/schemas/apps/gramps/behavior/database-path</key>
-        <applyto>/apps/gramps/behavior/database-path</applyto>
-        <owner>gramps</owner>
-        <type>string</type>
-        <default>~/.gramps/grampsdb</default>
-        <locale name="C">
-          <short>Additional path where the databases may reside</short>
-          <long>Additional path where the databases may reside</long>
-        </locale>
-      </schema>
-
      <schema>
        <key>/schemas/apps/gramps/preferences/fprefix</key>
        <applyto>/apps/gramps/preferences/fprefix</applyto>
@@ -649,19 +601,6 @@
        </locale>
      </schema>

-      <schema>
-        <key>/schemas/apps/gramps/preferences/nprefix</key>
-        <applyto>/apps/gramps/preferences/nprefix</applyto>
-        <owner>gramps</owner>
-        <type>string</type>
-        <default>N%04d</default>
-        <locale name="C">
-          <short>Default note GRAMPS ID pattern</short>
-          <long>The new GRAMPS IDs for the notes are generated according
-          to this format string.</long>
-        </locale>
-      </schema>
-
      <schema>
        <key>/schemas/apps/gramps/preferences/iprefix</key>
        <applyto>/apps/gramps/preferences/iprefix</applyto>
@@ -1214,18 +1153,5 @@
        </locale>
      </schema>

-      <schema>
-        <key>/schemas/apps/gramps/behavior/owner-warn</key>
-        <applyto>/apps/gramps/behavior/owner-warn</applyto>
-        <owner>gramps</owner>
-        <type>bool</type>
-        <default>0</default>
-        <locale name="C">
-          <short>Hide warning on missing database owner.</short>
-          <long>If set to 1, the warning about missing database owner will not
-          be displayed when GEDCOM export is done.</long>
-        </locale>
-      </schema>
-
    </schemalist>
 </gconfschemafile>
@@ -24,15 +24,15 @@
 -->

 <!--
-    This is the Document Type Definition file for v1.2.0
+    This is the Document Type Definition file for v1.1.4
    of the GRAMPS XML genealogy data format.
    Please use the following formal public identifier to identify it:

-    "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.1.4//EN"

    For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
-                "http://gramps-project.org/xml/1.2.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.1.4//EN"
+                "http://gramps-project.org/xml/1.1.4/grampsxml.dtd"
                [...]>
 -->

@@ -47,15 +47,14 @@ DATABASE
 	sources
 	places
 	objects
-	repositories
-	notes
+        repositories
 	bookmarks
 -->

 <!ELEMENT database (header, name-formats?, events?, people?, families?,
-                    sources?, places?, objects?, repositories?, notes?,
-                    bookmark?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.2.0/">
+                    sources?, places?, objects?, repositories?,
+                    bookmarks?, namemaps?)>
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.4/">

 <!--	************************************************************
 HEADER
@@ -95,8 +94,8 @@ PEOPLE
 >

 <!ELEMENT person (gender, name*, nick?, eventref*, lds_ord*,
-                  objref*, address*, attribute*, url*, childof*,
-                  parentin*, personref*, noteref*, sourceref*)>
+                  objref*, address*, attribute*, url*,
+                  childof*,  parentin*, personref*, note?, sourceref*)>
 <!ATTLIST person
        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
@@ -110,8 +109,8 @@ GENDER has values of M, F, or U.
 -->
 <!ELEMENT gender  (#PCDATA)>

-<!ELEMENT name    (first?,call?last?,suffix?,patronymic?,title?,
-                  (daterange|dateval|datestr)?,noteref*,sourceref*)>
+<!ELEMENT name    (first?,call?,last?,suffix?,patronymic?,title?,
+                  (daterange|datespan|dateval|datestr)?,note?,sourceref*)>
 <!ATTLIST name    
        alt       (0|1) #IMPLIED
        type      CDATA #IMPLIED
@@ -140,15 +139,15 @@ GENDER has values of M, F, or U.
 <!ELEMENT parentin EMPTY>
 <!ATTLIST parentin hlink IDREF #REQUIRED>

-<!ELEMENT personref (sourceref*,noteref*)>
+<!ELEMENT personref (sourceref*,note?)>
 <!ATTLIST personref 
  hlink IDREF #REQUIRED
  priv  (0|1) #IMPLIED
  rel   CDATA #REQUIRED
 >

-<!ELEMENT address ((daterange|dateval|datestr)?,street?,city?,county?,state?,
-                   country?,postal?,phone?,noteref*,sourceref*)>
+<!ELEMENT address ((daterange|datespan|dateval|datestr)?,street?,city?,
+                   county?,state?,country?,postal?,phone?,note?,sourceref*)>
 <!ATTLIST address priv (0|1) #IMPLIED>

 <!ELEMENT street  (#PCDATA)>
@@ -168,7 +167,7 @@ FAMILY
 <!ELEMENT families (family)*>

 <!ELEMENT family (rel?,father?,mother?,eventref*,lds_ord*,
-                  objref*,childref*,attribute*,noteref*,sourceref*)>
+                  objref*,childref*,attribute*,note?,sourceref*)>
 <!ATTLIST family
        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
@@ -183,7 +182,7 @@ FAMILY
 <!ELEMENT mother EMPTY>
 <!ATTLIST mother hlink IDREF #REQUIRED>

-<!ELEMENT childref (sourceref*,noteref*)>
+<!ELEMENT childref (sourceref*,note?)>
 <!ATTLIST childref
  hlink IDREF #REQUIRED
  priv  (0|1) #IMPLIED
@@ -201,8 +200,8 @@ EVENT
 -->
 <!ELEMENT events (event)*>

-<!ELEMENT event (type?,(daterange|dateval|datestr)?,place?,cause?,
-                 description?,attribute*,noteref*,sourceref*,objref*)>
+<!ELEMENT event (type?,(daterange|datespan|dateval|datestr)?,place?,cause?,
+                 description?,attribute*,note?,sourceref*,objref*)>
 <!ATTLIST event 
        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
@@ -217,7 +216,7 @@ SOURCES

 <!ELEMENT sources (source)*>
 <!ELEMENT source (stitle?,sauthor?,spubinfo?,sabbrev?,
-                  noteref*,objref*,data_item*,reporef*)>
+                  note?,objref*,data_item*,reporef*)>
 <!ATTLIST source
        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
@@ -236,7 +235,7 @@ PLACES

 <!ELEMENT places (placeobj)*>

-<!ELEMENT placeobj (ptitle?,coord?,location*,objref*,url*,noteref*,sourceref*)>
+<!ELEMENT placeobj (ptitle?,coord?,location*,objref*,url*,note?,sourceref*)>
 <!ATTLIST placeobj
        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
@@ -271,7 +270,7 @@ OBJECTS

 <!ELEMENT objects (object)*>

-<!ELEMENT object (file,attribute*,noteref*,(daterange|dateval|datestr)?,
+<!ELEMENT object (file,attribute*,note?,(daterange|datespan|dateval|datestr)?,
 		  sourceref*)>
 <!ATTLIST object
        id        CDATA #REQUIRED
@@ -294,7 +293,7 @@ REPOSITORIES

 <!ELEMENT repositories (repository)*>

-<!ELEMENT repository (rname,type,address*,url*,noteref*)>
+<!ELEMENT repository (rname,type,address*,url*,note?)>
 <!ATTLIST repository
        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
@@ -305,23 +304,6 @@ REPOSITORIES

 <!ELEMENT rname   (#PCDATA)>

-<!--	************************************************************
-NOTES
-->
-
-<!ELEMENT notes (note)*>
-
-<!ELEMENT note (#PCDATA)>
-<!ATTLIST note
-        id        CDATA #REQUIRED
-        handle    ID    #REQUIRED
-        priv      (0|1) #IMPLIED
-	marker    CDATA #IMPLIED
-	change    CDATA #REQUIRED
-	format    (0|1) #IMPLIED
-	type      CDATA #REQUIRED
->
-

 <!--	************************************************************
 BOOKMARKS
@@ -334,6 +316,17 @@ BOOKMARKS
        hlink  IDREF #REQUIRED
 >

+<!--	************************************************************
+NAME MAPS
+-->
+<!ELEMENT namemaps (map)*>
+<!ELEMENT map EMPTY>
+<!ATTLIST map 
+        type  CDATA #REUIRED
+        key   CDATA #REQUIRED
+        value CDATA #REQUIRED
+>
+
 <!--	************************************************************
 NAME FORMATS
 -->
@@ -358,6 +351,14 @@ SHARED ELEMENTS
        cformat CDATA #IMPLIED
 >

+<!ELEMENT datespan    EMPTY>
+<!ATTLIST datespan
+        start   CDATA #REQUIRED
+        stop    CDATA #REQUIRED
+        quality (estimated|calculated) #IMPLIED
+        cformat CDATA #IMPLIED
+>
+
 <!ELEMENT dateval    EMPTY>
 <!ATTLIST dateval
        val     CDATA                  #REQUIRED
@@ -369,43 +370,49 @@ SHARED ELEMENTS
 <!ELEMENT datestr    EMPTY>
 <!ATTLIST datestr val CDATA #REQUIRED>

-<!ELEMENT sourceref (spage?,noteref*,stext?,(daterange|dateval|datestr)?)>
+<!ELEMENT note       (#PCDATA)>
+<!ATTLIST note format (0|1) #IMPLIED>
+
+<!ELEMENT sourceref (spage?,scomments?,stext?,(daterange|dateval|datestr)?)>
 <!ATTLIST sourceref
        hlink IDREF #REQUIRED
        priv  (0|1) #IMPLIED
        conf  CDATA #IMPLIED
 >

-<!ELEMENT eventref (attribute*,noteref*)>
+<!ELEMENT eventref (attribute*,note?)>
 <!ATTLIST eventref
        hlink IDREF #REQUIRED
        priv  (0|1) #IMPLIED
        role  CDATA #IMPLIED
 >

-<!ELEMENT reporef (noteref*)>
+<!ELEMENT reporef (note?)>
 <!ATTLIST reporef
        hlink  IDREF #REQUIRED
        callno CDATA #IMPLIED
        medium CDATA #IMPLIED
 >

-<!ELEMENT noteref EMPTY>
-<!ATTLIST noteref
-        hlink IDREF #REQUIRED
+<!ELEMENT marker EMPTY>
+<!ATTLIST marker
+        type  CDATA  #REQUIRED
 >

 <!ELEMENT spage     (#PCDATA)>
+<!ELEMENT scomments (#PCDATA)>
 <!ELEMENT sdate     (#PCDATA)>
 <!ELEMENT stext     (#PCDATA)>

-<!ELEMENT attribute  (sourceref*,noteref*)>
+<!ELEMENT attribute  (sourceref*,note?)>
 <!ATTLIST attribute
        priv 	(0|1) 	#IMPLIED
        type	CDATA	#REQUIRED
        value	CDATA	#REQUIRED
 >

+<!ELEMENT comment (#PCDATA)>
+
 <!ELEMENT place EMPTY>
 <!ATTLIST place hlink IDREF #REQUIRED>

@@ -420,12 +427,20 @@ SHARED ELEMENTS
        description CDATA #IMPLIED
 >

-<!ELEMENT objref (attribute*,sourceref*,noteref*)>
+<!ELEMENT objref (region?,attribute*,sourceref*,note?)>
 <!ATTLIST objref 
        hlink IDREF #REQUIRED
        priv (0|1)  #IMPLIED
 >

+<!ELEMENT region EMPTY>
+<!ATTLIST region
+        corner1_x  CDATA #REQUIRED
+        corner1_y  CDATA #REQUIRED
+        corner2_x  CDATA #REQUIRED
+        corner2_y  CDATA #REQUIRED
+>
+
 <!ELEMENT data_item EMPTY>
 <!ATTLIST data_item
        key   CDATA #REQUIRED
@@ -433,7 +448,7 @@ SHARED ELEMENTS
 >

 <!ELEMENT lds_ord ((daterange|dateval|datestr)?,temple?,place?,status?,
-                   sealed_to?,noteref*,sourceref*)>
+                   sealed_to?,note?,sourceref*)>
 <!ATTLIST lds_ord
        priv  (0|1) #IMPLIED
        type   CDATA #REQUIRED
@@ -31,7 +31,7 @@

 <grammar
  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.2.0/"
+  ns="http://gramps-project.org/xml/1.1.4/"
  xmlns="http://relaxng.org/ns/structure/1.0">

  <start><element name="database">
@@ -98,18 +98,17 @@
          </element></zeroOrMore>
      </element></optional>

-      <optional><element name="notes">
-          <zeroOrMore><element name="note">
-              <ref name="note-content"/>
-          </element></zeroOrMore>
-      </element></optional>
-
      <optional><element name="bookmarks">
          <zeroOrMore><element name="bookmark">
              <ref name="bookmark-content"/>
          </element></zeroOrMore>
      </element></optional>

+      <optional><element name="namemaps">
+          <zeroOrMore><element name="map">
+              <ref name="map-content"/>
+          </element></zeroOrMore>
+      </element></optional>
  </element></start>

  <define name="researcher-content">
@@ -176,9 +175,9 @@
        </attribute></optional>
        <attribute name="rel"><text/></attribute>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
@@ -224,9 +223,9 @@
    <optional><element name="patronymic"><text/></element></optional>
    <optional><element name="title"><text/></element></optional>
    <optional><ref name="date-content"/></optional>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
@@ -244,9 +243,9 @@
    <optional><element name="country"><text/></element></optional>
    <optional><element name="postal"><text/></element></optional>
    <optional><element name="phone"><text/></element></optional>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
@@ -263,6 +262,15 @@
            </choice></attribute></optional>
            <optional><attribute name="cformat"><text/></attribute></optional>
        </element>
+        <element name="datespan">
+            <attribute name="start"><text/></attribute>
+            <attribute name="stop"><text/></attribute>
+            <optional><attribute name="quality"><choice>
+                <value>estimated</value>
+                <value>calculated</value>
+            </choice></attribute></optional>
+            <optional><attribute name="cformat"><text/></attribute></optional>
+        </element>
        <element name="dateval">
            <attribute name="val"><text/></attribute>
            <optional><attribute name="cformat"><text/></attribute></optional>
@@ -317,9 +325,9 @@
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <optional><ref name="date-content"/></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
@@ -337,9 +345,9 @@
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
@@ -354,9 +362,9 @@
    <optional><element name="sauthor"><text/></element></optional>
    <optional><element name="spubinfo"><text/></element></optional>
    <optional><element name="sabbrev"><text/></element></optional>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
@@ -392,9 +400,9 @@
    <zeroOrMore><element name="url">
        <ref name="url-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
@@ -411,9 +419,9 @@
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <optional><ref name="date-content"/></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
@@ -430,9 +438,9 @@
    <zeroOrMore><element name="url">
        <ref name="url-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
  </define>

  <define name="bookmark-content">
@@ -448,6 +456,14 @@
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
  
+  <define name="map-content">
+    <attribute name="type"><choice>
+        <value>group_as</value>
+    </choice></attribute>
+    <attribute name="key"><text/></attribute>
+    <attribute name="value"><text/></attribute>
+  </define>
+
  <define name="format-content">
    <attribute name="number"><text/></attribute>
    <attribute name="name"><text/></attribute>
@@ -459,12 +475,10 @@
  </define>

  <define name="note-content">
-    <ref name="primary-object"/>
    <optional><attribute name="format"><choice>
        <value>0</value>
        <value>1</value>
    </choice></attribute></optional>
-    <attribute name="type"><text/></attribute>
    <text/>
  </define>

@@ -475,9 +489,7 @@
    </attribute></optional>
    <optional><attribute name="conf"><text/></attribute></optional>
    <optional><element name="spage"><text/></element></optional>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="scomments"><text/></element></optional>
    <optional><element name="stext"><text/></element></optional>
    <optional><ref name="date-content"/></optional>
  </define>
@@ -491,22 +503,18 @@
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
  </define>

  <define name="reporef-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
    <optional><attribute name="callno"><text/></attribute></optional>
    <optional><attribute name="medium"><text/></attribute></optional>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
-  </define>
-
-  <define name="noteref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
  </define>

  <define name="priv-content">
@@ -525,9 +533,9 @@
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
  </define>

  <define name="url-content">
@@ -544,15 +552,18 @@
    <optional><attribute name="priv">
        <ref name="priv-content"/>
    </attribute></optional>
+    <optional><element name="region">
+        <ref name="region-content"/>
+    </element></optional>    
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
    </element></zeroOrMore>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
  </define>

  <define name="lds-content">
@@ -573,13 +584,21 @@
    <optional><element name="sealed_to">
        <attribute name="hlink"><data type="IDREF"/></attribute>
    </element></optional>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
    <optional><ref name="date-content"/></optional>
    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

+  <define name="region-content">
+    <attribute name="corner1_x"><data type="integer"/></attribute>
+    <attribute name="corner1_y"><data type="integer"/></attribute>
+    <attribute name="corner2_x"><data type="integer"/></attribute>
+    <attribute name="corner2_y"><data type="integer"/></attribute>
+    <text/>
+  </define>
+
 </grammar>
@@ -5,7 +5,7 @@
 <!--
  User Manual for Gramps - a GTK+/GNOME based genealogy program

-  Copyright (C) 2003-2006  Alexander Roitman
+  Copyright (C) 2003-2007  Alexander Roitman

  This document is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
    </copyright>

    <copyright>
-      <year>2003-2006</year>
+      <year>2003-2007</year>

      <holder>Alex Roitman</holder>
    </copyright>
@@ -100,16 +100,6 @@
        </affiliation>
      </author>

-      <author>
-        <firstname>Donald N.</firstname>
-        <surname>Allingham</surname>
-
-        <affiliation>
-          <orgname>GRAMPS Project</orgname>
-          <address><email>don@gramps-project.org</email></address>
-        </affiliation>
-      </author>
-
      <othercredit role="maintainer">
 	<firstname>Donald N.</firstname> 
 	<surname>Allingham</surname> 
@@ -903,7 +893,7 @@
              the person's name is a symbol indicating gender, and an Edit
              button. Clicking the <guibutton>Edit</guibutton> button will
              allow you to edit all of the person's individual information in
-              an Edit Person dialog.</para>
+              an <guilabel>Edit Person</guilabel> dialog.</para>
            </listitem>
          </varlistentry>

@@ -958,7 +948,7 @@
            <listitem>
              <para>Similar to the Parents section is the Family section,
              which displays families where the Active Person is a parent. Because it
-              is possible to have multiple familes, it is possible to have
+              is possible to have multiple families, it is possible to have
              multiple Family sections. Each family section displays the
              spouse and any children.</para>

@@ -1239,7 +1229,7 @@
        <para>If a place has been highlighted, you may select the
        <guibutton>Google Maps</guibutton> button to attempt to display the
        place in a web browser. Your default web browser should open,
-        attempting to use either the longitude and lattitude coordinates or
+        attempting to use either the longitude and latitude coordinates or
        the place name to display the location using the Google Maps web site.
        This feature is limited, and may not always produce the results you
        desire.</para>
@@ -1413,7 +1403,7 @@

          <guimenuitem>Undo</guimenuitem>
        </menuchoice>. If you select this command repeatedly, your most recent
-      changes will be undone one at a time. To roll back multple commands at a
+      changes will be undone one at a time. To roll back multiple commands at a
      time, you can using the <guilabel>Undo History</guilabel> dialog
      available from the <guilabel>Edit</guilabel> menu.</para>

@@ -1503,7 +1493,7 @@
            Berkeley database (BSDDB) with a special structure of data tables.
            This format is binary and architecture-dependent. It is very quick
            and efficient, but not generally portable across computers with
-            different binary architecture (e.g. i386 vs alpha).</para>
+            different binary architecture (e.g. i386 vs. alpha).</para>
          </listitem>
        </varlistentry>

@@ -1694,7 +1684,7 @@
              your images when writing image references in GEDCOM.</para>

              <para>This option allows specify where your image files are
-              located. This is useful when you are transfering your GEDCOM
+              located. This is useful when you are transferring your GEDCOM
              file from one computer to another. It tells the program that is
              importing the data where your images are.</para>
            </listitem>
@@ -1892,7 +1882,7 @@
        </note>

        <para>People can also be added to the database in the Relationships
-        View, Edit Family dialog, and other places where it makes
+        View, <guilabel>Edit Family</guilabel> dialog, and other places where it makes
        sense.</para>
      </sect2>

@@ -1900,7 +1890,7 @@
        <title>To Specify a Relationship</title>

        <para>There are two primary ways to specify relationships between
-        people - using the Relationships View and using the Edit Family dialog
+        people - using the Relationships View and using the <guilabel>Edit Family</guilabel> dialog
        from the Family List View. The Family List is usually used to build
        all the relationships within a single family at a time. The
        Relationships View is usually used to build multiple relationships to
@@ -1911,8 +1901,8 @@
        this individual indicated as the "Active Person". Next to the
        <guilabel>Family</guilabel> label is a <guibutton>Add</guibutton>
        button (typically represented by a <guibutton>+</guibutton> sign).
-        Clicking the <guibutton>Add</guibutton> button will display the Edit
-        Family dialog with the Active Person set as either the father or the
+        Clicking the <guibutton>Add</guibutton> button will display the <guilabel>Edit
+        Family</guilabel> dialog with the Active Person set as either the father or the
        mother.</para>

        <figure id="edit-family">
@@ -1975,7 +1965,7 @@

        <para>To specify a new relationship in the Family List View, click on
        the <guibutton>Add</guibutton> button on the toolbar, and an empty
-        Edit Family dialog will open. At this point, you can add people to the
+        <guilabel>Edit Family</guilabel> dialog will open. At this point, you can add people to the
        family.</para>
      </sect2>

@@ -1991,7 +1981,7 @@
        <guibutton>Add</guibutton> button.</para>

        <para>If you click on the <guibutton>Select</guibutton> button, you
-        are presented with the Select Family dialog. This will allow you to
+        are presented with the <guilabel>Select Family</guilabel> dialog. This will allow you to
        select the existing family, and then the Active Person will be added
        as a child to the family.</para>

@@ -2011,7 +2001,7 @@
        </figure>

        <para>If you click on the <guibutton>Add</guibutton> button, a new
-        Edit Family dialog is presented with the Active Person listed a child
+        <guilabel>Edit Family</guilabel> dialog is presented with the Active Person listed a child
        of the new family. You can add the parents to the family by either
        adding new people as the parents or selecting existing people as the
        parents.</para>
@@ -2019,7 +2009,7 @@
        <warning>
          <para>If you create a new family and select parents that are already
          in an existing family, GRAMPS will issue a warning message. If you
-          proceed by saving the new famiy, you will have a duplicate
+          proceed by saving the new family, you will have a duplicate
          family.</para>

          <figure id="family-warn">
@@ -2041,7 +2031,7 @@
        <para>You can also specify the parents of a person in the Family List
        View. If the family already exists, click on the
        <guibutton>Edit</guibutton> button on the tool bar and add the person
-        as a child when the Edit Family dialog is displayed. If the family
+        as a child when the <guilabel>Edit Family</guilabel> dialog is displayed. If the family
        does not already exist, click the <guibutton>Add</guibutton> button to
        create a new family, and add the appropriate parents and
        children.</para>
@@ -2051,20 +2041,20 @@
        <title>To Specify Children</title>

        <para>Adding children to a relationship is done through a similar
-        proceedure. From the Relationships View or the Family List View,
+        procedure. From the Relationships View or the Family List View,
        select the existing family or create a new family. Children can be
        added by selecting the Add button or Select button to the right of the
        child list.</para>

        <para>Clicking the <guibutton>Add</guibutton> button will display the
-        Edit Person dialog, allowing you to enter a new person. Clicking on
+        <guilabel>Edit Person</guilabel> dialog, allowing you to enter a new person. Clicking on
        the <guibutton>Select</guibutton> button, will allow you to select an
        existing person from a list. By default, the child is added with a the
        relationship type of birth to both parents.</para>

        <para>If you wish to change the parent/child relationship from the
        default setting of birth, select the child and click on the Edit
-        button. This will display the Edit Child Reference dialog.</para>
+        button. This will display the <guilabel>Edit Child Reference</guilabel> dialog.</para>

        <figure id="child-ref">
          <title>Child Reference Editor</title>
@@ -2356,7 +2346,7 @@

              <para>The field <guilabel>ID</guilabel> displays the GRAMPS ID
              number which identifies the user in the database. This value
-              helps you distiguish between people who have the same name. You
+              helps you distinguish between people who have the same name. You
              may enter any unique value you want. If you do not provide a
              value, GRAMPS will automatically select a value for you.</para>

@@ -2567,7 +2557,7 @@
              ignored.</para>

              <para>If you select the Preformatted option, the text in reports
-              and web pages will appear exactly as you enter it in the Notes
+              and web pages will appear exactly as you enter it in the <guilabel>Notes</guilabel>
              dialog.</para>
            </listitem>
          </varlistentry>
@@ -2609,7 +2599,7 @@
                as sources of the event (under the <guilabel>Events</guilabel>
                tab) instead of as a source of the person. The person's
                <guilabel>Sources</guilabel> tab is best used for any sources
-                not specificly connected to any other data.</para>
+                not specifically connected to any other data.</para>
              </tip>

              <para>The central part displays the list of all source
@@ -2788,7 +2778,7 @@
        care to preserve and use any date information available.</para>

        <para>Information can be entered into a date field by directly typing
-        it or by invoking the Date selection dialog. Both methods will be
+        it or by invoking the <guilabel>Date selection</guilabel> dialog. Both methods will be
        discussed below, but first, we will cover some important features of
        dates as they are used in GRAMPS.</para>

@@ -2866,7 +2856,7 @@
          <note>
            <title>Date parsing rules</title>

-            <para>The list only applys to the English version of GRAMPS. If
+            <para>The list only applies to the English version of GRAMPS. If
            you are using localized version of GRAMPS, your version may or may
            not provide a localized date parser. At the time of this writing,
            localized parsers exist for French, German, Russian, Finnish,
@@ -3013,10 +3003,10 @@
          <note>
            <para>If you have an important comment to make about a date, you
            are better off doing so in a Note that corresponds to the event
-            than in the Text comment field of the Date selection dialog. We
+            than in the Text comment field of the <guilabel>Date selection</guilabel> dialog. We
            recommend this for the following reason: If you enter a date by
-            typing it directly into the date field (that is, not via the Date
-            selector dialog), your entry will be copied and stored as the text
+            typing it directly into the date field (that is, not via the <guilabel>Date
+            selector</guilabel> dialog), your entry will be copied and stored as the text
            comment string when GRAMPS parses the entered text. Thus, any
            comment that may have been there prior to the parsing will be
            overwritten.</para>
@@ -3097,7 +3087,7 @@
        </tip>

 	<para>The <guilabel>Relationship Information</guilabel>
-	section fields have the basic desciption of the
+	section fields have the basic description of the
 	relationship. The <guilabel>GRAMPS ID</guilabel> field
 	displays the ID number which labels this relationship in the
 	database. The available types (such as Married, Unmarried,
@@ -3229,7 +3219,7 @@
              new paragraph; additional inserted lines will be ignored.</para>

              <para>If you select the Preformatted option, the text in reports
-              and web pages will appear exactly as you enter it in the Notes
+              and web pages will appear exactly as you enter it in the <guilabel>Notes</guilabel>
              dialog.</para>
            </listitem>
          </varlistentry>
@@ -3589,7 +3579,7 @@
            <listitem>
              <para>The <guilabel>References</guilabel> tab indicates any
              database records (events or LDS ordinances) that refer to a
-              place. This information cannot be modified from the Place Editor
+              place. This information cannot be modified from the <guilabel>Place Editor</guilabel>
              dialog. Instead, the corresponding database record (e.g., a
              birth event) has to be brought up and its place reference
              edited.</para>
@@ -4707,9 +4697,9 @@
        variables. The difference between the two styles is how empty data is
        handled.</para>

-        <para>The first style of variables are preceeded by a '$'. If the
+        <para>The first style of variables are preceded by a '$'. If the
        variable evaluates to an empty string, the variable is replaced with
-        the empty string. The second style of variables are preceeded by a
+        the empty string. The second style of variables are preceded by a
        '%'. If the variable evaluates to an empty string, the line that
        contains the variable is removed from the output.</para>

@@ -4803,7 +4793,7 @@
            <term>$M/%M</term>

            <listitem>
-              <para>Displays the place assocated with the marriage of the
+              <para>Displays the place associated with the marriage of the
              person and the preferred spouse.</para>
            </listitem>
          </varlistentry>
@@ -4994,7 +4984,7 @@

            <listitem>
              <para>This report produces a chart resembling a fan, with Active
-              person in the center, parents the the semicircle next to it,
+              person in the center, parents the semicircle next to it,
              grandparents in the next semicircle, and so on, for a total of
              five generations.</para>
            </listitem>
@@ -5006,7 +4996,7 @@
            <listitem>
              <para>This report creates a complex relationship graph in
              GraphViz format and then converts into graphical output running
-              it through the the GraphViz <command>dot</command> tool behind
+              it through the GraphViz <command>dot</command> tool behind
              the scene. Specific options for this report include filter,
              options for dates and places for the events, and whether to
              include URLs and IDs for individuals and families. There are
@@ -5267,10 +5257,10 @@
                <para>Genealogy records can generate a lot of files. Many web
                servers have a difficult time with many files in a single
                directory. The Narrative Web Generator strives to keep the
-                number of files per directory to a managable level. To do
-                this, a hierarchy of directores is created. The generated
+                number of files per directory to a manageable level. To do
+                this, a hierarchy of directories is created. The generated
                files names are not intuitive, but are unique per person.
-                Subsequent runs will geneate identical file names, making it
+                Subsequent runs will generate identical file names, making it
                easy to replace files.</para>

                <para>By default, the output files are written to the
@@ -5338,7 +5328,7 @@
                GRAMPS, distorting characters on the screen.</para>

                <para>If your web server is misconfigured and you do not have
-                priveledge to fix the configururation, you may solve this
+                privilege to fix the configuration, you may solve this
                problem by overriding the default character set to match what
                your web server may be expecting.</para>
              </listitem>
@@ -5411,7 +5401,7 @@
                indicate that a certain number of years must pass after
                someone's death before information can be published. The
                <guilabel>Years to restrict from person's death</guilabel>
-                option allows you to specifiy how many years a person must be
+                option allows you to specify how many years a person must be
                deceased before the information is included.</para>

                <para>Please note that it is your responsibility to double
@@ -5940,7 +5930,7 @@
 	    
            <listitem>
              <para>This option controls the enabling and disabling of 
-	       the Tip of the Day dialog at startup.</para>
+	       the <guilabel>Tip of the Day</guilabel> dialog at startup.</para>
            </listitem>
          </varlistentry>

@@ -6165,7 +6155,7 @@
 		<para>
 		  The actual format is defined here using special formatting
 		  characters. Before and after these special characters any
-		  other character or string is allowed. For exmple: <userinput>
+		  other character or string is allowed. For example: <userinput>
 		  "(%t) %L, %f"</userinput> will give <replaceable>"(Dr.) SMITH,
 		  Edwin"</replaceable>. The formatting characters are:
 		</para>
@@ -6357,13 +6347,13 @@

          <listitem>
            <para>The columns of the list views may be added, removed, or
-            reordered in a <guilabel>Column Editor Dialog</guilabel>, see
+            reordered in a <guilabel>Column Editor</guilabel> dialog, see
            <xref linkend="column-editor-fig" />. Only checked columns will be
            shown in the view. To change their order, drag any column to its
            desired place inside the editor. Clicking
            <guibutton>OK</guibutton> will reflect the changes in the
            appropriate view. To invoke <guilabel>Column Editor
-            Dialog</guilabel>, choose <menuchoice>
+            </guilabel> dialog, choose <menuchoice>
                <guimenu>Edit</guimenu>

                <guimenuitem>Column Editor...</guimenuitem>
@@ -6696,18 +6686,18 @@
      </varlistentry>

      <varlistentry>
-        <term>Why are non-latin characters displayed as garbage in PDF/PS
+        <term>Why are non-Latin characters displayed as garbage in PDF/PS
        reports?</term>

        <listitem>
-          <para>This is a limitation of the builtin fonts of PS and PDF
-          formats. To print non-latin text, use the Print... in the format
+          <para>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.</para>

-          <para>If you only have latin text, the PDF option will produce a
-          smalled PDF compared to that created by gnome-print, simply because
+          <para>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.</para>
        </listitem>
      </varlistentry>
@@ -6796,12 +6786,10 @@

          <para>Most problems can be fixed quickly provided there is enough
          information. To ensure this, please follow up on your bug reports.
-          In particular, if you file a bug report with sf.net bug tracker,
-          PLEASE log in to sf.net before filing (register your free account if
-          you don't have one). Then we will have a way of contacting you
-          should we need more information. If you choose to file your report
-          anonymously, at least check every so often whether your report page
-          has something new posted, as it probably would.</para>
+          In particular, if you file a bug report with the gramps bug tracker,
+          PLEASE log in to bugs.gramps-project.org before filing (register
+          your free account if you don't have one). Then we will have a way
+          of contacting you should we need more information.</para>

          <para>If the above explanations seem vague, please follow <ulink
          type="http"
@@ -6826,7 +6814,7 @@
          project, to ensure compatibility or import/export options to your
          new format of a project.</para>

-          <para>If, however, you would like the GRAMPS project to to adopt
+          <para>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.</para>
@@ -6849,7 +6837,7 @@
    <sect1 id="keybind-lists">
      <title>List Views</title>

-      <sect2>
+      <sect2 id="common_bindings">
 	<title>Common bindings</title>
 	<para>The following bindings are available in all list views: People
 	  View, Sources View, Places View, and Media View.</para>
@@ -6896,7 +6884,7 @@
          </tgroup>
 	</informaltable>
      </sect2>
-      <sect2>
+      <sect2 id="people_view_bindings">
 	<title>People View bindings</title>
 	<informaltable frame="topbot">
          <tgroup cols="2">
@@ -7926,7 +7914,7 @@
        <listitem>
          <para>Any errors encountered during import, export, or action, will
          be either dumped to stdout (if these are exceptions handled by
-          GRAMPS) or or to stderr (if these are not handled). Use usual shell
+          GRAMPS) or to stderr (if these are not handled). Use usual shell
          redirections of stdout and stderr to save messages and errors in
          files.</para>
        </listitem>
@@ -7943,7 +7931,7 @@
          may type:</term>

          <listitem>
-            <para><command>gramps -i<filename>file1.ged</filename> -i
+            <para><command>gramps -i <filename>file1.ged</filename> -i
            <filename>file2.gpkg</filename> -i
            <filename>~/db3.gramps</filename> -i
            <filename>file4.wft</filename> -a
@@ -1,3 +1,31 @@
+2007-10-10  Mirko Leonhaeuser <mirko@leonhaeuser.de>
+	* de/de.po:
+	* de/figures/mainwin.png:
+	* de/figures/first-open.png:
+	updated for the 2.2.9 release
+
+2007-05-24  Lubo Vasko  <pgval@inMail.sk>
+	* sk/sk.po: Translation update.
+
+2007-05-08  Lubo Vasko  <pgval@inMail.sk>
+	* sk/sk.po: Translation update.
+
+2007-02-23  Alex Roitman  <shura@gramps-project.org>
+	* C/gramps.xml: List Don just once, as a maintainer.
+	* output/Makefile.am (HELP_LINGUAS): Disable nb for now;
+	(fo): Generate fo output.
+
+	* output/gramps-help-screen.css: Modify css to see revision
+	history by the main text.
+
+2007-02-22  Alex Roitman  <shura@gramps-project.org>
+	* output/Makefile.am: Write rule for manual website creation.
+
+2007-02-16  Alex Roitman  <shura@gramps-project.org>
+	* help/nl: Add svn:ignore property.
+	* various: Add stuff for generating html and pdf output.
+	* Makefile.am (SUBDIRS): Add subdirs.
+
 2007-02-13  Lubo Vasko  <pgval@inMail.sk>
 	* sk/figures/*.png : Update.
 	* sk/sk.po: Translation update.
@@ -1,6 +1,8 @@
 # This is the help level Makefile for gramps
 # $Id$

+SUBDIRS = output
+
 include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook

@@ -65,5 +67,5 @@ DOC_FIGURES = \
 	figures/side-filt.png\
 	figures/sources.png

-DOC_LINGUAS = fr nb sk nl
-#de fr hu ru
+DOC_LINGUAS = de fr nb sk nl
+#hu ru
@@ -0,0 +1,70 @@
+# This is the help/output level Makefile for gramps
+# $Id$
+
+BRANCH = 2.2
+HELP_LINGUAS = C fr sk nl #nb
+
+# admon images to copy
+ADMON_IMAGES = note.png tip.png warning.png
+
+# Docbook stuff
+chunkxsl = /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
+admonimgdir = /usr/share/xml/docbook/stylesheet/nwalsh/images/
+docbookxsl = /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl
+
+html:
+	rm -rf gramps-manual 	# Clean up the output dir
+	for lang in $(HELP_LINGUAS) ; do \
+		xsltproc -o gramps-manual/$(BRANCH)/$$lang/index.html \
+			--stringparam chunker.output.encoding UTF-8 \
+			--stringparam html.stylesheet \
+				../../gramps-help-screen.css \
+			--stringparam admon.graphics 1 \
+			--stringparam admon.graphics.path ../../images/ \
+			--stringparam navig.graphics 1 \
+			--stringparam navig.graphics.extension .png \
+			--stringparam navig.graphics.path ../../images/ \
+			$(chunkxsl) ../$$lang/gramps.xml ; \
+		mkdir gramps-manual/$(BRANCH)/$$lang/figures ; \
+		cp ../$$lang/figures/*.png \
+			gramps-manual/$(BRANCH)/$$lang/figures/ ; \
+		echo "	Done with html for $$lang" ; \
+		echo "	" ; \
+	done
+
+	mv gramps-manual/$(BRANCH)/C gramps-manual/$(BRANCH)/en
+
+	mkdir gramps-manual/images
+	cp htmlpic/* gramps-manual/images/
+	for img in $(ADMON_IMAGES) ; do \
+		cp $(admonimgdir)/$$img gramps-manual/images/ ; \
+	done
+
+	cp gramps-help-screen.css gramps-manual/
+
+pdf:	fo
+
+fo:
+	rm -rf gramps-pdf 	# Clean up the output dir
+	for lang in $(HELP_LINGUAS) ; do \
+		if test $$lang = C ; then \
+			papers="USletter A4"; \
+		else \
+			papers=A4 ; \
+		fi ; \
+		for paper in $$papers ; do \
+			xsltproc  \
+				--output gramps-pdf/$$lang/gramps-$$paper.fo \
+				--stringparam  paper.type $$paper \
+				--stringparam  double.sided 1 \
+				--stringparam  admon.graphics 1 \
+				--stringparam  admon.graphics.path ./admonpdf \
+				--stringparam  section.autolabel 1 \
+				--stringparam  section.autolabel.max.depth 3 \
+				--stringparam  \
+				    section.label.includes.component.label 1 \
+				--stringparam  body.start.indent 0pt \
+				--stringparam  fop.extensions  1 \
+				$(docbookxsl) ../$$lang/gramps.xml ; \
+		done ; \
+	done
@@ -0,0 +1,840 @@
+/* This file is part of gimp-help-2. It is copyrighted under the GNU
+   Free Documentation License Version 1.1 which you can get from
+   http://www.gnu.org 
+   
+   Browser wrangling and typographic design by
+     Oyvind Kolas / pippin@gimp.org
+
+   Thanks to:
+     Liam R. E. Quin
+     William Skaggs
+     Jakub Steiner
+   
+   */
+
+/* Modified by for GRAMPS by:
+     Benny
+     Alex Roitman
+
+     $Id$
+   */
+
+@media screen {
+    body {
+      font-family: sans-serif;
+      font-size: 100%;
+      padding: 0;
+      margin: 0;
+    }
+    
+    .book,
+    .section,
+    div.sect1,
+    div.sect2,
+    div.sect3,
+    .simplesect,
+    .chapter,
+    .part,
+    .preface,
+    .glossary,
+    .bibliography,
+    .reference,
+    .refentry,
+    .appendix,
+    .index {
+        max-width: 45em;
+        min-width: 34em;
+        width: 45em;
+        margin: 0 auto;
+        margin-bottom: 2em;
+    }
+
+    h1,h2,h3,h4,h5,h6,h7 {
+      clear: both;
+    }
+
+    h1 {
+      font-weight: bold;
+      font-size: 166%;
+      text-align: left;
+      clear: both;
+      padding: 0;
+      margin: 2em 0 0em 0em;
+    }
+
+    h2.subtitle {
+      margin: 0.10 0 3.0em 0;
+      padding: 0;
+      width: 80%;
+      padding-left: 20%;
+      font-weight: normal;
+      font-style: italic;
+      text-align: right;
+    }
+
+    h2 {
+      margin: 2em 0 0.66em 0em;
+      padding: 0.5em 0 0em 0em;
+      font-size: 142.14%;
+      font-weight: normal;
+    }
+
+    h3.subtitle {
+      margin: 0 0em 1em 0em;
+      padding: 0;
+      font-size: 142.14%;
+      font-weight: normal;
+      text-align : right;
+    }
+
+    h3 {
+      margin: 1em 0 0.5em 0em;
+      padding: 1em 0 0em 0em;
+      font-size: 140%;
+      font-weight: normal;
+    }
+
+    h4 {
+      margin: 1em 0 0.5em 0em;
+      padding: 1em 0 0em 0em;
+      font-size: 120%;
+      font-weight: normal;
+    }
+
+    h5 {
+      margin: 1em 0 0.5em 0em;
+      padding: 1em 0 0em 0em;
+      font-size: 110.000%;
+      border-bottom: 1px solid black;
+    }
+
+    h6 {
+      margin: 1em 0 0em 0em;
+      padding: 1em 0 0em 0em;
+      font-size: 80%;
+      font-weight: normal;
+    }
+
+    .authorgroup {
+      float: right;
+      margin: 0em 0em 0em 1.5em
+    }
+
+    h3.author {
+      margin: 0;
+      padding: 0;
+      font-weight: normal;
+    }
+
+    .author tt.email {
+      font-size: 66%;
+    }
+
+    .titlepage hr {
+      width: 0;
+    }
+
+    .toc,
+    .list-of-tables,
+    .list-of-examples,
+    .list-of-figures {
+      padding: 1.33em 0 2.5em 0em;
+    }
+
+    .toc p,
+    .list-of-tables p,
+    .list-of-figures p,
+    .list-of-examples p {
+      padding: 0;
+      padding: 0 0em 0.3em;
+      margin: 1.5em 0 0 0;
+    }
+
+    .toc p b,
+    .list-of-tables p b,
+    .list-of-figures p b,
+    .list-of-examples p b{
+      font-weight: bold;
+    }
+
+    .toc dl,
+    .list-of-tables dl,
+    .list-of-figures dl,
+    .list-of-examples dl {
+      margin: 0 0 0.5em 0;
+      padding: 0;
+    }
+
+    .toc dt {
+      margin: 0;
+      padding: 0;
+    }
+
+    .toc dd {
+      margin: 0 0em 0em 2.6em;
+      padding: 0;
+    }
+
+    div.glossary dl,
+    div.variablelist dl {
+    }
+
+    .glossary dl dt,
+    .variablelist dl dt span.term {
+      font-weight: normal;
+    }
+
+    .glossary dl dd,
+    .variablelist dl dd {
+      margin-left: 2.6em;
+    }
+
+    .glossary dd p,
+    .variablelist dd p {
+      margin-top: 0;
+      margin-bottom: 1em;
+    }
+
+    div.calloutlist table {
+      margin-top: 1em;
+    }
+
+    div.calloutlist table td {
+      padding: 0;
+      margin: 0;
+    }
+
+    div.calloutlist table td p {
+      margin-top: 0;
+      margin-bottom: 1em;
+    }
+
+    div.calloutlist table td img {
+      margin-left: 2em;
+    }
+
+    div p.copyright {
+      text-align: left;
+    }
+
+    div.legalnotice p.legalnotice-title {
+      margin-bottom: 0;
+    }
+
+    p {
+      text-align : justify;
+      line-height: 142%;
+      margin: 1em 0;
+    }
+
+    dl {
+      padding-top: 0;
+    }
+
+    hr {
+      border: solid 1px;
+    }
+
+
+    .mediaobject,
+    .mediaobjectco,
+    div.navheader table th {
+      text-align: center;
+    }
+
+    img {
+      border: none;
+    }
+
+    .mediaobject img,
+    .mediaobjectco img{
+      max-width: 36em;
+    }
+
+    /*
+     *align two mediaobjects in a figure besides each other
+     */
+    .figure .mediaobject {
+      display: table-cell;
+      padding: 0.5em;
+    }
+
+    ul {
+      padding: 0 0 0 1.5em;
+    }
+
+    ul li {
+      padding: 0;
+    }
+
+    ul li p {
+      text-align: left;
+    }
+
+    table {
+      width :100%;
+    }
+
+    th {
+      padding: 0.25em;
+      text-align: left;
+      font-weight: normal;
+      vertical-align: top;
+    }
+
+    td {
+      padding: 0.25em;
+      vertical-align: top;
+    }
+
+    p a[id],
+    p a[id]:hover,
+    p a[id]:visited {
+      margin: 0;
+      padding: 0;
+      display: inline;
+      background-image: none;
+    }
+
+    p a,
+    p a:hover,
+    p a:visited {
+       margin-left: 5px;
+       padding-left: 10px;
+       background-image: url("images/link.png");
+       background-repeat: no-repeat;
+       background-position: center left;
+    }
+
+    pre {
+        overflow : auto;
+    }
+
+    div.informalfigure,
+    div.informalexample,
+    div.informaltable,
+    div.figure,
+    div.table,
+    div.example {
+      margin: 1em 0;
+      padding: 1em;
+      page-break-inside: avoid;
+    }
+
+
+    div.informalfigure p.title b,
+    div.informalexample p.title b,
+    div.informaltable p.title b,
+    div.figure p.title b,
+    div.example p.title b,
+    div.table p.title b{
+        padding-top: 0;
+        margin-top: 0;
+        font-weight: normal;
+    }
+
+    .mediaobject .caption, 
+    .mediaobject .caption p  {
+      text-align: left;
+      padding-top: 0.5em;
+      padding-bottom: 0.5em;
+    }
+
+    .epigraph {
+      padding-left: 55%;
+      margin-bottom: 1em;
+    }
+
+    .epigraph p {
+      text-align: left;
+    }
+
+    .epigraph .quote {
+      font-style: italic;
+    }
+    .epigraph .attribution {
+      font-style: normal;
+      text-align: right;
+    }
+
+    span.application {
+      font-style: italic;
+    }
+
+    .programlisting {
+      font-family: monospace;
+      font-size: 80%;
+      white-space: pre;
+      margin: 1.33em 0;
+      padding: 1.33em;
+    }
+
+    .tip,
+    .warning,
+    .caution,
+    .note {
+      margin-top: 1em;
+      margin-bottom: 1em;
+
+    }
+
+    /* force full width of table within div */
+    .tip table,
+    .warning table,
+    .caution table,
+    .note table {
+      border: none;
+      width: 100%;
+    }
+
+
+    .tip table th,
+    .warning table th,
+    .caution table th,
+    .note table th {
+      padding: 0.8em 0.0 0.0em 0.0em;
+      margin : 0;
+    }
+
+    .tip p,
+    .warning p,
+    .caution p,
+    .note p {
+      margin-top: 0.5em;
+      margin-bottom: 0.5em;
+      padding-right: 1em;
+      text-align: left;
+    }
+
+    .acronym {
+      text-transform: uppercase;
+    }
+
+    b.keycap,
+    .keycap {
+      padding: 0.09em 0.3em;
+      margin: 0;
+    }
+    
+    .mousebutton {                                                                                                                                                       
+      background-color: #fffaf0;  /* FloralWhite   */                                                                                                                    
+      /* same as .keycap: */                                                                                                                                             
+      padding: 0.09em 0.3em;                                                                                                                                             
+      margin: 0;                                                                                                                                                         
+      border: 1px solid #999;                                                                                                                                            
+      -moz-border-radius: 0.3em;                                                                                                                                         
+    }                                                                                                                                                                    
+                                                                                                                                                                         
+    div[class="segmentedlist"] tr[class="segtitle"] {                                                                                                                    
+      color:            white;                                                                                                                                           
+      background-color: #4d4d4d;  /* grey30         */                                                                                                                   
+    }   
+    
+    .itemizedlist li {
+      clear: none;
+    }
+
+    .filename {
+      font-size: medium;
+      font-family: Courier, monospace;
+    }
+
+
+    div.navheader, div.heading{
+      background-color: #e5ceb0; /*#d6ba00; */
+      width: 100%;
+    }
+
+    div.navfooter, div.footing{
+      background-color: #e5ceb0; /*#d6ba00; */
+      width: 100%;
+    }
+
+
+    div.navheader table {
+      border-left: 0;
+      border-right: 0;
+      border-top: 0;
+      width: 100%;
+    }
+
+    div.navfooter table {
+      border-left: 0;
+      border-right: 0;
+      border-bottom: 0;
+      width: 100%;
+    }
+
+    div.navheader table td a,
+    div.navfooter table td a {
+      color: #777;
+      text-decoration: none;
+    }
+
+    /* normal text in the footer */
+    div.navfooter table td {
+      color: black;
+    }
+
+    div.navheader table td a:visited,
+    div.navfooter table td a:visited {
+      color: #444;
+    }
+
+
+    /* links in header and footer */
+    div.navheader table td a:hover,
+    div.navfooter table td a:hover {
+      text-decoration: underline;
+      background-color: transparent;
+      color: #33a;
+    }
+
+    div.navheader hr,
+    div.navfooter hr {
+      display: none;
+    }
+
+
+    .qandaset tr.question td p {
+      margin: 0 0 1em 0;
+      padding: 0;
+    }
+
+    .qandaset tr.answer td p {
+      margin: 0 0 1em 0;
+      padding: 0;
+    }
+    .answer td {
+      padding-bottom: 1.5em;
+    }
+
+    .emphasis {
+      text-weight: bold;
+    }
+
+
+      /************* /
+     / decorations  /
+    / *************/
+
+    .titlepage {
+    }
+
+    .part .title {
+    }
+
+    .subtitle {
+        border: none;
+    }
+
+    h1 {
+      border: none;
+    }
+
+    h2 {
+      border-top: solid 0.2em;
+      border-bottom: solid 0.06em;
+    }
+
+    h3 {
+      border-top: 0;
+      border-bottom: solid 0.06em;
+    }
+
+    h4 {
+      border: 0;
+      border-bottom: solid 0.06em;
+    }
+
+    h5 {
+      border: 0;
+    }
+
+    .programlisting {
+      border: solid 1px;
+    }
+
+    div.figure,
+    div.table,
+    div.informalfigure,
+    div.informaltable,
+    div.informalexample,
+    div.example {
+      border         : 1px solid;
+    }
+
+
+
+    .tip,
+    .warning,
+    .caution,
+    .note {
+      border    : 1px solid;
+    }
+
+    .tip table th,
+    .warning table th,
+    .caution table th,
+    .note table th {
+      border-bottom  : 1px solid;
+    }
+
+    .question td {
+      border-top: 1px solid black;
+    }
+
+    .answer {
+    }
+
+
+    b.keycap,
+    .keycap {
+      border: 1px solid;
+    }
+      
+
+    div.navheader, div.heading{
+      border-bottom: 1px solid;
+    }
+
+
+    div.navfooter, div.footing{
+      border-top: 1px solid;
+    }
+
+      /********* /
+     /  colors  /
+    / *********/
+
+    body {
+      color: #222;
+      background: #fdfdfd;
+    }
+
+    a {
+      color: #026;
+      text-decoration: underline;
+    }
+
+    a:hover,
+    a:visited {
+      background: transparent;
+      color: darkviolet;
+    }
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6,
+    h7,
+    h8 {
+      background-color   : transparent;
+    }
+
+    hr {
+      border-color: #aaa;
+    }
+
+
+    .tip, .warning, .caution, .note {
+      border-color    : #aaa;
+    }
+
+
+    .tip table th,
+    .warning table th,
+    .caution table th,
+    .note table th {
+      border-bottom-color: #aaa;
+    }
+
+
+    .warning {
+      background-color: #fea;
+    }
+
+    .caution {
+      background-color: #fea;
+    }
+
+    .tip {
+      background-color: #eff;
+    }
+
+    .note {
+      background-color: #dfc;
+    }
+
+    .glossary dl dt, 
+    .variablelist dl dt,
+    .variablelist dl dt span.term {
+      color: #044;
+    }
+
+    div.figure,
+    div.table,
+    div.example,
+    div.informalfigure,
+    div.informaltable,
+    div.informalexample {
+      border-color: #aaa;
+    }
+
+    pre.programlisting {
+      color: black;
+      background-color: #fff;
+      border-color: #aaa;
+    }
+
+    .guibutton,
+    .guimenu,
+    .guilabel,
+    .guisubmenu,
+    .guimenuitem {
+      background-color: #eee;
+    }
+
+
+    b.keycap,
+    .keycap {
+      background-color: #eee;
+      border-color: #999;
+    }
+
+
+    div.navheader {
+      border-color: black;
+    }
+
+
+    div.navfooter {
+      border-color: black;
+    }
+
+
+      /*********** /
+     /  graphics  /
+    / ***********/
+
+    /*
+    body {
+      background-image: url("images/body_bg.jpg");
+      background-attachment: fixed;
+    }
+
+    .navheader,
+    .note,
+    .tip {
+      background-image: url("images/note_bg.jpg");
+      background-attachment: fixed;
+    }
+
+    .warning,
+    .caution {
+      background-image: url("images/warning_bg.jpg");
+      background-attachment: fixed;
+    }
+
+    .figure,
+    .informalfigure,
+    .example,
+    .informalexample,
+    .table,
+    .informaltable {
+      background-image: url("images/figure_bg.jpg");
+      background-attachment: fixed;
+    }
+
+    */
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6,
+    h7{
+    }
+
+    div.preface .titlepage .title, 
+    div.colophon .title, 
+    div.chapter .titlepage .title {
+      background-image: url("images/title-bg.png");
+      background-position: bottom;
+      background-repeat: repeat-x;
+    }
+
+    div.section div.section .titlepage .title,
+    div.sect2 .titlepage .title {
+        background: none;
+    }
+
+
+    h1.title {
+      background-color: transparent;
+      background-image: none;
+    }
+
+    h2.subtitle {
+      background-color: transparent;
+      background-image: none;
+    }
+
+      /*************************************** /
+     /  gimp-help-2 specific alterations      /
+    / ***************************************/
+
+    /* titlepage */
+    div.book .titlepage {
+      padding-top: 300px; /* height of the splash image */
+      background-image: url("images/gramps-splash.jpg");
+      background-repeat: no-repeat;
+    }
+
+    /* revhistory */
+    div.revhistory {
+      margin-left: 0.5em;
+      float: right;
+      border: 1px dotted #aaa;
+    }
+    
+    div.revhistory table {
+      width: auto;
+      border: 0;
+    }
+    
+    div.revhistory table tr th,
+    div.revhistory table tr td {
+      border: 0;
+    }
+    
+    div.revhistory table tr th,
+    div.revhistory table tr td {
+      color: #aaa;
+      font-size: small;
+    }
+
+      /**************************************** /
+     / mozilla vendor specific css extensions  /
+    / ****************************************/
+
+    div.figure,
+    div.table,
+    div.informalfigure,
+    div.informaltable,
+    div.informalexample,
+    div.example,
+    .tip,
+    .warning,
+    .caution,
+    .note {
+      -moz-border-radius: 0.5em;
+    }
+
+    b.keycap,
+    .keycap {
+      -moz-border-radius: 0.3em;
+    }
+}
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<fop version="1.0">
+
+  <!-- Source resolution in dpi (dots/pixels per inch) for 
+     determining the size of pixels in SVG and bitmap images, 
+     default: 72dpi -->
+  <source-resolution>72</source-resolution>
+  <!-- Target resolution in dpi (dots/pixels per inch) for 
+     specifying the target resolution for generated bitmaps, 
+     default: 72dpi -->
+  <target-resolution>72</target-resolution>
+ 
+  <renderers>
+    <renderer mime="application/pdf">
+       <fonts>
+        <!-- embedded fonts -->
+        <!--
+        This information must exactly match the font specified
+        in the fo file. Otherwise it will use a default font.
+        -->
+        <font metrics-url="file://@HELPPATH@/FreeSerif.xml"
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerif.ttf">
+          <font-triplet name="FreeSerif" style="normal" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeSerifBold.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerifBold.ttf">
+          <font-triplet name="FreeSerif" style="normal" weight="bold"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeSerifItalic.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerifItalic.ttf">
+          <font-triplet name="FreeSerif" style="italic" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeSerifBoldItalic.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerifBoldItalic.ttf">
+          <font-triplet name="FreeSerif" style="italic" weight="bold"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMono.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMono.ttf">
+          <font-triplet name="FreeMono" style="normal" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMonoBold.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMonoBold.ttf">
+          <font-triplet name="FreeMono" style="normal" weight="bold"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMonoOblique.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMonoOblique.ttf">
+          <font-triplet name="FreeMono" style="italic" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMonoBoldOblique.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMonoBoldOblique.ttf">
+          <font-triplet name="FreeMono" style="italic" weight="bold"/>
+        </font>
+      </fonts>
+    </renderer>
+  </renderers>
+
+</fop>
--- a/Show More
+++ b/Show More