Merge lp:~inkscape.dev/inkscape/guides-improvements into lp:~inkscape.dev/inkscape/trunk

[hermes ramirez]

[ScislaC (scislac)]

This is currently an ongoing GSOC project and is not ready for merging. This is an outside branch and has not been merged yet.

[lp:~inkscape.dev/inkscape/guides-improvements]

11501. By Samuel Chase on 2012-07-26

debugging info

11502. By Samuel Chase on 2012-07-26

merged with trunk r:11573

11503. By Samuel Chase on 2012-07-27

debugging information with line numbers

11504. By Samuel Chase on 2012-07-27

commented out debugging information

11505. By Samuel Chase on 2012-07-30

removed debugging information. partially working labels.

11506. By Samuel Chase on 2012-07-30

Fix for Bug #1029033

11507. By Samuel Chase on 2012-07-30

memory leak fix.

11508. By Samuel Chase on 2012-07-30

merged with trunk

11509. By Samuel Chase on 2012-08-04

added two buttons. experimental prototyping. needs a lot of fixing.

11510. By Samuel Chase on 2012-08-05

removed unnecessary file

11511. By Samuel Chase on 2012-08-06

added guide-manager.cpp, guide-manager.h. Got inkscape to build.

11512. By Samuel Chase on 2012-08-06

made guide_manager a pointer.

11513. By Samuel Chase on 2012-08-06

removed inclusion of header

11514. By Samuel Chase on 2012-08-07

I can see!

11515. By Samuel Chase on 2012-08-08

basic guide information displayed in TreeView

11516. By Samuel Chase on 2012-08-09

added some checking macros.

11517. By Samuel Chase on 2012-08-09

NULL checks. eye and lock ImageTogglers

11518. By Samuel Chase on 2012-08-09

cosmetic changes

11519. By Samuel Chase on 2012-08-09

removed the header-row, and the Guide-no. column

11520. By Samuel Chase on 2012-08-12

Fixed bug in which guides without labels caused Inkscape to crash.

11521. By Samuel Chase on 2012-08-12

NULL check for getAttribute

11522. By Samuel Chase on 2012-08-13

merged with trunk

11523. By Samuel Chase on 2012-08-14

trying to get the "Delete" button to work

11524. By Samuel Chase on 2012-08-14

rearrangement of code

11525. By Samuel Chase on 2012-08-15

The "Delete" button works.

11526. By Samuel Chase on 2012-08-15

attempt to make the guide-lable editable in-place

11527. By Samuel Chase on 2012-08-15

revert to r:11525. New approach needed.

11528. By Samuel Chase on 2012-08-15

basic class design for GuideManager

11529. By Samuel Chase on 2012-08-15

empty constructor

11530. By Samuel Chase on 2012-08-16

it buids.

11531. By Samuel Chase on 2012-08-16

duplicated the code in layer-manager.cpp in guide-manager.cpp and commented it all out

11532. By Samuel Chase on 2012-08-17

Well, it builds.

11533. By Samuel Chase on 2012-08-18

implemented destructor, removed some unnecessary commented code

11534. By Samuel Chase on 2012-08-18

removed more unecessary commented code

11535. By Samuel Chase on 2012-08-18

merged with trunk

11536. By Samuel Chase on 2012-08-18

as SPNamedView::connectModified is being used, names changed appropriately

11537. By Samuel Chase on 2012-08-18

cosmetic changes. The Delete button doesn't work any more

11538. By Samuel Chase on 2012-08-20

The "Delete" button works again. Also removed some unncessary commented out code

11539. By Samuel Chase on 2012-08-20

fixed the SP_IS_GUIDE check

11540. By Samuel Chase on 2012-08-20

implementing _rebuild. Initial stages

11541. By Samuel Chase on 2012-08-20

still _rebuilding

11542. By Samuel Chase on 2012-09-03

merged with trunk

11543. By Samuel Chase on 2012-09-06

rudimentary _rebuild()

11544. By Samuel Chase on 2012-09-10

merged with trunk

11545. By Samuel Chase on 2012-09-14

All new guides will be created as "inkscape:guide".

11546. By Samuel Chase on 2012-09-19

first broken attempt to transform old-style guides to new style guides

11547. By Samuel Chase on 2012-09-20

more broken things.

11548. By Samuel Chase on 2012-10-04

Horrible attempt #1.

11549. By Samuel Chase on 2012-10-05

position and orientation attribute reading code same as that of canvas-guide.cpp. and a few other cleanups

11550. By Samuel Chase on 2012-10-05

Reading from SVG using streams works

11551. By Samuel Chase on 2012-10-06

reverted

11552. By Samuel Chase on 2012-10-06

added comment

11553. By Samuel Chase on 2012-11-02

merge with trunk

11554. By Samuel Chase on 2012-11-12

height is read from the document instead of using getHeight(). using sp_repr_set_double makes things a little less ugly.

11555. By Samuel Chase on 2012-11-12

merge with trunk

11556. By Samuel Chase on 2012-11-12

added the enable attribute. GC'd the node

11557. By Samuel Chase on 2012-11-12

sp_namedview_convert_old_guides now has the same arguments as sp_namedview_generate_old_grid, kinda.

11558. By Johan Engelen on 2012-11-15

enable console output for windows builds

11559. By Johan Engelen on 2012-11-30

backwards compatibility: convert old-style guides to new-style

11560. By Johan Engelen on 2012-11-30

guides default enabled

11561. By Samuel Chase on 2012-12-07

merged with trunk

11562. By Samuel Chase on 2012-12-30

merged with trunk

11563. By Samuel Chase on 2013-02-11

merged with trunk

11564. By Johan Engelen on 2013-03-15

work on changing coord system for grids too. display is good now. snapping is still in old coordsystem

11565. By Johan Engelen on 2013-03-15

fix grid snapping. i think grids are now in same coord system as everything else. the UI is now awkward, as the origin location does not correspond to what is put on the rulers... (similar to guide dialog (double-click on guide))

11566. By Johan Engelen on 2013-03-15

1. fix axonomgrid snapping
2. fix alt-drag grid-multiple snapping

11567. By Johan Engelen on 2013-03-16

merge trunnk.......

11568. By Johan Engelen on 2013-03-31

correctly move guides and grids when resizing page to drawing/selection

11569. By Samuel Chase on 2014-04-14

Merge with trunk.

11570. By Samuel Chase on 2014-04-14

Attempt to merge canvas-guide.cpp with a newer sp-guide.cpp from trunk

11571. By Samuel Chase on 2014-04-14

Merge with trunk.

11572. By Samuel Chase on 2014-04-16

Add <glibmm/threads.h> include to make Inkscape build again.

11573. By Samuel Chase on 2014-04-16

Change sodipodi:guide to inkscape:guide

11574. By Samuel Chase on 2014-05-05

Merge with trunk.

11575. By Samuel Chase on 2014-05-16

Merge with trunk

11576. By Samuel Chase on 2014-05-16

Merge with trunk

11577. By Samuel Chase on 2014-05-17

Remove warning. Stylistic changes

* Change from sodipodi:guide to inkscape:guide.
  Earlier there was a warning on console "unknown type: sodipodi:guide" when
  the icons.svg file was read. This warning was from factory.h

* Trivial stylistic changes in document-properties.cpp

11578. By Samuel Chase on 2014-05-17

Update documentation

11579. By Samuel Chase on 2014-05-21

Fix build error in document-properties.cc

- Change GTK+ code to use GTKMM instead
- Minor stylistic changes

11580. By Samuel Chase on 2014-05-22

Modularise method by creating helper method

11581. By Samuel Chase on 2014-05-22

Stylistic Changes

Break long lines
Spaces around infix aritmetic operators

11582. By Samuel Chase on 2014-05-22

clang-formatt document-properties.cpp

11583. By Samuel Chase on 2014-05-22

Fix formatting of widget_array[]

11584. By Samuel Chase on 2014-05-22

Merge with trunk.

11585. By Samuel Chase on 2014-06-11

Merge with trunk

11586. By Samuel Chase on 2014-06-14

Refactor populate_guides_list()

- Remove unnecessary checks.
- Remove C-style cast.
- Use more descriptive variable names.
- Fix unrelated documentation formatting.

11587. By Samuel Chase on 2014-06-14

Implement multiple guide selection and deletion

- Some unrelated stylistic refactoring
- Made some functions private

11588. By Samuel Chase on 2014-06-24

Fix Undo for guide-multi-delete

- Some unrelated stylistic change.

11589. By Samuel Chase on 2014-06-24

Remove unnecessary headers

11590. By Samuel Chase on 2014-07-30

Intermediate GTK3 migration attempt commit

11591. By Samuel Chase on 2014-07-30

Merge with trunk

11592. By Samuel Chase on 2014-09-23

Merge with trunk

Unmerged revisions

11592. By Samuel Chase on 2014-09-23

Merge with trunk

11591. By Samuel Chase on 2014-07-30

Merge with trunk

11590. By Samuel Chase on 2014-07-30

Intermediate GTK3 migration attempt commit

11589. By Samuel Chase on 2014-06-24

Remove unnecessary headers

11588. By Samuel Chase on 2014-06-24

Fix Undo for guide-multi-delete

- Some unrelated stylistic change.

11587. By Samuel Chase on 2014-06-14

Implement multiple guide selection and deletion

- Some unrelated stylistic refactoring
- Made some functions private

11586. By Samuel Chase on 2014-06-14

Refactor populate_guides_list()

- Remove unnecessary checks.
- Remove C-style cast.
- Use more descriptive variable names.
- Fix unrelated documentation formatting.

11585. By Samuel Chase on 2014-06-11

Merge with trunk

11584. By Samuel Chase on 2014-05-22

Merge with trunk.

11583. By Samuel Chase on 2014-05-22

Fix formatting of widget_array[]

=== modified file 'build.xml'
--- build.xml	2014-09-02 23:51:04 +0000
+++ build.xml	2014-09-23 18:22:24 +0000
@@ -354,13 +354,6 @@
         <flags>
             -Wall -Wformat -Werror=format-security -Wextra -Wpointer-arith -Wcast-align -Wsign-compare -Wswitch
             -Werror=return-type
-            <!-- - ->  -Werror <!-- -->
-            <!-- A list of warnings that should not error *yet*, any help is welcome in fixing the code generating these warnings! -->
-            <!-- libcroco is using guchar where it should use gchar, so we need: --> -Wno-error=pointer-sign
-            -Wno-error=unused-parameter -Wno-error=unused-but-set-variable -Wno-error=strict-overflow -Wno-error=write-strings
-            <!-- Format warnings are obviously bad errors, but with the current old compiler on Windows (gcc 4.6.) we run into a problem with long long ints...
-                 The errors can be restored by removing these flags after updating to a newer compiler (soon after 0.91 release hopefully)  -->
-            -Wno-error=format -Wno-error=format-extra-args
             -O2
             -mms-bitfields
             -fopenmp
@@ -530,7 +523,6 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
            -mthreads
        </flags>
        <fileset dir="${build}/obj">
 
=== modified file 'doc/HACKING.txt'
--- doc/HACKING.txt	2010-03-20 11:18:53 +0000
+++ doc/HACKING.txt	2014-09-23 18:22:24 +0000
@@ -30,7 +30,7 @@
 of something you'd like to work on. If not, here are just a few ways you
 can help: 
 
-   * Pick a bug, fix it, and send in a patch ("diff -uNrp" or "cvs diff -up")
+   * Pick a bug, fix it, and send in a patch ("diff -uNrp" or "bzr diff")
    * Choose a feature you want to see developed, and make it
    * If you speak a language in addition to English, work on your
      language's i18n file in the po/ directory
 
=== modified file 'doc/architecture.txt'
--- doc/architecture.txt	2006-01-16 02:36:01 +0000
+++ doc/architecture.txt	2014-09-23 18:22:24 +0000
@@ -159,7 +159,7 @@
   SPObjectGroup ABSTRACT
     SPNamedView <sodipodi:namedview>
     SPClipPath <clipPath>
-  SPGuide <sodipodi:guide>
+  SPGuide <inkscape:guide>
   SPPaintServer ABSTRACT
     SPGradient ABSTRACT
       SPLinearGradient <linearGradient>
 
=== modified file 'share/icons/icons.svg'
--- share/icons/icons.svg	2014-06-13 16:06:01 +0000
+++ share/icons/icons.svg	2014-09-23 18:22:24 +0000
@@ -866,8 +866,8 @@
 </defs>
 <sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="svg1" inkscape:grid-bbox="true" inkscape:pageopacity="1.0000000" pagecolor="#e8e8e4" snaptoguides="true" showguides="true" inkscape:window-y="0" inkscape:window-x="40" inkscape:window-height="745" inkscape:window-width="1326" inkscape:cy="417.9499" inkscape:cx="364.8285" inkscape:zoom="3.343024" gridtolerance="6" snaptogrid="false" showgrid="false" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="8" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="false" objecttolerance="11" inkscape:snap-bbox="false" inkscape:snap-nodes="true" inkscape:bbox-nodes="false" inkscape:bbox-paths="false" inkscape:snap-global="false" inkscape:snap-center="false" inkscape:snap-midpoints="false" inkscape:snap-intersection-paths="true" inkscape:object-paths="false" inkscape:snap-object-midpoints="true" inkscape:window-maximized="1" inkscape:snap-grids="true" inkscape:snap-smooth-nodes="false" inkscape:snap-text-baseline="false" inkscape:snap-page="true" inkscape:snap-bbox-midpoints="false" inkscape:snap-bbox-edge-midpoints="false">
 <inkscape:grid type="xygrid" id="grid9252" originx="0px" originy="0px" spacingx="0.5px" spacingy="0.5px" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" />
-<sodipodi:guide orientation="0,1" position="630.08101,968.02815" id="guide4946" />
-<sodipodi:guide orientation="0,1" position="618.47896,943.93157" id="guide4948" />
+<inkscape:guide orientation="0,1" position="630.08101,968.02815" id="guide4946" />
+<inkscape:guide orientation="0,1" position="618.47896,943.93157" id="guide4948" />
 </sodipodi:namedview>
 <metadata id="metadata1810">
 <rdf:RDF>
 
=== modified file 'src/Makefile_insert'
--- src/Makefile_insert	2014-07-31 14:31:01 +0000
+++ src/Makefile_insert	2014-09-23 18:22:24 +0000
@@ -61,6 +61,7 @@
 	gradient-chemistry.cpp gradient-chemistry.h			\
 	gradient-drag.cpp gradient-drag.h				\
 	graphlayout.cpp graphlayout.h					\
+	guide-manager.cpp guide-manager.h 				\
 	guide-snapper.cpp guide-snapper.h				\
 	help.cpp help.h							\
 	helper-fns.h							\
@@ -157,7 +158,6 @@
 	sp-gradient-vector.h						\
 	sp-guide-attachment.h						\
 	sp-guide-constraint.h						\
-	sp-guide.cpp sp-guide.h						\
 	sp-image.cpp sp-image.h						\
 	sp-item.cpp sp-item.h						\
 	sp-item-group.cpp sp-item-group.h				\
 
=== modified file 'src/attributes.cpp'
--- src/attributes.cpp	2014-08-01 09:04:51 +0000
+++ src/attributes.cpp	2014-09-23 18:22:24 +0000
@@ -124,6 +124,8 @@
     /* SPGuide */
     {SP_ATTR_ORIENTATION, "orientation"},
     {SP_ATTR_POSITION, "position"},
+    {SP_ATTR_ENABLE, "enable"},
+    {SP_ATTR_GROUP, "group"},
     /* SPImage */
     {SP_ATTR_X, "x"},
     {SP_ATTR_Y, "y"},
 
=== modified file 'src/attributes.h'
--- src/attributes.h	2014-08-01 09:04:51 +0000
+++ src/attributes.h	2014-09-23 18:22:24 +0000
@@ -125,6 +125,8 @@
     /* SPGuide */
     SP_ATTR_ORIENTATION,
     SP_ATTR_POSITION,
+    SP_ATTR_ENABLE,
+    SP_ATTR_GROUP,
     /* SPImage */
     SP_ATTR_X,
     SP_ATTR_Y,
 
=== modified file 'src/box3d.cpp'
--- src/box3d.cpp	2014-07-22 19:15:15 +0000
+++ src/box3d.cpp	2014-09-23 18:22:24 +0000
@@ -31,7 +31,7 @@
 #include "persp3d-reference.h"
 #include "uri.h"
 #include <2geom/line.h>
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 #include "sp-namedview.h"
 #include "preferences.h"
 
 
=== modified file 'src/desktop-events.cpp'
--- src/desktop-events.cpp	2014-07-22 19:16:13 +0000
+++ src/desktop-events.cpp	2014-09-23 18:22:24 +0000
@@ -34,11 +34,15 @@
 #include "document-undo.h"
 #include "ui/tools/tool-base.h"
 #include "helper/action.h"
+// #include "helper/unit-menu.h"
+// #include "helper/units.h"
+#include "helper/geom.h"
 #include "message-context.h"
 #include "preferences.h"
 #include "snap.h"
 #include "display/sp-canvas.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
+// #include "sp-metrics.h"
 #include "sp-namedview.h"
 #include "tools-switch.h"
 #include "verbs.h"
@@ -49,7 +53,7 @@
 
 static void snoop_extended(GdkEvent* event, SPDesktop *desktop);
 static void init_extended();
-void sp_dt_ruler_snap_new_guide(SPDesktop *desktop, SPCanvasItem *guide, Geom::Point &event_dt, Geom::Point &normal);
+void sp_dt_ruler_snap_new_guide(SPDesktop *desktop, SPCanvasItem *guide, Geom::Point &event_dt, Geom::Point &normal_dt);
 
 /* Root item handler */
 
@@ -74,7 +78,7 @@
     return sp_event_context_root_handler(desktop->event_context, event);
 }
 
-static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz)
+static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz_ruler)
 {
     static bool clicked = false;
     static bool dragged = false;
@@ -84,7 +88,7 @@
     static gint xp = 0, yp = 0; // where drag started
 
     SPDesktop *desktop = dtw->desktop;
-    GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(dtw->canvas));
+    GdkWindow *window  = gtk_widget_get_window(GTK_WIDGET(dtw->canvas));
 
     gint width, height;
 
@@ -94,7 +98,7 @@
     gdk_window_get_geometry(window, NULL /*x*/, NULL /*y*/, &width, &height);
 #else
     gdk_window_get_pointer(window, &wx, &wy, NULL);
-    gdk_window_get_geometry(window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/);
+    gdk_window_get_geometry(window, NULL /*x*/, NULL /*y*/, &width, &height, NULL /*depth*/);
 #endif
     
     Geom::Point const event_win(wx, wy);
@@ -110,14 +114,16 @@
 
                 Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
                 Geom::Point const event_dt(desktop->w2d(event_w));
+                Geom::Point const event_doc(desktop->w2doc(event_w));
 
                 // calculate the normal of the guidelines when dragged from the edges of rulers.
                 Geom::Point normal_bl_to_tr(-1.,1.); //bottomleft to topright
-                Geom::Point normal_tr_to_bl(1.,1.); //topright to bottomleft
+                Geom::Point normal_tr_to_bl(1.,1.);  //topright to bottomleft
                 normal_bl_to_tr.normalize();
                 normal_tr_to_bl.normalize();
+
                 Inkscape::CanvasGrid * grid = sp_namedview_get_first_enabled_grid(desktop->namedview);
