Commit a merge to trunk, with probabal errors

(bzr r11073.1.36)

1 files changed, 17 insertions, 41 deletions

diff --git a/src/Makefile_insert b/src/Makefile_insert
index e9c149cb2..5ff44b253 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -3,15 +3,13 @@
 ink_common_sources +=	\
 	util/find-last-if.h					\
 	util/longest-common-suffix.h				\
-	approx-equal.h remove-last.h					\
-	arc-context.cpp arc-context.h					\
+	remove-last.h					\
 	attributes.cpp attributes.h					\
 	attribute-rel-svg.cpp attribute-rel-svg.h			\
 	attribute-rel-css.cpp attribute-rel-css.h			\
 	attribute-rel-util.cpp attribute-rel-util.h			\
 	axis-manip.cpp axis-manip.h					\
 	bad-uri-exception.h						\
-	box3d-context.cpp box3d-context.h				\
 	box3d.cpp box3d.h						\
 	box3d-side.cpp box3d-side.h					\
 	brokenimage.xpm							\
@@ -21,15 +19,12 @@ ink_common_sources +=	\
 	color-profile.cpp color-profile.h				\
 	color-profile-cms-fns.h						\
 	color-rgba.h							\
-	common-context.cpp common-context.h				\
-	compat-key-syms.h						\
+	colorspace.h							\
 	composite-undo-stack-observer.cpp				\
 	composite-undo-stack-observer.h					\
 	conditions.cpp conditions.h					\
-	connection-points.cpp connection-points.h			\
 	conn-avoid-ref.cpp conn-avoid-ref.h				\
 	connection-pool.h						\
-	connector-context.cpp connector-context.h			\
 	console-output-undo-observer.h console-output-undo-observer.cpp \
 	context-fns.cpp context-fns.h					\
 	decimal-round.h							\
@@ -41,28 +36,21 @@ ink_common_sources +=	\
 	dir-util.cpp dir-util.h						\
 	document.cpp document.h document-private.h			\
 	document-subset.cpp document-subset.h				\
-	document-undo.cpp						\
+	document-undo.cpp document-undo.h \
 	doxygen-main.cpp						\
 	draw-anchor.cpp	draw-anchor.h					\
-	draw-context.cpp draw-context.h					\
-	dropper-context.cpp dropper-context.h				\
-	dyna-draw-context.cpp dyna-draw-context.h			\
 	ege-adjustment-action.cpp ege-adjustment-action.h		\
 	ege-color-prof-tracker.cpp ege-color-prof-tracker.h		\
 	ege-output-action.cpp ege-output-action.h			\
 	ege-select-one-action.cpp ege-select-one-action.h		\
 	enums.h								\
-	eraser-context.cpp eraser-context.h				\
-	event-context.cpp event-context.h				\
 	event-log.cpp event-log.h event.h				\
 	extract-uri.cpp extract-uri.h					\
+	factory.h							\
 	file.cpp file.h							\
 	fill-or-stroke.h						\
 	filter-chemistry.cpp filter-chemistry.h				\
 	filter-enums.cpp filter-enums.h					\
-	fixes.cpp							\
-	flood-context.cpp flood-context.h				\
-	forward.h							\
 	gc-alloc.h							\
 	gc-anchored.h gc-anchored.cpp					\
 	gc-core.h							\
@@ -71,7 +59,6 @@ ink_common_sources +=	\
 	gc-managed.h							\
 	gc-soft-ptr.h							\
 	gradient-chemistry.cpp gradient-chemistry.h			\
-	gradient-context.cpp gradient-context.h				\
 	gradient-drag.cpp gradient-drag.h				\
 	graphlayout.cpp graphlayout.h					\
 	guide-snapper.cpp guide-snapper.h				\
@@ -95,14 +82,13 @@ ink_common_sources +=	\
 	knot-holder-entity.h knot-holder-entity.cpp			\
 	layer-fns.cpp layer-fns.h					\
 	layer-manager.cpp layer-manager.h				\
