update to trunk

(bzr r13708.1.24)

4 files changed, 66 insertions, 63 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6659e8c0a..27c5e49db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 # -----------------------------------------------------------------------------
 # Define the main source
 # -----------------------------------------------------------------------------
@@ -33,8 +32,8 @@ set(sp_SRC
 	sp-gradient-reference.cpp
 	sp-gradient.cpp
 	sp-guide.cpp
-	sp-hatch.cpp
 	sp-hatch-path.cpp
+	sp-hatch.cpp
 	sp-image.cpp
 	sp-item-group.cpp
 	sp-item-notify-moveto.cpp
@@ -47,10 +46,10 @@ set(sp_SRC
 	sp-lpe-item.cpp
 	sp-marker.cpp
 	sp-mask.cpp
-	sp-mesh.cpp
 	sp-mesh-array.cpp
 	sp-mesh-patch.cpp
 	sp-mesh-row.cpp
+	sp-mesh.cpp
 	sp-metadata.cpp
 	sp-missing-glyph.cpp
 	sp-namedview.cpp
@@ -75,6 +74,9 @@ set(sp_SRC
 	sp-style-elem.cpp
 	sp-switch.cpp
 	sp-symbol.cpp
+	sp-tag-use-reference.cpp
+	sp-tag-use.cpp
+	sp-tag.cpp
 	sp-text.cpp
 	sp-title.cpp
 	sp-tref-reference.cpp
@@ -119,8 +121,8 @@ set(sp_SRC
 	sp-guide-attachment.h
 	sp-guide-constraint.h
 	sp-guide.h
-	sp-hatch.h
 	sp-hatch-path.h
+	sp-hatch.h
 	sp-image.h
 	sp-item-group.h
 	sp-item-notify-moveto.h
@@ -131,13 +133,13 @@ set(sp_SRC
 	sp-line.h
 	sp-linear-gradient.h
 	sp-lpe-item.h
-	sp-marker.h
 	sp-marker-loc.h
+	sp-marker.h
 	sp-mask.h
-	sp-mesh.h
 	sp-mesh-array.h
 	sp-mesh-patch.h
 	sp-mesh-row.h
+	sp-mesh.h
 	sp-metadata.h
 	sp-missing-glyph.h
 	sp-namedview.h
@@ -203,21 +205,17 @@ set(inkscape_SRC
 	filter-enums.cpp
 	gc-anchored.cpp
 	gc-finalized.cpp
-	gc.cpp
 	gradient-chemistry.cpp
 	gradient-drag.cpp
 	graphlayout.cpp
 	guide-snapper.cpp
 	help.cpp
 	id-clash.cpp
-	# ige-mac-menu.c
 	inkscape.cpp
-	inkscape.rc
-	interface.cpp
 	knot-holder-entity.cpp
+	knot-ptr.cpp
 	knot.cpp
 	knotholder.cpp
-	knot-ptr.cpp
 	layer-fns.cpp
 	layer-manager.cpp
 	layer-model.cpp
@@ -257,8 +255,8 @@ set(inkscape_SRC
 	snapped-line.cpp
 	snapped-point.cpp
 	snapper.cpp
-	style.cpp
 	style-internal.cpp
+	style.cpp
 	svg-view-widget.cpp
 	svg-view.cpp
 	text-chemistry.cpp
@@ -313,18 +311,12 @@ set(inkscape_SRC
 	event.h
 	extract-uri-test.h
 	extract-uri.h
-	factory.h
 	file.h
 	fill-or-stroke.h
 	filter-chemistry.h
 	filter-enums.h
-	gc-alloc.h
-	gc-allocator.h
 	gc-anchored.h
-	gc-core.h
 	gc-finalized.h
-	gc-managed.h
-	gc-soft-ptr.h
 	gradient-chemistry.h
 	gradient-drag.h
 	graphlayout.h
@@ -333,16 +325,14 @@ set(inkscape_SRC
 	helper-fns.h
 	icon-size.h
 	id-clash.h
-	# ige-mac-menu.h
 	inkscape-version.h
 	inkscape.h
-	interface.h
 	isinf.h
 	knot-enums.h
 	knot-holder-entity.h
+	knot-ptr.h
 	knot.h
 	knotholder.h
-	knot-ptr.h
 	layer-fns.h
 	layer-manager.h
 	layer-model.h
@@ -351,7 +341,6 @@ set(inkscape_SRC
 	macros.h
 	main-cmdlineact.h
 	marker-test.h
-	marker.h
 	media.h
 	menus-skeleton.h
 	message-context.h
@@ -376,7 +365,6 @@ set(inkscape_SRC
 	profile-manager.h
 	proj_pt.h
 	rdf.h
-	registrytool.h
 	remove-last.h
 	removeoverlap.h
 	require-config.h
@@ -403,10 +391,10 @@ set(inkscape_SRC
 	splivarot.h
 	streq.h
 	strneq.h
-	style-test.h
-	style.h
 	style-enums.h
 	style-internal.h
+	style-test.h
+	style.h
 	svg-profile.h
 	svg-view-widget.h
 	svg-view.h
@@ -430,8 +418,10 @@ set(inkscape_SRC
 
 if(WIN32)
 	list(APPEND inkscape_SRC
+		inkscape.rc
 		registrytool.cpp
 		#deptool.cpp
+		winconsole.cpp
 		winmain.cpp
 	)
 endif()
@@ -471,7 +461,6 @@ list(APPEND inkscape_SRC
 # All folders for internal inkscape
 # these call add_inkscape_source
 add_subdirectory(debug)
-add_subdirectory(dialogs)
 add_subdirectory(display)
 add_subdirectory(extension)
 add_subdirectory(filters)
@@ -545,6 +534,8 @@ target_link_libraries(inkscape
 	uemf_LIB
 	2geom_LIB
 	depixelize_LIB
+	util_LIB
+	gc_LIB
 
 	${INKSCAPE_LIBS}
 )
@@ -553,4 +544,3 @@ target_link_libraries(inkscape
 # make executable for INKVIEW
 #add_executable(inkview inkview.cpp)
 # ...
-
diff --git a/src/inkgc/CMakeLists.txt b/src/inkgc/CMakeLists.txt
index 22dd464e1..a4b96d5ee 100644
--- a/src/inkgc/CMakeLists.txt
+++ b/src/inkgc/CMakeLists.txt
@@ -1,11 +1,10 @@
-
 set(libgc_SRC
 	gc.cpp
-	
+
 	# -------
 	# Headers
 	gc-alloc.h
-	gc-anchored.h
+	../gc-anchored.h
 	gc-core.h
 	gc-managed.h
 	gc-soft-ptr.h
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index c8a02c810..c4b92e579 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set(live_effects_SRC
 	effect.cpp
 	lpe-angle_bisector.cpp
@@ -6,6 +5,7 @@ set(live_effects_SRC
 	lpe-bendpath.cpp
 	lpe-boolops.cpp
 	lpe-bounding-box.cpp
+	lpe-bspline.cpp
 	lpe-circle_3pts.cpp
 	lpe-circle_with_radius.cpp
 	lpe-clone-original.cpp
@@ -13,7 +13,7 @@ set(live_effects_SRC
 	lpe-copy_rotate.cpp
 	lpe-curvestitch.cpp
 	lpe-dynastroke.cpp
-	lpe-ellipse-5pts.cpp
+	lpe-ellipse_5pts.cpp
 	lpe-envelope.cpp
 	lpe-extrude.cpp
 	lpe-fill-between-many.cpp
@@ -21,8 +21,11 @@ set(live_effects_SRC
 	lpe-fillet-chamfer.cpp
 	lpe-gears.cpp
 	lpe-interpolate.cpp
+	lpe-interpolate_points.cpp
+	lpe-jointype.cpp
 	lpe-knot.cpp
 	lpe-lattice.cpp
+	lpe-lattice2.cpp
 	lpe-line_segment.cpp
 	lpe-mirror_symmetry.cpp
 	lpe-offset.cpp
@@ -30,43 +33,43 @@ set(live_effects_SRC
 	lpe-path_length.cpp
 	lpe-patternalongpath.cpp
 	lpe-perp_bisector.cpp
-	lpe-perspective_path.cpp
 	lpe-perspective-envelope.cpp
+	lpe-perspective_path.cpp
 	lpe-powerstroke.cpp
 	lpe-recursiveskeleton.cpp
 	lpe-rough-hatches.cpp
+	lpe-roughen.cpp
 	lpe-ruler.cpp
 	lpe-show_handles.cpp
 	lpe-simplify.cpp
-	# lpe-skeleton.cpp
+	lpe-skeleton.cpp
 	lpe-sketch.cpp
 	lpe-spiro.cpp
-	lpe-roughen.cpp
 	lpe-tangent_to_curve.cpp
+	lpe-taperstroke.cpp
 	lpe-test-doEffect-stack.cpp
-	lpe-bspline.cpp
 	lpe-text_label.cpp
-	lpe-vonkoch.cpp
 	lpegroupbbox.cpp
 	lpeobject-reference.cpp
+	lpe-vonkoch.cpp
 	lpeobject.cpp
-	spiro.cpp
 	spiro-converters.cpp
+	spiro.cpp
 
 	parameter/array.cpp
 	parameter/bool.cpp
 	parameter/filletchamferpointarray.cpp
-	parameter/parameter.cpp
-	parameter/path.cpp
 	parameter/originalpath.cpp
 	parameter/originalpatharray.cpp
+	parameter/parameter.cpp
 	parameter/path-reference.cpp
+	parameter/path.cpp
 	parameter/point.cpp
 	parameter/powerstrokepointarray.cpp
 	parameter/random.cpp
 	parameter/text.cpp
-	paramter/transformedpoint.cpp
 	parameter/togglebutton.cpp
+	parameter/transformedpoint.cpp
 	parameter/unit.cpp
 	parameter/vector.cpp
 
@@ -80,6 +83,7 @@ set(live_effects_SRC
 	lpe-bendpath.h
 	lpe-boolops.h
 	lpe-bounding-box.h
+	lpe-bspline.h
 	lpe-circle_3pts.h
 	lpe-circle_with_radius.h
 	lpe-clone-original.h
@@ -87,7 +91,7 @@ set(live_effects_SRC
 	lpe-copy_rotate.h
 	lpe-curvestitch.h
 	lpe-dynastroke.h
-	lpe-ellipse-5pts.h
+	lpe-ellipse_5pts.h
 	lpe-envelope.h
 	lpe-extrude.h
 	lpe-fill-between-many.h
@@ -95,8 +99,11 @@ set(live_effects_SRC
 	lpe-fillet-chamfer.h
 	lpe-gears.h
 	lpe-interpolate.h
+	lpe-interpolate_points.h
+	lpe-jointype.h
 	lpe-knot.h
 	lpe-lattice.h
+	lpe-lattice2.h
 	lpe-line_segment.h
 	lpe-mirror_symmetry.h
 	lpe-offset.h
@@ -104,47 +111,47 @@ set(live_effects_SRC
 	lpe-path_length.h
 	lpe-patternalongpath.h
 	lpe-perp_bisector.h
-	lpe-perspective_path.h
 	lpe-perspective-envelope.h
-	lpe-powerstroke.h
+	lpe-perspective_path.h
 	lpe-powerstroke-interpolators.h
+	lpe-powerstroke.h
 	lpe-recursiveskeleton.h
 	lpe-rough-hatches.h
+	lpe-roughen.h
 	lpe-ruler.h
-	lpe-simplify.h
 	lpe-show_handles.h
+	lpe-simplify.h
 	lpe-skeleton.h
 	lpe-sketch.h
 	lpe-spiro.h
-	lpe-roughen.h
 	lpe-tangent_to_curve.h
+	lpe-taperstroke.h
 	lpe-test-doEffect-stack.h
-	lpe-bspline.h
 	lpe-text_label.h
 	lpe-vonkoch.h
 	lpegroupbbox.h
 	lpeobject-reference.h
 	lpeobject.h
-	spiro.h
 	spiro-converters.h
+	spiro.h
 
 	parameter/array.h
 	parameter/bool.h
-	parameter/filletchamferpointarray.h
 	parameter/enum.h
+	parameter/filletchamferpointarray.h
+	parameter/originalpath.h
+	parameter/originalpatharray.h
 	parameter/parameter.h
 	parameter/path-reference.h
 	parameter/path.h
-	parameter/originalpath.h
-	parameter/originalpatharray.h
 	parameter/point.h
 	parameter/powerstrokepointarray.h
 	parameter/random.h
 	parameter/text.h
 	parameter/togglebutton.h
+	parameter/transformedpoint.h
 	parameter/unit.h
 	parameter/vector.h
-
 )
 
 # add_inkscape_lib(live_effects_LIB "${live_effects_SRC}")
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 674254686..991d11feb 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,11 +1,10 @@
-
 set(ui_SRC
 	clipboard.cpp
 	control-manager.cpp
 	dialog-events.cpp
 	draw-anchor.cpp
-	interface.cpp 
-	object-edit.cpp 
+	interface.cpp
+	object-edit.cpp
 	previewholder.cpp
 	shape-editor.cpp
 	tool-factory.cpp
@@ -56,8 +55,8 @@ set(ui_SRC
 	dialog/aboutbox.cpp
 	dialog/align-and-distribute.cpp
 	dialog/calligraphic-profile-rename.cpp
-	dialog/color-item.cpp
 	dialog/clonetiler.cpp
+	dialog/color-item.cpp
 	dialog/debug.cpp
 	dialog/desktop-tracker.cpp
 	dialog/dialog-manager.cpp
@@ -86,31 +85,36 @@ set(ui_SRC
 	dialog/livepatheffect-add.cpp
 	dialog/livepatheffect-editor.cpp
 	dialog/lpe-fillet-chamfer-properties.cpp
+	dialog/lpe-powerstroke-properties.cpp
 	dialog/memory.cpp
 	dialog/messages.cpp
 	dialog/new-from-template.cpp
 	dialog/object-attributes.cpp
 	dialog/object-properties.cpp
+	dialog/objects.cpp
 	dialog/ocaldialogs.cpp
+	dialog/pixelartdialog.cpp
 	dialog/polar-arrange-tab.cpp
 	dialog/print-colors-preview-dialog.cpp
 	dialog/print.cpp
-	dialog/symbols.cpp
-	dialog/xml-tree.cpp
 	dialog/spellcheck.cpp
 	dialog/svg-fonts-dialog.cpp
 	dialog/swatches.cpp
+	dialog/symbols.cpp
+	dialog/tags.cpp
 	dialog/template-load-tab.cpp
 	dialog/template-widget.cpp
 	dialog/text-edit.cpp
 	dialog/tile.cpp
 	dialog/tracedialog.cpp
-	dialog/pixelartdialog.cpp
 	dialog/transformation.cpp
 	dialog/undo-history.cpp
+	dialog/xml-tree.cpp
 
+	widget/addtoicon.cpp
 	widget/anchor-selector.cpp
 	widget/button.cpp
+	widget/clipmaskicon.cpp
 	widget/color-picker.cpp
 	widget/color-preview.cpp
 	widget/dock-item.cpp
@@ -121,10 +125,13 @@ set(ui_SRC
 	widget/frame.cpp
 	widget/gimpcolorwheel.c
 	widget/gimpspinscale.c
+	widget/highlight-picker.cpp
 	widget/imageicon.cpp
 	widget/imagetoggler.cpp
+	widget/insertordericon.cpp
 	widget/labelled.cpp
 	widget/layer-selector.cpp
+	widget/layertypeicon.cpp
 	widget/licensor.cpp
 	widget/notebook-page.cpp
 	widget/object-composite-settings.cpp
@@ -179,8 +186,8 @@ set(ui_SRC
 	dialog/arrange-tab.h
 	dialog/behavior.h
 	dialog/calligraphic-profile-rename.h
-	dialog/color-item.h
 	dialog/clonetiler.h
+	dialog/color-item.h
 	dialog/debug.h
 	dialog/desktop-tracker.h
 	dialog/dialog-manager.h
@@ -200,8 +207,8 @@ set(ui_SRC
 	dialog/floating-behavior.h
 	dialog/font-substitution.h
 	dialog/glyphs.h
-	dialog/guides.h
 	dialog/grid-arrange-tab.h
+	dialog/guides.h
 	dialog/icon-preview.h
 	dialog/inkscape-preferences.h
 	dialog/input.h
@@ -215,13 +222,13 @@ set(ui_SRC
 	dialog/new-from-template.h
 	dialog/object-attributes.h
 	dialog/object-properties.h
+	dialog/objects.h
 	dialog/ocaldialogs.h
 	dialog/panel-dialog.h
-	dialog/polar-arrange-tab.h
 	dialog/pixelartdialog.h
+	dialog/polar-arrange-tab.h
 	dialog/print-colors-preview-dialog.h
 	dialog/print.h
-	
 	dialog/spellcheck.h
 	dialog/svg-fonts-dialog.h
 	dialog/swatches.h