-                if (grid){
+                if (grid) {
                     if (grid->getGridType() == Inkscape::GRID_AXONOMETRIC ) {
                         Inkscape::CanvasAxonomGrid *axonomgrid = dynamic_cast<Inkscape::CanvasAxonomGrid *>(grid);
                         if (event->button.state & GDK_CONTROL_MASK) {
@@ -130,25 +136,48 @@
                         }
                     }
                 }
-                if (horiz) {
+
+                /*
+
+                  The following if-else block determines whether the guides created are horizontal,
+                  vertical or angled.
+
+                  Horizontal guides are created by clicked and dragging from the ruler on the left,
+                  vertical guides from the ruler on top and diagonal guides by clicking and
+                  dragging within 50 px of all the ends of the guides.
+
+                  horiz_ruler: true when the mouse click occurs at the ruler at the top, and false
+                  for the ruler at the left.
+
+                  Geom::Point normal_bl_to_tr(-1.,1.); //bottomleft to topright (desktop co-ords)
+                  The vector (-1, 1) is a normal for a topleft->bottomright guide in document
+                  co-ordinates.
+
+                  Geom::Point normal_tr_to_bl(1.,1.); //topright to bottomleft (desktop co-ords)
+                  The vector (1, 1) is a normal for a bottomleft->topright guide in document
+                  co-ordinates.
+                 
+                */
+
+                if (horiz_ruler) {
                     if (wx < 50) {
-                        normal = normal_bl_to_tr;
+                        normal = normal_tr_to_bl;
                     } else if (wx > width - 50) {
-                        normal = normal_tr_to_bl;
+                        normal = normal_bl_to_tr;
                     } else {
                         normal = Geom::Point(0.,1.);
                     }
                 } else {
                     if (wy < 50) {
-                        normal = normal_bl_to_tr;
+                        normal = normal_tr_to_bl;
                     } else if (wy > height - 50) {
-                        normal = normal_tr_to_bl;
+                        normal = normal_bl_to_tr;
                     } else {
                         normal = Geom::Point(1.,0.);
                     }
                 }
 
-                guide = sp_guideline_new(desktop->guides, NULL, event_dt, normal);
+                guide = sp_guideline_new(desktop->guides, NULL, event_doc, normal);
                 sp_guideline_set_color(SP_GUIDELINE(guide), desktop->namedview->guidehicolor);
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -156,12 +185,12 @@
                                 gtk_widget_get_window(widget), 
                                 GDK_OWNERSHIP_NONE,
                                 FALSE,
-                                (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
+                                (GdkEventMask) (GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
                                 NULL,
                                 event->button.time);
 #else
                 gdk_pointer_grab(gtk_widget_get_window (widget), FALSE,
-                                 (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
+                                 (GdkEventMask) (GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
                                  NULL, NULL,
                                  event->button.time);
 #endif
@@ -171,7 +200,8 @@
             if (clicked) {
                 Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
                 Geom::Point event_dt(desktop->w2d(event_w));
-
+                Geom::Point event_doc(desktop->w2doc(event_w));
+                
                 Inkscape::Preferences *prefs = Inkscape::Preferences::get();
                 gint tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
                 if ( ( abs( (gint) event->motion.x - xp ) < tolerance )
@@ -182,15 +212,23 @@
                 dragged = true;
 
                 // explicitly show guidelines; if I draw a guide, I want them on
-                if ((horiz ? wy : wx) >= 0) {
+                if ((horiz_ruler ? wy : wx) >= 0) {
                     desktop->namedview->setGuides(true);
                 }
 
                 if (!(event->motion.state & GDK_SHIFT_MASK)) {
-                    sp_dt_ruler_snap_new_guide(desktop, guide, event_dt, normal);
+                    // FIXME: snapping will need to be fixed later.
+                    Geom::Point normal_dt = transform_normal(normal, desktop->doc2dt());
+                    sp_dt_ruler_snap_new_guide(desktop, guide, event_dt, normal_dt);
+                    // sp_dt_ruler_snap_new_guide calls a function that changes the values of
+                    // normal and event_dt. This is why the variables holding the document
+                    // co-ordinate values need to be updated.
+                    event_doc = desktop->dt2doc(event_dt);
+                    normal = transform_normal(normal_dt, desktop->dt2doc());
                 }
+                
                 sp_guideline_set_normal(SP_GUIDELINE(guide), normal);
-                sp_guideline_set_position(SP_GUIDELINE(guide), event_dt);
+                sp_guideline_set_position(SP_GUIDELINE(guide), event_doc);
 
                 desktop->set_coordinate_status(event_dt);
             }
@@ -206,28 +244,41 @@
 #endif
 
                 Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
+
                 Geom::Point event_dt(desktop->w2d(event_w));
+                Geom::Point event_doc(desktop->w2doc(event_w));                
 
                 if (!(event->button.state & GDK_SHIFT_MASK)) {
-                    sp_dt_ruler_snap_new_guide(desktop, guide, event_dt, normal);
+                    Geom::Point normal_dt = transform_normal(normal, desktop->doc2dt());
+                    sp_dt_ruler_snap_new_guide(desktop, guide, event_dt, normal_dt);
+                    // sp_dt_ruler_snap_new_guide calls a function that changes the values of
+                    // normal and event_dt. This is why the variables holding the document
+                    // co-ordinate values need to be updated.
+                    event_doc = desktop->dt2doc(event_dt);
+                    normal = transform_normal(normal_dt, desktop->dt2doc());
                 }
 
                 sp_canvas_item_destroy(guide);
                 guide = NULL;
-                if ((horiz ? wy : wx) >= 0) {
+                if ((horiz_ruler ? wy : wx) >= 0) {
                     Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
-                    Inkscape::XML::Node *repr = xml_doc->createElement("sodipodi:guide");
+                    Inkscape::XML::Node *repr = NULL;
+
+                    repr = xml_doc->createElement("inkscape:guide");                    
+
                     sp_repr_set_point(repr, "orientation", normal);
-                    sp_repr_set_point(repr, "position", event_dt);
+                    sp_repr_set_point(repr, "position", event_doc);
+                    sp_repr_set_boolean(repr, "enable", true);
+                    repr->setAttribute("group", "default");
                     desktop->namedview->appendChild(repr);
                     Inkscape::GC::release(repr);
-                    DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_NONE,
+                    DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_NONE, 
                                      _("Create guide"));
                 }
                 desktop->set_coordinate_status(event_dt);
 
                 if (!dragged) {
-                    // Ruler click (without drag) toggle the guide visibility on and off
+                    // Clicking on the ruler (without dragging) toggles the guide visibility on and off
                     Inkscape::XML::Node *repr = desktop->namedview->getRepr();
                     sp_namedview_toggle_guides(sp_desktop_document(desktop), repr);
                     
@@ -246,7 +297,9 @@
 int sp_dt_hruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw)
 {
     if (event->type == GDK_MOTION_NOTIFY) {
-        sp_event_context_snap_delay_handler(dtw->desktop->event_context, (gpointer) widget, (gpointer) dtw, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::GUIDE_HRULER);
+        sp_event_context_snap_delay_handler(dtw->desktop->event_context, (gpointer) widget,
+                                            (gpointer) dtw, (GdkEventMotion *) event,
+                                            Inkscape::UI::Tools::DelayedSnapEvent::GUIDE_HRULER);
     }
     return sp_dt_ruler_event(widget, event, dtw, true);
 }
@@ -254,16 +307,18 @@
 int sp_dt_vruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw)
 {
     if (event->type == GDK_MOTION_NOTIFY) {
-        sp_event_context_snap_delay_handler(dtw->desktop->event_context, (gpointer) widget, (gpointer) dtw, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::GUIDE_VRULER);
+        sp_event_context_snap_delay_handler(dtw->desktop->event_context, 
+                                            (gpointer) widget, (gpointer) dtw, (GdkEventMotion *) event,
+                                            Inkscape::UI::Tools::DelayedSnapEvent::GUIDE_VRULER);
     }
     return sp_dt_ruler_event(widget, event, dtw, false);
 }
 
 static Geom::Point drag_origin;
 static SPGuideDragType drag_type = SP_DRAG_NONE;
-//static bool reset_drag_origin = false; // when Ctrl is pressed while dragging, this is used to trigger resetting of the
-//                                       // drag origin to that location so that constrained movement is more intuitive
-
+//static bool reset_drag_origin = false;
+// when Ctrl is pressed while dragging, this is used to trigger resetting of the
+// drag origin to that location so that constrained movement is more intuitive
 // Min distance from anchor to initiate rotation, measured in screenpixels
 #define tol 40.0
 
@@ -274,7 +329,7 @@
 
     SPGuide *guide = SP_GUIDE(data);
     SPDesktop *desktop = static_cast<SPDesktop*>(g_object_get_data(G_OBJECT(item->canvas), "SPDesktop"));
-
+    
     switch (event->type) {
     case GDK_2BUTTON_PRESS:
             if (event->button.button == 1) {
@@ -289,7 +344,7 @@
             if (event->button.button == 1) {
                 Geom::Point const event_w(event->button.x, event->button.y);
                 Geom::Point const event_dt(desktop->w2d(event_w));
-
+                
                 // Due to the tolerance allowed when grabbing a guide, event_dt will generally
                 // be close to the guide but not just exactly on it. The drag origin calculated
                 // here must be exactly on the guide line though, otherwise
@@ -321,9 +376,9 @@
             break;
         case GDK_MOTION_NOTIFY:
             if (drag_type != SP_DRAG_NONE) {
-                Geom::Point const motion_w(event->motion.x,
-                                           event->motion.y);
+                Geom::Point const motion_w(event->motion.x, event->motion.y);
                 Geom::Point motion_dt(desktop->w2d(motion_w));
+                Geom::Point motion_doc(desktop->w2doc(motion_w));
 
                 sp_event_context_snap_delay_handler(desktop->event_context, (gpointer) item, data, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::GUIDE_HANDLER);
 
@@ -336,31 +391,46 @@
                     // be forced to be on the guide. If we don't snap however, then
                     // the origin should still be constrained to the guide. So let's do
                     // that explicitly first:
+
+                    // guideConstrainedSnap modifies it's arguments. Points in document
+                    // co-ordinates have to be passed to the guide-snapping functions because they
+                    // operate on points in desktop co-ordinates.
+
                     Geom::Line line(guide->point_on_line, guide->angle());
-                    Geom::Coord t = line.nearestPoint(motion_dt);
-                    motion_dt = line.pointAt(t);
+                    Geom::Coord t = line.nearestPoint(motion_doc);
+                    motion_doc = line.pointAt(t);
                     if (!(event->motion.state & GDK_SHIFT_MASK)) {
                         m.guideConstrainedSnap(motion_dt, *guide);
                     }
                 } else if (!((drag_type == SP_DRAG_ROTATE) && (event->motion.state & GDK_CONTROL_MASK))) {
                     // cannot use shift here to disable snapping, because we already use it for rotating the guide
+
+                    Geom::Point point_on_line_dt = desktop->doc2dt(guide->point_on_line);
+                    Geom::Point normal_to_line_dt = transform_normal(guide->normal_to_line, desktop->doc2dt());
+
                     if (drag_type == SP_DRAG_ROTATE) {
-                        m.guideFreeSnap(motion_dt, guide->point_on_line, true, false);
+                        m.guideFreeSnap(motion_dt, point_on_line_dt, true, false);
                     } else {
-                        m.guideFreeSnap(motion_dt, guide->normal_to_line, false, true);
+                        m.guideFreeSnap(motion_dt, normal_to_line_dt, false, true);
                     }
+
+                    guide->point_on_line = desktop->dt2doc(point_on_line_dt);
+                    guide->normal_to_line = transform_normal(normal_to_line_dt, desktop->dt2doc());
+                    
                 }
                 m.unSetup();
 
+                motion_doc = desktop->dt2doc(motion_dt);
+
                 switch (drag_type) {
                     case SP_DRAG_TRANSLATE:
                     {
-                        sp_guide_moveto(*guide, motion_dt, false);
+                        sp_guide_moveto(*guide, motion_doc, false);
                         break;
                     }
                     case SP_DRAG_ROTATE:
                     {
-                        Geom::Point pt = motion_dt - guide->point_on_line;
+                        Geom::Point pt = motion_doc - guide->point_on_line;
                         Geom::Angle angle(pt);
                         if (event->motion.state & GDK_CONTROL_MASK) {
                             Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -383,7 +453,7 @@
                     }
                     case SP_DRAG_MOVE_ORIGIN:
                     {
-                        sp_guide_moveto(*guide, motion_dt, false);
+                        sp_guide_moveto(*guide, motion_doc, false);
                         break;
                     }
                     case SP_DRAG_NONE:
@@ -404,6 +474,7 @@
                     Geom::Point const event_w(event->button.x,
                                               event->button.y);
                     Geom::Point event_dt(desktop->w2d(event_w));
+                    Geom::Point event_doc(desktop->w2doc(event_w));
 
                     SnapManager &m = desktop->namedview->snap_manager;
                     m.setup(desktop, true, NULL, NULL, guide);
@@ -412,32 +483,43 @@
                         // be forced to be on the guide. If we don't snap however, then
                         // the origin should still be constrained to the guide. So let's
                         // do that explicitly first:
-                        Geom::Line line(guide->point_on_line, guide->angle());
+                        Geom::Line line(desktop->doc2dt(guide->point_on_line), guide->angle());
                         Geom::Coord t = line.nearestPoint(event_dt);
                         event_dt = line.pointAt(t);
+                        
                         if (!(event->button.state & GDK_SHIFT_MASK)) {
                             m.guideConstrainedSnap(event_dt, *guide);
                         }
                     } else if (!((drag_type == SP_DRAG_ROTATE) && (event->motion.state & GDK_CONTROL_MASK))) {
                         // cannot use shift here to disable snapping, because we already use it for rotating the guide
+
+                        Geom::Point point_on_line_dt = desktop->doc2dt(guide->point_on_line);
+                        Geom::Point normal_to_line_dt = transform_normal(guide->normal_to_line, desktop->doc2dt());
+
                         if (drag_type == SP_DRAG_ROTATE) {
-                            m.guideFreeSnap(event_dt, guide->point_on_line, true, false);
+                            m.guideFreeSnap(event_dt, point_on_line_dt, true, false);
                         } else {
-                            m.guideFreeSnap(event_dt, guide->normal_to_line, false, true);
+                            m.guideFreeSnap(event_dt, normal_to_line_dt, false, true);
                         }
+                        
+                        guide->point_on_line = desktop->dt2doc(point_on_line_dt);
+                        guide->normal_to_line = transform_normal(normal_to_line_dt, desktop->dt2doc());
                     }
+
                     m.unSetup();
 
+                    event_doc = desktop->dt2doc(event_dt);
+                    
                     if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) {
                         switch (drag_type) {
                             case SP_DRAG_TRANSLATE:
                             {
-                                sp_guide_moveto(*guide, event_dt, true);
+                                sp_guide_moveto(*guide, event_doc, true);
                                 break;
                             }
                             case SP_DRAG_ROTATE:
                             {
-                                Geom::Point pt = event_dt - guide->point_on_line;
+                                Geom::Point pt = event_doc - guide->point_on_line;
                                 Geom::Angle angle(pt);
                                 if (event->motion.state & GDK_CONTROL_MASK) {
                                     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -455,12 +537,13 @@
                                         }
                                     }
                                 }
+
                                 sp_guide_set_normal(*guide, Geom::Point::polar(angle).cw(), true);
                                 break;
                             }
                             case SP_DRAG_MOVE_ORIGIN:
                             {
-                                sp_guide_moveto(*guide, event_dt, true);
+                                sp_guide_moveto(*guide, event_doc, true);
                                 break;
                             }
                             case SP_DRAG_NONE:
@@ -609,7 +692,7 @@
             if ( devName
                  && (avoidName != devName)
                  && (devSrc != GDK_SOURCE_MOUSE) ) {
-//                 g_message("Adding '%s' as [%d]", devName, devSrc);
+                // g_message("Adding '%s' as [%d]", devName, devSrc);
 
                 // Set the initial tool for the device
                 switch ( devSrc ) {
@@ -714,10 +797,11 @@
 }
 
 
-void sp_dt_ruler_snap_new_guide(SPDesktop *desktop, SPCanvasItem * /*guide*/, Geom::Point &event_dt, Geom::Point &normal)
+void sp_dt_ruler_snap_new_guide(SPDesktop *desktop, SPCanvasItem * /*guide*/, Geom::Point &event_dt, Geom::Point &normal_dt)
 {
     SnapManager &m = desktop->namedview->snap_manager;
     m.setup(desktop);
+    
     // We're dragging a brand new guide, just pulled of the rulers seconds ago. When snapping to a
     // path this guide will change it slope to become either tangential or perpendicular to that path. It's
     // therefore not useful to try tangential or perpendicular snapping, so this will be disabled temporarily
@@ -728,17 +812,17 @@
     // We only have a temporary guide which is not stored in our document yet.
     // Because the guide snapper only looks in the document for guides to snap to,
     // we don't have to worry about a guide snapping to itself here
-    Geom::Point normal_orig = normal;
-    m.guideFreeSnap(event_dt, normal, false, false);
+    Geom::Point normal_orig = normal_dt;
+    m.guideFreeSnap(event_dt, normal_dt, false, false);
     // After snapping, both event_dt and normal have been modified accordingly; we'll take the normal (of the
     // curve we snapped to) to set the normal the guide. And rotate it by 90 deg. if needed
     if (pref_perp) { // Perpendicular snapping to paths is requested by the user, so let's do that
-        if (normal != normal_orig) {
-            normal = Geom::rot90(normal);
+        if (normal_dt != normal_orig) {
+            normal_dt = Geom::rot90(normal_dt);
         }
     }
     if (!(pref_tang || pref_perp)) { // if we don't want to snap either perpendicularly or tangentially, then
-        normal = normal_orig; // we must restore the normal to it's original state
+        normal_dt = normal_orig; // we must restore the normal to it's original state
     }
     // Restore the preferences
     m.snapprefs.setSnapPerp(pref_perp);
 
=== modified file 'src/desktop.cpp'
--- src/desktop.cpp	2014-04-20 00:36:33 +0000
+++ src/desktop.cpp	2014-09-23 18:22:24 +0000
@@ -60,6 +60,7 @@
 #include "layer-fns.h"
 #include "layer-manager.h"
 #include "layer-model.h"
+#include "guide-manager.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
@@ -101,6 +102,7 @@
     selection( 0 ),
     event_context( 0 ),
     layer_manager( 0 ),
+    guide_manager( 0 ),
     event_log( 0 ),
     temporary_item_list( 0 ),
     snapindicator( 0 ),
@@ -241,11 +243,12 @@
     // will not work (the snap indicator is on top of the node handler; is the snapindicator
     // being selected? or does it intercept some of the events that should have gone to the
     // node handler? see bug https://bugs.launchpad.net/inkscape/+bug/414142)
+    
     gridgroup = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
-    guides = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
-    sketch = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
+    guides    = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
+    sketch    = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
     tempgroup = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
-    controls = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
+    controls  = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL);
 
     // Set the select tool as the active tool.
     set_event_context2("/tools/select");
@@ -272,6 +275,8 @@
     /* Connect event for page resize */
     _doc2dt[5] = document->getHeight().value("px");
     sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (drawing), _doc2dt);
+    sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (gridgroup), _doc2dt);
+    sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (guides), _doc2dt);
 
     _modified_connection = namedview->connectModified(sigc::bind<2>(sigc::ptr_fun(&_namedview_modified), this));
 
@@ -284,8 +289,10 @@
     }
 
     namedview->show(this);
-    /* Ugly hack */
+    /* Ugly hack */    
+
     activate_guides (true);
+    
     /* Ugly hack */
     _namedview_modified (namedview, SP_OBJECT_MODIFIED_FLAG, this);
 
@@ -331,6 +338,7 @@
     /* setup LayerManager */
     //   (Setting up after the connections are all in place, as it may use some of them)
     layer_manager = new Inkscape::LayerManager( this );
+    guide_manager = new Inkscape::GuideManager( this );
 
     showGrids(namedview->grids_visible, false);
 
@@ -822,8 +830,8 @@
     int clear = FALSE;
     if (!Geom::are_near(newscale, scale, Geom::EPSILON * scale)) {
         // zoom changed - set new zoom factors
-        _d2w = Geom::Scale(newscale, -newscale);
-        _w2d = Geom::Scale(1/newscale, 1/-newscale);
+        _d2w   = Geom::Scale(newscale, -newscale);
+        _w2d   = Geom::Scale(1/newscale, 1/-newscale);
         redrawDesktop();
         clear = TRUE;
         zoomChanged = true;
@@ -1618,6 +1626,8 @@
 {
     _doc2dt[5] = height;
     sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (drawing), _doc2dt);
+    sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (gridgroup), _doc2dt);
+    sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (guides), _doc2dt);
     Geom::Rect const a(Geom::Point(0, 0), Geom::Point(width, height));
     SP_CTRLRECT(page)->setRectangle(a);
     SP_CTRLRECT(page_border)->setRectangle(a);
@@ -1803,12 +1813,22 @@
     return p * _w2d;
 }
 
+Geom::Affine SPDesktop::w2doc() const
+{
+    return w2d() * dt2doc();
+}
+
+Geom::Point SPDesktop::w2doc(Geom::Point const &p) const
+{
+    return p * w2d() * dt2doc();
+}
+
 Geom::Point SPDesktop::d2w(Geom::Point const &p) const
 {
     return p * _d2w;
 }
 
-Geom::Affine SPDesktop::doc2dt() const
+Geom::Affine SPDesktop::doc2dt () const
 {
     return _doc2dt;
 }
 
=== modified file 'src/desktop.h'
--- src/desktop.h	2014-05-15 21:51:32 +0000
+++ src/desktop.h	2014-09-23 18:22:24 +0000
@@ -78,6 +78,7 @@
   class MessageContext;
   class Selection;
   class LayerManager;
+  class GuideManager;
   class EventLog;
   namespace UI {
       namespace Dialog {
@@ -142,6 +143,7 @@
     Inkscape::Selection       *selection;
     Inkscape::UI::Tools::ToolBase            *event_context;
     Inkscape::LayerManager    *layer_manager;
+    Inkscape::GuideManager    *guide_manager;
     Inkscape::EventLog        *event_log;
     DocumentInterface *dbus_document_interface;
     Inkscape::Display::TemporaryItemList *temporary_item_list;
@@ -404,6 +406,8 @@
 
     Geom::Affine w2d() const; //transformation from window to desktop coordinates (used for zooming)
     Geom::Point w2d(Geom::Point const &p) const;
+    Geom::Affine w2doc() const;
+    Geom::Point w2doc(Geom::Point const &p) const;
     Geom::Point d2w(Geom::Point const &p) const;
     Geom::Affine doc2dt() const;
     Geom::Affine dt2doc() const;
 
=== modified file 'src/display/Makefile_insert'
--- src/display/Makefile_insert	2014-03-27 01:33:44 +0000
+++ src/display/Makefile_insert	2014-09-23 18:22:24 +0000
@@ -15,6 +15,8 @@
 	display/canvas-bpath.h	\
 	display/canvas-grid.cpp	\
 	display/canvas-grid.h	\
+	display/canvas-guide.cpp	\
+	display/canvas-guide.h	\
 	display/canvas-temporary-item.cpp	\
 	display/canvas-temporary-item.h	\
 	display/canvas-temporary-item-list.cpp	\
 
=== modified file 'src/display/canvas-axonomgrid.cpp'
--- src/display/canvas-axonomgrid.cpp	2014-08-17 00:23:01 +0000
+++ src/display/canvas-axonomgrid.cpp	2014-09-23 18:22:24 +0000
@@ -634,6 +634,8 @@
         return s;
     }
 
+//    Geom::Point spacing_dt = _snapmanager->getDesktop()->doc2dt(grid->spacing);
+    Geom::Point origin_dt = _snapmanager->getDesktop()->doc2dt(grid->origin);
     double spacing_h;
     double spacing_v;
 
@@ -661,16 +663,16 @@
     // - 2 angled x grid lines, one above and one below the point
 
     // Calculate the x coordinate of the vertical grid lines
-    Geom::Coord x_max = Inkscape::Util::round_to_upper_multiple_plus(p[Geom::X], spacing_h, grid->origin[Geom::X]);
-    Geom::Coord x_min = Inkscape::Util::round_to_lower_multiple_plus(p[Geom::X], spacing_h, grid->origin[Geom::X]);
+    Geom::Coord x_max = Inkscape::Util::round_to_upper_multiple_plus(p[Geom::X], spacing_h, origin_dt[Geom::X]);
+    Geom::Coord x_min = Inkscape::Util::round_to_lower_multiple_plus(p[Geom::X], spacing_h, origin_dt[Geom::X]);
 
     // Calculate the y coordinate of the intersection of the angled grid lines with the y-axis
-    double y_proj_along_z = p[Geom::Y] - grid->tan_angle[Z]*(p[Geom::X] - grid->origin[Geom::X]);
-    double y_proj_along_x = p[Geom::Y] + grid->tan_angle[X]*(p[Geom::X] - grid->origin[Geom::X]);
-    double y_proj_along_z_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_z, spacing_v, grid->origin[Geom::Y]);
-    double y_proj_along_z_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_z, spacing_v, grid->origin[Geom::Y]);
-    double y_proj_along_x_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_x, spacing_v, grid->origin[Geom::Y]);
-    double y_proj_along_x_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_x, spacing_v, grid->origin[Geom::Y]);
+    double y_proj_along_z = p[Geom::Y] - grid->tan_angle[Z]*(p[Geom::X] - origin_dt[Geom::X]);
+    double y_proj_along_x = p[Geom::Y] + grid->tan_angle[X]*(p[Geom::X] - origin_dt[Geom::X]);
+    double y_proj_along_z_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_z, spacing_v, origin_dt[Geom::Y]);
+    double y_proj_along_z_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_z, spacing_v, origin_dt[Geom::Y]);
+    double y_proj_along_x_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_x, spacing_v, origin_dt[Geom::Y]);
+    double y_proj_along_x_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_x, spacing_v, origin_dt[Geom::Y]);
 
     // Calculate the versor for the angled grid lines
     Geom::Point vers_x = Geom::Point(1, -grid->tan_angle[X]);
@@ -709,21 +711,21 @@
 
     if (inters) {
         Geom::Point inters_pt = line_x.pointAt((*inters).ta);
-        use_left_half = (p[Geom::X] - grid->origin[Geom::X]) < inters_pt[Geom::X];
+        use_left_half = (p[Geom::X] - origin_dt[Geom::X]) < inters_pt[Geom::X];
         use_right_half = !use_left_half;
     }
 
     // Return the three grid lines which define the triangle that encloses our point
     // If we didn't find an intersection above, all 6 grid lines will be returned
     if (use_left_half) {
-        s.push_back(std::make_pair(norm_z, Geom::Point(grid->origin[Geom::X], y_proj_along_z_max)));
-        s.push_back(std::make_pair(norm_x, Geom::Point(grid->origin[Geom::X], y_proj_along_x_min)));
+        s.push_back(std::make_pair(norm_z, Geom::Point(origin_dt[Geom::X], y_proj_along_z_max)));
+        s.push_back(std::make_pair(norm_x, Geom::Point(origin_dt[Geom::X], y_proj_along_x_min)));
         s.push_back(std::make_pair(Geom::Point(1, 0), Geom::Point(x_max, 0)));
     }
 
     if (use_right_half) {
-        s.push_back(std::make_pair(norm_z, Geom::Point(grid->origin[Geom::X], y_proj_along_z_min)));
-        s.push_back(std::make_pair(norm_x, Geom::Point(grid->origin[Geom::X], y_proj_along_x_max)));
+        s.push_back(std::make_pair(norm_z, Geom::Point(origin_dt[Geom::X], y_proj_along_z_min)));
+        s.push_back(std::make_pair(norm_x, Geom::Point(origin_dt[Geom::X], y_proj_along_x_max)));
         s.push_back(std::make_pair(Geom::Point(1, 0), Geom::Point(x_min, 0)));
     }
 
 
=== modified file 'src/display/canvas-axonomgrid.h'
--- src/display/canvas-axonomgrid.h	2014-03-27 01:33:44 +0000
+++ src/display/canvas-axonomgrid.h	2014-09-23 18:22:24 +0000
@@ -85,5 +85,15 @@
 
 
 #endif
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
 
 
=== modified file 'src/display/canvas-grid.cpp'
--- src/display/canvas-grid.cpp	2014-03-30 21:43:02 +0000
+++ src/display/canvas-grid.cpp	2014-09-23 18:22:24 +0000
@@ -996,6 +996,9 @@
         return s;
     }
 
+    Geom::Point spacing_dt = _snapmanager->getDesktop()->doc2dt(grid->spacing);
+    Geom::Point origin_dt = _snapmanager->getDesktop()->doc2dt(grid->origin);
+   
     for (unsigned int i = 0; i < 2; ++i) {
 
         double spacing;
@@ -1011,21 +1014,22 @@
             }
         } else {
             // Snapping to any grid line, whether it's visible or not
-            spacing = grid->spacing[i];
+            spacing = spacing_dt[i];
         }
 
-        Geom::Coord rounded;
-        Geom::Point point_on_line;
         Geom::Point cvec(0.,0.);
         cvec[i] = 1.;
 
-        rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], spacing, grid->origin[i]);
-        point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0);
-        s.push_back(std::make_pair(cvec, point_on_line));
-
-        rounded = Inkscape::Util::round_to_lower_multiple_plus(p[i], spacing, grid->origin[i]);
-        point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0);
-        s.push_back(std::make_pair(cvec, point_on_line));
+        { // upper
+            Geom::Coord rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], spacing, origin_dt[i]);
+            Geom::Point point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0);
+            s.push_back(std::make_pair(cvec, point_on_line));
+        }
+        { // lower
+            Geom::Coord rounded = Inkscape::Util::round_to_lower_multiple_plus(p[i], spacing, origin_dt[i]);
+            Geom::Point point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0);
+            s.push_back(std::make_pair(cvec, point_on_line));
+        }
     }
 
     return s;
 