+  layer-model.cpp layer-model.h         \
 	line-geometry.cpp line-geometry.h				\
 	line-snapper.cpp line-snapper.h					\
-	lpe-tool-context.cpp lpe-tool-context.h				\
 	macros.h							\
 	main-cmdlineact.cpp main-cmdlineact.h				\
 	marker.cpp marker.h						\
 	media.cpp media.h						\
-	memeq.h								\
 	menus-skeleton.h						\
 	message-context.cpp message-context.h				\
 	message.h							\
@@ -114,8 +100,6 @@ ink_common_sources +=	\
 	object-snapper.cpp object-snapper.h				\
 	path-chemistry.cpp path-chemistry.h				\
 	path-prefix.h							\
-	pencil-context.cpp pencil-context.h				\
-	pen-context.cpp	pen-context.h					\
 	persp3d.cpp persp3d.h						\
 	persp3d-reference.cpp persp3d-reference.h			\
 	perspective-line.cpp perspective-line.h				\
@@ -127,14 +111,12 @@ ink_common_sources +=	\
 	proj_pt.cpp proj_pt.h						\
 	removeoverlap.cpp removeoverlap.h				\
 	rdf.cpp rdf.h							\
-	rect-context.cpp rect-context.h					\
 	resource-manager.cpp resource-manager.h				\
 	require-config.h						\
 	round.h								\
 	rubberband.cpp rubberband.h					\
 	satisfied-guide-cns.cpp satisfied-guide-cns.h			\
 	selcue.cpp selcue.h						\
-	select-context.cpp select-context.h				\
 	selection-chemistry.cpp selection-chemistry.h			\
 	selection.cpp selection.h					\
 	selection-describer.cpp selection-describer.h			\
@@ -143,7 +125,7 @@ ink_common_sources +=	\
 	shape-editor.cpp shape-editor.h					\
 	shortcuts.cpp shortcuts.h					\
 	snap.cpp snap.h							\
-	snap-enums.h snap-candidate.h \
+	snap-enums.h snap-candidate.h					\
 	snapped-curve.cpp snapped-curve.h				\
 	snapped-line.cpp snapped-line.h					\
 	snapped-point.cpp snapped-point.h				\
@@ -157,6 +139,7 @@ ink_common_sources +=	\
 	sp-defs.cpp sp-defs.h						\
 	sp-desc.cpp sp-desc.h						\
 	sp-ellipse.cpp sp-ellipse.h					\
+	sp-factory.h							\
 	sp-filter.cpp sp-filter.h number-opt-number.h			\
 	sp-filter-primitive.cpp	sp-filter-primitive.h			\
 	sp-filter-reference.cpp	sp-filter-reference.h			\
@@ -169,7 +152,6 @@ ink_common_sources +=	\
         sp-glyph.cpp sp-glyph.h						\
         sp-glyph-kerning.cpp sp-glyph-kerning.h				\
 	sp-gradient.cpp sp-gradient.h					\
-	sp-gradient-fns.h						\
 	sp-gradient-reference.cpp sp-gradient-reference.h		\
 	sp-gradient-spread.h						\
 	sp-gradient-units.h						\
@@ -178,28 +160,27 @@ ink_common_sources +=	\
 	sp-guide-constraint.h						\
 	sp-guide.cpp sp-guide.h						\
 	sp-image.cpp sp-image.h						\
-	spiral-context.cpp spiral-context.h				\
 	sp-item.cpp sp-item.h						\
 	sp-item-group.cpp sp-item-group.h				\
 	sp-item-notify-moveto.cpp sp-item-notify-moveto.h		\
 	sp-item-rm-unsatisfied-cns.cpp sp-item-rm-unsatisfied-cns.h	\
 	sp-item-transform.cpp sp-item-transform.h			\
 	sp-item-update-cns.cpp sp-item-update-cns.h			\
