* New Makefile structure

* screengrabs moved from "images" to "figures" to conform with GNOME
  guidelines
* gramps-manual removed since that is now generated in the make process
  and not needed in a developer's release.


svn: r1062

gramps/doc/gramps-manual/C/Makefile.am

@@ -0,0 +1,53 @@
+SGML_FILES = gramps-manual.sgml
+
+figs = \
+     figures/addmedia.png \
+     figures/druidpg1.png \
+     figures/editbookmarks.png \
+     figures/ep-address.png \
+     figures/ep-altname.png \
+     figures/ep-attributes.png \
+     figures/ep-event.png \
+     figures/ep-gallery.png \
+     figures/ep-general.png \
+     figures/ep-internet.png \
+     figures/ep-lds.png \
+     figures/ep-notes.png \
+     figures/familyview.png \
+     figures/filter.png \
+     figures/globalmedia.png \
+     figures/gotobookmark.png \
+     figures/localmedia.png \
+     figures/mainwin.png \
+     figures/mediaview.png \
+     figures/opendb.png \
+     figures/pedegreesel.png \
+     figures/pedegreeview.png \
+     figures/peoplelist.png \
+     figures/placelist.png \
+     figures/prefs-bars.png \
+     figures/prefs-colors.png \
+     figures/prefs-dates.png \
+     figures/prefs-disp.png \
+     figures/prefs-find.png \
+     figures/prefs-gen.png \
+     figures/prefs-guess.png \
+     figures/prefs-ids.png \
+     figures/prefs-main.png \
+     figures/prefs-media.png \
+     figures/prefs-report.png \
+     figures/prefs-research.png \
+     figures/prefs-revision.png \
+     figures/reportsel.png \
+     figures/revcontrol.png \
+     figures/savecomment.png \
+     figures/sourcelist.png \
+     figures/sourcerefsel.png \
+     figures/toolsel.png
+
+docname = gramps-manual
+lang = C
+omffile = gramps-manual-C.omf
+sgml_ents = 
+include $(top_srcdir)/doc/sgmldocs.make
+dist-hook: app-dist-hook

gramps/doc/gramps-manual/C/Makefile.in