=== added file 'src/display/canvas-guide.cpp'
--- src/display/canvas-guide.cpp	1970-01-01 00:00:00 +0000
+++ src/display/canvas-guide.cpp	2014-09-23 18:22:24 +0000
@@ -0,0 +1,549 @@
+/*
+ * Inkscape guideline implementation
+ *
+ * Authors:
+ *   Lauris Kaplinski <[e-mail]>
+ *   Peter Moulder <[e-mail]>
+ *   Johan Engelen
+ *   Jon A. Cruz <[e-mail]>
+ *   Abhishek Sharma
+ *
+ * Copyright (C) 2000-2002 authors
+ * Copyright (C) 2004 Monash University
+ * Copyright (C) 2007 Johan Engelen
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <algorithm>
+#include <cstring>
+#include <string>
+#include "desktop-handles.h"
+#include "display/sp-canvas.h"
+#include "display/guideline.h"
+#include "svg/svg.h"
+#include "svg/stringstream.h"
+#include "attributes.h"
+#include "canvas-guide.h"
+#include <sp-item-notify-moveto.h>
+#include <sp-item.h>
+#include <sp-guide-constraint.h>
+#include <glibmm/i18n.h>
+#include <xml/repr.h>
+#include <remove-last.h>
+// #include "sp-metrics.h"
+#include "inkscape.h"
+#include "desktop.h"
+#include "sp-namedview.h"
+#include <2geom/angle.h>
+#include "document.h"
+#include "document-undo.h"
+#include "verbs.h"
+
+using Inkscape::DocumentUndo;
+using std::vector;
+
+//enum {
+//    PROP_0,
+//    PROP_COLOR,
+//    PROP_HICOLOR
+//};
+//
+//static void sp_guide_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+//static void sp_guide_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createGuide() {
+		return new SPGuide();
+	}
+
+	bool guideRegistered = SPFactory::instance().registerObject("inkscape:guide", createGuide);
+}
+
+SPGuide::SPGuide() : SPObject() {
+	this->label = NULL;
+	this->views = NULL;
+
+    this->normal_to_line = Geom::Point(0.,1.);
+    this->point_on_line = Geom::Point(0.,0.);
+    this->color = 0x0000ff7f;
+    this->hicolor = 0xff00007f;
+    // this->enable = true;
+    // this->group = g_strdup("default");
+}
+
+SPGuide::~SPGuide() {
+}
+
+guint32 SPGuide::getColor() const {
+	return color;
+}
+
+guint32 SPGuide::getHiColor() const {
+	return hicolor;
+}
+
+void SPGuide::setColor(guint32 c) {
+	color = c;
+
+	for (GSList *l = this->views; l != NULL; l = l->next) {
+		sp_guideline_set_color(SP_GUIDELINE(l->data), this->color);
+	}
+}
+
+void SPGuide::setHiColor(guint32 h) {
+	this->hicolor = h;
+}
+
+//static void sp_guide_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec */*pspec*/)
+//{
+//    SPGuide &guide = *SP_GUIDE(object);
+//
+//    switch (prop_id) {
+//        case PROP_COLOR:
+//            guide.color = g_value_get_uint(value);
+//            for (GSList *l = guide.views; l != NULL; l = l->next) {
+//                sp_guideline_set_color(SP_GUIDELINE(l->data), guide.color);
+//            }
+//            break;
+//
+//        case PROP_HICOLOR:
+//            guide.hicolor = g_value_get_uint(value);
+//            break;
+//    }
+//}
+//
+//static void sp_guide_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec */*pspec*/)
+//{
+//    SPGuide const &guide = *SP_GUIDE(object);
+//
+//    switch (prop_id) {
+//        case PROP_COLOR:
+//            g_value_set_uint(value, guide.color);
+//            break;
+//        case PROP_HICOLOR:
+//            g_value_set_uint(value, guide.hicolor);
+//            break;
+//    }
+//}
+
+void SPGuide::build(SPDocument *document, Inkscape::XML::Node *repr) {
+	SPObject::build(document, repr);
+
+    this->readAttr( "inkscape:label" );
+    this->readAttr( "orientation" );
+    this->readAttr( "position" );
+    // FIXME: Samuel Chase
+    // this->readAttr( "enable" );
+    // this->readAttr( "group" );
+
+    /* Register */
+    document->addResource("guide", this);
+}
+
+void SPGuide::release() {
+    while (this->views) {
+        sp_guideline_delete(SP_GUIDELINE(this->views->data));
+        this->views = g_slist_remove(this->views, this->views->data);
+    }
+
+    if (this->document) {
+        // Unregister ourselves
+        this->document->removeResource("guide", this);
+    }
+
+    SPObject::release();
+}
+
+void SPGuide::set(unsigned int key, const gchar *value) {
+    switch (key) {
+    case SP_ATTR_INKSCAPE_LABEL:
+        if (value) {
+            this->label = g_strdup(value);
+        } else {
+            this->label = NULL;
+        }
+
+        sp_guide_set_label(*this, this->label, false);
+        break;
+    case SP_ATTR_ORIENTATION:
+        {
+            if (value && !strcmp(value, "horizontal")) {
+                /* Visual representation of a horizontal line, constrain vertically (y coordinate). */
+                this->normal_to_line = Geom::Point(0., 1.);
+            } else if (value && !strcmp(value, "vertical")) {
+                this->normal_to_line = Geom::Point(1., 0.);
+            } else if (value) {
+                gchar ** strarray = g_strsplit(value, ",", 2);
+                double newx, newy;
+                unsigned int success = sp_svg_number_read_d(strarray[0], &newx);
+                success += sp_svg_number_read_d(strarray[1], &newy);
+                g_strfreev (strarray);
+                if (success == 2 && (fabs(newx) > 1e-6 || fabs(newy) > 1e-6)) {
+                    Geom::Point direction(newx, newy);
+                    direction.normalize();
+                    this->normal_to_line = direction;
+                } else {
+                    // default to vertical line for bad arguments
+                    this->normal_to_line = Geom::Point(1., 0.);
+                }
+            } else {
+                // default to vertical line for bad arguments
+                this->normal_to_line = Geom::Point(1., 0.);
+            }
+            sp_guide_set_normal(*this, this->normal_to_line, false);
+        }
+        break;
+    case SP_ATTR_POSITION:
+        {
+            if (value) {
+                gchar ** strarray = g_strsplit(value, ",", 2);
+                double newx, newy;
+                unsigned int success = sp_svg_number_read_d(strarray[0], &newx);
+                success += sp_svg_number_read_d(strarray[1], &newy);
+                g_strfreev (strarray);
+                if (success == 2) {
+                    this->point_on_line = Geom::Point(newx, newy);
+                } else if (success == 1) {
+                    // before 0.46 style guideline definition.
+                    const gchar *attr = this->getRepr()->attribute("orientation");
+                    if (attr && !strcmp(attr, "horizontal")) {
+                        this->point_on_line = Geom::Point(0, newx);
+                    } else {
+                        this->point_on_line = Geom::Point(newx, 0);
+                    }
+                }
+            } else {
+                // default to (0,0) for bad arguments
+                this->point_on_line = Geom::Point(0,0);
+            }
+            // update position in non-committing way
+            // fixme: perhaps we need to add an update method instead, and request_update here
+            sp_guide_moveto(*this, this->point_on_line, false);
+        }
+        break;
+        
+        case SP_ATTR_ENABLE:
+        {
+            
+            // if (value) {
+            //     const gchar *attr = object->getRepr()->attribute("enable");
+            //     if (attr && !strcmp(attr, "true")) {
+            //         guide->enable = true;
+            //     } else if (attr && !strcmp(attr, "false")) {
+            //         guide->enable = false;
+            //     }
+            // }
+        }
+        break;
+
+        case SP_ATTR_GROUP:
+        {
+
+        }
+        break;    
+            
+        default:
+            SPObject::set(key, value);
+            break;
+    }
+}
+
+SPGuide *SPGuide::createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::Point const &pt2)
+{
+    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
+
+    Inkscape::XML::Node *repr = xml_doc->createElement("inkscape:guide");
+
+    Geom::Point n = Geom::rot90(pt2 - pt1);
+
+    sp_repr_set_point(repr, "position", pt1);
+    sp_repr_set_point(repr, "orientation", n);
+    sp_repr_set_boolean(repr, "enable", false);
+
+    SPNamedView *namedview = sp_document_namedview(doc, NULL);
+    if (namedview) {
+        namedview->appendChild(repr);
+    }
+    Inkscape::GC::release(repr);
+
+    SPGuide *guide= SP_GUIDE(doc->getObjectByRepr(repr));
+    return guide;
+}
+
+void
+sp_guide_pt_pairs_to_guides(SPDocument *doc, std::list<std::pair<Geom::Point, Geom::Point> > &pts) {
+    for (std::list<std::pair<Geom::Point, Geom::Point> >::iterator i = pts.begin(); i != pts.end(); ++i) {
+        SPGuide::createSPGuide(doc, (*i).first, (*i).second);
+    }
+}
+
+void
+sp_guide_create_guides_around_page(SPDesktop *dt) {
+    SPDocument *doc=sp_desktop_document(dt);
+    std::list<std::pair<Geom::Point, Geom::Point> > pts;
+
+    Geom::Point A(0, 0);
+    Geom::Point C(doc->getWidth().value("px"), doc->getHeight().value("px"));
+    Geom::Point B(C[Geom::X], 0);
+    Geom::Point D(0, C[Geom::Y]);
+
+    pts.push_back(std::make_pair<Geom::Point, Geom::Point>(A, B));
+    pts.push_back(std::make_pair<Geom::Point, Geom::Point>(B, C));
+    pts.push_back(std::make_pair<Geom::Point, Geom::Point>(C, D));
+    pts.push_back(std::make_pair<Geom::Point, Geom::Point>(D, A));
+
+    sp_guide_pt_pairs_to_guides(doc, pts);
+
+    DocumentUndo::done(doc, SP_VERB_NONE, _("Create Guides Around the Page"));
+}
+
+void
+sp_guide_delete_all_guides(SPDesktop *dt) {
+    SPDocument *doc=sp_desktop_document(dt);
+    const GSList *current;
+    while ( (current = doc->getResourceList("guide")) ) {
+        SPGuide* guide = SP_GUIDE(current->data);
+        sp_guide_remove(guide);
+    }
+
+    DocumentUndo::done(doc, SP_VERB_NONE, _("Delete All Guides"));
+}
+
+void SPGuide::showSPGuide(SPCanvasGroup *group, GCallback handler)
+{
+    SPCanvasItem *item = sp_guideline_new(group, label, point_on_line, normal_to_line);
+    sp_guideline_set_color(SP_GUIDELINE(item), color);
+
+    // FIXME: sp_guideline_set_enable(SP_GUIDELINE(item), enable);
+    
+    // for (GSList *l = views; l != NULL; l = l->next) {
+    //     g_message("showSPGuide: Enable: %d", enable);
+    //     sp_guideline_set_enable(SP_GUIDELINE(l->data), enable);
+    // }
+
+    g_signal_connect(G_OBJECT(item), "event", G_CALLBACK(handler), this);
+
+    views = g_slist_prepend(views, item);
+}
+
+void SPGuide::hideSPGuide(SPCanvas *canvas)
+{
+    g_assert(canvas != NULL);
+    g_assert(SP_IS_CANVAS(canvas));
+
+    for (GSList *l = views; l != NULL; l = l->next) {
+        if (canvas == SP_CANVAS_ITEM(l->data)->canvas) {
+            sp_guideline_delete(SP_GUIDELINE(l->data));
+            views = g_slist_remove(views, l->data);
+            return;
+        }
+    }
+
+    g_assert_not_reached();
+}
+
+void SPGuide::sensitize(SPCanvas *canvas, gboolean sensitive)
+{
+    g_assert(canvas != NULL);
+    g_assert(SP_IS_CANVAS(canvas));
+
+    for (GSList *l = views; l != NULL; l = l->next) {
+        if (canvas == SP_CANVAS_ITEM(l->data)->canvas) {
+            sp_guideline_set_sensitive(SP_GUIDELINE(l->data), sensitive);
+            return;
+        }
+    }
+
+    g_assert_not_reached();
+}
+
+Geom::Point SPGuide::getPositionFrom(Geom::Point const &pt) const
+{
+    return -(pt - point_on_line);
+}
+
+double SPGuide::getDistanceFrom(Geom::Point const &pt) const
+{
+    return Geom::dot(pt - point_on_line, normal_to_line);
+}
+
+/**
+ * \arg commit False indicates temporary moveto in response to motion event while dragging,
+ *      true indicates a "committing" version: in response to button release event after
+ *      dragging a guideline, or clicking OK in guide editing dialog.
+ */
+void sp_guide_moveto(SPGuide &guide, Geom::Point const point_on_line, bool const commit)
+{
+    g_assert(SP_IS_GUIDE(&guide));
+
+    for (GSList *l = guide.views; l != NULL; l = l->next) {
+        sp_guideline_set_position(SP_GUIDELINE(l->data), point_on_line);
+    }
+
+    /* Calling sp_repr_set_point must precede calling sp_item_notify_moveto in the commit
+       case, so that the guide's new position is available for sp_item_rm_unsatisfied_cns. */
+    if (commit) {
+        //XML Tree being used here directly while it shouldn't be.
+        sp_repr_set_point(guide.getRepr(), "position", point_on_line);
+    }
+
+/*  DISABLED CODE BECAUSE  SPGuideAttachment  IS NOT USE AT THE MOMENT (johan)
+    for (vector<SPGuideAttachment>::const_iterator i(guide.attached_items.begin()),
+             iEnd(guide.attached_items.end());
+         i != iEnd; ++i)
+    {
+        SPGuideAttachment const &att = *i;
+        sp_item_notify_moveto(*att.item, guide, att.snappoint_ix, position, commit);
+    }
+*/
+}
+
+/**
+ * \arg commit False indicates temporary moveto in response to motion event while dragging,
+ *      true indicates a "committing" version: in response to button release event after
+ *      dragging a guideline, or clicking OK in guide editing dialog.
+ */
+void sp_guide_set_normal(SPGuide &guide, Geom::Point const normal_to_line, bool const commit)
+{
+    g_assert(SP_IS_GUIDE(&guide));
+
+    for (GSList *l = guide.views; l != NULL; l = l->next) {
+        sp_guideline_set_normal(SP_GUIDELINE(l->data), normal_to_line);
+    }
+
+    /* Calling sp_repr_set_svg_point must precede calling sp_item_notify_moveto in the commit
+       case, so that the guide's new position is available for sp_item_rm_unsatisfied_cns. */
+    if (commit) {
+        //XML Tree being used directly while it shouldn't be
+        sp_repr_set_point(guide.getRepr(), "orientation", normal_to_line);
+    }
+
+/*  DISABLED CODE BECAUSE  SPGuideAttachment  IS NOT USE AT THE MOMENT (johan)
+    for (vector<SPGuideAttachment>::const_iterator i(guide.attached_items.begin()),
+             iEnd(guide.attached_items.end());
+         i != iEnd; ++i)
+    {
+        SPGuideAttachment const &att = *i;
+        sp_item_notify_moveto(*att.item, guide, att.snappoint_ix, position, commit);
+    }
+*/
+}
+
+void sp_guide_set_color(SPGuide &guide, const unsigned r, const unsigned g, const unsigned b, bool const commit)
+{
+    g_assert(SP_IS_GUIDE(&guide));
+    guide.color = (r << 24) | (g << 16) | (b << 8) | 0x7f;
+
+    if (guide.views) {
+        sp_guideline_set_color(SP_GUIDELINE(guide.views->data), guide.color);
+    }
+
+    if (commit) {
+        std::ostringstream os;
+        os << "rgb(" << r << "," << g << "," << b << ")";
+        //XML Tree being used directly while it shouldn't be
+        guide.getRepr()->setAttribute("inkscape:color", os.str().c_str());
+    }
+}
+
+void sp_guide_set_label(SPGuide &guide, const char* label, bool const commit)
+{
+    g_assert(SP_IS_GUIDE(&guide));
+
+    if (guide.views) {
+        sp_guideline_set_label(SP_GUIDELINE(guide.views->data), label);
+    }
+
+    if (commit) {
+        //XML Tree being used directly while it shouldn't be
+        guide.getRepr()->setAttribute("inkscape:label", label);
+    }
+}
+
+/**
+ * Returns a human-readable description of the guideline for use in dialog boxes and status bar.
+ * If verbose is false, only positioning information is included (useful for dialogs).
+ *
+ * The caller is responsible for freeing the string.
+ */
+char *sp_guide_description(SPGuide const *guide, const bool verbose)
+{
+    using Geom::X;
+    using Geom::Y;
+
+    char *descr = 0;
+    if ( !guide->document ) {
+        // Guide has probably been deleted and no longer has an attached namedview.
+        descr = g_strdup_printf("%s", _("Deleted"));
+    } else {
+        SPNamedView *namedview = sp_document_namedview(guide->document, NULL);
+
+        Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(guide->point_on_line[X], "px");
+        Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(guide->point_on_line[Y], "px");
+        GString *position_string_x = g_string_new(x_q.string(namedview->doc_units).c_str());
+        GString *position_string_y = g_string_new(y_q.string(namedview->doc_units).c_str());
+
+        gchar *shortcuts = g_strdup_printf("; %s", _("<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to delete"));
+
+        if ( are_near(guide->normal_to_line, Geom::Point(1., 0.)) ||
+             are_near(guide->normal_to_line, -Geom::Point(1., 0.)) ) {
+            descr = g_strdup_printf(_("vertical, at %s"), position_string_x->str);
+        } else if ( are_near(guide->normal_to_line, Geom::Point(0., 1.)) ||
+                    are_near(guide->normal_to_line, -Geom::Point(0., 1.)) ) {
+            descr = g_strdup_printf(_("horizontal, at %s"), position_string_y->str);
+        } else {
+            double const radians = guide->angle();
+            double const degrees = Geom::rad_to_deg(radians);
+            int const degrees_int = (int) round(degrees);
+            descr = g_strdup_printf(_("at %d degrees, through (%s,%s)"), 
+                                    degrees_int, position_string_x->str, position_string_y->str);
+        }
+
+        g_string_free(position_string_x, TRUE);
+        g_string_free(position_string_y, TRUE);
+
+        if (verbose) {
+            gchar *oldDescr = descr;
+            descr = g_strconcat(oldDescr, shortcuts, NULL);
+            g_free(oldDescr);
+        }
+        g_free(shortcuts);
+    }
+
+    return descr;
+}
+
+void sp_guide_remove(SPGuide *guide)
+{
+    g_assert(SP_IS_GUIDE(guide));
+
+    for (vector<SPGuideAttachment>::const_iterator i(guide->attached_items.begin()),
+             iEnd(guide->attached_items.end());
+         i != iEnd; ++i)
+    {
+        SPGuideAttachment const &att = *i;
+        remove_last(att.item->constraints, SPGuideConstraint(guide, att.snappoint_ix));
+    }
+    guide->attached_items.clear();
+
+    //XML Tree being used directly while it shouldn't be.
+    sp_repr_unparent(guide->getRepr());
+}
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
 
=== added file 'src/display/canvas-guide.h'
--- src/display/canvas-guide.h	1970-01-01 00:00:00 +0000
+++ src/display/canvas-guide.h	2014-09-23 18:22:24 +0000
@@ -0,0 +1,92 @@
+#ifndef SEEN_SP_GUIDE_H
+#define SEEN_SP_GUIDE_H
+
+/*
+ * SPGuide
+ *
+ * A guideline
+ *
+ * Copyright (C) Lauris Kaplinski 2000
+ * Copyright (C) Johan Engelen 2007
+ *   Abhishek Sharma
+ *   Jon A. Cruz <[e-mail]>
+ *
+ */
+
+#include <vector>
+
+#include <2geom/point.h>
+#include "sp-object.h"
+#include "sp-guide-attachment.h"
+
+struct SPCanvas;
+struct SPCanvasGroup;
+class SPDesktop;
+
+#define SP_GUIDE(obj) (dynamic_cast<SPGuide*>((SPObject*)obj))
+#define SP_IS_GUIDE(obj) (dynamic_cast<const SPGuide*>((SPObject*)obj) != NULL)
+
+/* Represents the constraint on p that dot(g.direction, p) == g.position. */
+class SPGuide : public SPObject {
+public:
+	SPGuide();
+	virtual ~SPGuide();
+
+    char* label;
+    char* group;
+    bool enable;
+
+    Geom::Point normal_to_line;
+    Geom::Point point_on_line;
+
+    guint32 color;
+    guint32 hicolor;
+    GSList *views;
+    std::vector<SPGuideAttachment> attached_items;
+
+    guint32 getColor() const;
+    guint32 getHiColor() const;
+    void setColor(guint32 c);
+    void setHiColor(guint32 h);
+    inline bool isHorizontal() const { return (normal_to_line[Geom::X] == 0.); };
+    inline bool isVertical() const { return (normal_to_line[Geom::Y] == 0.); };
+    inline double angle() const { return std::atan2( - normal_to_line[Geom::X], normal_to_line[Geom::Y] ); };
+    static SPGuide *createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::Point const &pt2);
+    void showSPGuide(SPCanvasGroup *group, GCallback handler);
+    void hideSPGuide(SPCanvas *canvas);
+    void sensitize(SPCanvas *canvas, gboolean sensitive);
+    Geom::Point getPositionFrom(Geom::Point const &pt) const;
+    double getDistanceFrom(Geom::Point const &pt) const;
+
+protected:
+	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+	virtual void release();
+	virtual void set(unsigned int key, const gchar* value);
+};
+
+void sp_guide_pt_pairs_to_guides(SPDocument *doc, std::list<std::pair<Geom::Point, Geom::Point> > &pts);
+void sp_guide_create_guides_around_page(SPDesktop *dt);
+void sp_guide_delete_all_guides(SPDesktop *dt);
+
+void sp_guide_moveto(SPGuide &guide, Geom::Point const point_on_line, bool const commit);
+void sp_guide_set_normal(SPGuide &guide, Geom::Point const normal_to_line, bool const commit);
+void sp_guide_set_label(SPGuide &guide, const char* label, bool const commit);
+void sp_guide_set_color(SPGuide &guide, const unsigned r, const unsigned g, const unsigned b, bool const commit);
+void sp_guide_set_enable(SPGuide &guide, bool const enable_flag, bool const commit);
+
+void sp_guide_remove(SPGuide *guide);
+
+char *sp_guide_description(SPGuide const *guide, const bool verbose = true);
+
+#endif // SEEN_SP_GUIDE_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== modified file 'src/display/guideline.cpp'
--- src/display/guideline.cpp	2014-03-27 01:33:44 +0000
+++ src/display/guideline.cpp	2014-09-23 18:22:24 +0000
@@ -1,5 +1,5 @@
 /*
- * Horizontal/vertical but can also be angled line
+ * Guides can be horizontal, vertical or angled.
  *
  * Authors:
  *   Lauris Kaplinski <[e-mail]>
@@ -16,6 +16,7 @@
 
 #include <2geom/coord.h>
 #include <2geom/transforms.h>
+#include <helper/geom.h>
 #include "sp-canvas-util.h"
 #include "sp-ctrlpoint.h"
 #include "guideline.h"
@@ -84,6 +85,9 @@
     gl->point_on_line = Geom::Point(0,0);
     gl->sensitive = 0;
 
+    gl->group = g_strdup("default");
+    gl->enable = true;
+
     gl->origin = NULL;
     gl->label = NULL;
 }
@@ -113,10 +117,13 @@
 
 static void sp_guideline_render(SPCanvasItem *item, SPCanvasBuf *buf)
 {
-    //TODO: the routine that renders the label of a specific guideline sometimes
+    // TODO: the routine that renders the label of a specific guideline sometimes
     // ends up erasing the labels of the other guidelines.
     // Maybe we should render all labels everytime.
 
+    static const double dash[] = {4.0, 4.0};
+    static int len  = sizeof(dash) / sizeof(dash[0]);
+
     SPGuideLine const *gl = SP_GUIDELINE (item);
 
     cairo_save(buf->ct);
@@ -126,7 +133,13 @@
     cairo_set_line_cap(buf->ct, CAIRO_LINE_CAP_SQUARE);
     cairo_set_font_size(buf->ct, 10);
 
-    Geom::Point normal_dt = /*unit_vector*/(gl->normal_to_line * gl->affine.withoutTranslation()); // note that normal_dt does not have unit length
+    //g_message("Enable: %d", gl->enable);
+
+    if (!gl->enable) {    
+            cairo_set_dash(buf->ct, dash, len, 1);
+    }
+    
+    Geom::Point normal_dt = transform_normal(gl->normal_to_line, gl->affine); // note that normal_dt does not have unit length
     Geom::Point point_on_line_dt = gl->point_on_line * gl->affine;
 
     if (gl->label) {
@@ -228,7 +241,7 @@
 
     *actual_item = item;
 
-    Geom::Point vec = gl->normal_to_line * gl->affine.withoutTranslation();
+    Geom::Point vec = transform_normal(gl->normal_to_line, gl->affine);
     double distance = Geom::dot((p - gl->point_on_line * gl->affine), unit_vector(vec));
     return MAX(fabs(distance)-1, 0);
 }
@@ -238,7 +251,7 @@
     SPCanvasItem *item = sp_canvas_item_new(parent, SP_TYPE_GUIDELINE, NULL);
     SPCanvasItem *origin = ControlManager::getManager().createControl(parent, Inkscape::CTRL_TYPE_ORIGIN);
     ControlManager::getManager().track(origin);
-
+    
     SPGuideLine *gl = SP_GUIDELINE(item);
     SPCtrlPoint *cp = SP_CTRLPOINT(origin);
     gl->origin = cp;
@@ -247,6 +260,8 @@
     gl->label = label;
     gl->normal_to_line = normal;
     gl->angle = tan( -gl->normal_to_line[Geom::X] / gl->normal_to_line[Geom::Y]);
+    gl->group = g_strdup("default");
+    //gl->enable = true;
     sp_guideline_set_position(gl, point_on_line);
 
     sp_ctrlpoint_set_coords(cp, point_on_line);
@@ -254,13 +269,30 @@
     return item;
 }
 
+void sp_guideline_set_group(SPGuideLine *gl, const char* group)
+{
+    if (gl->group) {
+        g_free(gl->group);
+    }
+    gl->group = g_strdup(group);
+
+    sp_canvas_item_request_update(SP_CANVAS_ITEM (gl));
+}
+
+void sp_guideline_set_enable(SPGuideLine *gl, bool enable_flag)
+{
+    gl->enable = enable_flag;
+    sp_canvas_item_request_update(SP_CANVAS_ITEM (gl));
+}
+
 void sp_guideline_set_label(SPGuideLine *gl, const char* label)
 {
+    
     if (gl->label) {
         g_free(gl->label);
     }
+
     gl->label = g_strdup(label);
-
     sp_canvas_item_request_update(SP_CANVAS_ITEM (gl));
 }
 
 
=== modified file 'src/display/guideline.h'
--- src/display/guideline.h	2014-03-27 01:33:44 +0000
+++ src/display/guideline.h	2014-09-23 18:22:24 +0000
@@ -32,9 +32,11 @@
     guint32 rgba;
 
     char* label;
+    char* group;
     Geom::Point normal_to_line;
     Geom::Point point_on_line;
     double angle;
+    bool enable;
 
     unsigned int sensitive : 1;
 
@@ -55,6 +57,8 @@
 void sp_guideline_set_normal(SPGuideLine *gl, Geom::Point normal_to_line);
 void sp_guideline_set_color(SPGuideLine *gl, unsigned int rgba);
 void sp_guideline_set_sensitive(SPGuideLine *gl, int sensitive);
+void sp_guideline_set_group(SPGuideLine *gl, char* group);
+void sp_guideline_set_enable(SPGuideLine *gl, bool enable_flag);
 void sp_guideline_delete(SPGuideLine *gl);
 
 #endif // SEEN_SP_GUIDELINE_H
 