-	sp-linear-gradient-fns.h					\
-	sp-linear-gradient.h						\
+	sp-linear-gradient.cpp sp-linear-gradient.h			\
 	sp-line.cpp sp-line.h						\
 	splivarot.cpp splivarot.h					\
 	sp-lpe-item.cpp sp-lpe-item.h					\
 	sp-marker-loc.h							\
 	sp-mask.cpp sp-mask.h						\
 	sp-metadata.cpp sp-metadata.h					\
-	sp-metric.h							\
-	sp-metrics.cpp sp-metrics.h					\
+	sp-mesh-array.cpp sp-mesh-array.h				\
+	sp-mesh-gradient.cpp sp-mesh-gradient.h				\
+	sp-mesh-patch.cpp sp-mesh-patch.h				\
+	sp-mesh-row.cpp sp-mesh-row.h					\
         sp-missing-glyph.cpp sp-missing-glyph.h \
 	sp-namedview.cpp sp-namedview.h		\
 	sp-object.cpp sp-object.h		\
 	sp-object-group.cpp sp-object-group.h	\
-	sp-object-repr.cpp sp-object-repr.h	\
 	sp-offset.cpp sp-offset.h		\
 	sp-paint-server.cpp sp-paint-server.h	\
 	sp-paint-server-reference.h		\
@@ -207,8 +188,7 @@ ink_common_sources +=	\
 	sp-pattern.cpp sp-pattern.h		\
 	sp-polygon.cpp sp-polygon.h		\
 	sp-polyline.cpp sp-polyline.h		\
-	sp-radial-gradient-fns.h		\
-	sp-radial-gradient.h			\
+	sp-radial-gradient.cpp sp-radial-gradient.h			\
 	sp-rect.cpp sp-rect.h			\
 	sp-root.cpp sp-root.h			\
 	sp-script.cpp sp-script.h		\
@@ -228,33 +208,29 @@ ink_common_sources +=	\
 	sp-tspan.cpp sp-tspan.h			\
 	sp-use.cpp sp-use.h			\
 	sp-use-reference.cpp sp-use-reference.h	\
-	spray-context.cpp spray-context.h	\
-	star-context.cpp star-context.h		\
 	streq.h					\
 	strneq.h				\
 	style.cpp style.h			\
+	style-enums.h style-internal.h		\
 	svg-profile.h				\
 	svg-view.cpp svg-view.h			\
 	svg-view-widget.cpp svg-view-widget.h	\
 	syseq.h					\
 	text-chemistry.cpp text-chemistry.h	\
-	text-context.cpp text-context.h		\
 	text-editing.cpp text-editing.h		\
 	text-tag-attributes.h			\
+	tool-factory.h				\
 	tools-switch.cpp tools-switch.h		\
 	transf_mat_3x4.cpp transf_mat_3x4.h	\
-	tweak-context.h tweak-context.cpp	\
 	unclump.cpp unclump.h			\
 	undo-stack-observer.h			\
 	unicoderange.cpp unicoderange.h		\
-	unit-constants.h			\
 	uri.cpp uri.h				\
 	uri-references.cpp uri-references.h	\
 	vanishing-point.cpp vanishing-point.h	\
 	verbs.cpp verbs.h			\
 	version.cpp version.h			\
-	zoom-context.cpp zoom-context.h			\
-	measure-context.cpp measure-context.h
+	viewbox.cpp viewbox.h
 
 # Additional dependencies
 
@@ -279,8 +255,8 @@ CXXTEST_TESTSUITES +=			\
 	$(srcdir)/extract-uri-test.h	\
 	$(srcdir)/marker-test.h		\
 	$(srcdir)/mod360-test.h		\
+	$(srcdir)/preferences-test.h    \
 	$(srcdir)/round-test.h		\
-	$(srcdir)/preferences-test.h	\
 	$(srcdir)/sp-gradient-test.h	\
 	$(srcdir)/sp-style-elem-test.h	\
 	$(srcdir)/style-test.h		\