update to trunk

(bzr r11950.1.274)

5 files changed, 12 insertions, 11 deletions

diff --git a/src/display/drawing-surface.cpp b/src/display/drawing-surface.cpp
index 94e0e1ab5..30579134b 100644
--- a/src/display/drawing-surface.cpp
+++ b/src/display/drawing-surface.cpp
@@ -123,7 +123,7 @@ DrawingSurface::scale() const
 Geom::Affine
 DrawingSurface::drawingTransform() const
 {
-    Geom::Affine ret = _scale * Geom::Translate(-_origin);
+    Geom::Affine ret = Geom::Translate(-_origin) * _scale;
     return ret;
 }
 
diff --git a/src/marker.cpp b/src/marker.cpp
index fb7b0fd21..7fee16ead 100644
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -206,7 +206,9 @@ void SPMarker::update(SPCtx *ctx, guint flags) {
     SPItemCtx rctx = get_rctx( &ictx );
 
     // Shift according to refX, refY
-    this->c2p = Geom::Translate(this->viewBox.left()-this->refX.computed, this->viewBox.top()-this->refY.computed) * this->c2p;
+    Geom::Point ref( this->refX.computed, this->refY.computed );
+    ref *= c2p;
+    this->c2p = this->c2p * Geom::Translate( -ref );
 
     // And invoke parent method
     SPGroup::update((SPCtx *) &rctx, flags);
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 76be086a2..b3d9af910 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1747,7 +1747,7 @@ void sp_selection_rotate_90(SPDesktop *desktop, bool ccw)
 
     DocumentUndo::done(sp_desktop_document(desktop),
                        ccw ? SP_VERB_OBJECT_ROTATE_90_CCW : SP_VERB_OBJECT_ROTATE_90_CW,
-                       ccw ? _("Rotate 90° CCW") : _("Rotate 90° CW"));
+                       ccw ? _("Rotate 90\xc2\xb0 CCW") : _("Rotate 90\xc2\xb0 CW"));
 }
 
 void
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 425ca9efa..8e67141fb 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -595,8 +595,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b
     // the pattern onto a surface with that size and at that resolution.
 
     // Pattern server to user
-    Geom::Affine ps2user;
-    ps2user = pattern_patternTransform(this);
+    Geom::Affine ps2user = pattern_patternTransform(this);
     if (!this->viewBox_set && pattern_patternContentUnits (this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) {
         /* BBox to user coordinate system */
         Geom::Affine bbox2user (bbox->width(), 0.0, 0.0, bbox->height(), bbox->left(), bbox->top());
@@ -631,7 +630,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b
     //       to find the optimum tile size for rendering
     // c is number of pixels in buffer x and y.
     // Scale factor of 1.1 is too small... see bug #1251039
-    Geom::Point c(pattern_tile.dimensions()*vb2ps.descrim()*ps2user.descrim()*full.descrim()*2.0);
+    Geom::Point c(pattern_tile.dimensions()*vb2ps.descrim()*full.descrim()*2.0);
 
     c[Geom::X] = ceil(c[Geom::X]);
     c[Geom::Y] = ceil(c[Geom::Y]);
@@ -651,7 +650,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b
 
     // TODO: make sure there are no leaks.
     Inkscape::UpdateContext ctx;  // UpdateContext is structure with only ctm!
-    ctx.ctm = vb2ps * pattern_surface.drawingTransform();
+    ctx.ctm = ps2user * pattern_surface.drawingTransform();  // vb2ps?
     dc.transform( pattern_surface.drawingTransform().inverse() );
     drawing.update(Geom::IntRect::infinite(), ctx);
 
@@ -679,7 +678,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b
 
     cairo_pattern_t *cp = cairo_pattern_create_for_surface(pattern_surface.raw());
     // Apply transformation to user space. Also compensate for oversampling.
-    ink_cairo_pattern_set_matrix(cp, ps2user.inverse() * pattern_surface.drawingTransform());
+    ink_cairo_pattern_set_matrix(cp, pattern_surface.drawingTransform() );
 
     cairo_pattern_set_extend(cp, CAIRO_EXTEND_REPEAT);
 
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 653d5f892..8b72dd5ab 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2472,7 +2472,7 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"),
                  N_("Deselect any selected objects or nodes"), INKSCAPE_ICON("edit-select-none")),
     new EditVerb(SP_VERB_EDIT_DELETE_ALL_GUIDES, "EditRemoveAllGuides", N_("Delete All Guides"),
-                 N_("Create four guides aligned with the page borders"), NULL),
+                 N_("Delete all the guides in the document"), NULL),
     new EditVerb(SP_VERB_EDIT_GUIDES_AROUND_PAGE, "EditGuidesAroundPage", N_("Create _Guides Around the Page"),
                  N_("Create four guides aligned with the page borders"), NULL),
     new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next path effect parameter"),
@@ -2609,11 +2609,11 @@ Verb *Verb::_base_verbs[] = {
                   N_("Toggle visibility of current layer"), NULL),
 
     // Object
-    new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CW, "ObjectRotate90", N_("Rotate _90° CW"),
+    new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CW, "ObjectRotate90", N_("Rotate _90\xc2\xb0 CW"),
                    // This is shared between tooltips and statusbar, so they
                    // must use UTF-8, not HTML entities for special characters.
                    N_("Rotate selection 90\xc2\xb0 clockwise"), INKSCAPE_ICON("object-rotate-right")),
-    new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CCW, "ObjectRotate90CCW", N_("Rotate 9_0° CCW"),
+    new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CCW, "ObjectRotate90CCW", N_("Rotate 9_0\xc2\xb0 CCW"),
                    // This is shared between tooltips and statusbar, so they
                    // must use UTF-8, not HTML entities for special characters.
                    N_("Rotate selection 90\xc2\xb0 counter-clockwise"), INKSCAPE_ICON("object-rotate-left")),