=== modified file 'src/document-undo.cpp'
--- src/document-undo.cpp	2014-08-06 17:56:59 +0000
+++ src/document-undo.cpp	2014-09-23 18:22:24 +0000
@@ -22,8 +22,8 @@
  * stack. Two methods exist to indicate that the given action is completed:
  *
  * \verbatim
-   void sp_document_done( SPDocument *document );
-   void sp_document_maybe_done( SPDocument *document, const unsigned char *key ) \endverbatim
+ * void sp_document_done( SPDocument *document );
+ * void sp_document_maybe_done( SPDocument *document, const unsigned char *key ) \endverbatim
  *
  * Both move the recent action list into the undo stack and clear the
  * list afterwards.  While the first method does an unconditional push,
@@ -150,17 +150,19 @@
 
 }
 
-void Inkscape::DocumentUndo::maybeDone(SPDocument *doc, const gchar *key, const unsigned int event_type,
+void Inkscape::DocumentUndo::maybeDone(SPDocument *doc, const gchar *key,
+                                       const unsigned int event_type,
                                        Glib::ustring const &event_description)
 {
 	g_assert (doc != NULL);
 	g_assert (doc->priv != NULL);
-        g_assert (doc->priv->sensitive);
-        if ( key && !*key ) {
-            g_warning("Blank undo key specified.");
-        }
-
-        Inkscape::Debug::EventTracker<CommitEvent> tracker(doc, key, event_type);
+    g_assert (doc->priv->sensitive);
+
+    if ( key && !*key ) {
+        g_warning("Blank undo key specified.");
+    }
+
+    Inkscape::Debug::EventTracker<CommitEvent> tracker(doc, key, event_type);
 
 	doc->collectOrphans();
 
@@ -168,11 +170,12 @@
 
 	DocumentUndo::clearRedo(doc);
 
-	Inkscape::XML::Event *log = sp_repr_coalesce_log (doc->priv->partial, sp_repr_commit_undoable (doc->rdoc));
+	Inkscape::XML::Event *log = sp_repr_coalesce_log(doc->priv->partial,
+                                                     sp_repr_commit_undoable(doc->rdoc));
 	doc->priv->partial = NULL;
 
 	if (!log) {
-		sp_repr_begin_transaction (doc->rdoc);
+		sp_repr_begin_transaction(doc->rdoc);
 		return;
 	}
 
@@ -180,24 +183,25 @@
                 ((Inkscape::Event *)doc->priv->undo->data)->event =
                     sp_repr_coalesce_log (((Inkscape::Event *)doc->priv->undo->data)->event, log);
 	} else {
-                Inkscape::Event *event = new Inkscape::Event(log, event_type, event_description);
-                doc->priv->undo = g_slist_prepend (doc->priv->undo, event);
+        Inkscape::Event *event = new Inkscape::Event(log, event_type, event_description);
+        doc->priv->undo = g_slist_prepend(doc->priv->undo, event);
 		doc->priv->history_size++;
 		doc->priv->undoStackObservers.notifyUndoCommitEvent(event);
 	}
 
-        if ( key ) {
-            doc->actionkey = key;
-        } else {
-            doc->actionkey.clear();
-        }
+    if (key) {
+        doc->actionkey = key;
+    }
+    else {
+        doc->actionkey.clear();
+    }
 
 	doc->virgin = FALSE;
-        doc->setModifiedSinceSave();
+    doc->setModifiedSinceSave();
 
 	sp_repr_begin_transaction (doc->rdoc);
 
-  doc->priv->commit_signal.emit();
+    doc->priv->commit_signal.emit();
 }
 
 void Inkscape::DocumentUndo::cancel(SPDocument *doc)
 
=== modified file 'src/document.cpp'
--- src/document.cpp	2014-09-02 23:51:04 +0000
+++ src/document.cpp	2014-09-23 18:22:24 +0000
@@ -747,11 +747,11 @@
     root->translateChildItems(tr);
 
     if(nv) {
+        nv->translateGuides(Geom::Translate(tr[0],-tr[1]));
+        nv->translateGrids (Geom::Translate(tr[0],-tr[1]));
+
+        // update the viewport so the drawing appears to stay where it was
         Geom::Translate tr2(-rect_with_margins.min());
-        nv->translateGuides(tr2);
-        nv->translateGrids(tr2);
-
-        // update the viewport so the drawing appears to stay where it was
         nv->scrollAllDesktops(-tr2[0], tr2[1], false);
     }
 }
 
=== modified file 'src/file.cpp'
--- src/file.cpp	2014-08-19 21:24:08 +0000
+++ src/file.cpp	2014-09-23 18:22:24 +0000
@@ -59,6 +59,7 @@
 #include "selection.h"
 #include "sp-namedview.h"
 #include "style.h"
+#include "2geom/transforms.h"
 #include "ui/view/view-widget.h"
 #include "uri.h"
 #include "xml/rebase-hrefs.h"
@@ -67,6 +68,9 @@
 #include "event-log.h"
 #include "ui/dialog/font-substitution.h"
 
+#include "svg/stringstream.h"
+#include "svg/svg.h"
+
 #include <gtk/gtk.h>
 #include <gtkmm/main.h>
 
@@ -249,12 +253,106 @@
     }
 }
 
-
 /*######################
 ## O P E N
 ######################*/
 
 /**
+ * Convert old-style guides (pre-0.50, "sodipodi:guide") to new-style (0.50, "inkscape-guide")
+ * \return true if there was anything changed
+ */
+static
+bool sp_file_backwcompat_guides(SPDocument *doc)
+{
+    SPNamedView *namedview = sp_document_namedview(doc, NULL);
+    if (!namedview) return false;
+    Inkscape::XML::Document *document = doc->getReprDoc();
+    if (!document) return false;
+    Inkscape::XML::Node *nv_root = namedview->getRepr();
+    if (!nv_root) return false;
+    Inkscape::XML::Node *node = nv_root->firstChild();
+    std::vector<Inkscape::XML::Node * > nodes_to_be_removed;
+
+    while (node) {
+        if (!strcmp(node->name(), "sodipodi:guide")) {
+            gchar const *position    = node->attribute("position");
+            gchar const *orientation = node->attribute("orientation");
+
+            Geom::Point normal = Geom::Point(1.,0.); // default value if reading from SVG fails
+            Geom::Point point_on_line = Geom::Point(0.,0.); // default value if reading from SVG fails
+
+            // the value string of "position" is of the form:
+            // <x-coord double>,<y-coord double>. e.g. 123.243434,355.438534
+
+            if (position) {
+                double pos_x, pos_y;
+                gchar **attr_val = g_strsplit(position, ",", 2);
+                unsigned int success = sp_svg_number_read_d(attr_val[0], &pos_x);
+                success += sp_svg_number_read_d(attr_val[1], &pos_y);
+                g_strfreev(attr_val);
+                if (success == 2) {
+                    point_on_line = Geom::Point(pos_x, pos_y);
+                }
+                else if (success == 1) {
+                    if (orientation && !strcmp(orientation, "horizontal")) {
+                        point_on_line = Geom::Point(0, pos_x);
+                    } else {
+                        point_on_line = Geom::Point(pos_x, 0);
+                    }
+                }
+            }
+
+            if (orientation) {
+                if ( !strcmp(orientation, "horizontal") ) {
+                    normal = Geom::Point(0., 1.);
+                }
+                else if ( !strcmp(orientation, "vertical") ) {
+                    normal = Geom::Point(1., 0.);
+                } else {
+                    double ort_x, ort_y;
+                    gchar **attr_val = g_strsplit(orientation, ",", 2);
+                    unsigned int success = sp_svg_number_read_d(attr_val[0], &ort_x);
+                    success += sp_svg_number_read_d(attr_val[1], &ort_y);
+                    g_strfreev(attr_val);
+                    if (success == 2 && (fabs(ort_x) > 1e-6 || fabs(ort_y) > 1e-6)) {
+                        normal = Geom::Point(ort_x, ort_y);
+                        normal.normalize();
+                    }
+                }
+            }
+
+            double height = doc->getHeight().value("px");
+
+            Geom::Point point_on_line_doc = Geom::Point(point_on_line[0], -point_on_line[1] + height);
+            Geom::Point normal_doc = Geom::Point(normal[0], -normal[1]);
+
+            Inkscape::SVGOStringStream pos, ort;
+            pos << point_on_line_doc;
+            ort << normal_doc;
+
+            Inkscape::XML::Node *new_node = document->createElement("inkscape:guide");
+            new_node->setAttribute("id", node->attribute("id"));
+            new_node->setAttribute("label", node->attribute("label"));
+            new_node->setAttribute("color", node->attribute("color"));
+            new_node->setAttribute("position", pos.str().c_str());
+            new_node->setAttribute("orientation", ort.str().c_str());
+
+            nv_root->appendChild(new_node);
+            Inkscape::GC::release(new_node);
+
+            nodes_to_be_removed.push_back(node);
+        }
+        node = node->next();
+    } // end while
+
+    for (std::vector<Inkscape::XML::Node * >::iterator itr = nodes_to_be_removed.begin(); itr != nodes_to_be_removed.end(); ++itr) {
+        nv_root->removeChild(*itr);
+    }
+
+    return ( !nodes_to_be_removed.empty() );
+}
+
+/**
  *  Open a file, add the document to the desktop
  *
  *  \param replace_empty if true, and the current desktop is empty, this document
@@ -291,6 +389,10 @@
 
         SPDocument *existing = desktop ? sp_desktop_document(desktop) : NULL;
 
+        // backwards compatibility: updating old-style files to new-style files
+        bool changed = sp_file_backwcompat_guides(doc);
+        /// \todo report the change to the user, and perhaps find better place to do such things
+
         if (existing && existing->virgin && replace_empty) {
             // If the current desktop is empty, open the document there
             doc->ensureUpToDate(); // TODO this will trigger broken link warnings, etc.
@@ -298,7 +400,21 @@
             doc->emitResizedSignal(doc->getWidth().value("px"), doc->getHeight().value("px"));
         } else {
             // create a whole new desktop and window
+                
+            // Ipnkscape::XML::Document *xml_doc = doc->getReprDoc();
+            // SPViewWidget *dtw;
+            // // find if old-style guides are being used.
+            // if (sp_repr_lookup_name(xml_doc->root(), "sodipodi:guide")) {
+            //     SPNamedView *nv = sp_document_namedview(doc, NULL);
+            //     g_message("hi");
+            //     Geom::Affine dt2doc = desktop->dt2doc();
+            //     //nv->transformGuides(dt2doc);
+            //     //dtw = sp_desktop_widget_new(nv);
+            // }
+            // else {
             SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.
+            // }
+
             sp_create_window(dtw, TRUE);
             desktop = static_cast<SPDesktop*>(dtw->view);
         }
 
=== added file 'src/guide-manager.cpp'
--- src/guide-manager.cpp	1970-01-01 00:00:00 +0000
+++ src/guide-manager.cpp	2014-09-23 18:22:24 +0000
@@ -0,0 +1,154 @@
+/*
+
+  #include "guide-manager.h"
+
+  namespace Inkscape {
+
+  class GuideManager::GuideWatcher {
+  public:
+  };
+
+  GuideManager::GuideManager(SPDesktop *desktop) : _desktop(desktop)
+  {
+
+  }
+
+
+
+  } // end of namespace Inkscape
+
+*/
+
+/*
+ * Inkscape::GuideManager
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#include <set>
+#include <sigc++/functors/mem_fun.h>
+#include <sigc++/adaptors/hide.h>
+#include "gc-managed.h"
+#include "gc-finalized.h"
+#include "document.h"
+#include "desktop.h"
+#include "desktop-handles.h"
+#include "guide-manager.h"
+#include "preferences.h"
+#include "ui/view/view.h"
+#include "selection.h"
+#include "sp-object.h"
+#include "sp-namedview.h"
+#include "sp-item-group.h"
+#include "xml/node.h"
+#include "xml/node-observer.h"
+#include "util/format.h"
+// #include "debug/event-tracker.h"
+// #include "debug/simple-event.h"
+
+namespace Inkscape {
+
+// class GuideManager::GuideWatcher {
+// public:
+// };
+
+GuideManager::GuideManager(SPDesktop *desktop) : _desktop(desktop)
+{
+    _namedview_connection = desktop->namedview->connectModified(sigc::mem_fun(*this, &GuideManager::_namedview_changed));
+}
+
+using Inkscape::XML::Node;
+
+class GuideManager::GuideWatcher : public Inkscape::XML::NodeObserver {
+public:
+    GuideWatcher(GuideManager* mgr, SPObject* obj, sigc::connection c) :
+        _mgr(mgr),
+        _obj(obj),
+        _connection(c)
+    {}
+
+    virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
+    virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
+    virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) {}
+    virtual void notifyContentChanged( Node &/*node*/, Util::ptr_shared<char> /*old_content*/, Util::ptr_shared<char> /*new_content*/ ) {}
+
+    virtual void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared<char> /*old_value*/, Util::ptr_shared<char> /*new_value*/ ) {
+        if ( _mgr && _obj ) {
+            _mgr->_objectModified( _obj, 0 );
+        }
+    }
+
+    GuideManager* _mgr;
+    SPObject* _obj;
+    sigc::connection _connection;
+};
+
+GuideManager::~GuideManager()
+{
+    _namedview_connection.disconnect();
+    _resource_connection.disconnect();
+    //_document = 0;
+}
+
+// void LayerManager::_setDocument(SPDocument *document) {
+//     if (_document) {
+//         _resource_connection.disconnect();
+//     }
+//     _document = document;
+//     if (document) {
+//         _resource_connection = document->connectResourcesChanged("layer", sigc::mem_fun(*this, &LayerManager::_rebuild));
+//     }
+//     _rebuild();
+// }
+
+void GuideManager::_objectModified(SPObject* obj, guint /*flags*/ )
+{
+    _details_changed_signal.emit(obj);
+}
+
+void GuideManager::_rebuild() {
+
+    while ( !_watchers.empty() ) {
+        GuideWatcher* one = _watchers.back();
+        _watchers.pop_back();
+        if ( one->_obj ) {
+            Node* node = one->_obj->getRepr();
+            if ( node ) {
+                node->removeObserver(*one);
+            }
+            one->_connection.disconnect();
+        }
+    }
+
+    _clear();
+
+    GSList const *guides = _desktop->namedview->guides;
+
+    for (GSList const *iter = guides; iter; iter = iter->next) {
+        
+        SPObject *guide = SP_OBJECT(iter);        
+        sigc::connection connection = guide->connectModified(sigc::mem_fun(*this, &GuideManager::_objectModified));
+        GuideWatcher *eye = new GuideWatcher(this, guide, connection);
+        
+        _watchers.push_back(eye);
+        guide->getRepr()->addObserver(*eye);
+        _addOne(guide);
+    }
+}
+
+void GuideManager::_namedview_changed(SPObject *guide, guint /*flags*/)
+{
+    _namedview_changed_signal.emit(guide);
+}
+
+} //namespace
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== added file 'src/guide-manager.h'
--- src/guide-manager.h	1970-01-01 00:00:00 +0000
+++ src/guide-manager.h	2014-09-23 18:22:24 +0000
@@ -0,0 +1,65 @@
+/*
+ * Inkscape::GuideManager
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ *
+ */
+
+#ifndef SEEN_INKSCAPE_GUIDE_MANAGER_H
+#define SEEN_INKSCAPE_GUIDE_MANAGER_H
+
+#include "document-subset.h"
+#include "gc-finalized.h"
+#include "gc-soft-ptr.h"
+#include <vector>
+#include <map>
+
+class SPDesktop;
+class SPDocument;
+
+namespace Inkscape {
+  
+class GuideManager : public DocumentSubset,
+                     public GC::Finalized
+
+{
+
+public:
+    GuideManager(SPDesktop *desktop);
+    ~GuideManager();
+    
+private:
+    friend class GuideWatcher;
+    class GuideWatcher;
+
+    void _objectModified(SPObject* obj, guint flags);
+    void _setDocument(SPDocument *document);
+    void _rebuild();
+    void _namedview_changed(SPObject *guide, guint);
+
+    sigc::connection _namedview_connection;
+    sigc::connection _resource_connection;
+
+    GC::soft_ptr<SPDesktop> _desktop;
+    
+    std::vector<GuideWatcher*> _watchers;
+
+    sigc::signal<void, SPObject *> _namedview_changed_signal;
+    sigc::signal<void, SPObject *> _details_changed_signal;
+
+};
+
+} // namespace
+
+#endif
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== modified file 'src/guide-snapper.cpp'
--- src/guide-snapper.cpp	2014-03-27 01:33:44 +0000
+++ src/guide-snapper.cpp	2014-09-23 18:22:24 +0000
@@ -13,7 +13,8 @@
 
 #include "sp-namedview.h"
 #include "desktop.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
