diff --git a/foocanvas/zmap_source/configure.in.diff b/foocanvas/zmap_source/configure.in.diff
index a118440e998690662bd85550500716ff9c565083..e043aa751a5db2e0ae79b7102d6c5fc7c5187d01 100644
--- a/foocanvas/zmap_source/configure.in.diff
+++ b/foocanvas/zmap_source/configure.in.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/configure.in 2010-03-09 10:49:06.852000000 +0000
-+++ ./zmap_foocanvas/configure.in 2008-03-25 09:07:37.000000000 +0000
+--- ./tmp_merged_foocanvas/configure.in 2010-03-12 18:06:32.277000000 +0000
++++ ./tmp_zmap_foocanvas/configure.in 2010-03-12 18:06:23.192000000 +0000
@@ -3,7 +3,8 @@
AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
diff --git a/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff b/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff
index 8530568077ce34a6cc7f2a713e268a6412bddd00..375d3f594bca8be5d0f253ba90703aa7942c6b91 100644
--- a/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff
+++ b/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/Makefile.am 2010-03-09 10:49:06.596000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/Makefile.am 2008-03-25 09:07:37.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am 2010-03-12 18:06:31.534000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am 2010-03-12 18:06:22.459000000 +0000
@@ -22,10 +22,13 @@
libfoocanvasinclude_HEADERS = \
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff
index c225b45d168496107fa7fb3dc6afce17e3053c4c..ae68c4f72dbbfd3373354ecc00c139130ad8ee39 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-09 10:49:06.570000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-04 15:11:52.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-12 18:06:31.372000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-12 18:06:22.501000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:11 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff
index 9e813a68407c406f46379d9e1d8786d9bc4f6e6c..500dc4040e857149ea3675473452a2369a866c3e 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas-marshal.list 2010-03-09 10:49:06.537000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas-marshal.list 2008-03-25 09:07:37.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-marshal.list 2010-03-12 18:06:31.288000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-marshal.list 2010-03-12 18:06:22.542000000 +0000
@@ -1,2 +1,3 @@
VOID:INT,INT,INT,INT
BOOLEAN:BOXED
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff
index 82570b1b07675f0d8782c302fbba5f3e3c11bdbe..ce38a8fd391a712d1293a8f8bf8958ad3366dfb1 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-09 10:49:06.594000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-04 15:19:06.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-12 18:06:31.512000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-12 18:06:22.584000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:19 2010 (edgrif) */
/* GNOME libraries - GdkPixbuf item for the GNOME canvas
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff
index 5166d49fa621d751eccfae9210adfb92cca2b6a8..b577dab52924fe319c0fb7bb237fb18a93fb89e1 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-09 10:49:06.574000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-04 15:18:21.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-12 18:06:31.393000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-12 18:06:22.627000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:18 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff
index 22f87c435f65e9f4c1536d4eadb285b574817edf..e9587a156a7572564b1f6f26176dbc75407610af 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-09 10:49:06.582000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-04 15:21:47.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-12 18:06:31.431000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-12 18:06:22.671000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:21 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff
index 2e7961821597046d4f068b013696ce83a1a6b15f..60621b3358c48dda26e0fa67f97f14f5301e6989 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff
@@ -1,10 +1,14 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-09 10:49:06.551000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-08 10:25:19.000000000 +0000
-@@ -1,3 +1,4 @@
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-12 18:06:31.352000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-12 18:06:22.716000000 +0000
+@@ -1,6 +1,7 @@
+/* Last edited: Mar 8 10:25 2010 (edgrif) */
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * $Id: foo-canvas-text.c 59 2008-06-21 15:57:11Z jody $
+- * $Id: foo-canvas-text.c 59 2008-06-21 15:57:11Z jody $
++ * $Id: foo-canvas-text.c,v 1.1 2010-03-10 15:27:23 edgrif Exp $
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
@@ -582,8 +583,8 @@
/* Get canvas pixel coordinates for clip rectangle position */
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff
index ff7913404872bafbf7344e816a8795c7ac756167..c1d9a22c60096a4d63dccee7af3142faa5526dd4 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-09 10:49:06.544000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-04 15:53:45.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-12 18:06:31.311000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-12 18:06:22.758000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:53 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff
index 467a689d871c3ab1c51e98f154b6db3bc6e8fbb3..ba158b064bfb78f7692ed0b378452daf04db6e1b 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas.c 2010-03-09 10:49:06.614000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas.c 2010-03-04 16:31:44.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas.c 2010-03-12 18:06:31.634000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas.c 2010-03-12 18:06:22.807000000 +0000
@@ -75,7 +75,7 @@
static void foo_canvas_request_update (FooCanvas *canvas);
@@ -184,17 +184,19 @@
if (item->object.flags & FOO_CANVAS_ITEM_VISIBLE &&
group->item.object.flags & FOO_CANVAS_ITEM_MAPPED) {
-@@ -1703,6 +1782,9 @@
+@@ -1703,6 +1782,11 @@
enum {
DRAW_BACKGROUND,
+ DRAWN_ITEMS,
+ BEGIN_UPDATE,
+ END_UPDATE,
++ BEGIN_MAP,
++ END_MAP,
LAST_SIGNAL
};
-@@ -2053,6 +2135,35 @@
+@@ -2053,6 +2137,53 @@
G_TYPE_NONE, 4,
G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
@@ -226,11 +228,29 @@
+ foo_canvas_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
++ canvas_signals[BEGIN_MAP] =
++ g_signal_new ("begin_map",
++ G_TYPE_FROM_CLASS (object_class),
++ G_SIGNAL_RUN_FIRST,
++ 0,
++ NULL, NULL,
++ foo_canvas_marshal_VOID__VOID,
++ G_TYPE_NONE, 0);
++
++ canvas_signals[END_MAP] =
++ g_signal_new ("end_map",
++ G_TYPE_FROM_CLASS (object_class),
++ G_SIGNAL_RUN_FIRST,
++ 0,
++ NULL, NULL,
++ foo_canvas_marshal_VOID__VOID,
++ G_TYPE_NONE, 0);
++
+
atk_registry_set_factory_type (atk_get_default_registry (),
FOO_TYPE_CANVAS,
foo_canvas_accessible_factory_get_type ());
-@@ -2080,7 +2191,8 @@
+@@ -2080,7 +2211,8 @@
canvas->scroll_x2 = canvas->layout.width;
canvas->scroll_y2 = canvas->layout.height;
@@ -240,7 +260,26 @@
canvas->pick_event.type = GDK_LEAVE_NOTIFY;
canvas->pick_event.crossing.x = 0;
-@@ -2305,8 +2417,8 @@
+@@ -2195,6 +2327,8 @@
+
+ g_return_if_fail (FOO_IS_CANVAS (widget));
+
++ g_signal_emit(G_OBJECT (canvas), canvas_signals[BEGIN_MAP], 0);
++
+ /* Normal widget mapping stuff */
+
+ if (GTK_WIDGET_CLASS (canvas_parent_class)->map)
+@@ -2208,6 +2342,9 @@
+ !(canvas->root->object.flags & FOO_CANVAS_ITEM_MAPPED) &&
+ FOO_CANVAS_ITEM_GET_CLASS (canvas->root)->map)
+ (* FOO_CANVAS_ITEM_GET_CLASS (canvas->root)->map) (canvas->root);
++
++ g_signal_emit(G_OBJECT (canvas), canvas_signals[END_MAP], 0);
++
+ }
+
+ /* Unmap handler for the canvas */
+@@ -2305,8 +2442,8 @@
canvas_width = GTK_WIDGET (canvas)->allocation.width;
canvas_height = GTK_WIDGET (canvas)->allocation.height;
@@ -251,7 +290,7 @@
right_limit = scroll_width - canvas_width;
bottom_limit = scroll_height - canvas_height;
-@@ -2873,6 +2985,8 @@
+@@ -2873,6 +3010,8 @@
if (canvas->need_update) {
g_return_val_if_fail (!canvas->doing_update, FALSE);
@@ -260,7 +299,7 @@
canvas->doing_update = TRUE;
foo_canvas_item_invoke_update (canvas->root, 0, 0, 0);
-@@ -2881,6 +2995,8 @@
+@@ -2881,6 +3020,8 @@
canvas->doing_update = FALSE;
canvas->need_update = FALSE;
@@ -269,7 +308,7 @@
}
/* Hmmm. Would like to queue antiexposes if the update marked
-@@ -2901,6 +3017,10 @@
+@@ -2901,6 +3042,10 @@
/* Chain up to get exposes on child widgets */
GTK_WIDGET_CLASS (canvas_parent_class)->expose_event (widget, event);
@@ -280,7 +319,7 @@
return FALSE;
}
-@@ -2927,6 +3047,8 @@
+@@ -2927,6 +3072,8 @@
if (canvas->need_update) {
g_return_if_fail (!canvas->doing_update);
@@ -289,7 +328,7 @@
canvas->doing_update = TRUE;
foo_canvas_item_invoke_update (canvas->root, 0, 0, 0);
-@@ -2935,6 +3057,8 @@
+@@ -2935,6 +3082,8 @@
canvas->doing_update = FALSE;
canvas->need_update = FALSE;
@@ -298,7 +337,7 @@
}
/* Pick new current item */
-@@ -3029,7 +3153,7 @@
+@@ -3029,7 +3178,7 @@
(canvas->scroll_x2 == x2) && (canvas->scroll_y2 == y2)) {
return;
}
@@ -307,7 +346,7 @@
/*
* Set the new scrolling region. If possible, do not move the visible contents of the
* canvas.
-@@ -3109,10 +3233,30 @@
+@@ -3109,10 +3258,30 @@
*
* Sets the zooming factor of a canvas by specifying the number of pixels that
* correspond to one canvas unit.
@@ -338,7 +377,7 @@
GtkWidget *widget;
double cx, cy;
int x1, y1;
-@@ -3122,7 +3266,8 @@
+@@ -3122,7 +3291,8 @@
gint attributes_mask;
g_return_if_fail (FOO_IS_CANVAS (canvas));
@@ -348,7 +387,7 @@
widget = GTK_WIDGET (canvas);
-@@ -3130,14 +3275,15 @@
+@@ -3130,14 +3300,15 @@
center_y = widget->allocation.height / 2;
/* Find the coordinates of the screen center in units. */
@@ -369,7 +408,7 @@
if (!(canvas->root->object.flags & FOO_CANVAS_ITEM_NEED_DEEP_UPDATE)) {
canvas->root->object.flags |= FOO_CANVAS_ITEM_NEED_DEEP_UPDATE;
-@@ -3271,7 +3417,8 @@
+@@ -3271,7 +3442,8 @@
foo_canvas_w2c (canvas, x, y, &cx, &cy);
dist = foo_canvas_item_invoke_point (canvas->root, x, y, cx, cy, &item);
@@ -379,7 +418,7 @@
return item;
else
return NULL;
-@@ -3334,16 +3481,17 @@
+@@ -3334,16 +3506,17 @@
void
foo_canvas_w2c (FooCanvas *canvas, double wx, double wy, int *cx, int *cy)
{
@@ -401,7 +440,7 @@
}
/**
-@@ -3383,16 +3531,17 @@
+@@ -3383,16 +3556,17 @@
void
foo_canvas_w2c_d (FooCanvas *canvas, double wx, double wy, double *cx, double *cy)
{
@@ -423,7 +462,7 @@
}
-@@ -3409,16 +3558,17 @@
+@@ -3409,16 +3583,17 @@
void
foo_canvas_c2w (FooCanvas *canvas, int cx, int cy, double *wx, double *wy)
{
@@ -445,7 +484,7 @@
}
-@@ -3444,11 +3594,11 @@
+@@ -3444,11 +3619,11 @@
if (worldx)
*worldx = canvas->scroll_x1 + ((winx - canvas->zoom_xofs)
@@ -459,7 +498,7 @@
}
-@@ -3471,10 +3621,10 @@
+@@ -3471,10 +3646,10 @@
g_return_if_fail (FOO_IS_CANVAS (canvas));
if (winx)
@@ -472,7 +511,7 @@
}
-@@ -3997,3 +4147,11 @@
+@@ -3997,3 +4172,11 @@
FOO_TYPE_CANVAS_ITEM,
foo_canvas_item_accessible_factory_get_type ());
}
@@ -483,4 +522,4 @@
+ /* do nothing */
+}
+
-+/* Last edited: Mar 4 16:31 2010 (edgrif) */
++/* Last edited: Mar 12 10:11 2010 (edgrif) */
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff
index 6c8d50a9499f631103677b58615e9b5f213410d1..5ac100ad61ffae45448ede30437f572357edee0b 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foo-canvas.h 2010-03-09 10:49:06.532000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foo-canvas.h 2010-03-08 10:28:07.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas.h 2010-03-12 18:06:31.253000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas.h 2010-03-12 18:06:22.850000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 8 10:28 2010 (edgrif) */
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff
index 68eec5483846aac208a8a49042c55cd3c847951c..f2702ff9502ad8cd82f4e9cc7829f3b473efa940 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foozmap-canvas-floating-group.c 1970-01-01 00:00:00.000000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.c 2010-03-04 13:58:19.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-floating-group.c 1970-01-01 00:00:00.000000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.c 2010-03-12 18:06:22.892000000 +0000
@@ -0,0 +1,449 @@
+/* File: foozmap-canvas-floating-group.c
+ * Author: Roy Storey (rds@sanger.ac.uk)
@@ -32,7 +32,7 @@
+ * HISTORY:
+ * Last edited: Mar 23 16:47 2008 (rds)
+ * Created: Thu Jan 24 08:36:25 2008 (rds)
-+ * CVS info: $Id: foozmap-canvas-floating-group.c,v 1.3 2008-03-23 16:49:04 rds Exp $
++ * CVS info: $Id: foozmap-canvas-floating-group.c,v 1.1 2010-03-10 15:27:23 edgrif Exp $
+ *-------------------------------------------------------------------
+ */
+
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff
index 2f0c5bd1b8a0615d593503b2d7b19813d5184c98..44280e7c450f608eedb88d9eb262353e3b4e9f20 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foozmap-canvas-floating-group.h 1970-01-01 00:00:00.000000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.h 2010-03-04 13:58:19.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-floating-group.h 1970-01-01 00:00:00.000000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.h 2010-03-12 18:06:22.934000000 +0000
@@ -0,0 +1,89 @@
+/* File: foozmap-canvas-floating-group.h
+ * Author: Roy Storey (rds@sanger.ac.uk)
@@ -32,7 +32,7 @@
+ * HISTORY:
+ * Last edited: Jan 25 09:59 2008 (rds)
+ * Created: Thu Jan 24 08:39:05 2008 (rds)
-+ * CVS info: $Id: foozmap-canvas-floating-group.h,v 1.1 2008-03-11 10:28:42 rds Exp $
++ * CVS info: $Id: foozmap-canvas-floating-group.h,v 1.1 2010-03-10 15:27:23 edgrif Exp $
+ *-------------------------------------------------------------------
+ */
+
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff
index 0e8124c6c4d234dc666b448e4d73b4d3b59f289f..6a9550fc44d5be23e274f156689a248add0ef5f9 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.c 1970-01-01 00:00:00.000000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.c 2010-03-04 13:58:19.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.c 1970-01-01 00:00:00.000000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.c 2010-03-12 18:06:22.977000000 +0000
@@ -0,0 +1,1480 @@
+/* Last edited: Oct 3 14:00 2006 (edgrif) */
+/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff
index cfbc4f52287a5530ed5eb969408014e023c45940..35d1edeec4d0ea57e2cefa9c0baff5f48222b906 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.h 1970-01-01 00:00:00.000000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.h 2010-03-04 13:58:19.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.h 1970-01-01 00:00:00.000000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.h 2010-03-12 18:06:23.019000000 +0000
@@ -0,0 +1,126 @@
+/* Last edited: Oct 3 14:00 2006 (edgrif) */
+/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff
index 69c01eb0f67fecd63f2382e6ab3e1b9f472df28a..4014361d0d546a03df99ae83a914aaac24efd651 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foozmap-canvas-text.c 1970-01-01 00:00:00.000000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foozmap-canvas-text.c 2010-03-04 13:58:19.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-text.c 1970-01-01 00:00:00.000000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-text.c 2010-03-12 18:06:23.063000000 +0000
@@ -0,0 +1,1356 @@
+/* File: foozmap-canvas-text.c
+ * Author: Roy Storey (rds@sanger.ac.uk)
@@ -32,7 +32,7 @@
+ * HISTORY:
+ * Last edited: Mar 22 08:06 2008 (rds)
+ * Created: Fri Jan 25 12:01:12 2008 (rds)
-+ * CVS info: $Id: foozmap-canvas-text.c,v 1.5 2008-03-23 16:49:41 rds Exp $
++ * CVS info: $Id: foozmap-canvas-text.c,v 1.1 2010-03-10 15:27:23 edgrif Exp $
+ *-------------------------------------------------------------------
+ */
+
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff
index 9ec53c7ea136e96ac97459942c6daaf45a8412f5..2ca1832aa77752ae1a68ce76a5dc46491a490b80 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/foozmap-canvas-text.h 1970-01-01 00:00:00.000000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/foozmap-canvas-text.h 2010-03-04 13:58:19.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-text.h 1970-01-01 00:00:00.000000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-text.h 2010-03-12 18:06:23.109000000 +0000
@@ -0,0 +1,132 @@
+/* File: foozmap-canvas-text.h
+ * Author: Roy Storey (rds@sanger.ac.uk)
@@ -32,7 +32,7 @@
+ * HISTORY:
+ * Last edited: Mar 17 09:20 2008 (rds)
+ * Created: Thu Jan 24 08:36:51 2008 (rds)
-+ * CVS info: $Id: foozmap-canvas-text.h,v 1.4 2008-03-20 13:22:12 rds Exp $
++ * CVS info: $Id: foozmap-canvas-text.h,v 1.1 2010-03-10 15:27:23 edgrif Exp $
+ *-------------------------------------------------------------------
+ */
+
diff --git a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff
index 28b6fd147e08f72739a2843c0b1ebbbc76125e63..f1a6ce2d33f084907eb70204432c294aa460e86b 100644
--- a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff
@@ -1,5 +1,5 @@
---- ./merged_foocanvas/libfoocanvas/libfoocanvas.h 2010-03-09 10:49:06.539000000 +0000
-+++ ./zmap_foocanvas/libfoocanvas/libfoocanvas.h 2008-03-25 09:07:37.000000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/libfoocanvas.h 2010-03-12 18:06:31.295000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/libfoocanvas.h 2010-03-12 18:06:23.153000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Jan 24 09:17 2008 (rds) */
/*