@@ -1,36 +1,463 @@
-include @top_srcdir@/Makefile.comm
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-MANSRC = ${GM}.sgml
-MANDIR = ${GM}
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-html: ${MANDIR}/index.html
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-${MANDIR}/index.html: ${MANSRC}
-	${DB2HTML} ${MANSRC} -o ./tmp
-	mv ./tmp/*.html ./${MANDIR}.junk
-	-rmdir ./tmp
-	-mv ${MANDIR}/stylesheet-images ./${MANDIR}.junk/
-	rm -rf ${MANDIR}
-	mv ./${MANDIR}.junk ${MANDIR}
+@SET_MAKE@
 
-install:
-	-${INSTALL} -d ${GNOMEHELP}/${GM}/C
-	-${INSTALL} -m 644 ${MANSRC} ${GNOMEHELP}/${GM}/C
-	-${INSTALL} -m 644 ${GM}/*.png ${GNOMEHELP}/${GM}/C
+# To use this template:
+#     1) Define: figs, docname, lang, omffile, sgml_ents although figs, 
+#        omffile, and sgml_ents may be empty in your Makefile.am which 
+#        will "include" this one 
+#     2) Figures must go under figures/ and be in PNG format
+#     3) You should only have one document per directory 
+#
+#        Note that this makefile forces the directory name under
+#        $prefix/share/gnome/help/ to be the same as the SGML filename
+#        of the document.  This is required by GNOME. eg:
+#        $prefix/share/gnome/help/fish_applet/C/fish_applet.sgml
+#                                 ^^^^^^^^^^^   ^^^^^^^^^^^
+# Definitions:
+#   figs         A list of screenshots which will be included in EXTRA_DIST
+#                Note that these should reside in figures/ and should be .png
+#                files, or you will have to make modifications below.
+#   docname      This is the name of the SGML file: <docname>.sgml
+#   lang         This is the document locale
+#   omffile      This is the name of the OMF file.  Convention is to name
+#                it <docname>-<locale>.omf.
+#   sgml_ents    This is a list of SGML entities which must be installed 
+#                with the main SGML file and included in EXTRA_DIST. 
+# eg:
+#   figs = \
+#          figures/fig1.png            \
+#          figures/fig2.png
+#   docname = scrollkeeper-manual
+#   lang = C
+#   omffile=scrollkeeper-manual-C.omf
+#   sgml_ents = fdl.sgml
+#   include $(top_srcdir)/help/sgmldocs.make
+#   dist-hook: app-dist-hook
+#
+SHELL = @SHELL@
 
-# We only install the .html files since .png's 
-# should already be there from the normal install
-install-html:
-	-${INSTALL} -d ${GNOMEHELP}/${GM}/C
-	-${INSTALL} -m 644 ${GM}/*.html ${GNOMEHELP}/${GM}/C
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 
-uninstall:
-	-rm -f ${GNOMEHELP}/${GM}/C/*.sgml
-	-rm -f ${GNOMEHELP}/${GM}/C/*.html
-	-rm -f ${GNOMEHELP}/${GM}/C/*.png
-	-rmdir ${GNOMEHELP}/${GM}/C
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 
-clean:
-	-rm -f ${MANDIR}/*.html
-	-rm -rf ${MANDIR}/stylesheet-images/
-	-rm -rf ${MANDIR}.junk/
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
+AWK = @AWK@
+BINSH = @BINSH@
+CC = @CC@
+DEPDIR = @DEPDIR@
+DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
+GNOMEHELP = @GNOMEHELP@
+HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
+HAVE_JW = @HAVE_JW@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+JW = @JW@
+LANGUAGES = @LANGUAGES@
+LIBS = @LIBS@
+MOFILES = @MOFILES@
+MSGFMT = @MSGFMT@
+P15_INCLUDES = @P15_INCLUDES@
+P20_INCLUDES = @P20_INCLUDES@
+P21_INCLUDES = @P21_INCLUDES@
+P22_INCLUDES = @P22_INCLUDES@
+PACKAGE = @PACKAGE@
+POFILES = @POFILES@
+PYTHON = @PYTHON@
+PYTHON15 = @PYTHON15@
+PYTHON20 = @PYTHON20@
+PYTHON21 = @PYTHON21@
+PYTHON22 = @PYTHON22@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RELEASE = @RELEASE@
+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONSTRING = @VERSIONSTRING@
+ZIP = @ZIP@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+SGML_FILES = gramps-manual.sgml
+
+figs = \
+     figures/addmedia.png \
+     figures/druidpg1.png \
+     figures/editbookmarks.png \
+     figures/ep-address.png \
+     figures/ep-altname.png \
+     figures/ep-attributes.png \
+     figures/ep-event.png \
+     figures/ep-gallery.png \
+     figures/ep-general.png \
+     figures/ep-internet.png \
+     figures/ep-lds.png \
+     figures/ep-notes.png \
+     figures/familyview.png \
+     figures/filter.png \
+     figures/globalmedia.png \
+     figures/gotobookmark.png \
+     figures/localmedia.png \
+     figures/mainwin.png \
+     figures/mediaview.png \
+     figures/opendb.png \
+     figures/pedegreesel.png \
+     figures/pedegreeview.png \
+     figures/peoplelist.png \
+     figures/placelist.png \
+     figures/prefs-bars.png \
+     figures/prefs-colors.png \
+     figures/prefs-dates.png \
+     figures/prefs-disp.png \
+     figures/prefs-find.png \
+     figures/prefs-gen.png \
+     figures/prefs-guess.png \
+     figures/prefs-ids.png \
+     figures/prefs-main.png \
+     figures/prefs-media.png \
+     figures/prefs-report.png \
+     figures/prefs-research.png \
+     figures/prefs-revision.png \
+     figures/reportsel.png \
+     figures/revcontrol.png \
+     figures/savecomment.png \
+     figures/sourcelist.png \
+     figures/sourcerefsel.png \
+     figures/toolsel.png
+
+
+docname = gramps-manual
+lang = C
+omffile = gramps-manual-C.omf
+sgml_ents = 
+
+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+
+doc_DATA = index.html
+
+sgml_files = $(sgml_ents) $(docname).sgml
+
+omf_dir = $(top_srcdir)/omf-install
+
+EXTRA_DIST = $(sgml_files) $(doc_DATA) $(omffile) $(figs)
+
+CLEANFILES = omf_timestamp
+
+# when doing a distclean, we also want to clear out html files:
+CONFIG_CLEAN_FILES = index.html $(docname)/*.html $(docname)/stylesheet-images/*.gif
+subdir = doc/gramps-manual/C
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_SOURCES =
+DATA = $(doc_DATA)
+
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  Makefile.am $(top_srcdir)/doc/sgmldocs.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  doc/gramps-manual/C/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+docDATA_INSTALL = $(INSTALL_DATA)
+install-docDATA: $(doc_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(docdir)
+	@list='$(doc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \
+	  $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \
+	done
+
+uninstall-docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(doc_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(docdir)/$$f"; \
+	  rm -f $(DESTDIR)$(docdir)/$$f; \
+	done
+tags: TAGS
+TAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	$(mkinstalldirs) $(distdir)/figures
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(docdir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-docDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-docDATA uninstall-info-am uninstall-local
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-docDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-docDATA uninstall-info-am uninstall-local
+
+
+all: index.html omf
+
+omf: omf_timestamp
+
+omf_timestamp: $(omffile)
+	-for file in $(omffile); do \
+	  scrollkeeper-preinstall $(docdir)/$(docname).sgml $$file $(omf_dir)/$$file; \
+	done
+	touch omf_timestamp
+
+index.html: $(docname)/index.html
+	-cp $(docname)/index.html .
+
+# The weird srcdir trick is because the db2html from the Cygnus RPMs
+# cannot handle relative filenames.
+# The t1 test is for certain versions of jw that create cryptic
+# html pages, o fwhich the index is called "t1".  Also, the jw
+# script from docbook-utils 0.6.9 does not copy the template 
+# stylesheet-images directory like the db2html script does, so 
+# we give it a little help (at least for now)
+
+$(docname)/index.html: $(docname).sgml
+	-srcdir=`cd $(srcdir) && pwd`;   \
+	if test "$(HAVE_JW)" = 'yes' ; then \
+	   if test -f /usr/share/sgml/docbook/dsssl-stylesheets/images/next.gif ; then \
+	        mkdir -p $$srcdir/$(docname)/stylesheet-images ; \
+	   	cp /usr/share/sgml/docbook/dsssl-stylesheets/images/*.gif $$srcdir/$(docname)/stylesheet-images/ ; \
+	   fi; \
+	   jw -c /etc/sgml/catalog $$srcdir/$(docname).sgml -o $$srcdir/$(docname); \
+	else \
+	   db2html $$srcdir/$(docname).sgml; \
+	fi
+	if test -f $(docname)/t1.html; then \
+	   cd $(srcdir)/$(docname) && cp t1.html index.html; \
+	   cd $(srcdir); \
+	fi
+
+$(docname).sgml: $(sgml_ents)
+	-ourdir=`cd . && pwd`;  \
+	cd $(srcdir);   \
+	cp $(sgml_ents) $$ourdir
+
+app-dist-hook: index.html
+	-$(mkinstalldirs) $(distdir)/$(docname)/stylesheet-images
+	-$(mkinstalldirs) $(distdir)/figures
+	-cp $(srcdir)/$(docname)/*.html $(distdir)/$(docname)
+	-for file in $(srcdir)/$(docname)/*.css; do \
+	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	  cp $$file $(distdir)/$(docname)/$$basefile ; \
+	done
+	-for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
+	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	  cp $$file $(distdir)/$(docname)/stylesheet-images/$$basefile ; \
+	done
+	-if [ -e topic.dat ]; then \
+		cp $(srcdir)/topic.dat $(distdir); \
+	 fi
+
+install-data-am: index.html omf
+	-$(mkinstalldirs) $(DESTDIR)$(docdir)/stylesheet-images
+	-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
+	-cp $(srcdir)/$(sgml_files) $(DESTDIR)$(docdir)
+	-for file in $(srcdir)/$(docname)/*.html $(srcdir)/$(docname)/*.css; do \
+	  basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$$basefile; \
+	done
+	-for file in $(srcdir)/figures/*.png; do \
+	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/figures/$$basefile; \
+	done
+	-for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
+	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/stylesheet-images/$$basefile; \
+	done
+	-if [ -e $(srcdir)/topic.dat ]; then \
+		$(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(docdir); \
+	 fi
+
+$(docname).ps: $(srcdir)/$(docname).sgml
+	-srcdir=`cd $(srcdir) && pwd`; \
+	db2ps $$srcdir/$(docname).sgml
+
+$(docname).rtf: $(srcdir)/$(docname).sgml
+	-srcdir=`cd $(srcdir) && pwd`; \
+	db2ps $$srcdir/$(docname).sgml
+
+uninstall-local:
+	-for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
+	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	  rm -f $(docdir)/stylesheet-images/$$basefile; \
+	done
+	-for file in $(srcdir)/figures/*.png; do \
+	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	  rm -f $(docdir)/figures/$$basefile; \
+	done
+	-for file in $(srcdir)/$(docname)/*.html $(srcdir)/$(docname)/*.css; do \
+	  basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+	  rm -f $(DESTDIR)$(docdir)/$$basefile; \
+	done
+	-for file in $(sgml_files); do \
+	  rm -f $(DESTDIR)$(docdir)/$$file; \
+	done
+	-rmdir $(DESTDIR)$(docdir)/stylesheet-images
+	-rmdir $(DESTDIR)$(docdir)/figures
+	-rmdir $(DESTDIR)$(docdir)
+dist-hook: app-dist-hook
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

gramps/doc/gramps-manual/C/gramps-manual-C.omf

@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<omf>
+  <resource>
+    <title>
+      GRAMPS User Manual
+    </title>
+    <subject>
+      <category>GNOME|Applications</category>
+    </subject>
+    <format mime="text/sgml"/>
+    <identifier url="gramps-manual.sgml"/>
+    <language code="C"/>
+  </resource>
+</omf>

gramps/doc/gramps-manual/C/gramps-manual.sgml

@@ -1,5 +1,5 @@
 <!DOCTYPE article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-<!ENTITY version "0.7.2"> <!-- replace with application version -->
+<!ENTITY version "0.7.3"> <!-- replace with application version -->
 ]>
 
 <!-- =============Document Header ============================= -->
@@ -149,7 +149,7 @@
       <title>Getting Started screen, page 1</title>
       <screenshot>
 	<screeninfo>Getting Started screen, page 1</screeninfo>
-	<graphic fileref="druidpg1" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/druidpg1" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -180,7 +180,7 @@
       <title>GRAMPS Main Window</title>
       <screenshot>
 	<screeninfo>GRAMPS Main Window</screeninfo>
-	<graphic fileref="mainwin" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/mainwin" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -255,7 +255,7 @@
       <title>People View</title>
       <screenshot>
 	<screeninfo>People View</screeninfo>
-	<graphic fileref="peoplelist" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/peoplelist" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -318,7 +318,7 @@
       <title>Filter that requires an argument</title>
       <screenshot>
 	<screeninfo>Filter that requires an argument</screeninfo>
-	<graphic fileref="filter" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/filter" format="png" srccredit="Don Allingham">
 	</graphic>
       </screenshot>
       </figure>
@@ -359,7 +359,7 @@
         <title>General Information Tab</title>
         <screenshot>
 	  <screeninfo>General Information Tab</screeninfo>
-	  <graphic fileref="ep-general" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-general" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -379,7 +379,7 @@
         <title>Alternate Names Tab</title>
         <screenshot>
 	  <screeninfo>Alternate Names Tab</screeninfo>
-	  <graphic fileref="ep-altname" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-altname" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -418,7 +418,7 @@
         <title>Events Tab</title>
         <screenshot>
 	  <screeninfo>Events Tab</screeninfo>
-	  <graphic fileref="ep-event" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-event" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -457,7 +457,7 @@
         <title>Attributes Tab</title>
         <screenshot>
 	  <screeninfo>Attributes Tab</screeninfo>
-	  <graphic fileref="ep-attributes" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-attributes" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -498,7 +498,7 @@
         <title>Addresses Tab</title>
         <screenshot>
 	  <screeninfo>Addresses Tab</screeninfo>
-	  <graphic fileref="ep-address" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-address" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -531,7 +531,7 @@
         <title>Notes Tab</title>
         <screenshot>
 	  <screeninfo>Notes Tab</screeninfo>
-	  <graphic fileref="ep-notes" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-notes" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -553,7 +553,7 @@
         <title>Gallery Tab</title>
         <screenshot>
 	  <screeninfo>Gallery Tab</screeninfo>
-	  <graphic fileref="ep-gallery" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-gallery" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -581,7 +581,7 @@
         <title>Local Media Properties</title>
         <screenshot>
 	  <screeninfo>Local Media Properties</screeninfo>
-	  <graphic fileref="localmedia" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/localmedia" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -680,7 +680,7 @@
         <title>Internet Tab</title>
         <screenshot>
 	  <screeninfo>Internet Tab</screeninfo>
-	  <graphic fileref="ep-internet" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-internet" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -721,7 +721,7 @@
         <title>LDS Tab</title>
         <screenshot>
 	  <screeninfo>LDS Tab</screeninfo>
-	  <graphic fileref="ep-lds" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/ep-lds" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -744,7 +744,7 @@
       <title>Family View</title>
       <screenshot>
 	<screeninfo>Family View</screeninfo>
-	<graphic fileref="familyview" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/familyview" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -886,7 +886,7 @@
       <title>Pedigree View</title>
       <screenshot>
 	<screeninfo>Pedigree View</screeninfo>
-	<graphic fileref="pedegreeview" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/pedegreeview" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -918,7 +918,7 @@
       <title>Navigation</title>
       <screenshot>
 	<screeninfo>Navigation</screeninfo>
-	<graphic fileref="pedegreesel" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/pedegreesel" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -950,7 +950,7 @@
       <title>Source list</title>
       <screenshot>
 	<screeninfo>Source View</screeninfo>
-	<graphic fileref="sourcelist" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/sourcelist" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -978,7 +978,7 @@
       <title>Place View</title>
       <screenshot>
 	<screeninfo>Place View</screeninfo>
-	<graphic fileref="placelist" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/placelist" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -1007,7 +1007,7 @@
       <title>Media View</title>
       <screenshot>
 	<screeninfo>Media View</screeninfo>
-	<graphic fileref="mediaview" format="png" srccredit="Don Allingham">
+	<graphic fileref="figures/mediaview" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -1053,7 +1053,7 @@
         <title>Add Media Object Dialog Box</title>
         <screenshot>
 	  <screeninfo>Add Media Object Dialog Box</screeninfo>
-	  <graphic fileref="addmedia" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/addmedia" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1112,7 +1112,7 @@
         <title>Edit a Media Object's Global Properties</title>
         <screenshot>
 	  <screeninfo>Edit a Media Object's Global Properties</screeninfo>
-	  <graphic fileref="globalmedia" format="png" srccredit="Don Allingham">
+	  <graphic fileref="figures/globalmedia" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1155,7 +1155,7 @@
         <title>Using Bookmarks</title>
         <screenshot>
 	  <screeninfo>Using Bookmarks</screeninfo>
-  	  <graphic fileref="gotobookmark" format="png" srccredit="Don Allingham">
+  	  <graphic fileref="figures/gotobookmark" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1192,7 +1192,7 @@
         <title>Editing Bookmarks</title>
         <screenshot>
 	  <screeninfo>Editing Bookmarks</screeninfo>
-  	  <graphic fileref="editbookmarks" format="png" srccredit="Don Allingham">
+  	  <graphic fileref="figures/editbookmarks" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1222,7 +1222,7 @@
         <title>Providing a revision control comment</title>
         <screenshot>
 	  <screeninfo>Providing a revision control comment</screeninfo>
-  	  <graphic fileref="savecomment" format="png" srccredit="Don Allingham">
+  	  <graphic fileref="figures/savecomment" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1237,7 +1237,7 @@
         <title>Opening a database</title>
         <screenshot>
 	  <screeninfo>Opening a database</screeninfo>
-  	  <graphic fileref="opendb" format="png" srccredit="Don Allingham">
+  	  <graphic fileref="figures/opendb" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1252,7 +1252,7 @@
         <title>Choosing a revision</title>
         <screenshot>
 	  <screeninfo>Choosing a revision</screeninfo>
-  	  <graphic fileref="revcontrol" format="png" srccredit="Don Allingham">
+  	  <graphic fileref="figures/revcontrol" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1292,7 +1292,7 @@
         <title>Preferences Dialog</title>
         <screenshot>
           <screeninfo>Preferences Dialog</screeninfo>
-          <graphic fileref="prefs-main" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-main" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1309,7 +1309,7 @@
         <title>General Database options</title>
         <screenshot>
           <screeninfo>General Database Options</screeninfo>
-          <graphic fileref="prefs-gen" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-gen" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1369,7 +1369,7 @@
         <title>Dates and Calendars</title>
         <screenshot>
           <screeninfo>Dates and Calendars</screeninfo>
-          <graphic fileref="prefs-dates" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-dates" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1427,7 +1427,7 @@
         <title>Media Options</title>
         <screenshot>
           <screeninfo>Media Options</screeninfo>
-          <graphic fileref="prefs-media" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-media" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1438,7 +1438,7 @@
         <title>GRAMPS ID Options</title>
         <screenshot>
           <screeninfo>GRAMPS ID Options</screeninfo>
-          <graphic fileref="prefs-ids" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-ids" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1449,7 +1449,7 @@
         <title>Revision Control Options</title>
         <screenshot>
           <screeninfo>Revision Control Options</screeninfo>
-          <graphic fileref="prefs-revision" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-revision" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1460,7 +1460,7 @@
         <title>General Display Options</title>
         <screenshot>
           <screeninfo>General Display Options</screeninfo>
-          <graphic fileref="prefs-disp" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-disp" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1471,7 +1471,7 @@
         <title>Tool and Status Bar Options</title>
         <screenshot>
           <screeninfo>Tools and Status Bar Options</screeninfo>
-          <graphic fileref="prefs-bars" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-bars" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1482,7 +1482,7 @@
         <title>List Color Options</title>
         <screenshot>
           <screeninfo>List Color Options</screeninfo>
-          <graphic fileref="prefs-colors" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-colors" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1493,7 +1493,7 @@
         <title>Find Options</title>
         <screenshot>
           <screeninfo>Find Options</screeninfo>
-          <graphic fileref="prefs-find" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-find" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1504,7 +1504,7 @@
         <title>Report Options</title>
         <screenshot>
           <screeninfo>Report Options</screeninfo>
-          <graphic fileref="prefs-report" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-report" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1524,7 +1524,7 @@
         <title>Researcher Information</title>
         <screenshot>
           <screeninfo>Researcher Information</screeninfo>
-          <graphic fileref="prefs-research" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-research" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1541,7 +1541,7 @@
         <title>Data Guessing Options</title>
         <screenshot>
           <screeninfo>Data Guessing Options</screeninfo>
-          <graphic fileref="prefs-guess" format="png" srccredit="Don Allingham">
+          <graphic fileref="figures/prefs-guess" format="png" srccredit="Don Allingham">
           </graphic>
         </screenshot>
       </figure>
@@ -1564,7 +1564,7 @@
       <title>Report Generation Dialog</title>
       <screenshot>
         <screeninfo>Report Generation Dialog</screeninfo>
-        <graphic fileref="reportsel" format="png" srccredit="Don Allingham">
+        <graphic fileref="figures/reportsel" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>
@@ -1693,7 +1693,7 @@ appear in every GRAMPS generated file.
       <title>Tool Selection Dialog</title>
       <screenshot>
         <screeninfo>Tool Selection Dialog</screeninfo>
-        <graphic fileref="toolsel" format="png" srccredit="Don Allingham">
+        <graphic fileref="figures/toolsel" format="png" srccredit="Don Allingham">
         </graphic>
       </screenshot>
     </figure>