+#include "helper/geom.h"
 
 Inkscape::GuideSnapper::GuideSnapper(SnapManager *sm, Geom::Coord const d) : LineSnapper(sm, d)
 {
@@ -47,8 +48,8 @@
 
     for (GSList const *l = _snapmanager->getNamedView()->guides; l != NULL; l = l->next) {
         SPGuide const *g = SP_GUIDE(l->data);
-        if (g != guide_to_ignore) {
-            s.push_back(std::make_pair(g->normal_to_line, g->point_on_line));
+        if (g != guide_to_ignore && g->enable == true) {
+            s.push_back(std::make_pair(transform_normal(g->normal_to_line, _snapmanager->getDesktop()->doc2dt()), _snapmanager->getDesktop()->doc2dt(g->point_on_line)));
         }
     }
 
@@ -70,7 +71,7 @@
 void Inkscape::GuideSnapper::_addSnappedLine(IntermSnapResults &isr, Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const &normal_to_line, Geom::Point const &point_on_line) const
 {
     SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, source, source_num, Inkscape::SNAPTARGET_GUIDE, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line);
-    isr.guide_lines.push_back(dummy);
+        isr.guide_lines.push_back(dummy);
 }
 
 void Inkscape::GuideSnapper::_addSnappedLinesOrigin(IntermSnapResults &isr, Geom::Point const &origin, Geom::Coord const &snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const
 
=== modified file 'src/helper/geom.cpp'
--- src/helper/geom.cpp	2014-03-27 01:33:44 +0000
+++ src/helper/geom.cpp	2014-09-23 18:22:24 +0000
@@ -812,7 +812,21 @@
     rect = Geom::Rect(ints[0], ints[1]);
 }
 
-
+Geom::Point transform_normal(Geom::Point normal, Geom::Affine affine) {
+
+/* Function that transforms normals. Ensures that the normal still has a magnitude of 1 */
+
+    normal = normal.ccw();    // normal is now parallel to the line.
+    normal = normal * affine.withoutTranslation(); // apply the transform
+    normal = normal.ccw();     // rotate in the opposite direction to make it perpendicular again.
+        
+    if (!normal.isNormalized()) {
+        normal.normalize();
+    }
+
+    return normal;
+}
+    
 namespace Geom {
 
 bool transform_equalp(Geom::Affine const &m0, Geom::Affine const &m1, Geom::Coord const epsilon) {
 
=== modified file 'src/helper/geom.h'
--- src/helper/geom.h	2014-03-27 01:33:44 +0000
+++ src/helper/geom.h	2014-09-23 18:22:24 +0000
@@ -34,6 +34,9 @@
 
 void round_rectangle_outwards(Geom::Rect & rect);
 
+Geom::Point transform_normal(Geom::Point normal, Geom::Affine affine);
+    
+
 namespace Geom{
 bool transform_equalp(Geom::Affine const &m0, Geom::Affine const &m1, Geom::Coord const epsilon);
 bool translate_equalp(Geom::Affine const &m0, Geom::Affine const &m1, Geom::Coord const epsilon);
 
=== modified file 'src/line-snapper.cpp'
--- src/line-snapper.cpp	2014-03-27 01:33:44 +0000
+++ src/line-snapper.cpp	2014-09-23 18:22:24 +0000
@@ -32,7 +32,7 @@
 
     /* Get the lines that we will try to snap to */
     const LineList lines = _getSnapLines(p.getPoint());
-
+    
     for (LineList::const_iterator i = lines.begin(); i != lines.end(); ++i) {
         Geom::Point const p1 = i->second; // point at guide/grid line
         Geom::Point const p2 = p1 + Geom::rot90(i->first); // 2nd point at guide/grid line
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2014-06-03 17:50:49 +0000
+++ src/main.cpp	2014-09-23 18:22:24 +0000
@@ -78,7 +78,8 @@
 #include "inkscape-version.h"
 
 #include "sp-namedview.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
+// #include "sp-object-repr.h"
 #include "xml/repr.h"
 
 #include "io/sys.h"
 
=== modified file 'src/satisfied-guide-cns.cpp'
--- src/satisfied-guide-cns.cpp	2014-03-27 01:33:44 +0000
+++ src/satisfied-guide-cns.cpp	2014-09-23 18:22:24 +0000
@@ -1,6 +1,6 @@
 #include <2geom/coord.h>
 #include "desktop-handles.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 #include "sp-guide-constraint.h"
 #include "sp-namedview.h"
 #include "satisfied-guide-cns.h"
 
=== modified file 'src/snap.cpp'
--- src/snap.cpp	2014-08-17 18:31:38 +0000
+++ src/snap.cpp	2014-09-23 18:22:24 +0000
@@ -30,7 +30,7 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "selection.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 #include "preferences.h"
 #include "ui/tools/tool-base.h"
 #include "util/mathfns.h"
@@ -179,7 +179,8 @@
                 // will use the grid snapper. Simply snapping the value t to the grid will do, but
                 // only if the origin of the grid is at (0,0). If it's not then compensate for this
                 // in the translation t
-                Geom::Point const t_offset = t + grid->origin;
+                Geom::Point origin_dt = getDesktop()->doc2dt(grid->origin); // remember snapping is done in desktop-coords
+                Geom::Point const t_offset = t + origin_dt;
                 IntermSnapResults isr;
                 // Only the first three parameters are being used for grid snappers
                 snapper->freeSnap(isr, Inkscape::SnapCandidatePoint(t_offset, Inkscape::SNAPSOURCE_GRID_PITCH),Geom::OptRect(), NULL, NULL);
@@ -192,7 +193,7 @@
                     // use getSnapDistance() instead of getWeightedDistance() here because the pointer's position
                     // doesn't tell us anything about which node to snap
                     success = true;
-                    nearest_multiple = s.getPoint() - grid->origin;
+                    nearest_multiple = s.getPoint() - origin_dt;
                     nearest_distance = s.getSnapDistance();
                     bestSnappedPoint = s;
                 }
@@ -384,7 +385,7 @@
     return sp;
 }
 
-void SnapManager::guideFreeSnap(Geom::Point &p, Geom::Point &origin_or_vector, bool origin, bool freeze_angle) const
+void SnapManager::guideFreeSnap(Geom::Point &point_dt, Geom::Point &origin_or_vector, bool origin, bool freeze_angle) const
 {
     if (freeze_angle && origin) {
         g_warning("Dear developer, when snapping guides you shouldn't ask me to freeze the guide's vector when you haven't specified one");
@@ -395,11 +396,11 @@
         return;
     }
 
-    Inkscape::SnapCandidatePoint candidate(p, Inkscape::SNAPSOURCE_GUIDE);
+    Inkscape::SnapCandidatePoint candidate(point_dt, Inkscape::SNAPSOURCE_GUIDE);
     if (origin) {
         candidate.addOrigin(origin_or_vector);
     } else {
-        candidate = Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_GUIDE_ORIGIN);
+        candidate = Inkscape::SnapCandidatePoint(point_dt, Inkscape::SNAPSOURCE_GUIDE_ORIGIN);
         candidate.addVector(Geom::rot90(origin_or_vector));
     }
 
@@ -411,7 +412,7 @@
 
     Inkscape::SnappedPoint const s = findBestSnap(candidate, isr, false);
 
-    s.getPointIfSnapped(p);
+    s.getPointIfSnapped(point_dt);
 
     if (!freeze_angle && s.getSnapped()) {
         if (!Geom::are_near(s.getTangent(), Geom::Point(0,0))) { // If the tangent has been set ...
@@ -421,13 +422,13 @@
     }
 }
 
-void SnapManager::guideConstrainedSnap(Geom::Point &p, SPGuide const &guideline) const
+void SnapManager::guideConstrainedSnap(Geom::Point &point_dt, SPGuide const &guideline) const
 {
     if (!snapprefs.getSnapEnabledGlobally() || snapprefs.getSnapPostponedGlobally() || !snapprefs.isTargetSnappable(Inkscape::SNAPTARGET_GUIDE)) {
         return;
     }
 
-    Inkscape::SnapCandidatePoint candidate(p, Inkscape::SNAPSOURCE_GUIDE_ORIGIN, Inkscape::SNAPTARGET_UNDEFINED);
+    Inkscape::SnapCandidatePoint candidate(point_dt, Inkscape::SNAPSOURCE_GUIDE_ORIGIN, Inkscape::SNAPTARGET_UNDEFINED);
 
     IntermSnapResults isr;
     Inkscape::Snapper::SnapConstraint cl(guideline.point_on_line, Geom::rot90(guideline.normal_to_line));
@@ -438,7 +439,7 @@
     }
 
     Inkscape::SnappedPoint const s = findBestSnap(candidate, isr, false);
-    s.getPointIfSnapped(p);
+    s.getPointIfSnapped(point_dt);
 }
 
 Inkscape::SnappedPoint SnapManager::_snapTransformed(
 
=== removed file 'src/sp-guide.cpp'
--- src/sp-guide.cpp	2014-03-28 21:16:35 +0000
+++ src/sp-guide.cpp	1970-01-01 00:00:00 +0000
@@ -1,540 +0,0 @@
-/*
- * Inkscape guideline implementation
- *
- * Authors:
- *   Lauris Kaplinski <[e-mail]>
- *   Peter Moulder <[e-mail]>
- *   Johan Engelen
- *   Jon A. Cruz <[e-mail]>
- *   Abhishek Sharma
- *
- * Copyright (C) 2000-2002 authors
- * Copyright (C) 2004 Monash University
- * Copyright (C) 2007 Johan Engelen
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <algorithm>
-#include <cstring>
-#include <string>
-#include "desktop-handles.h"
-#include "display/sp-canvas.h"
-#include "display/guideline.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
-#include "attributes.h"
-#include "sp-guide.h"
-#include <sp-item-notify-moveto.h>
-#include <sp-item.h>
-#include <sp-guide-constraint.h>
-#include <glibmm/i18n.h>
-#include <xml/repr.h>
-#include <remove-last.h>
-#include "inkscape.h"
-#include "desktop.h"
-#include "sp-namedview.h"
-#include <2geom/angle.h>
-#include "document.h"
-#include "document-undo.h"
-#include "verbs.h"
-
-using Inkscape::DocumentUndo;
-using std::vector;
-
-//enum {
-//    PROP_0,
-//    PROP_COLOR,
-//    PROP_HICOLOR
-//};
-//
-//static void sp_guide_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-//static void sp_guide_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-
-#include "sp-factory.h"
-
-namespace {
-	SPObject* createGuide() {
-		return new SPGuide();
-	}
-
-	bool guideRegistered = SPFactory::instance().registerObject("sodipodi:guide", createGuide);
-}
-
-//static void sp_guide_class_init(SPGuideClass *gc)
-//{
-//    GObjectClass *gobject_class = (GObjectClass *) gc;
-//
-//    gobject_class->set_property = sp_guide_set_property;
-//    gobject_class->get_property = sp_guide_get_property;
-//
-//    g_object_class_install_property(gobject_class,
-//                                    PROP_COLOR,
-//                                    g_param_spec_uint("color", "Color", "Color",
-//                                                      0,
-//                                                      0xffffffff,
-//                                                      0xff000000,
-//                                                      (GParamFlags) G_PARAM_READWRITE));
-//
-//    g_object_class_install_property(gobject_class,
-//                                    PROP_HICOLOR,
-//                                    g_param_spec_uint("hicolor", "HiColor", "HiColor",
-//                                                      0,
-//                                                      0xffffffff,
-//                                                      0xff000000,
-//                                                      (GParamFlags) G_PARAM_READWRITE));
-//}
-// CPPIFY: properties!
-
-SPGuide::SPGuide() : SPObject() {
-	this->label = NULL;
-	this->views = NULL;
-
-    this->normal_to_line = Geom::Point(0.,1.);
-    this->point_on_line = Geom::Point(0.,0.);
-    this->color = 0x0000ff7f;
-    this->hicolor = 0xff00007f;
-}
-
-SPGuide::~SPGuide() {
-}
-
-guint32 SPGuide::getColor() const {
-	return color;
-}
-
-guint32 SPGuide::getHiColor() const {
-	return hicolor;
-}
-
-void SPGuide::setColor(guint32 c) {
-	color = c;
-
-	for (GSList *l = this->views; l != NULL; l = l->next) {
-		sp_guideline_set_color(SP_GUIDELINE(l->data), this->color);
-	}
-}
-
-void SPGuide::setHiColor(guint32 h) {
-	this->hicolor = h;
-}
-
-//static void sp_guide_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec */*pspec*/)
-//{
-//    SPGuide &guide = *SP_GUIDE(object);
-//
-//    switch (prop_id) {
-//        case PROP_COLOR:
-//            guide.color = g_value_get_uint(value);
-//            for (GSList *l = guide.views; l != NULL; l = l->next) {
-//                sp_guideline_set_color(SP_GUIDELINE(l->data), guide.color);
-//            }
-//            break;
-//
-//        case PROP_HICOLOR:
-//            guide.hicolor = g_value_get_uint(value);
-//            break;
-//    }
-//}
-//
-//static void sp_guide_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec */*pspec*/)
-//{
-//    SPGuide const &guide = *SP_GUIDE(object);
-//
-//    switch (prop_id) {
-//        case PROP_COLOR:
-//            g_value_set_uint(value, guide.color);
-//            break;
-//        case PROP_HICOLOR:
-//            g_value_set_uint(value, guide.hicolor);
-//            break;
-//    }
-//}
-
-void SPGuide::build(SPDocument *document, Inkscape::XML::Node *repr) {
-	SPObject::build(document, repr);
-
-    this->readAttr( "inkscape:label" );
-    this->readAttr( "orientation" );
-    this->readAttr( "position" );
-
-    /* Register */
-    document->addResource("guide", this);
-}
-
-void SPGuide::release() {
-    while (this->views) {
-        sp_guideline_delete(SP_GUIDELINE(this->views->data));
-        this->views = g_slist_remove(this->views, this->views->data);
-    }
-
-    if (this->document) {
-        // Unregister ourselves
-        this->document->removeResource("guide", this);
-    }
-
-    SPObject::release();
-}
-
-void SPGuide::set(unsigned int key, const gchar *value) {
-    switch (key) {
-    case SP_ATTR_INKSCAPE_LABEL:
-        if (this->label) g_free(this->label);
-        
-        if (value) {
-            this->label = g_strdup(value);
-        } else {
-            this->label = NULL;
-        }
-
-        sp_guide_set_label(*this, this->label, false);
-        break;
-    case SP_ATTR_ORIENTATION:
-        {
-            if (value && !strcmp(value, "horizontal")) {
-                /* Visual representation of a horizontal line, constrain vertically (y coordinate). */
-                this->normal_to_line = Geom::Point(0., 1.);
-            } else if (value && !strcmp(value, "vertical")) {
-                this->normal_to_line = Geom::Point(1., 0.);
-            } else if (value) {
-                gchar ** strarray = g_strsplit(value, ",", 2);
-                double newx, newy;
-                unsigned int success = sp_svg_number_read_d(strarray[0], &newx);
-                success += sp_svg_number_read_d(strarray[1], &newy);
-                g_strfreev (strarray);
-                if (success == 2 && (fabs(newx) > 1e-6 || fabs(newy) > 1e-6)) {
-                    Geom::Point direction(newx, newy);
-                    direction.normalize();
-                    this->normal_to_line = direction;
-                } else {
-                    // default to vertical line for bad arguments
-                    this->normal_to_line = Geom::Point(1., 0.);
-                }
-            } else {
-                // default to vertical line for bad arguments
-                this->normal_to_line = Geom::Point(1., 0.);
-            }
-            sp_guide_set_normal(*this, this->normal_to_line, false);
-        }
-        break;
-    case SP_ATTR_POSITION:
-        {
-            if (value) {
-                gchar ** strarray = g_strsplit(value, ",", 2);
-                double newx, newy;
-                unsigned int success = sp_svg_number_read_d(strarray[0], &newx);
-                success += sp_svg_number_read_d(strarray[1], &newy);
-                g_strfreev (strarray);
-                if (success == 2) {
-                    this->point_on_line = Geom::Point(newx, newy);
-                } else if (success == 1) {
-                    // before 0.46 style guideline definition.
-                    const gchar *attr = this->getRepr()->attribute("orientation");
-                    if (attr && !strcmp(attr, "horizontal")) {
-                        this->point_on_line = Geom::Point(0, newx);
-                    } else {
-                        this->point_on_line = Geom::Point(newx, 0);
-                    }
-                }
-            } else {
-                // default to (0,0) for bad arguments
-                this->point_on_line = Geom::Point(0,0);
-            }
-            // update position in non-committing way
-            // fixme: perhaps we need to add an update method instead, and request_update here
-            sp_guide_moveto(*this, this->point_on_line, false);
-        }
-        break;
-    default:
-    	SPObject::set(key, value);
-            break;
-    }
-}
-
-SPGuide *SPGuide::createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::Point const &pt2)
-{
-    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
-
-    Inkscape::XML::Node *repr = xml_doc->createElement("sodipodi:guide");
-
-    Geom::Point n = Geom::rot90(pt2 - pt1);
-
-    sp_repr_set_point(repr, "position", pt1);
-    sp_repr_set_point(repr, "orientation", n);
-
-    SPNamedView *namedview = sp_document_namedview(doc, NULL);
-    if (namedview) {
-        namedview->appendChild(repr);
-    }
-    Inkscape::GC::release(repr);
-
-    SPGuide *guide= SP_GUIDE(doc->getObjectByRepr(repr));
-    return guide;
-}
-
-void
-sp_guide_pt_pairs_to_guides(SPDocument *doc, std::list<std::pair<Geom::Point, Geom::Point> > &pts) {
-    for (std::list<std::pair<Geom::Point, Geom::Point> >::iterator i = pts.begin(); i != pts.end(); ++i) {
-        SPGuide::createSPGuide(doc, (*i).first, (*i).second);
-    }
-}
-
-void
-sp_guide_create_guides_around_page(SPDesktop *dt) {
-    SPDocument *doc=sp_desktop_document(dt);
-    std::list<std::pair<Geom::Point, Geom::Point> > pts;
-
-    Geom::Point A(0, 0);
-    Geom::Point C(doc->getWidth().value("px"), doc->getHeight().value("px"));
-    Geom::Point B(C[Geom::X], 0);
-    Geom::Point D(0, C[Geom::Y]);
-
-    pts.push_back(std::pair<Geom::Point, Geom::Point>(A, B));
-    pts.push_back(std::pair<Geom::Point, Geom::Point>(B, C));
-    pts.push_back(std::pair<Geom::Point, Geom::Point>(C, D));
-    pts.push_back(std::pair<Geom::Point, Geom::Point>(D, A));
-
-    sp_guide_pt_pairs_to_guides(doc, pts);
-
-    DocumentUndo::done(doc, SP_VERB_NONE, _("Create Guides Around the Page"));
-}
-
-void
-sp_guide_delete_all_guides(SPDesktop *dt) {
-    SPDocument *doc=sp_desktop_document(dt);
-    const GSList *current;
-    while ( (current = doc->getResourceList("guide")) ) {
-        SPGuide* guide = SP_GUIDE(current->data);
-        sp_guide_remove(guide);
-    }
-
-    DocumentUndo::done(doc, SP_VERB_NONE, _("Delete All Guides"));
-}
-
-void SPGuide::showSPGuide(SPCanvasGroup *group, GCallback handler)
-{
-    SPCanvasItem *item = sp_guideline_new(group, label, point_on_line, normal_to_line);
-    sp_guideline_set_color(SP_GUIDELINE(item), color);
-
-    g_signal_connect(G_OBJECT(item), "event", G_CALLBACK(handler), this);
-
-    views = g_slist_prepend(views, item);
-}
-
-void SPGuide::hideSPGuide(SPCanvas *canvas)
-{
-    g_assert(canvas != NULL);
-    g_assert(SP_IS_CANVAS(canvas));
-
-    for (GSList *l = views; l != NULL; l = l->next) {
-        if (canvas == SP_CANVAS_ITEM(l->data)->canvas) {
-            sp_guideline_delete(SP_GUIDELINE(l->data));
-            views = g_slist_remove(views, l->data);
-            return;
-        }
-    }
-
-    g_assert_not_reached();
-}
-
-void SPGuide::sensitize(SPCanvas *canvas, gboolean sensitive)
-{
-    g_assert(canvas != NULL);
-    g_assert(SP_IS_CANVAS(canvas));
-
-    for (GSList *l = views; l != NULL; l = l->next) {
-        if (canvas == SP_CANVAS_ITEM(l->data)->canvas) {
-            sp_guideline_set_sensitive(SP_GUIDELINE(l->data), sensitive);
-            return;
-        }
-    }
-
-    g_assert_not_reached();
-}
-
-Geom::Point SPGuide::getPositionFrom(Geom::Point const &pt) const
-{
-    return -(pt - point_on_line);
-}
-
-double SPGuide::getDistanceFrom(Geom::Point const &pt) const
-{
-    return Geom::dot(pt - point_on_line, normal_to_line);
-}
-
-/**
- * \arg commit False indicates temporary moveto in response to motion event while dragging,
- *      true indicates a "committing" version: in response to button release event after
- *      dragging a guideline, or clicking OK in guide editing dialog.
- */
-void sp_guide_moveto(SPGuide &guide, Geom::Point const point_on_line, bool const commit)
-{
-    g_assert(SP_IS_GUIDE(&guide));
-
-    for (GSList *l = guide.views; l != NULL; l = l->next) {
-        sp_guideline_set_position(SP_GUIDELINE(l->data), point_on_line);
-    }
-
-    /* Calling sp_repr_set_point must precede calling sp_item_notify_moveto in the commit
-       case, so that the guide's new position is available for sp_item_rm_unsatisfied_cns. */
-    if (commit) {
-        //XML Tree being used here directly while it shouldn't be.
-        sp_repr_set_point(guide.getRepr(), "position", point_on_line);
-    }
-
-/*  DISABLED CODE BECAUSE  SPGuideAttachment  IS NOT USE AT THE MOMENT (johan)
-    for (vector<SPGuideAttachment>::const_iterator i(guide.attached_items.begin()),
-             iEnd(guide.attached_items.end());
-         i != iEnd; ++i)
-    {
-        SPGuideAttachment const &att = *i;
-        sp_item_notify_moveto(*att.item, guide, att.snappoint_ix, position, commit);
-    }
-*/
-}
-
-/**
- * \arg commit False indicates temporary moveto in response to motion event while dragging,
- *      true indicates a "committing" version: in response to button release event after
- *      dragging a guideline, or clicking OK in guide editing dialog.
- */
-void sp_guide_set_normal(SPGuide &guide, Geom::Point const normal_to_line, bool const commit)
-{
-    g_assert(SP_IS_GUIDE(&guide));
-
-    for (GSList *l = guide.views; l != NULL; l = l->next) {
-        sp_guideline_set_normal(SP_GUIDELINE(l->data), normal_to_line);
-    }
-
-    /* Calling sp_repr_set_svg_point must precede calling sp_item_notify_moveto in the commit
-       case, so that the guide's new position is available for sp_item_rm_unsatisfied_cns. */
-    if (commit) {
-        //XML Tree being used directly while it shouldn't be
-        sp_repr_set_point(guide.getRepr(), "orientation", normal_to_line);
-    }
-
-/*  DISABLED CODE BECAUSE  SPGuideAttachment  IS NOT USE AT THE MOMENT (johan)
-    for (vector<SPGuideAttachment>::const_iterator i(guide.attached_items.begin()),
-             iEnd(guide.attached_items.end());
-         i != iEnd; ++i)
-    {
-        SPGuideAttachment const &att = *i;
-        sp_item_notify_moveto(*att.item, guide, att.snappoint_ix, position, commit);
-    }
-*/
-}
-
-void sp_guide_set_color(SPGuide &guide, const unsigned r, const unsigned g, const unsigned b, bool const commit)
-{
-    g_assert(SP_IS_GUIDE(&guide));
-    guide.color = (r << 24) | (g << 16) | (b << 8) | 0x7f;
-
-    if (guide.views){
-        sp_guideline_set_color(SP_GUIDELINE(guide.views->data), guide.color);
-    }
-
-    if (commit){
-        std::ostringstream os;
-        os << "rgb(" << r << "," << g << "," << b << ")";
-        //XML Tree being used directly while it shouldn't be
-        guide.getRepr()->setAttribute("inkscape:color", os.str().c_str());
-    }
-}
-
-void sp_guide_set_label(SPGuide &guide, const char* label, bool const commit)
-{
-    g_assert(SP_IS_GUIDE(&guide));
-    if (guide.views){
-        sp_guideline_set_label(SP_GUIDELINE(guide.views->data), label);
-    }
-
-    if (commit){
-        //XML Tree being used directly while it shouldn't be
-        guide.getRepr()->setAttribute("inkscape:label", label);
-    }
-}
-
-/**
- * Returns a human-readable description of the guideline for use in dialog boxes and status bar.
- * If verbose is false, only positioning information is included (useful for dialogs).
- *
- * The caller is responsible for freeing the string.
- */
-char *sp_guide_description(SPGuide const *guide, const bool verbose)
-{
-    using Geom::X;
-    using Geom::Y;
-
-    char *descr = 0;
-    if ( !guide->document ) {
-        // Guide has probably been deleted and no longer has an attached namedview.
-        descr = g_strdup_printf("%s", _("Deleted"));
-    } else {
-        SPNamedView *namedview = sp_document_namedview(guide->document, NULL);
-
-        Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(guide->point_on_line[X], "px");
-        Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(guide->point_on_line[Y], "px");
-        GString *position_string_x = g_string_new(x_q.string(namedview->doc_units).c_str());
-        GString *position_string_y = g_string_new(y_q.string(namedview->doc_units).c_str());
-
-        gchar *shortcuts = g_strdup_printf("; %s", _("<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to delete"));
-
-        if ( are_near(guide->normal_to_line, Geom::Point(1., 0.)) ||
-             are_near(guide->normal_to_line, -Geom::Point(1., 0.)) ) {
-            descr = g_strdup_printf(_("vertical, at %s"), position_string_x->str);
-        } else if ( are_near(guide->normal_to_line, Geom::Point(0., 1.)) ||
-                    are_near(guide->normal_to_line, -Geom::Point(0., 1.)) ) {
-            descr = g_strdup_printf(_("horizontal, at %s"), position_string_y->str);
-        } else {
-            double const radians = guide->angle();
-            double const degrees = Geom::rad_to_deg(radians);
-            int const degrees_int = (int) round(degrees);
-            descr = g_strdup_printf(_("at %d degrees, through (%s,%s)"), 
-                                    degrees_int, position_string_x->str, position_string_y->str);
-        }
-
-        g_string_free(position_string_x, TRUE);
-        g_string_free(position_string_y, TRUE);
-
-        if (verbose) {
-            gchar *oldDescr = descr;
-            descr = g_strconcat(oldDescr, shortcuts, NULL);
-            g_free(oldDescr);
-        }
-        g_free(shortcuts);
-    }
-
-    return descr;
-}
-
-void sp_guide_remove(SPGuide *guide)
-{
-    g_assert(SP_IS_GUIDE(guide));
-
-    for (vector<SPGuideAttachment>::const_iterator i(guide->attached_items.begin()),
-             iEnd(guide->attached_items.end());
-         i != iEnd; ++i)
-    {
-        SPGuideAttachment const &att = *i;
-        remove_last(att.item->constraints, SPGuideConstraint(guide, att.snappoint_ix));
-    }
-    guide->attached_items.clear();
-
-    //XML Tree being used directly while it shouldn't be.
-    sp_repr_unparent(guide->getRepr());
-}
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
 
=== removed file 'src/sp-guide.h'
--- src/sp-guide.h	2014-03-27 01:33:44 +0000
+++ src/sp-guide.h	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-#ifndef SEEN_SP_GUIDE_H
-#define SEEN_SP_GUIDE_H
-
-/*
- * SPGuide
- *
- * A guideline
- *
- * Copyright (C) Lauris Kaplinski 2000
- * Copyright (C) Johan Engelen 2007
- *   Abhishek Sharma
- *   Jon A. Cruz <[e-mail]>
- *
- */
-
-#include <vector>
-
-#include <2geom/point.h>
-#include "sp-object.h"
-#include "sp-guide-attachment.h"
-
-struct SPCanvas;
-struct SPCanvasGroup;
-class SPDesktop;
-
-#define SP_GUIDE(obj) (dynamic_cast<SPGuide*>((SPObject*)obj))
-#define SP_IS_GUIDE(obj) (dynamic_cast<const SPGuide*>((SPObject*)obj) != NULL)
-
-/* Represents the constraint on p that dot(g.direction, p) == g.position. */
-class SPGuide : public SPObject {
-public:
-	SPGuide();
-	virtual ~SPGuide();
-
-    char* label;
-    Geom::Point normal_to_line;
-    Geom::Point point_on_line;
-
-    guint32 color;
-    guint32 hicolor;
-    GSList *views;
-    std::vector<SPGuideAttachment> attached_items;
-
-    guint32 getColor() const;
-    guint32 getHiColor() const;
-    void setColor(guint32 c);
-    void setHiColor(guint32 h);
-
-    inline bool isHorizontal() const { return (normal_to_line[Geom::X] == 0.); };
-    inline bool isVertical() const { return (normal_to_line[Geom::Y] == 0.); };
-    inline double angle() const { return std::atan2( - normal_to_line[Geom::X], normal_to_line[Geom::Y] ); };
-    static SPGuide *createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::Point const &pt2);
-    void showSPGuide(SPCanvasGroup *group, GCallback handler);
-    void hideSPGuide(SPCanvas *canvas);
-    void sensitize(SPCanvas *canvas, gboolean sensitive);
-    Geom::Point getPositionFrom(Geom::Point const &pt) const;
-    double getDistanceFrom(Geom::Point const &pt) const;
-
-protected:
-	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void release();
-	virtual void set(unsigned int key, const gchar* value);
-};
-
-void sp_guide_pt_pairs_to_guides(SPDocument *doc, std::list<std::pair<Geom::Point, Geom::Point> > &pts);
-void sp_guide_create_guides_around_page(SPDesktop *dt);
-void sp_guide_delete_all_guides(SPDesktop *dt);
-
-void sp_guide_moveto(SPGuide &guide, Geom::Point const point_on_line, bool const commit);
-void sp_guide_set_normal(SPGuide &guide, Geom::Point const normal_to_line, bool const commit);
-void sp_guide_set_label(SPGuide &guide, const char* label, bool const commit);
-void sp_guide_set_color(SPGuide &guide, const unsigned r, const unsigned g, const unsigned b, bool const commit);
-void sp_guide_remove(SPGuide *guide);
-
-char *sp_guide_description(SPGuide const *guide, const bool verbose = true);
-
-#endif // SEEN_SP_GUIDE_H
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== modified file 'src/sp-item-notify-moveto.cpp'
--- src/sp-item-notify-moveto.cpp	2014-03-27 01:33:44 +0000
+++ src/sp-item-notify-moveto.cpp	2014-09-23 18:22:24 +0000
@@ -4,7 +4,7 @@
 
 #include <sp-item.h>
 #include <2geom/transforms.h>
-#include <sp-guide.h>
+#include <display/canvas-guide.h>
 #include <sp-item-rm-unsatisfied-cns.h>
 #include <sp-item-notify-moveto.h>
 using std::vector;
 
=== modified file 'src/sp-item-rm-unsatisfied-cns.cpp'
--- src/sp-item-rm-unsatisfied-cns.cpp	2014-03-27 01:33:44 +0000
+++ src/sp-item-rm-unsatisfied-cns.cpp	2014-09-23 18:22:24 +0000
@@ -3,7 +3,7 @@
 #include <2geom/coord.h>
 
 #include "remove-last.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 #include "sp-guide-constraint.h"
 #include "sp-item.h"
 #include "sp-item-rm-unsatisfied-cns.h"
 
=== modified file 'src/sp-item-update-cns.cpp'
--- src/sp-item-update-cns.cpp	2014-03-27 01:33:44 +0000
+++ src/sp-item-update-cns.cpp	2014-09-23 18:22:24 +0000
@@ -1,9 +1,8 @@
-
 #include "satisfied-guide-cns.h"
 #include "sp-guide-constraint.h"
+#include "display/canvas-guide.h"
+#include "sp-item.h"
 #include "sp-item-update-cns.h"
-#include "sp-guide.h"
-#include "sp-item.h"
 #include <algorithm>
 using std::find;
 using std::vector;
 
=== modified file 'src/sp-item.cpp'
--- src/sp-item.cpp	2014-08-26 20:38:14 +0000
+++ src/sp-item.cpp	2014-09-23 18:22:24 +0000
@@ -55,7 +55,7 @@
 #include "conditions.h"
 #include "sp-filter-reference.h"
 #include "filter-chemistry.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 #include "sp-title.h"
 #include "sp-desc.h"
 
@@ -1638,7 +1638,7 @@
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int prefs_bbox = prefs->getInt("/tools/bounding_box", 0);
 
-    Geom::OptRect bbox = (prefs_bbox == 0) ? desktopVisualBounds() : desktopGeometricBounds();
+    Geom::OptRect bbox = (prefs_bbox == 0) ? documentVisualBounds() : documentGeometricBounds();
     if (!bbox) {
         g_warning ("Cannot determine item's bounding box during conversion to guides.\n");
         return;
 
=== modified file 'src/sp-line.cpp'
--- src/sp-line.cpp	2014-03-27 01:33:44 +0000
+++ src/sp-line.cpp	2014-09-23 18:22:24 +0000
@@ -17,7 +17,7 @@
 #include "attributes.h"
 #include "style.h"
 #include "sp-line.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 #include "display/curve.h"
 #include <glibmm/i18n.h>
 #include "xml/repr.h"
@@ -128,10 +128,11 @@
 
 void SPLine::convert_to_guides() const {
     Geom::Point points[2];
-    Geom::Affine const i2dt(this->i2dt_affine());
-
-    points[0] = Geom::Point(this->x1.computed, this->y1.computed)*i2dt;
-    points[1] = Geom::Point(this->x2.computed, this->y2.computed)*i2dt;
+
+    Geom::Affine const i2doc(this->i2doc_affine());
+
+    points[0] = Geom::Point(this->x1.computed, this->y1.computed)*i2doc;
+    points[1] = Geom::Point(this->x2.computed, this->y2.computed)*i2doc;
 
     SPGuide::createSPGuide(this->document, points[0], points[1]);
 }
 
=== modified file 'src/sp-namedview.cpp'
--- src/sp-namedview.cpp	2014-03-27 01:33:44 +0000
+++ src/sp-namedview.cpp	2014-09-23 18:22:24 +0000
@@ -14,14 +14,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <cstring>
 #include <string>
 #include "event-log.h"
 #include <2geom/transforms.h>
 
+#include "display/guideline.h"
 #include "display/canvas-grid.h"
-#include "display/guideline.h"
+#include "display/canvas-guide.h"
+
 #include "util/units.h"
 #include "svg/svg-color.h"
 #include "xml/repr.h"
@@ -30,7 +35,6 @@
 #include "document-undo.h"
 #include "desktop-events.h"
 #include "desktop-handles.h"
-#include "sp-guide.h"
 #include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "preferences.h"
@@ -38,6 +42,8 @@
 #include "conn-avoid-ref.h" // for defaultConnSpacing.
 #include "sp-root.h"
 #include <gtkmm/window.h>
+#include "guide-manager.h"
+
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
@@ -1162,6 +1168,24 @@
     }
 }
 
+// void SPNamedView::transformGuides(Geom::Affine const affine) {
+
+//     for (GSList *l = guides; l != NULL; l = l->next) {
+//         SPGuide &guide = *SP_GUIDE(l->data);
+
+//         Geom::Point point_on_line = guide.point_on_line;
+//         Geom::Point normal = guide.normal_to_line;
+        
+//         point_on_line *= affine;
+//         normal = transform_normal(normal, affine);
+
+//         sp_guide_moveto(guide, point_on_line, true);
+//         sp_guide_set_normal(guide, normal, true);
+
+//         // TODO attribute names should be changed as well.
+//     }
+// }
+
 void SPNamedView::translateGrids(Geom::Translate const &tr) {
     for (GSList *l = grids; l != NULL; l = l->next) {
         Inkscape::CanvasGrid* g = reinterpret_cast<Inkscape::CanvasGrid*>(l->data);
@@ -1172,10 +1196,10 @@
 }
 
 void SPNamedView::scrollAllDesktops(double dx, double dy, bool is_scrolling) {
-        for(GSList *l = views; l; l = l->next) {
-            SPDesktop *desktop = static_cast<SPDesktop *>(l->data);
-            desktop->scroll_world_in_svg_coords(dx, dy, is_scrolling);
-        }
+    for (GSList *l = views; l; l = l->next) {
+        SPDesktop *desktop = static_cast<SPDesktop *>(l->data);
+        desktop->scroll_world_in_svg_coords(dx, dy, is_scrolling);
+    }
 }
 
 
 
=== modified file 'src/sp-namedview.h'
--- src/sp-namedview.h	2014-03-27 01:33:44 +0000
+++ src/sp-namedview.h	2014-09-23 18:22:24 +0000
@@ -22,11 +22,13 @@
 #include "document.h"
 #include "util/units.h"
 
+
 namespace Inkscape {
-    class CanvasGrid;
+class CanvasGrid;
     namespace Util {
         class Unit;
     }
+    class GuideManager;
 }
 
 enum {
@@ -55,6 +57,7 @@
     gint window_maximized;
 
     SnapManager snap_manager;
+    Inkscape::GuideManager *guide_manager;
     GSList * grids;
     bool grids_visible;
 
@@ -86,6 +89,7 @@
 
     void translateGuides(Geom::Translate const &translation);
     void translateGrids(Geom::Translate const &translation);
+    // void transformGuides(Geom::Affine const affine);
     void scrollAllDesktops(double dx, double dy, bool is_scrolling);
     void writeNewGrid(SPDocument *document,int gridtype);
     bool getSnapGlobal() const;
@@ -116,8 +120,9 @@
 void sp_namedview_document_from_window(SPDesktop *desktop);
 void sp_namedview_update_layers_from_document (SPDesktop *desktop);
 
+void sp_namedview_show_grids(SPNamedView *namedview, bool show, bool dirty_document);
 void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr);
-void sp_namedview_show_grids(SPNamedView *namedview, bool show, bool dirty_document);
+void sp_namedview_convert_old_guides(SPNamedView * /*nv*/, SPDocument *document, Inkscape::XML::Node *repr);
 Inkscape::CanvasGrid * sp_namedview_get_first_enabled_grid(SPNamedView *namedview);
 
 
 
=== modified file 'src/sp-path.cpp'
--- src/sp-path.cpp	2014-07-28 21:44:54 +0000
+++ src/sp-path.cpp	2014-09-23 18:22:24 +0000
@@ -37,7 +37,7 @@
 #include "attributes.h"
 
 #include "sp-path.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 
 #include "document.h"
 #include "desktop.h"
@@ -107,7 +107,7 @@
 
     std::list<std::pair<Geom::Point, Geom::Point> > pts;
 
-    Geom::Affine const i2dt(this->i2dt_affine());
+    Geom::Affine const i2doc(this->i2doc_affine());
     Geom::PathVector const & pv = this->_curve->get_pathvector();
     
     for(Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit) {
@@ -115,7 +115,7 @@
             // only add curves for straight line segments
             if( is_straight_curve(*cit) )
             {
-                pts.push_back(std::make_pair(cit->initialPoint() * i2dt, cit->finalPoint() * i2dt));
+                pts.push_back(std::make_pair(cit->initialPoint() * i2doc, cit->finalPoint() * i2doc));
             }
         }
     }
 
=== modified file 'src/sp-rect.cpp'
--- src/sp-rect.cpp	2014-03-27 01:33:44 +0000
+++ src/sp-rect.cpp	2014-09-23 18:22:24 +0000
@@ -26,7 +26,7 @@
 #include "sp-rect.h"
 #include <glibmm/i18n.h>
 #include "xml/repr.h"
-#include "sp-guide.h"
+#include "display/canvas-guide.h"
 #include "preferences.h"
 
 #define noRECT_VERBOSE
@@ -529,12 +529,12 @@
 
     std::list<std::pair<Geom::Point, Geom::Point> > pts;
 
-    Geom::Affine const i2dt(this->i2dt_affine());
+    Geom::Affine const i2doc(this->i2doc_affine());
 
-    Geom::Point A1(Geom::Point(this->x.computed, this->y.computed) * i2dt);
-    Geom::Point A2(Geom::Point(this->x.computed, this->y.computed + this->height.computed) * i2dt);
-    Geom::Point A3(Geom::Point(this->x.computed + this->width.computed, this->y.computed + this->height.computed) * i2dt);
-    Geom::Point A4(Geom::Point(this->x.computed + this->width.computed, this->y.computed) * i2dt);
+    Geom::Point A1(Geom::Point(this->x.computed, this->y.computed) * i2doc);
+    Geom::Point A2(Geom::Point(this->x.computed, this->y.computed + this->height.computed) * i2doc);
+    Geom::Point A3(Geom::Point(this->x.computed + this->width.computed, this->y.computed + this->height.computed) * i2doc);
+    Geom::Point A4(Geom::Point(this->x.computed + this->width.computed, this->y.computed) * i2doc);
 
     pts.push_back(std::make_pair(A1, A2));
     pts.push_back(std::make_pair(A2, A3));
 
=== modified file 'src/ui/dialog/document-properties.cpp'
--- src/ui/dialog/document-properties.cpp	2014-09-08 17:13:03 +0000
+++ src/ui/dialog/document-properties.cpp	2014-09-23 18:22:24 +0000
@@ -19,13 +19,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "ui/widget/notebook-page.h"
 #include "document-properties.h"
 #include "display/canvas-grid.h"
+#include "display/canvas-guide.h"
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "inkscape.h"
@@ -43,8 +45,10 @@
 #include "ui/dialog/filedialog.h"
 #include "verbs.h"
 #include "widgets/icon.h"
+#include "ui/icon-names.h"
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
+#include "ui/widget/imagetoggler.h"
 #include <algorithm>    // std::min
 
 #include "rdf.h"
@@ -75,20 +79,20 @@
 
 //---------------------------------------------------
 
-static void on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data);
-static void on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data);
-static void on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer);
-
-static Inkscape::XML::NodeEventVector const _repr_events = {
-    on_child_added, // child_added
-    on_child_removed, // child_removed
-    on_repr_attr_changed,
-    NULL, // content_changed
-    NULL  // order_changed
+static void on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void *data);
+
+static void on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref,
+                             void *data);
+
+static void on_repr_attr_changed(Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer);
+
+static Inkscape::XML::NodeEventVector const _repr_events = { on_child_added,             // child_added
+                                                             on_child_removed,           // child_removed
+                                                             on_repr_attr_changed, NULL, // content_changed
+                                                             NULL                        // order_changed
 };
 
-
-DocumentProperties& DocumentProperties::getInstance()
+DocumentProperties &DocumentProperties::getInstance()
 {
     DocumentProperties &instance = *new DocumentProperties();
     instance.init();
@@ -96,70 +100,112 @@
     return instance;
 }
 
-DocumentProperties::DocumentProperties()
-    : UI::Widget::Panel ("", "/dialogs/documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
-      _page_page(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
-      _page_guides(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-      _page_snap(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-      _page_cms(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-      _page_scripting(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-      _page_external_scripts(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-      _page_embedded_scripts(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-      _page_metadata1(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-      _page_metadata2(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
-    //---------------------------------------------------------------
-      _rcb_antialias(_("Use antialiasing"), _("If unset, no antialiasing will be done on the drawing"), "shape-rendering", _wr, false, NULL, NULL, NULL, "crispEdges"),
-      _rcb_canb(_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false),
-      _rcb_bord(_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false),
-      _rcb_shad(_("_Show border shadow"), _("If set, page border shows a shadow on its right and lower side"), "inkscape:showpageshadow", _wr, false),
-      _rcp_bg(_("Back_ground color:"), _("Background color"), _("Color of the page background. Note: transparency setting ignored while editing but used when exporting to bitmap."), "pagecolor", "inkscape:pageopacity", _wr),
-      _rcp_bord(_("Border _color:"), _("Page border color"), _("Color of the page border"), "bordercolor", "borderopacity", _wr),
-      _rum_deflt(_("Default _units:"), "inkscape:document-units", _wr),
-      _page_sizer(_wr),
-    //---------------------------------------------------------------
-      //General snap options
-      _rcb_sgui(_("Show _guides"), _("Show or hide guides"), "showguides", _wr),
-      _rcp_gui(_("Guide co_lor:"), _("Guideline color"), _("Color of guidelines"), "guidecolor", "guideopacity", _wr),
-      _rcp_hgui(_("_Highlight color:"), _("Highlighted guideline color"), _("Color of a guideline when it is under mouse"), "guidehicolor", "guidehiopacity", _wr),
-    //---------------------------------------------------------------
-    _rsu_sno(_("Snap _distance"), _("Snap only when _closer than:"), _("Always snap"),
-                  _("Snapping distance, in screen pixels, for snapping to objects"), _("Always snap to objects, regardless of their distance"),
-                  _("If set, objects only snap to another object when it's within the range specified below"),
-                  "objecttolerance", _wr),
-    //Options for snapping to grids
+DocumentProperties::DocumentProperties() :
+    UI::Widget::Panel ("", "/dialogs/documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
+    _page_page             (Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
+    _page_guides           (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+    _page_snap             (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+    _page_cms              (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+    _page_scripting        (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+    _page_external_scripts (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+    _page_embedded_scripts (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+    _page_metadata1        (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+    _page_metadata2        (Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
+//---------------------------------------------------------------
+    _rcb_antialias(_("Use antialiasing"),
+                   _("If unset, no antialiasing will be done on the drawing"),
+                   "shape-rendering", _wr, false, NULL, NULL, NULL, "crispEdges"),
+
+    _rcb_canb(_("Show page _border"), _("If set, rectangular page border is shown"),
+              "showborder", _wr, false),
+    
+    _rcb_bord(_("Border on _top of drawing"),
+              _("If set, border is always on top of the drawing"),
+              "borderlayer", _wr, false),
+
+    _rcb_shad(_("_Show border shadow"),
+              _("If set, page border shows a shadow on its right and lower side"),
+              "inkscape:showpageshadow", _wr, false),
+
+    _rcp_bg(_("Back_ground color:"), _("Background color"),
+            _("Color of the page background. Note: transparency setting ignored"
+              "while editing but used when exporting to bitmap."),
+            "pagecolor", "inkscape:pageopacity", _wr),
+
+    _rcp_bord(_("Border _color:"), _("Page border color"),
+              _("Color of the page border"), "bordercolor", "borderopacity", _wr),
+
+    _rum_deflt(_("Default _units:"), "inkscape:document-units", _wr),
+
+    _page_sizer(_wr),
+
+//---------------------------------------------------------------
+// General snap options
+// TODO: might have to clean these up, as might not used anymore.
+
+    _rcb_sgui(_("Show _guides"), _("Show or hide guides"), "showguides", _wr),
+
+    _rcp_gui(_("Guide co_lor:"), _("Guideline color"), _("Color of guidelines"),
+             "guidecolor", "guideopacity", _wr),
+
+    _rcp_hgui(_("_Highlight color:"), _("Highlighted guideline color"),
+              _("Color of a guideline when it is under mouse"),
+              "guidehicolor", "guidehiopacity", _wr),
+//---------------------------------------------------------------
+    _rsu_sno(_("Snap _distance"), _("Snap only when _closer than:"),
+             _("Always snap"),
+             _("Snapping distance, in screen pixels, for snapping to objects"),
+             _("Always snap to objects, regardless of their distance"),
+             _("If set, objects only snap to another object when it's within the range specified below"),
+             "objecttolerance", _wr),
+// Options for snapping to grids
     _rsu_sn(_("Snap d_istance"), _("Snap only when c_loser than:"), _("Always snap"),
-                  _("Snapping distance, in screen pixels, for snapping to grid"), _("Always snap to grids, regardless of the distance"),
-                  _("If set, objects only snap to a grid line when it's within the range specified below"),
-                  "gridtolerance", _wr),
-    //Options for snapping to guides
+            _("Snapping distance, in screen pixels, for snapping to grid"),
+            _("Always snap to grids, regardless of the distance"),
+            _("If set, objects only snap to a grid line when it's within the range specified below"),
+            "gridtolerance", _wr),
+
+// Options for snapping to guides
     _rsu_gusn(_("Snap dist_ance"), _("Snap only when close_r than:"), _("Always snap"),
-                _("Snapping distance, in screen pixels, for snapping to guides"), _("Always snap to guides, regardless of the distance"),
-                _("If set, objects only snap to a guide when it's within the range specified below"),
-                "guidetolerance", _wr),
-    //---------------------------------------------------------------
-      _rcb_snclp(_("Snap to clip paths"), _("When snapping to paths, then also try snapping to clip paths"), "inkscape:snap-path-clip", _wr),
-      _rcb_snmsk(_("Snap to mask paths"), _("When snapping to paths, then also try snapping to mask paths"), "inkscape:snap-path-mask", _wr),
-      _rcb_perp(_("Snap perpendicularly"), _("When snapping to paths or guides, then also try snapping perpendicularly"), "inkscape:snap-perpendicular", _wr),
-      _rcb_tang(_("Snap tangentially"), _("When snapping to paths or guides, then also try snapping tangentially"), "inkscape:snap-tangential", _wr),
-    //---------------------------------------------------------------
-      _grids_label_crea("", Gtk::ALIGN_START),
-      _grids_button_new(C_("Grid", "_New"), _("Create new grid.")),
-      _grids_button_remove(C_("Grid", "_Remove"), _("Remove selected grid.")),
-      _grids_label_def("", Gtk::ALIGN_START)
+              _("Snapping distance, in screen pixels, for snapping to guides"),
+              _("Always snap to guides, regardless of the distance"),
+              _("If set, objects only snap to a guide when it's within the range specified below"),
+              "guidetolerance", _wr),
+//---------------------------------------------------------------
+    _rcb_snclp(_("Snap to clip paths"),
+               _("When snapping to paths, then also try snapping to clip paths"),
+               "inkscape:snap-path-clip", _wr),
+
+    _rcb_snmsk(_("Snap to mask paths"),
+               _("When snapping to paths, then also try snapping to mask paths"),
+               "inkscape:snap-path-mask", _wr),
+
+    _rcb_perp(_("Snap perpendicularly"),
+              _("When snapping to paths or guides, then also try snapping perpendicularly"),
+              "inkscape:snap-perpendicular", _wr),
+
+    _rcb_tang(_("Snap tangentially"),
+              _("When snapping to paths or guides, then also try snapping tangentially"),
+              "inkscape:snap-tangential", _wr),
+//---------------------------------------------------------------
+    _grids_label_crea("", Gtk::ALIGN_START),
+    _grids_button_new(C_("Grid", "_New"), _("Create new grid.")),
+    _grids_button_remove(C_("Grid", "_Remove"), _("Remove selected grid.")),
+    _grids_label_def("", Gtk::ALIGN_START)
 {
-    _getContents()->set_spacing (4);
+    _getContents()->set_spacing(4);
     _getContents()->pack_start(_notebook, true, true);
 
-    _notebook.append_page(*_page_page,      _("Page"));
-    _notebook.append_page(*_page_guides,    _("Guides"));
-    _notebook.append_page(_grids_vbox,     _("Grids"));
-    _notebook.append_page(*_page_snap,      _("Snap"));
+    _notebook.append_page(*_page_page, _("Page"));
+    _notebook.append_page(*_page_guides, _("Guides"));
+    _notebook.append_page(_grids_vbox, _("Grids"));
+    _notebook.append_page(*_page_snap, _("Snap"));
     _notebook.append_page(*_page_cms, _("Color"));
     _notebook.append_page(*_page_scripting, _("Scripting"));
     _notebook.append_page(*_page_metadata1, _("Metadata"));
     _notebook.append_page(*_page_metadata2, _("License"));
 
-    _wr.setUpdating (true);
+    _wr.setUpdating(true);
     build_page();
     build_guides();
     build_gridspage();
@@ -169,7 +215,9 @@
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     build_scripting();
     build_metadata();
-    _wr.setUpdating (false);
+    _wr.setUpdating(false);
+
+    _refresh_guidelist_button.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::populate_guides_list));
 
     _grids_button_new.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onNewGrid));
     _grids_button_remove.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onRemoveGrid));
@@ -187,126 +235,138 @@
     update();
 
     Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
-    repr->addListener (&_repr_events, this);
+    repr->addListener(&_repr_events, this);
     Inkscape::XML::Node *root = sp_desktop_document(getDesktop())->getRoot()->getRepr();
-    root->addListener (&_repr_events, this);
+    root->addListener(&_repr_events, this);
 
     show_all_children();
     _grids_button_remove.hide();
+    _guidelist.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
 }
 
 DocumentProperties::~DocumentProperties()
 {
     Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
-    repr->removeListenerByData (this);
+    repr->removeListenerByData(this);
     Inkscape::XML::Node *root = sp_desktop_document(getDesktop())->getRoot()->getRepr();
-    root->removeListenerByData (this);
+    root->removeListenerByData(this);
 
-    for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); ++it)
+    for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); ++it) {
         delete (*it);
+    }
 }
 
 //========================================================================
 
 /**
- * Helper function that attaches widgets in a 3xn table. The widgets come in an
- * array that has two entries per table row. The two entries code for four
- * possible cases: (0,0) means insert space in first column; (0, non-0) means
- * widget in columns 2-3; (non-0, 0) means label in columns 1-3; and
+ * Helper function that attaches widgets in a 3xn table. The widgets come in an array that has two
+ * entries per table row.
+ *
+ * The two entries describe the four possible cases:
+ *
+ * (0, 0)         means insert space in first column.
+ *
+ * (0, non-0)     means widget in columns 2-3.
+ *
+ * (non-0, 0)     means label  in columns 1-3.
+ *
  * (non-0, non-0) means two widgets in columns 2 and 3.
+ *
  */
 #if WITH_GTKMM_3_0
-inline void attach_all(Gtk::Grid &table, Gtk::Widget *const arr[], unsigned const n, int start = 0, int docum_prop_flag = 0)
+inline void attach_all(Gtk::Grid &table, Gtk::Widget *const arr[], unsigned const n, int start = 0,
+                       int docum_prop_flag = 0)
 #else
-inline void attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int start = 0, int docum_prop_flag = 0)
+inline void attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int start = 0,
+                       int docum_prop_flag = 0)
 #endif
 {
     for (unsigned i = 0, r = start; i < n; i += 2) {
-        if (arr[i] && arr[i+1]) {
+        if (arr[i] && arr[i + 1]) {
 #if WITH_GTKMM_3_0
             arr[i]->set_hexpand();
-            arr[i+1]->set_hexpand();
+            arr[i + 1]->set_hexpand();
             arr[i]->set_valign(Gtk::ALIGN_CENTER);
-            arr[i+1]->set_valign(Gtk::ALIGN_CENTER);
-            table.attach(*arr[i],   1, r, 1, 1);
-            table.attach(*arr[i+1], 2, r, 1, 1);
+            arr[i + 1]->set_valign(Gtk::ALIGN_CENTER);
+            table.attach(*arr[i], 1, r, 1, 1);
+            table.attach(*arr[i + 1], 2, r, 1, 1);
 #else
-            table.attach(*arr[i],   1, 2, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
-            table.attach(*arr[i+1], 2, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+            table.attach(*arr[i], 1, 2, r, r + 1, Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+            table.attach(*arr[i + 1], 2, 3, r, r + 1, Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
 #endif
         } else {
-            if (arr[i+1]) {
+            if (arr[i + 1]) {
                 Gtk::AttachOptions yoptions = (Gtk::AttachOptions)0;
-                if (dynamic_cast<Inkscape::UI::Widget::PageSizer*>(arr[i+1])) {
+                if (dynamic_cast<Inkscape::UI::Widget::PageSizer *>(arr[i + 1])) {
                     // only the PageSizer in Document Properties|Page should be stretched vertically
-                    yoptions = Gtk::FILL|Gtk::EXPAND;
+                    yoptions = Gtk::FILL | Gtk::EXPAND;
                 }
                 if (docum_prop_flag) {
                     // this sets the padding for subordinate widgets on the "Page" page
-                    if( i==(n-8) || i==(n-10) ) {
+                    if (i == (n - 8) || i == (n - 10)) {
 #if WITH_GTKMM_3_0
-                        arr[i+1]->set_hexpand();
-                        arr[i+1]->set_margin_left(20);
-                        arr[i+1]->set_margin_right(20);
+                        arr[i + 1]->set_hexpand();
+                        arr[i + 1]->set_margin_left(20);
+                        arr[i + 1]->set_margin_right(20);
 
                         if (yoptions & Gtk::EXPAND)
-                            arr[i+1]->set_vexpand();
+                            arr[i + 1]->set_vexpand();
                         else
-                            arr[i+1]->set_valign(Gtk::ALIGN_CENTER);
+                            arr[i + 1]->set_valign(Gtk::ALIGN_CENTER);
 
-                        table.attach(*arr[i+1], 1, r, 2, 1);
+                        table.attach(*arr[i + 1], 1, r, 2, 1);
 #else
-                        table.attach(*arr[i+1], 1, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, yoptions, 20,0);
+                        table.attach(*arr[i + 1], 1, 3, r, r + 1, Gtk::FILL | Gtk::EXPAND, yoptions, 20, 0);
 #endif
                     } else {
 #if WITH_GTKMM_3_0
-                        arr[i+1]->set_hexpand();
+                        arr[i + 1]->set_hexpand();
 
                         if (yoptions & Gtk::EXPAND)
-                            arr[i+1]->set_vexpand();
+                            arr[i + 1]->set_vexpand();
                         else
-                            arr[i+1]->set_valign(Gtk::ALIGN_CENTER);
+                            arr[i + 1]->set_valign(Gtk::ALIGN_CENTER);
 
-                        table.attach(*arr[i+1], 1, r, 2, 1);
+                        table.attach(*arr[i + 1], 1, r, 2, 1);
 #else
-                        table.attach(*arr[i+1], 1, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, yoptions, 0,0);
+                        table.attach(*arr[i + 1], 1, 3, r, r + 1, Gtk::FILL | Gtk::EXPAND, yoptions, 0, 0);
 #endif
                     }
                 } else {
 #if WITH_GTKMM_3_0
-                    arr[i+1]->set_hexpand();
-                        
+                    arr[i + 1]->set_hexpand();
+
                     if (yoptions & Gtk::EXPAND)
-                        arr[i+1]->set_vexpand();
+                        arr[i + 1]->set_vexpand();
                     else
-                        arr[i+1]->set_valign(Gtk::ALIGN_CENTER);
+                        arr[i + 1]->set_valign(Gtk::ALIGN_CENTER);
 
-                    table.attach(*arr[i+1], 1, r, 2, 1);
+                    table.attach(*arr[i + 1], 1, r, 2, 1);
 #else
-                    table.attach(*arr[i+1], 1, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, yoptions, 0,0);
+                    table.attach(*arr[i + 1], 1, 3, r, r + 1, Gtk::FILL | Gtk::EXPAND, yoptions, 0, 0);
 #endif
                 }
             } else if (arr[i]) {
-                Gtk::Label& label = reinterpret_cast<Gtk::Label&>(*arr[i]);
-                label.set_alignment (0.0);
+                Gtk::Label &label = reinterpret_cast<Gtk::Label &>(*arr[i]);
+                label.set_alignment(0.0);
 
 #if WITH_GTKMM_3_0
                 label.set_hexpand();
                 label.set_valign(Gtk::ALIGN_CENTER);
                 table.attach(label, 0, r, 3, 1);
 #else
-                table.attach (label, 0, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+                table.attach(label, 0, 3, r, r + 1, Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
 #endif
             } else {
-                Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
-                space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
+                Gtk::HBox *space = Gtk::manage(new Gtk::HBox);
+                space->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
                 space->set_halign(Gtk::ALIGN_CENTER);
                 space->set_valign(Gtk::ALIGN_CENTER);
                 table.attach(*space, 0, r, 1, 1);
 #else
-                table.attach (*space, 0, 1, r, r+1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0,0,0);
+                table.attach(*space, 0, 1, r, r + 1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0, 0, 0);
 #endif
             }
         }
@@ -318,20 +378,20 @@
 {
     _page_page->show();
 
-    Gtk::Label* label_gen = Gtk::manage (new Gtk::Label);
-    label_gen->set_markup (_("<b>General</b>"));
-    Gtk::Label *label_for = Gtk::manage (new Gtk::Label);
-    label_for->set_markup (_("<b>Page Size</b>"));
-    Gtk::Label* label_dsp = Gtk::manage (new Gtk::Label);
-    label_dsp->set_markup (_("<b>Display</b>"));
+    Gtk::Label *label_gen = Gtk::manage(new Gtk::Label);
+    label_gen->set_markup(_("<b>General</b>"));
+    Gtk::Label *label_for = Gtk::manage(new Gtk::Label);
+    label_for->set_markup(_("<b>Page Size</b>"));
+    Gtk::Label *label_dsp = Gtk::manage(new Gtk::Label);
+    label_dsp->set_markup(_("<b>Display</b>"));
     _page_sizer.init();
 
     Gtk::Widget *const widget_array[] =
     {
         label_gen,         0,
         0,                 &_rum_deflt,
-        //label_col,         0,
-        //_rcp_bg._label,    &_rcp_bg,
+        // label_col,      0,
+        // _rcp_bg._label, &_rcp_bg,
         0,                 0,
         label_for,         0,
         0,                 &_page_sizer,
@@ -345,76 +405,225 @@
         _rcp_bord._label,  &_rcp_bord,
     };
 
-    std::list<Gtk::Widget*> _slaveList;
+    std::list<Gtk::Widget *> _slaveList;
     _slaveList.push_back(&_rcb_bord);
     _slaveList.push_back(&_rcb_shad);
     _rcb_canb.setSlaveWidgets(_slaveList);
 
-    attach_all(_page_page->table(), widget_array, G_N_ELEMENTS(widget_array),0,1);
+    attach_all(_page_page->table(), widget_array, G_N_ELEMENTS(widget_array), 0, 1);
+}
+
+void DocumentProperties::guides_page_config_buttons()
+{
+    _delete_guide_button.set_label(_("Delete"));
+    _delete_guide_button.set_image(*Gtk::manage(new Gtk::Image(Gtk::Stock::REMOVE, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
+    _delete_guide_button.set_tooltip_text(_("Delete guide"));
+    _delete_guide_button.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::delete_selected_guides));
+    _delete_guide_button.set_alignment(0.0, 0.0);
+
+    _refresh_guidelist_button.set_image(
+        *Gtk::manage(new Gtk::Image(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
+    _refresh_guidelist_button.set_tooltip_text(_("Refresh guide list"));
+    _refresh_guidelist_button.set_label(_("Refresh"));
+}
+
+void DocumentProperties::guides_page_attach_widgets()
+{
+#if WITH_GTKMM_3_0
+    // _page_guides->table().attach(*label_guidelist, 0, row++, 1, 1);
+    // _page_guides->table().attach(_guidelist_ListScroller, 0, row++, 1, 1);
+    // _page_guides->table().attach(_delete_guide_button, 0, row++, 1, 1);
+    // _page_guides->table().attach(_refresh_guidelist_button, 0, row, 1, 1);
+#else
+    Gtk::Label *label_gui = Gtk::manage(new Gtk::Label);
+    label_gui->set_markup(_("<b>Guides</b>"));
+    
+    Gtk::Widget *const widget_array[] = 
+        {
+            label_gui,        0,
+            0,                &_rcb_sgui,
+            _rcp_gui._label,  &_rcp_gui,
+            _rcp_hgui._label, &_rcp_hgui
+        };
+
+    attach_all(_page_guides->table(), widget_array, G_N_ELEMENTS(widget_array));
+
+    Gtk::Label *label_guidelist = manage(new Gtk::Label("", Gtk::ALIGN_START));
+    label_guidelist->set_markup(_("<b>Guide list:</b>"));
+    label_guidelist->set_alignment(0.0);
+
+    Gtk::HBox *spacer = Gtk::manage(new Gtk::HBox());
+    spacer->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
+
+    _page_guides->set_spacing(4);
+
+    gint row = 4;
+
+    _page_guides->table().attach(*label_guidelist, 0, 1, row, row + 1,
+                                 Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions) 0,
+                                 0, 1);
+    row++;
+
+    _page_guides->table().attach(_guidelist_ListScroller, 0, 1, row, row + 1,
+                                 Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions) 0,
+                                 0, 0);
+    row++;
+
+    _page_guides->table().attach(_delete_guide_button, 0, 1, row, row + 1,
+                                 (Gtk::AttachOptions) 0, (Gtk::AttachOptions) 0,
+                                 0, 0);
+    row++;
+
+    _page_guides->table().attach(_refresh_guidelist_button, 0, 1, row, row + 1,
+                                 (Gtk::AttachOptions) 0, (Gtk::AttachOptions) 0,
+                                 0, 0);
+#endif
+}
+
+void DocumentProperties::guides_page_config_guidelist()
+{
+    using Inkscape::UI::Widget::ImageToggler;
+
+    ImageToggler *visiblity_toggler =
+        Gtk::manage(new ImageToggler(INKSCAPE_ICON("object-visible"),
+                                     INKSCAPE_ICON("object-hidden")));
+
+    ImageToggler *lock_toggler =
+        Gtk::manage(new ImageToggler(INKSCAPE_ICON("object-locked"),
+                                     INKSCAPE_ICON("object-unlocked")));
+
+    _guidelist_ListStore = Gtk::ListStore::create(_guidelist_columns);
+    _guidelist.set_model(_guidelist_ListStore);
+    _guidelist.append_column("", *visiblity_toggler);
+    _guidelist.append_column("", *lock_toggler);
+    _guidelist.append_column(_("Guide id"), _guidelist_columns.guide_name_column);
+    _guidelist.set_headers_visible(false);
+
+    _guidelist_ListScroller.add(_guidelist);
+    _guidelist_ListScroller.set_shadow_type(Gtk::SHADOW_IN);
+    _guidelist_ListScroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
+    _guidelist_ListScroller.set_size_request(-1, 90);
 }
 
 void DocumentProperties::build_guides()
 {
     _page_guides->show();
-
-    Gtk::Label *label_gui = Gtk::manage (new Gtk::Label);
-    label_gui->set_markup (_("<b>Guides</b>"));
-
-    Gtk::Widget *const widget_array[] =
-    {
-        label_gui,        0,
-        0,                &_rcb_sgui,
-        _rcp_gui._label,  &_rcp_gui,
-        _rcp_hgui._label, &_rcp_hgui
-    };
-
-    attach_all(_page_guides->table(), widget_array, G_N_ELEMENTS(widget_array));
+    guides_page_config_buttons();
+    guides_page_attach_widgets();
+    guides_page_config_guidelist();
+    populate_guides_list();
+}
+
+void DocumentProperties::delete_guide_in_treeview_row(const Gtk::TreeModel::iterator &iter)
+{
+    SPDesktop *desktop = getDesktop();
+
+    if (!desktop) {
+        return;
+    }
+
+    SPDocument *document = sp_desktop_document(desktop);
+
+    if (!document) {
+        return;
+    }
+
+    Glib::ustring guide_id = (*iter)[_guidelist_columns.guide_id_column];
+
+    SPObject *guide = document->getObjectById(guide_id.c_str());
+
+    if (!SP_IS_GUIDE(guide)) {
+        return;
+    }
+    else {
+        sp_guide_remove((SPGuide *) guide);
+        DocumentUndo::maybeDone(document, "guide:delete",
+                                SP_VERB_NONE, _("Delete selected guides."));
+    }    
+}
+
+void DocumentProperties::delete_selected_guides()
+{
+    _guidelist.get_selection()->selected_foreach_iter
+        (sigc::mem_fun(*this, &DocumentProperties::delete_guide_in_treeview_row));
+
+    populate_guides_list();
+}
+
+void DocumentProperties::populate_guides_list()
+{
+    SPDesktop *desktop = getDesktop();
+
+    if (!desktop) {
+        return;
+    }
+
+    SPNamedView *named_view = sp_desktop_namedview(desktop);
+
+    if (!named_view) {
+        return;
+    }
+
+    _guidelist_ListStore->clear();
+
+    for (SPObject *object = named_view->firstChild(); object; object = object->getNext()) {
+
+        if (SP_IS_GUIDE(object)) {
+
+            SPGuide *guide = SP_GUIDE(object);
+            Gtk::TreeModel::Row row = *(_guidelist_ListStore->append());
+
+            const gchar *guide_id = guide->getAttribute("id");
+
+            if (guide_id) {
+
+                if (guide->label != NULL) {
+                    row[_guidelist_columns.guide_name_column] = guide->label;
+                }
+                else {                
+                    row[_guidelist_columns.guide_name_column] = guide_id;
+                }
+
+                row[_guidelist_columns.guide_id_column] = guide_id;
+            }
+        }
+    }
 }
 
 void DocumentProperties::build_snap()
 {
     _page_snap->show();
 
-    Gtk::Label *label_o = Gtk::manage (new Gtk::Label);
-    label_o->set_markup (_("<b>Snap to objects</b>"));
-    Gtk::Label *label_gr = Gtk::manage (new Gtk::Label);
-    label_gr->set_markup (_("<b>Snap to grids</b>"));
-    Gtk::Label *label_gu = Gtk::manage (new Gtk::Label);
-    label_gu->set_markup (_("<b>Snap to guides</b>"));
-    Gtk::Label *label_m = Gtk::manage (new Gtk::Label);
-    label_m->set_markup (_("<b>Miscellaneous</b>"));
+    Gtk::Label *label_o = Gtk::manage(new Gtk::Label);
+    label_o->set_markup(_("<b>Snap to objects</b>"));
+    Gtk::Label *label_gr = Gtk::manage(new Gtk::Label);
+    label_gr->set_markup(_("<b>Snap to grids</b>"));
+    Gtk::Label *label_gu = Gtk::manage(new Gtk::Label);
+    label_gu->set_markup(_("<b>Snap to guides</b>"));
+    Gtk::Label *label_m = Gtk::manage(new Gtk::Label);
+    label_m->set_markup(_("<b>Miscellaneous</b>"));
 
-    Gtk::Widget *const array[] =
-    {
-        label_o,            0,
-        0,                  _rsu_sno._vbox,
-        0,                  &_rcb_snclp,
-        0,                  &_rcb_snmsk,
-        0,                  0,
-        label_gr,           0,
-        0,                  _rsu_sn._vbox,
-        0,                  0,
-        label_gu,           0,
-        0,                  _rsu_gusn._vbox,
-        0,                  0,
-        label_m,           0,
-        0,                  &_rcb_perp,
-        0,                  &_rcb_tang
-    };
+    Gtk::Widget *const array[] = { label_o, 0,               0, _rsu_sno._vbox, 0,        &_rcb_snclp,
+                                   0,       &_rcb_snmsk,     0, 0,              label_gr, 0,
+                                   0,       _rsu_sn._vbox,   0, 0,              label_gu, 0,
+                                   0,       _rsu_gusn._vbox, 0, 0,              label_m,  0,
+                                   0,       &_rcb_perp,      0, &_rcb_tang };
 
     attach_all(_page_snap->table(), array, G_N_ELEMENTS(array));
- }
+}
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 /// Populates the available color profiles combo box
-void DocumentProperties::populate_available_profiles(){
+void DocumentProperties::populate_available_profiles()
+{
     _combo_avail.remove_all(); // Clear any existing items in the combo box
 
     // Iterate through the list of profiles and add the name to the combo box.
     std::vector<std::pair<Glib::ustring, Glib::ustring> > pairs = ColorProfile::getProfileFilesWithNames();
-    for ( std::vector<std::pair<Glib::ustring, Glib::ustring> >::const_iterator it = pairs.begin(); it != pairs.end(); ++it ) {
+    for (std::vector<std::pair<Glib::ustring, Glib::ustring> >::const_iterator it = pairs.begin(); it != pairs.end();
+         ++it) {
         Glib::ustring name = it->second;
-	_combo_avail.append(name);
+        _combo_avail.append(name);
     }
 }
 
@@ -422,29 +631,21 @@
  * Cleans up name to remove disallowed characters.
  * Some discussion at http://markmail.org/message/bhfvdfptt25kgtmj
  * Allowed ASCII first characters:  ':', 'A'-'Z', '_', 'a'-'z'
- * Allowed ASCII remaining chars add: '-', '.', '0'-'9', 
+ * Allowed ASCII remaining chars add: '-', '.', '0'-'9',
  *
  * @param str the string to clean up.
  */
-static void sanitizeName( Glib::ustring& str )
+static void sanitizeName(Glib::ustring &str)
 {
     if (str.size() > 1) {
         char val = str.at(0);
-        if (((val < 'A') || (val > 'Z'))
-            && ((val < 'a') || (val > 'z'))
-            && (val != '_')
-            && (val != ':')) {
+        if (((val < 'A') || (val > 'Z')) && ((val < 'a') || (val > 'z')) && (val != '_') && (val != ':')) {
             str.replace(0, 1, "-");
         }
         for (Glib::ustring::size_type i = 1; i < str.size(); i++) {
             char val = str.at(i);
-            if (((val < 'A') || (val > 'Z'))
-                && ((val < 'a') || (val > 'z'))
-                && ((val < '0') || (val > '9'))
-                && (val != '_')
-                && (val != ':')
-                && (val != '-')
-                && (val != '.')) {
+            if (((val < 'A') || (val > 'Z')) && ((val < 'a') || (val > 'z')) && ((val < '0') || (val > '9')) &&
+                (val != '_') && (val != ':') && (val != '-') && (val != '.')) {
                 str.replace(i, 1, "-");
             }
         }
@@ -454,36 +655,36 @@
 /// Links the selected color profile in the combo box to the document
 void DocumentProperties::linkSelectedProfile()
 {
-//store this profile in the SVG document (create <color-profile> element in the XML)
+    // store this profile in the SVG document (create <color-profile> element in the XML)
     // TODO remove use of 'active' desktop
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (!desktop){
+    if (!desktop) {
         g_warning("No active desktop");
     } else {
-	// Find the index of the currently-selected row in the color profiles combobox
-	int row = _combo_avail.get_active_row_number();
+        // Find the index of the currently-selected row in the color profiles combobox
+        int row = _combo_avail.get_active_row_number();
 
-	if (row == -1){
+        if (row == -1) {
             g_warning("No color profile available.");
             return;
         }
-	
-	// Read the filename and description from the list of available profiles
-	std::vector<std::pair<Glib::ustring, Glib::ustring> > pairs = ColorProfile::getProfileFilesWithNames();
+
+        // Read the filename and description from the list of available profiles
+        std::vector<std::pair<Glib::ustring, Glib::ustring> > pairs = ColorProfile::getProfileFilesWithNames();
         Glib::ustring file = pairs[row].first;
         Glib::ustring name = pairs[row].second;
 
         Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
         Inkscape::XML::Node *cprofRepr = xml_doc->createElement("svg:color-profile");
-        gchar* tmp = g_strdup(name.c_str());
+        gchar *tmp = g_strdup(name.c_str());
         Glib::ustring nameStr = tmp ? tmp : "profile"; // TODO add some auto-numbering to avoid collisions
         sanitizeName(nameStr);
         cprofRepr->setAttribute("name", nameStr.c_str());
-        cprofRepr->setAttribute("xlink:href", (gchar*) file.c_str());
+        cprofRepr->setAttribute("xlink:href", (gchar *)file.c_str());
 
         // Checks whether there is a defs element. Creates it when needed
         Inkscape::XML::Node *defsRepr = sp_repr_lookup_name(xml_doc, "svg:defs");
-        if (!defsRepr){
+        if (!defsRepr) {
             defsRepr = xml_doc->createElement("svg:defs");
             xml_doc->root()->addChild(defsRepr, NULL);
         }
@@ -492,7 +693,7 @@
         defsRepr->addChild(cprofRepr, NULL);
 
         // TODO check if this next line was sometimes needed. It being there caused an assertion.
-        //Inkscape::GC::release(defsRepr);
+        // Inkscape::GC::release(defsRepr);
 
         // inform the document, so we can undo
         DocumentUndo::done(desktop->doc(), SP_VERB_EDIT_LINK_COLOR_PROFILE, _("Link Color Profile"));
@@ -504,44 +705,44 @@
 void DocumentProperties::populate_linked_profiles_box()
 {
     _LinkedProfilesListStore->clear();
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
     if (current) {
         _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
     }
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
-        Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
+    while (current) {
+        SPObject *obj = SP_OBJECT(current->data);
+        Inkscape::ColorProfile *prof = reinterpret_cast<Inkscape::ColorProfile *>(obj);
         Gtk::TreeModel::Row row = *(_LinkedProfilesListStore->append());
         row[_LinkedProfilesListColumns.nameColumn] = prof->name;
-//        row[_LinkedProfilesListColumns.previewColumn] = "Color Preview";
+        //        row[_LinkedProfilesListColumns.previewColumn] = "Color Preview";
         current = g_slist_next(current);
     }
 }
 
-void DocumentProperties::external_scripts_list_button_release(GdkEventButton* event)
+void DocumentProperties::external_scripts_list_button_release(GdkEventButton *event)
 {
-    if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
+    if ((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
         _ExternalScriptsContextMenu.popup(event->button, event->time);
     }
 }
 
-void DocumentProperties::embedded_scripts_list_button_release(GdkEventButton* event)
+void DocumentProperties::embedded_scripts_list_button_release(GdkEventButton *event)
 {
-    if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
+    if ((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
         _EmbeddedScriptsContextMenu.popup(event->button, event->time);
     }
 }
 
-void DocumentProperties::linked_profiles_list_button_release(GdkEventButton* event)
+void DocumentProperties::linked_profiles_list_button_release(GdkEventButton *event)
 {
-    if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
+    if ((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
         _EmbProfContextMenu.popup(event->button, event->time);
     }
 }
 
-void DocumentProperties::cms_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
+void DocumentProperties::cms_create_popup_menu(Gtk::Widget &parent, sigc::slot<void> rem)
 {
-    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    Gtk::MenuItem *mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
     _EmbProfContextMenu.append(*mi);
     mi->signal_activate().connect(rem);
     mi->show();
@@ -549,18 +750,18 @@
 }
 
 
-void DocumentProperties::external_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
+void DocumentProperties::external_create_popup_menu(Gtk::Widget &parent, sigc::slot<void> rem)
 {
-    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    Gtk::MenuItem *mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
     _ExternalScriptsContextMenu.append(*mi);
     mi->signal_activate().connect(rem);
     mi->show();
     _ExternalScriptsContextMenu.accelerate(parent);
 }
 
-void DocumentProperties::embedded_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
+void DocumentProperties::embedded_create_popup_menu(Gtk::Widget &parent, sigc::slot<void> rem)
 {
-    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    Gtk::MenuItem *mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
     _EmbeddedScriptsContextMenu.append(*mi);
     mi->signal_activate().connect(rem);
     mi->show();
@@ -571,30 +772,31 @@
 {
     Glib::RefPtr<Gtk::TreeSelection> sel = _LinkedProfilesList.get_selection();
     if (sel) {
-        _unlink_btn.set_sensitive(sel->count_selected_rows () > 0);
+        _unlink_btn.set_sensitive(sel->count_selected_rows() > 0);
     }
 }
 
 
-void DocumentProperties::removeSelectedProfile(){
+void DocumentProperties::removeSelectedProfile()
+{
     Glib::ustring name;
-    if(_LinkedProfilesList.get_selection()) {
+    if (_LinkedProfilesList.get_selection()) {
         Gtk::TreeModel::iterator i = _LinkedProfilesList.get_selection()->get_selected();
 
-        if(i){
+        if (i) {
             name = (*i)[_LinkedProfilesListColumns.nameColumn];
         } else {
             return;
         }
     }
 
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
-        Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
-        if (!name.compare(prof->name)){
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
+    while (current) {
+        SPObject *obj = SP_OBJECT(current->data);
+        Inkscape::ColorProfile *prof = reinterpret_cast<Inkscape::ColorProfile *>(obj);
+        if (!name.compare(prof->name)) {
 
-            //XML Tree being used directly here while it shouldn't be.
+            // XML Tree being used directly here while it shouldn't be.
             sp_repr_unparent(obj->getRepr());
             DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_COLOR_PROFILE, _("Remove linked color profile"));
             break; // removing the color profile likely invalidates part of the traversed list, stop traversing here.
@@ -609,10 +811,10 @@
 void DocumentProperties::build_cms()
 {
     _page_cms->show();
-    Gtk::Label *label_link= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
-    label_link->set_markup (_("<b>Linked Color Profiles:</b>"));
-    Gtk::Label *label_avail = Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
-    label_avail->set_markup (_("<b>Available Color Profiles:</b>"));
+    Gtk::Label *label_link = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START));
+    label_link->set_markup(_("<b>Linked Color Profiles:</b>"));
+    Gtk::Label *label_avail = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START));
+    label_avail->set_markup(_("<b>Available Color Profiles:</b>"));
 
     _link_btn.set_tooltip_text(_("Link Profile"));
 #if WITH_GTKMM_3_10
@@ -642,7 +844,7 @@
     label_link->set_valign(Gtk::ALIGN_CENTER);
     _page_cms->table().attach(*label_link, 0, row, 3, 1);
 #else
-    _page_cms->table().attach(*label_link, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_cms->table().attach(*label_link, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -652,12 +854,13 @@
     _LinkedProfilesListScroller.set_valign(Gtk::ALIGN_CENTER);
     _page_cms->table().attach(_LinkedProfilesListScroller, 0, row, 3, 1);
 #else
-    _page_cms->table().attach(_LinkedProfilesListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_cms->table().attach(_LinkedProfilesListScroller, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                              (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
 
-    Gtk::HBox* spacer = Gtk::manage(new Gtk::HBox());
+    Gtk::HBox *spacer = Gtk::manage(new Gtk::HBox());
     spacer->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
@@ -665,7 +868,7 @@
     spacer->set_valign(Gtk::ALIGN_CENTER);
     _page_cms->table().attach(*spacer, 0, row, 3, 1);
 #else
-    _page_cms->table().attach(*spacer, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_cms->table().attach(*spacer, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -677,7 +880,7 @@
     label_avail->set_valign(Gtk::ALIGN_CENTER);
     _page_cms->table().attach(*label_avail, 0, row, 3, 1);
 #else
-    _page_cms->table().attach(*label_avail, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_cms->table().attach(*label_avail, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -697,7 +900,7 @@
     _unlink_btn.set_valign(Gtk::ALIGN_CENTER);
     _page_cms->table().attach(_unlink_btn, 2, row, 1, 1);
 #else
-    _page_cms->table().attach(_combo_avail, 0, 1, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_cms->table().attach(_combo_avail, 0, 1, row, row + 1, Gtk::FILL | Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
     _page_cms->table().attach(_link_btn, 1, 2, row, row + 1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0, 2, 0);
     _page_cms->table().attach(_unlink_btn, 2, 3, row, row + 1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0, 0, 0);
 #endif
@@ -708,9 +911,9 @@
     _LinkedProfilesListStore = Gtk::ListStore::create(_LinkedProfilesListColumns);
     _LinkedProfilesList.set_model(_LinkedProfilesListStore);
     _LinkedProfilesList.append_column(_("Profile Name"), _LinkedProfilesListColumns.nameColumn);
-//    _LinkedProfilesList.append_column(_("Color Preview"), _LinkedProfilesListColumns.previewColumn);
+    //    _LinkedProfilesList.append_column(_("Color Preview"), _LinkedProfilesListColumns.previewColumn);
     _LinkedProfilesList.set_headers_visible(false);
-// TODO restore?    _LinkedProfilesList.set_fixed_height_mode(true);
+    // TODO restore?    _LinkedProfilesList.set_fixed_height_mode(true);
 
     populate_linked_profiles_box();
 
@@ -722,16 +925,19 @@
     _link_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::linkSelectedProfile));
     _unlink_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::removeSelectedProfile));
 
-    _LinkedProfilesList.get_selection()->signal_changed().connect( sigc::mem_fun(*this, &DocumentProperties::onColorProfileSelectRow) );
+    _LinkedProfilesList.get_selection()->signal_changed().connect(
+        sigc::mem_fun(*this, &DocumentProperties::onColorProfileSelectRow));
 
-    _LinkedProfilesList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::linked_profiles_list_button_release));
+    _LinkedProfilesList.signal_button_release_event().connect_notify(
+        sigc::mem_fun(*this, &DocumentProperties::linked_profiles_list_button_release));
     cms_create_popup_menu(_LinkedProfilesList, sigc::mem_fun(*this, &DocumentProperties::removeSelectedProfile));
 
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "defs" );
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("defs");
     if (current) {
         _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
     }
-    _emb_profiles_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_linked_profiles_box));
+    _emb_profiles_observer.signal_changed().connect(
+        sigc::mem_fun(*this, &DocumentProperties::populate_linked_profiles_box));
     onColorProfileSelectRow();
 }
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
@@ -740,7 +946,7 @@
 {
     _page_scripting->show();
 
-    _page_scripting->set_spacing (4);
+    _page_scripting->set_spacing(4);
     _page_scripting->pack_start(_scripting_notebook, true, true);
 
     _scripting_notebook.append_page(*_page_external_scripts, _("External scripts"));
@@ -748,8 +954,8 @@
 
     //# External scripts tab
     _page_external_scripts->show();
-    Gtk::Label *label_external= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
-    label_external->set_markup (_("<b>External script files:</b>"));
+    Gtk::Label *label_external = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START));
+    label_external->set_markup(_("<b>External script files:</b>"));
 
     _external_add_btn.set_tooltip_text(_("Add the current file name or browse for a file"));
 #if WITH_GTKMM_3_10
@@ -779,7 +985,8 @@
     label_external->set_valign(Gtk::ALIGN_CENTER);
     _page_external_scripts->table().attach(*label_external, 0, row, 3, 1);
 #else
-    _page_external_scripts->table().attach(*label_external, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_external_scripts->table().attach(*label_external, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -789,12 +996,13 @@
     _ExternalScriptsListScroller.set_valign(Gtk::ALIGN_CENTER);
     _page_external_scripts->table().attach(_ExternalScriptsListScroller, 0, row, 3, 1);
 #else
-    _page_external_scripts->table().attach(_ExternalScriptsListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_external_scripts->table().attach(_ExternalScriptsListScroller, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
 
-    Gtk::HBox* spacer_external = Gtk::manage(new Gtk::HBox());
+    Gtk::HBox *spacer_external = Gtk::manage(new Gtk::HBox());
     spacer_external->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
@@ -802,7 +1010,8 @@
     spacer_external->set_valign(Gtk::ALIGN_CENTER);
     _page_external_scripts->table().attach(*spacer_external, 0, row, 3, 1);
 #else
-    _page_external_scripts->table().attach(*spacer_external, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_external_scripts->table().attach(*spacer_external, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -822,9 +1031,12 @@
     _external_remove_btn.set_valign(Gtk::ALIGN_CENTER);
     _page_external_scripts->table().attach(_external_remove_btn, 2, row, 1, 1);
 #else
-    _page_external_scripts->table().attach(_script_entry, 0, 1, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
-    _page_external_scripts->table().attach(_external_add_btn, 1, 2, row, row + 1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0, 2, 0);
-    _page_external_scripts->table().attach(_external_remove_btn, 2, 3, row, row + 1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0, 0, 0);
+    _page_external_scripts->table().attach(_script_entry, 0, 1, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
+    _page_external_scripts->table().attach(_external_add_btn, 1, 2, row, row + 1, (Gtk::AttachOptions)0,
+                                           (Gtk::AttachOptions)0, 2, 0);
+    _page_external_scripts->table().attach(_external_remove_btn, 2, 3, row, row + 1, (Gtk::AttachOptions)0,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     //# Set up the External Scripts box
@@ -832,13 +1044,13 @@
     _ExternalScriptsList.set_model(_ExternalScriptsListStore);
     _ExternalScriptsList.append_column(_("Filename"), _ExternalScriptsListColumns.filenameColumn);
     _ExternalScriptsList.set_headers_visible(true);
-// TODO restore?    _ExternalScriptsList.set_fixed_height_mode(true);
+    // TODO restore?    _ExternalScriptsList.set_fixed_height_mode(true);
 
 
     //# Embedded scripts tab
     _page_embedded_scripts->show();
-    Gtk::Label *label_embedded= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
-    label_embedded->set_markup (_("<b>Embedded script files:</b>"));
+    Gtk::Label *label_embedded = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START));
+    label_embedded->set_markup(_("<b>Embedded script files:</b>"));
 
     _embed_new_btn.set_tooltip_text(_("New"));
 #if WITH_GTKMM_3_10
@@ -861,10 +1073,10 @@
 #if !WITH_GTKMM_3_0
     // TODO: This has been removed from Gtkmm 3.0. Check that
     //       everything still looks OK!
-    _embed_button_box.set_child_min_width( 16 );
-    _embed_button_box.set_spacing( 4 );
+    _embed_button_box.set_child_min_width(16);
+    _embed_button_box.set_spacing(4);
 #endif
-    _embed_button_box.set_layout (Gtk::BUTTONBOX_START);
+    _embed_button_box.set_layout(Gtk::BUTTONBOX_START);
     _embed_button_box.add(_embed_new_btn);
     _embed_button_box.add(_embed_remove_btn);
 
@@ -878,7 +1090,8 @@
     label_embedded->set_valign(Gtk::ALIGN_CENTER);
     _page_embedded_scripts->table().attach(*label_embedded, 0, row, 3, 1);
 #else
-    _page_embedded_scripts->table().attach(*label_embedded, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_embedded_scripts->table().attach(*label_embedded, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -888,7 +1101,8 @@
     _EmbeddedScriptsListScroller.set_valign(Gtk::ALIGN_CENTER);
     _page_embedded_scripts->table().attach(_EmbeddedScriptsListScroller, 0, row, 3, 1);
 #else
-    _page_embedded_scripts->table().attach(_EmbeddedScriptsListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_embedded_scripts->table().attach(_EmbeddedScriptsListScroller, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -898,12 +1112,13 @@
     _embed_button_box.set_valign(Gtk::ALIGN_CENTER);
     _page_embedded_scripts->table().attach(_embed_button_box, 0, row, 1, 1);
 #else
-    _page_embedded_scripts->table().attach(_embed_button_box, 0, 1, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_embedded_scripts->table().attach(_embed_button_box, 0, 1, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
 
-    Gtk::HBox* spacer_embedded = Gtk::manage(new Gtk::HBox());
+    Gtk::HBox *spacer_embedded = Gtk::manage(new Gtk::HBox());
     spacer_embedded->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
@@ -911,7 +1126,8 @@
     spacer_embedded->set_valign(Gtk::ALIGN_CENTER);
     _page_embedded_scripts->table().attach(*spacer_embedded, 0, row, 3, 1);
 #else
-    _page_embedded_scripts->table().attach(*spacer_embedded, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_embedded_scripts->table().attach(*spacer_embedded, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -921,11 +1137,11 @@
     _EmbeddedScriptsList.set_model(_EmbeddedScriptsListStore);
     _EmbeddedScriptsList.append_column(_("Script id"), _EmbeddedScriptsListColumns.idColumn);
     _EmbeddedScriptsList.set_headers_visible(true);
-// TODO restore?    _EmbeddedScriptsList.set_fixed_height_mode(true);
+    // TODO restore?    _EmbeddedScriptsList.set_fixed_height_mode(true);
 
     //# Set up the Embedded Scripts content box
-    Gtk::Label *label_embedded_content= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
-    label_embedded_content->set_markup (_("<b>Content:</b>"));
+    Gtk::Label *label_embedded_content = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START));
+    label_embedded_content->set_markup(_("<b>Content:</b>"));
 
     label_embedded_content->set_alignment(0.0);
 
@@ -934,7 +1150,8 @@
     label_embedded_content->set_valign(Gtk::ALIGN_CENTER);
     _page_embedded_scripts->table().attach(*label_embedded_content, 0, row, 3, 1);
 #else
-    _page_embedded_scripts->table().attach(*label_embedded_content, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_embedded_scripts->table().attach(*label_embedded_content, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     row++;
@@ -944,7 +1161,8 @@
     _EmbeddedContentScroller.set_valign(Gtk::ALIGN_CENTER);
     _page_embedded_scripts->table().attach(_EmbeddedContentScroller, 0, row, 3, 1);
 #else
-    _page_embedded_scripts->table().attach(_EmbeddedContentScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_embedded_scripts->table().attach(_EmbeddedContentScroller, 0, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                           (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     _EmbeddedContentScroller.add(_EmbeddedContent);
@@ -952,12 +1170,16 @@
     _EmbeddedContentScroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
     _EmbeddedContentScroller.set_size_request(-1, 140);
 
-    _EmbeddedScriptsList.signal_cursor_changed().connect(sigc::mem_fun(*this, &DocumentProperties::changeEmbeddedScript));
-    _EmbeddedScriptsList.get_selection()->signal_changed().connect( sigc::mem_fun(*this, &DocumentProperties::onEmbeddedScriptSelectRow) );
-
-    _ExternalScriptsList.get_selection()->signal_changed().connect( sigc::mem_fun(*this, &DocumentProperties::onExternalScriptSelectRow) );
-
-    _EmbeddedContent.get_buffer()->signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::editEmbeddedScript));
+    _EmbeddedScriptsList.signal_cursor_changed().connect(
+        sigc::mem_fun(*this, &DocumentProperties::changeEmbeddedScript));
+    _EmbeddedScriptsList.get_selection()->signal_changed().connect(
+        sigc::mem_fun(*this, &DocumentProperties::onEmbeddedScriptSelectRow));
+
+    _ExternalScriptsList.get_selection()->signal_changed().connect(
+        sigc::mem_fun(*this, &DocumentProperties::onExternalScriptSelectRow));
+
+    _EmbeddedContent.get_buffer()->signal_changed().connect(
+        sigc::mem_fun(*this, &DocumentProperties::editEmbeddedScript));
 
     populate_script_lists();
 
@@ -980,15 +1202,17 @@
     _external_remove_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::removeExternalScript));
     _embed_remove_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::removeEmbeddedScript));
 
-    _ExternalScriptsList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::external_scripts_list_button_release));
+    _ExternalScriptsList.signal_button_release_event().connect_notify(
+        sigc::mem_fun(*this, &DocumentProperties::external_scripts_list_button_release));
     external_create_popup_menu(_ExternalScriptsList, sigc::mem_fun(*this, &DocumentProperties::removeExternalScript));
 
-    _EmbeddedScriptsList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::embedded_scripts_list_button_release));
+    _EmbeddedScriptsList.signal_button_release_event().connect_notify(
+        sigc::mem_fun(*this, &DocumentProperties::embedded_scripts_list_button_release));
     embedded_create_popup_menu(_EmbeddedScriptsList, sigc::mem_fun(*this, &DocumentProperties::removeEmbeddedScript));
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
-//TODO: review this observers code:
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    // TODO: review this observers code:
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("script");
     if (current) {
         _scripts_observer.set(SP_OBJECT(current->data)->parent);
     }
@@ -1003,26 +1227,26 @@
 
     _page_metadata1->show();
 
-    Gtk::Label *label = Gtk::manage (new Gtk::Label);
-    label->set_markup (_("<b>Dublin Core Entities</b>"));
-    label->set_alignment (0.0);
+    Gtk::Label *label = Gtk::manage(new Gtk::Label);
+    label->set_markup(_("<b>Dublin Core Entities</b>"));
+    label->set_alignment(0.0);
 
 #if WITH_GTKMM_3_0
     label->set_valign(Gtk::ALIGN_CENTER);
-    _page_metadata1->table().attach (*label, 0,0,3,1);
+    _page_metadata1->table().attach(*label, 0, 0, 3, 1);
 #else
-    _page_metadata1->table().attach (*label, 0,3,0,1, Gtk::FILL, (Gtk::AttachOptions)0,0,0);
+    _page_metadata1->table().attach(*label, 0, 3, 0, 1, Gtk::FILL, (Gtk::AttachOptions)0, 0, 0);
 #endif
 
-     /* add generic metadata entry areas */
-    struct rdf_work_entity_t * entity;
+    /* add generic metadata entry areas */
+    struct rdf_work_entity_t *entity;
     int row = 1;
     for (entity = rdf_work_entities; entity && entity->name; entity++, row++) {
-        if ( entity->editable == RDF_EDIT_GENERIC ) {
-            EntityEntry *w = EntityEntry::create (entity, _wr);
-            _rdflist.push_back (w);
-            Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
-            space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
+        if (entity->editable == RDF_EDIT_GENERIC) {
+            EntityEntry *w = EntityEntry::create(entity, _wr);
+            _rdflist.push_back(w);
+            Gtk::HBox *space = Gtk::manage(new Gtk::HBox);
+            space->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
             space->set_valign(Gtk::ALIGN_CENTER);
@@ -1035,22 +1259,23 @@
             w->_packable->set_valign(Gtk::ALIGN_CENTER);
             _page_metadata1->table().attach(*w->_packable, 2, row, 1, 1);
 #else
-            _page_metadata1->table().attach (*space, 0,1, row, row+1, Gtk::FILL, (Gtk::AttachOptions)0,0,0);
-            _page_metadata1->table().attach (w->_label, 1,2, row, row+1, Gtk::FILL, (Gtk::AttachOptions)0,0,0);
-            _page_metadata1->table().attach (*w->_packable, 2,3, row, row+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+            _page_metadata1->table().attach(*space, 0, 1, row, row + 1, Gtk::FILL, (Gtk::AttachOptions)0, 0, 0);
+            _page_metadata1->table().attach(w->_label, 1, 2, row, row + 1, Gtk::FILL, (Gtk::AttachOptions)0, 0, 0);
+            _page_metadata1->table().attach(*w->_packable, 2, 3, row, row + 1, Gtk::FILL | Gtk::EXPAND,
+                                            (Gtk::AttachOptions)0, 0, 0);
 #endif
         }
     }
 
-    Gtk::Button *button_save = Gtk::manage (new Gtk::Button(_("_Save as default"),1));
+    Gtk::Button *button_save = Gtk::manage(new Gtk::Button(_("_Save as default"), 1));
     button_save->set_tooltip_text(_("Save this metadata as the default metadata"));
-    Gtk::Button *button_load = Gtk::manage (new Gtk::Button(_("Use _default"),1));
+    Gtk::Button *button_load = Gtk::manage(new Gtk::Button(_("Use _default"), 1));
     button_load->set_tooltip_text(_("Use the previously saved default metadata here"));
 
 #if WITH_GTKMM_3_0
-    Gtk::ButtonBox *box_buttons = Gtk::manage (new Gtk::ButtonBox);
+    Gtk::ButtonBox *box_buttons = Gtk::manage(new Gtk::ButtonBox);
 #else
-    Gtk::HButtonBox *box_buttons = Gtk::manage (new Gtk::HButtonBox);
+    Gtk::HButtonBox *box_buttons = Gtk::manage(new Gtk::HButtonBox);
 #endif
 
     box_buttons->set_layout(Gtk::BUTTONBOX_END);
@@ -1065,22 +1290,22 @@
     _page_metadata2->show();
 
     row = 0;
-    Gtk::Label *llabel = Gtk::manage (new Gtk::Label);
-    llabel->set_markup (_("<b>License</b>"));
-    llabel->set_alignment (0.0);
+    Gtk::Label *llabel = Gtk::manage(new Gtk::Label);
+    llabel->set_markup(_("<b>License</b>"));
+    llabel->set_alignment(0.0);
 
 #if WITH_GTKMM_3_0
     llabel->set_valign(Gtk::ALIGN_CENTER);
     _page_metadata2->table().attach(*llabel, 0, row, 3, 1);
 #else
-    _page_metadata2->table().attach (*llabel, 0,3, row, row+1, Gtk::FILL, (Gtk::AttachOptions)0,0,0);
+    _page_metadata2->table().attach(*llabel, 0, 3, row, row + 1, Gtk::FILL, (Gtk::AttachOptions)0, 0, 0);
 #endif
 
     /* add license selector pull-down and URI */
     ++row;
-    _licensor.init (_wr);
-    Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
-    space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
+    _licensor.init(_wr);
+    Gtk::HBox *space = Gtk::manage(new Gtk::HBox);
+    space->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
     space->set_valign(Gtk::ALIGN_CENTER);
@@ -1090,12 +1315,14 @@
     _licensor.set_valign(Gtk::ALIGN_CENTER);
     _page_metadata2->table().attach(_licensor, 1, row, 3, 1);
 #else
-    _page_metadata2->table().attach (*space, 0,1, row, row+1, Gtk::FILL, (Gtk::AttachOptions)0,0,0);
-    _page_metadata2->table().attach (_licensor, 1,3, row, row+1, Gtk::EXPAND|Gtk::FILL, (Gtk::AttachOptions)0,0,0);
+    _page_metadata2->table().attach(*space, 0, 1, row, row + 1, Gtk::FILL, (Gtk::AttachOptions)0, 0, 0);
+    _page_metadata2->table().attach(_licensor, 1, 3, row, row + 1, Gtk::EXPAND | Gtk::FILL, (Gtk::AttachOptions)0, 0,
+                                    0);
 #endif
 }
 
-void DocumentProperties::addExternalScript(){
+void DocumentProperties::addExternalScript()
+{
 
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (!desktop) {
@@ -1103,7 +1330,7 @@
         return;
     }
 
-    if (_script_entry.get_text().empty() ) {
+    if (_script_entry.get_text().empty()) {
         // Click Add button with no filename, show a Browse dialog
         browseExternalScript();
     }
@@ -1112,7 +1339,7 @@
 
         Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
         Inkscape::XML::Node *scriptRepr = xml_doc->createElement("svg:script");
-        scriptRepr->setAttribute("xlink:href", (gchar*) _script_entry.get_text().c_str());
+        scriptRepr->setAttribute("xlink:href", (gchar *)_script_entry.get_text().c_str());
         _script_entry.set_text("");
 
         xml_doc->root()->addChild(scriptRepr, NULL);
@@ -1122,12 +1349,12 @@
 
         populate_script_lists();
     }
-
 }
 
-static Inkscape::UI::Dialog::FileOpenDialog * selectPrefsFileInstance = NULL;
+static Inkscape::UI::Dialog::FileOpenDialog *selectPrefsFileInstance = NULL;
 
-void  DocumentProperties::browseExternalScript() {
+void DocumentProperties::browseExternalScript()
+{
 
     //# Get the current directory for finding files
     static Glib::ustring open_path;
@@ -1135,16 +1362,15 @@
 
 
     Glib::ustring attr = prefs->getString(_prefs_path);
-    if (!attr.empty()) open_path = attr;
+    if (!attr.empty())
+        open_path = attr;
 
     //# Test if the open_path directory exists
-    if (!Inkscape::IO::file_test(open_path.c_str(),
-              (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+    if (!Inkscape::IO::file_test(open_path.c_str(), (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
         open_path = "";
 
     //# If no open path, default to our home directory
-    if (open_path.empty())
-    {
+    if (open_path.empty()) {
         open_path = g_get_home_dir();
         open_path.append(G_DIR_SEPARATOR_S);
     }
@@ -1152,12 +1378,8 @@
     //# Create a dialog
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (!selectPrefsFileInstance) {
-        selectPrefsFileInstance =
-              Inkscape::UI::Dialog::FileOpenDialog::create(
-                 *desktop->getToplevel(),
-                 open_path,
-                 Inkscape::UI::Dialog::CUSTOM_TYPE,
-                 _("Select a script to load"));
+        selectPrefsFileInstance = Inkscape::UI::Dialog::FileOpenDialog::create(
+            *desktop->getToplevel(), open_path, Inkscape::UI::Dialog::CUSTOM_TYPE, _("Select a script to load"));
         selectPrefsFileInstance->addFilterMenu("Javascript Files", "*.js");
     }
 
@@ -1174,9 +1396,10 @@
     _script_entry.set_text(fileName);
 }
 
-void DocumentProperties::addEmbeddedScript(){
+void DocumentProperties::addEmbeddedScript()
+{
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (!desktop){
+    if (!desktop) {
         g_warning("No active desktop");
     } else {
         Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
@@ -1191,32 +1414,34 @@
     }
 }
 
-void DocumentProperties::removeExternalScript(){
+void DocumentProperties::removeExternalScript()
+{
     Glib::ustring name;
-    if(_ExternalScriptsList.get_selection()) {
+    if (_ExternalScriptsList.get_selection()) {
         Gtk::TreeModel::iterator i = _ExternalScriptsList.get_selection()->get_selected();
 
-        if(i){
+        if (i) {
             name = (*i)[_ExternalScriptsListColumns.filenameColumn];
         } else {
             return;
         }
     }
 
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    while ( current ) {
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("script");
+    while (current) {
         if (current->data && SP_IS_OBJECT(current->data)) {
-            SPObject* obj = SP_OBJECT(current->data);
-            SPScript* script = SP_SCRIPT(obj);
-            if (name == script->xlinkhref){
+            SPObject *obj = SP_OBJECT(current->data);
+            SPScript *script = SP_SCRIPT(obj);
+            if (name == script->xlinkhref) {
 
-                //XML Tree being used directly here while it shouldn't be.
+                // XML Tree being used directly here while it shouldn't be.
                 Inkscape::XML::Node *repr = obj->getRepr();
-                if (repr){
+                if (repr) {
                     sp_repr_unparent(repr);
 
                     // inform the document, so we can undo
-                    DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_EXTERNAL_SCRIPT, _("Remove external script"));
+                    DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_EXTERNAL_SCRIPT,
+                                       _("Remove external script"));
                 }
             }
         }
@@ -1226,23 +1451,24 @@
     populate_script_lists();
 }
 
-void DocumentProperties::removeEmbeddedScript(){
+void DocumentProperties::removeEmbeddedScript()
+{
     Glib::ustring id;
-    if(_EmbeddedScriptsList.get_selection()) {
+    if (_EmbeddedScriptsList.get_selection()) {
         Gtk::TreeModel::iterator i = _EmbeddedScriptsList.get_selection()->get_selected();
 
-        if(i){
+        if (i) {
             id = (*i)[_EmbeddedScriptsListColumns.idColumn];
         } else {
             return;
         }
     }
 
-    SPObject* obj = SP_ACTIVE_DOCUMENT->getObjectById(id);
+    SPObject *obj = SP_ACTIVE_DOCUMENT->getObjectById(id);
     if (obj) {
-        //XML Tree being used directly here while it shouldn't be.
+        // XML Tree being used directly here while it shouldn't be.
         Inkscape::XML::Node *repr = obj->getRepr();
-        if (repr){
+        if (repr) {
             sp_repr_unparent(repr);
 
             // inform the document, so we can undo
@@ -1257,7 +1483,7 @@
 {
     Glib::RefPtr<Gtk::TreeSelection> sel = _ExternalScriptsList.get_selection();
     if (sel) {
-        _external_remove_btn.set_sensitive(sel->count_selected_rows () > 0);
+        _external_remove_btn.set_sensitive(sel->count_selected_rows() > 0);
     }
 }
 
@@ -1265,45 +1491,47 @@
 {
     Glib::RefPtr<Gtk::TreeSelection> sel = _EmbeddedScriptsList.get_selection();
     if (sel) {
-        _embed_remove_btn.set_sensitive(sel->count_selected_rows () > 0);
+        _embed_remove_btn.set_sensitive(sel->count_selected_rows() > 0);
     }
 }
 
-void DocumentProperties::changeEmbeddedScript(){
+void DocumentProperties::changeEmbeddedScript()
+{
     Glib::ustring id;
-    if(_EmbeddedScriptsList.get_selection()) {
+    if (_EmbeddedScriptsList.get_selection()) {
         Gtk::TreeModel::iterator i = _EmbeddedScriptsList.get_selection()->get_selected();
 
-        if(i){
+        if (i) {
             id = (*i)[_EmbeddedScriptsListColumns.idColumn];
         } else {
             return;
         }
     }
 
-    bool voidscript=true;
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
-        if (id == obj->getId()){
+    bool voidscript = true;
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("script");
+    while (current) {
+        SPObject *obj = SP_OBJECT(current->data);
+        if (id == obj->getId()) {
 
-            int count=0;
-            for ( SPObject *child = obj->children ; child; child = child->next )
-            {
+            int count = 0;
+            for (SPObject *child = obj->children; child; child = child->next) {
                 count++;
             }
 
-            if (count>1)
-                g_warning("TODO: Found a script element with multiple (%d) child nodes! We must implement support for that!", count);
-
-            //XML Tree being used directly here while it shouldn't be.
-            SPObject* child = obj->firstChild();
-            //TODO: shouldnt we get all children instead of simply the first child?
-
-            if (child && child->getRepr()){
-                const gchar* content = child->getRepr()->content();
-                if (content){
-                    voidscript=false;
+            if (count > 1)
+                g_warning(
+                    "TODO: Found a script element with multiple (%d) child nodes! We must implement support for that!",
+                    count);
+
+            // XML Tree being used directly here while it shouldn't be.
+            SPObject *child = obj->firstChild();
+            // TODO: shouldnt we get all children instead of simply the first child?
+
+            if (child && child->getRepr()) {
+                const gchar *content = child->getRepr()->content();
+                if (content) {
+                    voidscript = false;
                     _EmbeddedContent.get_buffer()->set_text(content);
                 }
             }
@@ -1315,12 +1543,13 @@
         _EmbeddedContent.get_buffer()->set_text("");
 }
 
-void DocumentProperties::editEmbeddedScript(){
+void DocumentProperties::editEmbeddedScript()
+{
     Glib::ustring id;
-    if(_EmbeddedScriptsList.get_selection()) {
+    if (_EmbeddedScriptsList.get_selection()) {
         Gtk::TreeModel::iterator i = _EmbeddedScriptsList.get_selection()->get_selected();
 
-        if(i){
+        if (i) {
             id = (*i)[_EmbeddedScriptsListColumns.idColumn];
         } else {
             return;
@@ -1328,19 +1557,20 @@
     }
 
     Inkscape::XML::Document *xml_doc = SP_ACTIVE_DOCUMENT->getReprDoc();
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
-        if (id == obj->getId()){
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("script");
+    while (current) {
+        SPObject *obj = SP_OBJECT(current->data);
+        if (id == obj->getId()) {
 
-            //XML Tree being used directly here while it shouldn't be.
+            // XML Tree being used directly here while it shouldn't be.
             Inkscape::XML::Node *repr = obj->getRepr();
-            if (repr){
+            if (repr) {
                 SPObject *child;
-                while (NULL != (child = obj->firstChild())) child->deleteObject();
+                while (NULL != (child = obj->firstChild()))
+                    child->deleteObject();
                 obj->appendChildRepr(xml_doc->createTextNode(_EmbeddedContent.get_buffer()->get_text().c_str()));
 
-                //TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text());
+                // TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text());
 
                 // inform the document, so we can undo
                 DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_EMBEDDED_SCRIPT, _("Edit embedded script"));
@@ -1350,20 +1580,20 @@
     }
 }
 
-void DocumentProperties::populate_script_lists(){
+void DocumentProperties::populate_script_lists()
+{
     _ExternalScriptsListStore->clear();
     _EmbeddedScriptsListStore->clear();
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    if (current) _scripts_observer.set(SP_OBJECT(current->data)->parent);
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
-        SPScript* script = SP_SCRIPT(obj);
-        if (script->xlinkhref)
-        {
+    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("script");
+    if (current)