From d3b4bc2816e0d19e9ecea778ddc01717ea11efb3 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 3 Jan 2017 15:39:48 +0100
Subject: Fix logic error (non-scaling stroke on text).

(bzr r15386)
---
 src/display/drawing-text.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index 1280a2db9..21af7b200 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -599,7 +599,7 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are
         }
         {
             Inkscape::DrawingContext::Save save(dc);
-            if (!_style || ! _style->vector_effect.computed == SP_VECTOR_EFFECT_NON_SCALING_STROKE) {
+            if (!_style || !(_style->vector_effect.computed == SP_VECTOR_EFFECT_NON_SCALING_STROKE)) {
                 dc.transform(_ctm);
             }
             if (has_stroke) {
-- 
cgit v1.2.3


From 2b7b6e48c28acbf46d190124de21b8975bded102 Mon Sep 17 00:00:00 2001
From: Yale Zhang <simdgenius>
Date: Tue, 3 Jan 2017 21:33:12 +0100
Subject: Fix build on Windows (see
 http://inkscape.13.x6.nabble.com/compile-error-on-Windows-10-Inkscape-rev-15382-64-bit-td4978305.html)

Fixed bugs:
  - https://launchpad.net/bugs/1645062

(bzr r15388)
---
 src/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1102bf4bf..47aa02ef1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -521,7 +521,6 @@ set(INKSCAPE_TARGET_LIBS
         depixelize_LIB
         util_LIB
         gc_LIB
-        ${INKSCAPE_LIBS}
 )
 
 # Build everything except main and inkview.c in a shared library.
@@ -534,7 +533,7 @@ if(WITH_DBUS)
 endif()
 
 # Link the inkscape_base library against all external dependencies
-target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS})
+target_link_libraries(inkscape_base PRIVATE ${INKSCAPE_TARGET_LIBS} PUBLIC ${INKSCAPE_LIBS})
 
 # Link inkscape and inkview against inkscape_base
 target_link_libraries(inkscape inkscape_base)
-- 
cgit v1.2.3


From 525c5639f6cd43a4933d68307cd2e7176a93e0e7 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 4 Jan 2017 12:02:20 +0100
Subject: Fix misplaced parenthesis reported by compiler warning.

(bzr r15389)
---
 src/libuemf/uemf.h | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/libuemf/uemf.h b/src/libuemf/uemf.h
index 82fd0990c..05566af06 100644
--- a/src/libuemf/uemf.h
+++ b/src/libuemf/uemf.h
@@ -168,12 +168,24 @@ extern "C" {
 #define U_ROUND(A)  ( (A) > 0 ? floor((A)+0.5) : ( (A) < 0 ? -floor(-(A)+0.5) : (A) ) )
 
 #define MAKE_MIN_PTR(A,B) ( A < B ? A : B)
-/* This is tricky.  The next one can be called with a size which is either an int or an unsigned int.
-   The former can be negative, which is obviously wrong, but testing for that means that the size cannot
-   be more than INT_MAX/2.  Accept that limitation since no reasonable EMF record or file should ever be that large.
-   B must be an INT or size_t.  
-   If a uint16_t is used gcc complains about the first test.  Force B to be at least as big as int (at run time)  */
-#define IS_MEM_UNSAFE(A,B,C) ( (sizeof(B) < sizeof(int) || (int)(B)) < 0 ? 1 : ((int8_t *)(A) > (int8_t *)(C) ? 1 : ((int8_t *)(C) - (int8_t *)(A) >= (int)(B) ? 0 : 1 ))) //!< Return 1 when a region of memory starting at A of B bytes extends beyond pointer C
+
+/* IS_MEM_UNSAFE takes 3 parameters:
+      A  start address of a block of allocated memory
+      B  offset into this block starting at A
+      C  address of final byte of a block of allocated memory.
+   Returns
+      1 if B cannot be an int or size_t
+      1 if C > A 
+      1 if A+B is not in the range A to C, inclusive
+      0 otherwise.
+   B may be an int, an unsigned int, or a size_t. An int can be negative, 
+      which is obviously wrong, but testing for that means that the size
+      of B cannot be more than INT_MAX/2.  Accept that limitation since 
+      no reasonable EMF record or file should ever be that large.
+   If B is a uint16_t gcc complains about the first test.  
+   This Macro must not be used where B needs more than 32 bits!
+*/
+#define IS_MEM_UNSAFE(A,B,C) ( (sizeof(B) < sizeof(int) || (int)(B) < 0) ? 1 : ((int8_t *)(A) > (int8_t *)(C) ? 1 : ((int8_t *)(C) - (int8_t *)(A) >= (int)(B) ? 0 : 1 )))
 
 /** @} */
 
-- 
cgit v1.2.3


From 9aeb8085286ce9139f6e6505691ad8870c32b4e0 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Wed, 4 Jan 2017 22:08:53 +0100
Subject: increased space for font-size.

(bzr r15390)
---
 src/widgets/text-toolbar.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 784c467f1..ba79517d2 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -337,7 +337,7 @@ static void sp_text_lineheight_unset_changed( InkToggleAction*act, GObject *tbl
     sp_desktop_set_style (desktop, css);
 
     sp_repr_css_attr_unref(css);
-    
+
     DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_TEXT,
                        _("Text: Unset line height."));
 
@@ -571,7 +571,7 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl )
 static bool is_relative( Unit const *unit ) {
     return (unit->abbr == "" || unit->abbr == "em" || unit->abbr == "ex" || unit->abbr == "%");
 }
-   
+
 static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl )
 {
     // quit if run by the _changed callbacks
@@ -1706,7 +1706,7 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
                                                                       _(tooltip.c_str()),
                                                                       NULL,
                                                                       GTK_TREE_MODEL(model_size),
-                                                                      4,      // Width in characters
+                                                                      8,      // Width in characters
                                                                       0,      // Extra list width
                                                                       NULL,   // Cell layout
                                                                       NULL,   // Separator
-- 
cgit v1.2.3


From b6200950a88ac9b1bb7eee4fb7f86b01e323dbcc Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Thu, 5 Jan 2017 00:08:02 +0100
Subject: antialiasing options on export

(bzr r15391)
---
 src/display/drawing-group.cpp |  3 +++
 src/display/drawing-item.cpp  | 23 +++++++++++++++++------
 src/display/drawing-item.h    |  4 ++--
 src/display/drawing.cpp       |  6 +++++-
 src/display/drawing.h         |  2 +-
 src/helper/png-write.cpp      | 18 +++++++++---------
 src/helper/png-write.h        |  4 ++--
 src/sp-item.cpp               |  2 +-
 src/ui/dialog/export.cpp      | 15 ++++++++++++---
 src/ui/dialog/export.h        |  2 ++
 10 files changed, 54 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index 1a9cbfdcc..018f23e74 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -95,6 +95,7 @@ DrawingGroup::_renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigne
     if (stop_at == NULL) {
         // normal rendering
         for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
+            i->setAntialiasing(_antialias);
             i->render(dc, area, flags, stop_at);
         }
     } else {
@@ -103,10 +104,12 @@ DrawingGroup::_renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigne
             if (&*i == stop_at) return RENDER_OK; // do not render the stop_at item at all
             if (i->isAncestorOf(stop_at)) {
                 // render its ancestors without masks, opacity or filters
+                i->setAntialiasing(_antialias);
                 i->render(dc, area, flags | RENDER_FILTER_BACKGROUND, stop_at);
                 // stop further rendering
                 return RENDER_OK;
             } else {
+                i->setAntialiasing(_antialias);
                 i->render(dc, area, flags, stop_at);
             }
         }
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index 89ca66dc4..c4af81efc 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -132,7 +132,7 @@ DrawingItem::DrawingItem(Drawing &drawing)
     , _propagate(0)
 //    , _renders_opacity(0)
     , _pick_children(0)
-    , _antialias(1)
+    , _antialias(2)
     , _isolation(SP_CSS_ISOLATION_AUTO)
     , _mix_blend_mode(SP_CSS_BLEND_NORMAL)
 {}
@@ -291,7 +291,7 @@ DrawingItem::setOpacity(float opacity)
 }
 
 void
-DrawingItem::setAntialiasing(bool a)
+DrawingItem::setAntialiasing(unsigned a)
 {
     if (_antialias != a) {
         _antialias = a;
@@ -699,10 +699,21 @@ DrawingItem::render(DrawingContext &dc, Geom::IntRect const &area, unsigned flag
     Geom::OptIntRect carea = Geom::intersect(area, _drawbox);
     if (!carea) return RENDER_OK;
 
-    if (_antialias) {
-        cairo_set_antialias(dc.raw(), CAIRO_ANTIALIAS_DEFAULT);
-    } else {
-        cairo_set_antialias(dc.raw(), CAIRO_ANTIALIAS_NONE);
+    switch(_antialias){
+        case 0:
+            cairo_set_antialias(dc.raw(), CAIRO_ANTIALIAS_NONE);
+            break;
+        case 1:
+            cairo_set_antialias(dc.raw(), CAIRO_ANTIALIAS_FAST);
+            break;
+        case 2:
+            cairo_set_antialias(dc.raw(), CAIRO_ANTIALIAS_GOOD);
+            break;
+        case 3:
+            cairo_set_antialias(dc.raw(), CAIRO_ANTIALIAS_BEST);
+            break;
+        default: // should not happen
+            g_assert_not_reached();
     }
 
     // render from cache if possible
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index 3c593ceaa..21f6ffacc 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -115,7 +115,7 @@ public:
     virtual void setStyle(SPStyle *style, SPStyle *context_style = NULL);
     virtual void setChildrenStyle(SPStyle *context_style);
     void setOpacity(float opacity);
-    void setAntialiasing(bool a);
+    void setAntialiasing(unsigned a);
     void setIsolation(unsigned isolation); // CSS Compositing and Blending
     void setBlendMode(unsigned blend_mode);
     void setTransform(Geom::Affine const &trans);
@@ -222,7 +222,7 @@ protected:
     //unsigned _renders_opacity : 1; ///< Whether object needs temporary surface for opacity
     unsigned _pick_children : 1; ///< For groups: if true, children are returned from pick(),
                                  ///  otherwise the group is returned
-    unsigned _antialias : 1; ///< Whether to use antialiasing
+    unsigned _antialias : 2; ///< antialiasing level (NONE/FAST/GOOD(DEFAULT)/BEST)
 
     unsigned _isolation : 1;
     unsigned _mix_blend_mode : 4;
diff --git a/src/display/drawing.cpp b/src/display/drawing.cpp
index eadd7e528..71fb94be0 100644
--- a/src/display/drawing.cpp
+++ b/src/display/drawing.cpp
@@ -167,10 +167,14 @@ Drawing::update(Geom::IntRect const &area, UpdateContext const &ctx, unsigned fl
 }
 
 void
-Drawing::render(DrawingContext &dc, Geom::IntRect const &area, unsigned flags)
+Drawing::render(DrawingContext &dc, Geom::IntRect const &area, unsigned flags, int antialiasing)
 {
     if (_root) {
+        int prev_a = _root->_antialias;
+        if(antialiasing >= 0)
+            _root->setAntialiasing(antialiasing);
         _root->render(dc, area, flags);
+        _root->setAntialiasing(prev_a);
     }
 
     if (colorMode() == COLORMODE_GRAYSCALE) {
diff --git a/src/display/drawing.h b/src/display/drawing.h
index 0c12b1510..e472c8f5b 100644
--- a/src/display/drawing.h
+++ b/src/display/drawing.h
@@ -68,7 +68,7 @@ public:
     void setGrayscaleMatrix(double value_matrix[20]);
 
     void update(Geom::IntRect const &area = Geom::IntRect::infinite(), UpdateContext const &ctx = UpdateContext(), unsigned flags = DrawingItem::STATE_ALL, unsigned reset = 0);
-    void render(DrawingContext &dc, Geom::IntRect const &area, unsigned flags = 0);
+    void render(DrawingContext &dc, Geom::IntRect const &area, unsigned flags = 0, int antialiasing = -1);
     DrawingItem *pick(Geom::Point const &p, double delta, unsigned flags);
 
     sigc::signal<void, DrawingItem *> signal_request_update;
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index 2433e2777..e06c539d3 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -123,8 +123,8 @@ void PngTextList::add(gchar const* key, gchar const* text)
 static bool
 sp_png_write_rgba_striped(SPDocument *doc,
                           gchar const *filename, unsigned long int width, unsigned long int height, double xdpi, double ydpi,
-                          int (* get_rows)(guchar const **rows, void **to_free, int row, int num_rows, void *data, int color_type, int bit_depth),
-                          void *data, bool interlace, int color_type, int bit_depth, int zlib)
+                          int (* get_rows)(guchar const **rows, void **to_free, int row, int num_rows, void *data, int color_type, int bit_depth, int antialias),
+                          void *data, bool interlace, int color_type, int bit_depth, int zlib, int antialiasing)
 {
     g_return_val_if_fail(filename != NULL, false);
     g_return_val_if_fail(data != NULL, false);
@@ -286,7 +286,7 @@ sp_png_write_rgba_striped(SPDocument *doc,
         r = 0;
         while (r < static_cast<png_uint_32>(height)) {
             void *to_free;
-            int n = get_rows((unsigned char const **) row_pointers, &to_free, r, height-r, data, color_type, bit_depth);
+            int n = get_rows((unsigned char const **) row_pointers, &to_free, r, height-r, data, color_type, bit_depth, antialiasing);
             if (!n) break;
             png_write_rows(png_ptr, row_pointers, n);
             g_free(to_free);
@@ -320,7 +320,7 @@ sp_png_write_rgba_striped(SPDocument *doc,
  *
  */
 static int
-sp_export_get_rows(guchar const **rows, void **to_free, int row, int num_rows, void *data, int color_type, int bit_depth)
+sp_export_get_rows(guchar const **rows, void **to_free, int row, int num_rows, void *data, int color_type, int bit_depth, int antialiasing)
 {
     struct SPEBP *ebp = (struct SPEBP *) data;
 
@@ -352,7 +352,7 @@ sp_export_get_rows(guchar const **rows, void **to_free, int row, int num_rows, v
     dc.setOperator(CAIRO_OPERATOR_OVER);
 
     /* Render */
-    ebp->drawing->render(dc, bbox);
+    ebp->drawing->render(dc, bbox, 0, antialiasing);
     cairo_surface_destroy(s);
 
     // PNG stores data as unpremultiplied big-endian RGBA, which means
@@ -396,10 +396,10 @@ ExportResult sp_export_png_file(SPDocument *doc, gchar const *filename,
                                 unsigned long bgcolor,
                                 unsigned int (*status) (float, void *),
                                 void *data, bool force_overwrite,
-                                const std::vector<SPItem*> &items_only, bool interlace, int color_type, int bit_depth, int zlib)
+                                const std::vector<SPItem*> &items_only, bool interlace, int color_type, int bit_depth, int zlib, int antialiasing)
 {
     return sp_export_png_file(doc, filename, Geom::Rect(Geom::Point(x0,y0),Geom::Point(x1,y1)),
-                              width, height, xdpi, ydpi, bgcolor, status, data, force_overwrite, items_only, interlace, color_type, bit_depth, zlib);
+                              width, height, xdpi, ydpi, bgcolor, status, data, force_overwrite, items_only, interlace, color_type, bit_depth, zlib, antialiasing);
 }
 
 ExportResult sp_export_png_file(SPDocument *doc, gchar const *filename,
@@ -408,7 +408,7 @@ ExportResult sp_export_png_file(SPDocument *doc, gchar const *filename,
                                 unsigned long bgcolor,
                                 unsigned (*status)(float, void *),
                                 void *data, bool force_overwrite,
-                                const std::vector<SPItem*> &items_only, bool interlace, int color_type, int bit_depth, int zlib)
+                                const std::vector<SPItem*> &items_only, bool interlace, int color_type, int bit_depth, int zlib, int antialiasing)
 {
     g_return_val_if_fail(doc != NULL, EXPORT_ERROR);
     g_return_val_if_fail(filename != NULL, EXPORT_ERROR);
@@ -479,7 +479,7 @@ ExportResult sp_export_png_file(SPDocument *doc, gchar const *filename,
     ebp.px = g_try_new(guchar, 4 * ebp.sheight * width);
 
     if (ebp.px) {
-        write_status = sp_png_write_rgba_striped(doc, filename, width, height, xdpi, ydpi, sp_export_get_rows, &ebp, interlace, color_type, bit_depth, zlib);
+        write_status = sp_png_write_rgba_striped(doc, filename, width, height, xdpi, ydpi, sp_export_get_rows, &ebp, interlace, color_type, bit_depth, zlib, antialiasing);
         g_free(ebp.px);
     }
 
diff --git a/src/helper/png-write.h b/src/helper/png-write.h
index e47f01743..06498f46e 100644
--- a/src/helper/png-write.h
+++ b/src/helper/png-write.h
@@ -35,13 +35,13 @@ ExportResult sp_export_png_file(SPDocument *doc, gchar const *filename,
 				unsigned long int width, unsigned long int height, double xdpi, double ydpi,
 				unsigned long bgcolor,
 				unsigned int (*status) (float, void *), void *data, bool force_overwrite = false, const std::vector<SPItem*> &items_only = std::vector<SPItem*>(), 
-                                bool interlace = false, int color_type = 6, int bit_depth = 8, int zlib = 6);
+                                bool interlace = false, int color_type = 6, int bit_depth = 8, int zlib = 6, int antialiasing = 2);
 
 ExportResult sp_export_png_file(SPDocument *doc, gchar const *filename,
 				Geom::Rect const &area,
 				unsigned long int width, unsigned long int height, double xdpi, double ydpi,
 				unsigned long bgcolor,
 				unsigned int (*status) (float, void *), void *data, bool force_overwrite = false, const std::vector<SPItem*> &items_only = std::vector<SPItem*>(), 
-                                bool interlace = false, int color_type = 6, int bit_depth = 8, int zlib = 6);
+                                bool interlace = false, int color_type = 6, int bit_depth = 8, int zlib = 6, int antialiasing = 2);
 
 #endif // SEEN_SP_PNG_WRITE_H
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 36a9c3c9d..05af12229 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -667,7 +667,7 @@ void SPItem::update(SPCtx* ctx, guint flags) {
         if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) {
             for (SPItemView *v = display; v != NULL; v = v->next) {
                 v->arenaitem->setOpacity(SP_SCALE24_TO_FLOAT(style->opacity.value));
-                v->arenaitem->setAntialiasing(style->shape_rendering.computed != SP_CSS_SHAPE_RENDERING_CRISPEDGES);
+                v->arenaitem->setAntialiasing(style->shape_rendering.computed == SP_CSS_SHAPE_RENDERING_CRISPEDGES ? 0 : 2);
                 v->arenaitem->setIsolation( style->isolation.value );
                 v->arenaitem->setBlendMode( style->mix_blend_mode.value );
                 v->arenaitem->setVisible(!isHidden());
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 9bebde00f..1bb952de4 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -151,8 +151,10 @@ Export::Export (void) :
     zlib_compression(),
     pHYs_label(_("pHYs dpi")),
     pHYs_sb(pHYs_adj, 1.0, 2),
+    antialiasing_label(_("Antialiasing")),
+    antialiasing_cb(),
     hide_box(false, 5),
-    hide_export(_("Hide a_ll except selected"), _("In the exported image, hide all objects except those that are selected")),
+    hide_export(_("Hide all except selected"), _("In the exported image, hide all objects except those that are selected")),
     closeWhenDone(_("Close when complete"), _("Once the export completes, close this dialog")),
     button_box(false, 3),
     _prog(),
@@ -340,6 +342,10 @@ Export::Export (void) :
     pHYs_sb.set_width_chars(7);
     pHYs_sb.set_tooltip_text( _("Will force-set the physical dpi for the png file. Set this to 72 if you're planning to work on your png with Photoshop") );
     zlib_compression.set_hexpand();
+    const char* const antialising_list[] = {"CAIRO_ANTIALIAS_NONE","CAIRO_ANTIALIAS_FAST","CAIRO_ANTIALIAS_GOOD (default)","CAIRO_ANTIALIAS_BEST"};
+    for(int i=0; i<4; ++i)
+        antialiasing_cb.append(antialising_list[i]);
+    antialiasing_cb.set_active_text(antialising_list[2]);
     auto table = new Gtk::Grid();
     gtk_container_add(GTK_CONTAINER(expander.gobj()), (GtkWidget*)(table->gobj()));
     table->attach(interlacing,0,0,1,1);
@@ -349,6 +355,8 @@ Export::Export (void) :
     table->attach(zlib_compression,1,2,1,1);
     table->attach(pHYs_label,0,3,1,1);
     table->attach(pHYs_sb,1,3,1,1);
+    table->attach(antialiasing_label,0,4,1,1);
+    table->attach(antialiasing_cb,1,4,1,1);
     table->show();
 
     /* Main dialog */
@@ -984,6 +992,7 @@ void Export::onExport ()
     int bitdepths[] = {1,2,4,8,16,8,16,8,16,8,16};
     int color_type = colortypes[bitdepth_cb.get_active_row_number()] ;
     int bit_depth = bitdepths[bitdepth_cb.get_active_row_number()] ;
+    int antialiasing = antialiasing_cb.get_active_row_number();
 
 
     if (batch_export.get_active ()) {
@@ -1052,7 +1061,7 @@ void Export::onExport ()
                                              onProgressCallback, (void*)prog_dlg,
                                              TRUE,  // overwrite without asking
                                              hide ? selected : x, 
-                                             do_interlace, color_type, bit_depth, zlib
+                                             do_interlace, color_type, bit_depth, zlib, antialiasing
                                             )) {
                         gchar * error = g_strdup_printf(_("Could not export to filename %s.\n"), safeFile);
 
@@ -1145,7 +1154,7 @@ void Export::onExport ()
                               onProgressCallback, (void*)prog_dlg,
                               FALSE,
                               hide ? selected : x, 
-                              do_interlace, color_type, bit_depth, zlib
+                              do_interlace, color_type, bit_depth, zlib, antialiasing
                               );
         if (status == EXPORT_ERROR) {
             gchar * safeFile = Inkscape::IO::sanitizeString(path.c_str());
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index f64d92341..1f8e87dbc 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -327,6 +327,8 @@ private:
     Gtk::Label                        pHYs_label;
     Glib::RefPtr<Gtk::Adjustment>     pHYs_adj;
     Gtk::SpinButton                   pHYs_sb;
+    Gtk::Label                        antialiasing_label;
+    Gtk::ComboBoxText                 antialiasing_cb;
 
     /* Export Button widgets */
     Gtk::HBox button_box;
-- 
cgit v1.2.3


From 13412fe4b1e8ed5cf540394f799ac8df21b1cbc8 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 6 Jan 2017 02:09:33 +0100
Subject: Improve UI to partialy fix bug 1654121 now offset in measure is neas
 the only button tat have this option. also improved tooltip

(bzr r15393)
---
 src/widgets/measure-toolbar.cpp | 2 +-
 src/widgets/toolbox.cpp         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index a8c974bbc..066c3fbfa 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -326,7 +326,7 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
     {
         eact = create_adjustment_action( "MeasureOffsetAction",
                                          _("Offset"), _("Offset:"),
-                                         _("The offset size"),
+                                         _("Mark dimension offset"),
                                          "/tools/measure/offset", 5.0,
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0.0, 90000.0, 1.0, 4.0,
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 758a3125b..126eac9cd 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -362,8 +362,6 @@ static gchar const * ui_descr =
         "    <separator />"
         "    <toolitem action='MeasureScaleAction' />"
         "    <separator />"
-        "    <toolitem action='MeasureOffsetAction' />"
-        "    <separator />"
         "    <toolitem action='measure_units_label' />"
         "    <toolitem action='MeasureUnitsAction' />"
         "    <toolitem action='MeasureIgnore1stAndLast' />"
@@ -373,8 +371,9 @@ static gchar const * ui_descr =
         "    <toolitem action='MeasureReverse' />"
         "    <toolitem action='MeasureToPhantom' />"
         "    <toolitem action='MeasureToGuides' />"
-        "    <toolitem action='MeasureMarkDimension' />"
         "    <toolitem action='MeasureToItem' />"
+        "    <toolitem action='MeasureMarkDimension' />"
+        "    <toolitem action='MeasureOffsetAction' />"
         "  </toolbar>" 
 
         "  <toolbar name='StarToolbar'>"
-- 
cgit v1.2.3


From bfcc3c57a2387e25bb2bc05a8a77f0ce51ca6b21 Mon Sep 17 00:00:00 2001
From: Tim Sheridan <tghs@tghs.net>
Date: Sat, 7 Jan 2017 00:46:07 +0000
Subject: Add missing include for array template

(bzr r15394.1.1)
---
 src/widgets/eraser-toolbar.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index 64aace4e7..7377cdc00 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -33,6 +33,8 @@
 #include "eraser-toolbar.h"
 #include "calligraphy-toolbar.h" // TODO: needed for update_presets_list
 
+#include <array>
+
 #include "desktop.h"
 #include "document-undo.h"
 #include "widgets/ege-adjustment-action.h"
-- 
cgit v1.2.3


From 0baa29a9f73547319d667d898c961a9fdb436c9e Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sat, 7 Jan 2017 16:32:48 +0100
Subject: suppress warnings on symbols dialog

(bzr r15398)
---
 src/sp-object.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index e9c60fc7d..75f4657ef 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -660,7 +660,9 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) {
     object->readAttr("xml:space");
     object->readAttr("inkscape:label");
     object->readAttr("inkscape:collect");
-    if(object->cloned)
+    if(object->cloned && (repr->attribute("id")) ) // The cases where this happens are when the "original" has no id. This happens
+                                                   // if it is a SPString (a TextNode, e.g. in a <title>), or when importing
+                                                   // stuff externally modified to have no id. 
         object->clone_original = document->getObjectById(repr->attribute("id"));
 
     for (Inkscape::XML::Node *rchild = repr->firstChild() ; rchild != NULL; rchild = rchild->next()) {
-- 
cgit v1.2.3


From b92f23dfe2ae9c7887489a890da735b1771a7969 Mon Sep 17 00:00:00 2001
From: "mattia@debian.org" <>
Date: Sat, 7 Jan 2017 23:00:59 +0100
Subject: Fix typo in variable name s/strech/stretch/

Fixed bugs:
  - https://launchpad.net/bugs/1653371

(bzr r15400.1.1)
---
 src/live_effects/lpe-transform_2pts.cpp | 14 +++++++-------
 src/live_effects/lpe-transform_2pts.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index e1f36eee7..ef2900775 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -34,7 +34,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
     flip_vertical(_("Flip vertical"), _("Flip vertical"), "flip_vertical", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
     start(_("Start"), _("Start point"), "start", &wr, this, "Start point"),
     end(_("End"), _("End point"), "end", &wr, this, "End point"),
-    strech(_("Stretch"), _("Stretch the result"), "strech", &wr, this, 1),
+    stretch(_("Stretch"), _("Stretch the result"), "stretch", &wr, this, 1),
     offset(_("Offset"), _("Offset from knots"), "offset", &wr, this, 0),
     first_knot(_("First Knot"), _("First Knot"), "first_knot", &wr, this, 1),
     last_knot(_("Last Knot"), _("Last Knot"), "last_knot", &wr, this, 1),
@@ -52,7 +52,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
     registerParameter(&first_knot);
     registerParameter(&last_knot);
     registerParameter(&helper_size);
-    registerParameter(&strech);
+    registerParameter(&stretch);
     registerParameter(&offset);
     registerParameter(&start);
     registerParameter(&end);
@@ -73,9 +73,9 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
     offset.param_set_range(-999999.0, 999999.0);
     offset.param_set_increments(1, 1);
     offset.param_set_digits(2);
-    strech.param_set_range(0, 999.0);
-    strech.param_set_increments(0.01, 0.01);
-    strech.param_set_digits(4);
+    stretch.param_set_range(0, 999.0);
+    stretch.param_set_increments(0.01, 0.01);
+    stretch.param_set_digits(4);
     apply_to_clippath_and_mask = true;
 }
 
@@ -379,9 +379,9 @@ LPETransform2Pts::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const
         m *= Geom::Scale(-1,1);
         m *= Geom::Rotate(original_angle);
     }
-    if(strech != 1){
+    if(stretch != 1){
         m *= Geom::Rotate(-original_angle);
-        m *= Geom::Scale(1,strech);
+        m *= Geom::Scale(1,stretch);
         m *= Geom::Rotate(original_angle);
     }
     if(elastic) {
diff --git a/src/live_effects/lpe-transform_2pts.h b/src/live_effects/lpe-transform_2pts.h
index c20d56206..0f88e6b00 100644
--- a/src/live_effects/lpe-transform_2pts.h
+++ b/src/live_effects/lpe-transform_2pts.h
@@ -57,7 +57,7 @@ private:
     ToggleButtonParam flip_vertical;
     PointParam start;
     PointParam end;
-    ScalarParam strech;
+    ScalarParam stretch;
     ScalarParam offset;
     ScalarParam first_knot;
     ScalarParam last_knot;
-- 
cgit v1.2.3


From d994d8f220eec4293101dbe0b8299119efa6e4e0 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Sun, 8 Jan 2017 12:46:00 +0100
Subject: Fix a bad inicialization of unsigned int

(bzr r15402)
---
 src/ui/widget/registered-widget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index d410dbfe6..f66d5cbf2 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -135,7 +135,7 @@ private:
         repr = NULL;
         doc = NULL;
         write_undo = false;
-        event_type = -1;
+        event_type = 0; //SP_VERB_INVALID
     }
 };
 
-- 
cgit v1.2.3


From 5f0a1801ee8423cbdb4d0e86aa8502049f4e0c0f Mon Sep 17 00:00:00 2001
From: suv-lp <>
Date: Mon, 9 Jan 2017 20:32:29 +0100
Subject: [Bug #1654798] Broken icon in LPE 'Fill between many'

Fixed bugs:
  - https://launchpad.net/bugs/1654798

(bzr r15404)
---
 src/live_effects/parameter/originalpath.cpp      | 2 +-
 src/live_effects/parameter/originalpatharray.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 2741461be..f7eb48b7a 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -56,7 +56,7 @@ OriginalPathParam::param_newWidget()
     }
 
     { // Paste path to link button
-        Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( INKSCAPE_ICON("edit-paste"), Inkscape::ICON_SIZE_BUTTON) );
+        Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( INKSCAPE_ICON("edit-clone"), Inkscape::ICON_SIZE_BUTTON) );
         Gtk::Button *pButton = Gtk::manage(new Gtk::Button());
         pButton->set_relief(Gtk::RELIEF_NONE);
         pIcon->show();
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 4ee068ebf..083abc94c 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -144,7 +144,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget()
     
     
     { // Paste path to link button
-        Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon("gtk-stock", Inkscape::ICON_SIZE_BUTTON) );
+        Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon("edit-clone", Inkscape::ICON_SIZE_BUTTON) );
         Gtk::Button *pButton = Gtk::manage(new Gtk::Button());
         pButton->set_relief(Gtk::RELIEF_NONE);
         pIcon->show();
-- 
cgit v1.2.3


From 66095b4a7c8d8c38ffe727490f90de088f488574 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 10 Jan 2017 13:44:57 +0100
Subject: Another scaling option to test.

(bzr r15406)
---
 src/file.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/file.cpp b/src/file.cpp
index 756bc55bb..629e8205b 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -433,6 +433,7 @@ bool sp_file_open(const Glib::ustring &uri,
                     scaleDialog.add_button(_("Ignore"),          3);
                     scaleDialog.add_button("Scale test - group",    4);
                     scaleDialog.add_button("Scale test - children", 5);
+                    scaleDialog.add_button("Scale test - all",      6);
 
                     gint response = scaleDialog.run();
                     backup = backupButton.get_active();
@@ -519,9 +520,34 @@ bool sp_file_open(const Glib::ustring &uri,
                         prefs->setBool("/options/transform/rectcorners", transform_rectcorners);
                         prefs->setBool("/options/transform/pattern",     transform_pattern);
                         prefs->setBool("/options/transform/gradient",    transform_gradient);
+
+                    } else if (response == 6) {
+
+                        std::cout << "Respons 6a" << std::endl;
+
+                        // Save preferences
+                        bool onlysensitive = prefs->getBool("/options/kbselection/onlysensitive",true);
+                        bool onlyvisible   = prefs->getBool("/options/kbselection/onlyvisible",  true);
+
+                        prefs->setBool("/options/kbselection/onlysensitive", false);
+                        prefs->setBool("/options/kbselection/onlyvisible",   false);
+
+                        Inkscape::Selection *selection = desktop->getSelection();
+                        Inkscape::SelectionHelper::selectAllInAll( desktop );
+
+                        double height = root->height.computed;
+                        selection->setScaleRelative( Geom::Point(0,height), Geom::Scale(96.0/90.0,96.0/90.0) );
+                        std::cout << "  scaling: " << 96.0/90.0 << std::endl;
+                        selection->clear();
+
+                        prefs->setBool("/options/kbselection/onlysensitive", onlysensitive);
+                        prefs->setBool("/options/kbselection/onlyvisible",   onlyvisible  );
+
+                        did_scaling = true;
+
                     }
 
-                    need_fix_box3d = true;
+                    need_fix_box3d = false; // setScaleRelative() handles box3d
                     need_fix_guides = true; // Always fix guides
                 }
 
@@ -550,6 +576,7 @@ bool sp_file_open(const Glib::ustring &uri,
                     scaleDialog.add_button(_("Ignore"),         3);
                     scaleDialog.add_button("Scale test - group",    4);
                     scaleDialog.add_button("Scale test - children", 5);
+                    scaleDialog.add_button("Scale test - all",      6);
 
                     gint response = scaleDialog.run();
                     backup = backupButton.get_active();
@@ -671,9 +698,47 @@ bool sp_file_open(const Glib::ustring &uri,
                             prefs->setBool("/options/transform/gradient",    transform_gradient);
 
                             did_scaling = true;
+
                         }
 
-                        need_fix_box3d = true;
+                    } else if (response == 6) {
+
+                        std::cout << "Response 6b" << std::endl;
+                        double old_height = root->height.computed;
+                        Inkscape::Util::Quantity width  =
+                            Inkscape::Util::Quantity(doc->getWidth().value("px")/ratio, "px" );
+                        Inkscape::Util::Quantity height =
+                            Inkscape::Util::Quantity(doc->getHeight().value("px")/ratio,"px" );
+                        doc->setWidthAndHeight( width, height, false );
+
+                        if (!root->viewBox_set) {
+
+                            // Save preferences
+                            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+                            bool onlysensitive = prefs->getBool("/options/kbselection/onlysensitive",true);
+                            bool onlyvisible   = prefs->getBool("/options/kbselection/onlyvisible",  true);
+
+                            prefs->setBool("/options/kbselection/onlysensitive", false);
+                            prefs->setBool("/options/kbselection/onlyvisible",   false);
+
+                            Inkscape::Selection *selection = desktop->getSelection();
+                            Inkscape::SelectionHelper::selectAllInAll( desktop );
+                            std::cout << "  scaling: " << 96.0/90.0 << std::endl;
+                            double height = root->height.computed;
+
+                            // So far we have just enlarged the drawing but due to the
+                            // inverted coordinate system we must scale around the old
+                            // height position.
+                            selection->setScaleRelative( Geom::Point(0,old_height), Geom::Scale(96.0/90.0,96.0/90.0) );
+                            selection->clear();
+
+                            prefs->setBool("/options/kbselection/onlysensitive", onlysensitive);
+                            prefs->setBool("/options/kbselection/onlyvisible",   onlyvisible  );
+
+                            did_scaling = true;
+                        }
+
+                        need_fix_box3d = false; // setScaleRelative() handls box3s
                         need_fix_guides = true; // Only fix guides if drawing scaled
 
                     } else {
-- 
cgit v1.2.3


From 3d488c4a3091d4e14c045e85aa20b1ec96b479c0 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 10 Jan 2017 13:55:18 +0100
Subject: Remove debugging lines from last commit.

(bzr r15407)
---
 src/file.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src')

diff --git a/src/file.cpp b/src/file.cpp
index 629e8205b..9e96361c3 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -523,8 +523,6 @@ bool sp_file_open(const Glib::ustring &uri,
 
                     } else if (response == 6) {
 
-                        std::cout << "Respons 6a" << std::endl;
-
                         // Save preferences
                         bool onlysensitive = prefs->getBool("/options/kbselection/onlysensitive",true);
                         bool onlyvisible   = prefs->getBool("/options/kbselection/onlyvisible",  true);
@@ -537,7 +535,6 @@ bool sp_file_open(const Glib::ustring &uri,
 
                         double height = root->height.computed;
                         selection->setScaleRelative( Geom::Point(0,height), Geom::Scale(96.0/90.0,96.0/90.0) );
-                        std::cout << "  scaling: " << 96.0/90.0 << std::endl;
                         selection->clear();
 
                         prefs->setBool("/options/kbselection/onlysensitive", onlysensitive);
@@ -703,7 +700,6 @@ bool sp_file_open(const Glib::ustring &uri,
 
                     } else if (response == 6) {
 
-                        std::cout << "Response 6b" << std::endl;
                         double old_height = root->height.computed;
                         Inkscape::Util::Quantity width  =
                             Inkscape::Util::Quantity(doc->getWidth().value("px")/ratio, "px" );
@@ -723,7 +719,6 @@ bool sp_file_open(const Glib::ustring &uri,
 
                             Inkscape::Selection *selection = desktop->getSelection();
                             Inkscape::SelectionHelper::selectAllInAll( desktop );
-                            std::cout << "  scaling: " << 96.0/90.0 << std::endl;
                             double height = root->height.computed;
 
                             // So far we have just enlarged the drawing but due to the
-- 
cgit v1.2.3


From a990b228dac4df40190334093d695e486ba1eee4 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Wed, 11 Jan 2017 14:51:54 +0000
Subject: fix comment typos

(bzr r15408)
---
 src/ui/dialog/align-and-distribute.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 236832beb..1c88fc849 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -614,7 +614,7 @@ private :
     }
 };
 
-// instantiae the private static member
+// instantiate the private static member
 boost::optional<Geom::Point> ActionExchangePositions::center;
 
 class ActionUnclump : public Action {
@@ -928,7 +928,7 @@ AlignAndDistribute::AlignAndDistribute()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
-    //Instanciate the align buttons
+    //Instantiate the align buttons
     addAlignButton(INKSCAPE_ICON("align-horizontal-right-to-anchor"),
                    _("Align right edges of objects to the left edge of the anchor"),
                    0, 0);
-- 
cgit v1.2.3


From 5d4aa9ac147ae6db7428aa876293cf2c46fae7a5 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Wed, 11 Jan 2017 21:58:37 +0100
Subject: Fix snapping tooltips and highlighting of snapped bounding boxes
 (both of which were not shown)

(bzr r15410)
---
 src/display/snap-indicator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp
index 17deea16d..f2271e0c6 100644
--- a/src/display/snap-indicator.cpp
+++ b/src/display/snap-indicator.cpp
@@ -287,7 +287,7 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap
         } else if (p.getSource() != SNAPSOURCE_UNDEFINED) {
             tooltip_str = g_strdup(source_name);
         }
-        double fontsize = prefs->getInt("/tools/measure/fontsize");
+        double fontsize = prefs->getDouble("/tools/measure/fontsize", 10.0);
 
         if (tooltip_str) {
             Geom::Point tooltip_pos = p.getPoint();
@@ -327,7 +327,7 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap
             SP_CTRLRECT(box)->setDashed(true);
             SP_CTRLRECT(box)->pickable = false;  // See the extensive comment above
             sp_canvas_item_move_to_z(box, 0);
-            _snaptarget_bbox = _desktop->add_temporary_canvasitem(box, timeout_val);
+            _snaptarget_bbox = _desktop->add_temporary_canvasitem(box, timeout_val*1000.0);
         }
     }
 }
-- 
cgit v1.2.3


From 00bf8be09a333bb7434eeba9e885e6089b6eb5fd Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Thu, 12 Jan 2017 22:45:33 +0100
Subject: Use GStatBuf where appropriate to ensure usage of the correct type
 (fixes compilation with i686-w64-mingw32)

(bzr r15414)
---
 src/color-profile.cpp                  | 2 +-
 src/display/cairo-utils.cpp            | 2 +-
 src/inkscape.cpp                       | 2 +-
 src/io/sys.cpp                         | 2 +-
 src/sp-image.cpp                       | 2 +-
 src/ui/dialog/filedialogimpl-gtkmm.cpp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 7a4dcc1cd..cbd3475b4 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -781,7 +781,7 @@ std::vector<std::pair<Glib::ustring, bool> > ColorProfile::getBaseProfileDirs()
 static bool isIccFile( gchar const *filepath )
 {
     bool isIccFile = false;
-    struct stat st;
+    GStatBuf st;
     if ( g_stat(filepath, &st) == 0 && (st.st_size > 128) ) {
         //0-3 == size
         //36-39 == 'acsp' 0x61637370
diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 01b0d807c..8045007e7 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -290,7 +290,7 @@ Pixbuf *Pixbuf::create_from_file(std::string const &fn)
     if (!g_file_test(fn.c_str(), G_FILE_TEST_EXISTS)) { 
         return NULL;
     }
-    struct stat stdir;
+    GStatBuf stdir;
     int val = g_stat(fn.c_str(), &stdir);
     if (val == 0 && stdir.st_mode & S_IFDIR){
         return NULL;
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 2ba85026f..bf694ada7 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -274,7 +274,7 @@ int Application::autosave()
         if (doc->isModifiedSinceSave()) {
             gchar *oldest_autosave = 0;
             const gchar  *filename = 0;
-            struct stat sb;
+            GStatBuf sb;
             time_t min_time = 0;
             gint count = 0;
 
diff --git a/src/io/sys.cpp b/src/io/sys.cpp
index 94175176a..61a6a96f4 100644
--- a/src/io/sys.cpp
+++ b/src/io/sys.cpp
@@ -226,7 +226,7 @@ bool Inkscape::IO::file_is_writable( char const *utf8name)
             filename = g_filename_from_utf8 ( utf8name, -1, NULL, NULL, NULL );
         }
         if ( filename ) {
-            struct stat st;
+            GStatBuf st;
             if (g_file_test (filename, G_FILE_TEST_EXISTS)){ 
                 if (g_lstat (filename, &st) == 0) {
                     success = ((st.st_mode & S_IWRITE) != 0);
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index aa1dbfe20..1961971cb 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -793,7 +793,7 @@ void sp_image_refresh_if_outdated( SPImage* image )
     if ( image->href && image->pixbuf && image->pixbuf->modificationTime()) {
         // It *might* change
 
-        struct stat st;
+        GStatBuf st;
         memset(&st, 0, sizeof(st));
         int val = 0;
         if (g_file_test (image->pixbuf->originalPath().c_str(), G_FILE_TEST_EXISTS)){ 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index f5450ac9a..92e9ce834 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -554,7 +554,7 @@ bool SVGPreview::set(Glib::ustring &fileName, int dialogType)
         Glib::ustring fileNameUtf8 = Glib::filename_to_utf8(fileName);
         gchar *fName = const_cast<gchar *>(
             fileNameUtf8.c_str()); // const-cast probably not necessary? (not necessary on Windows version of stat())
-        struct stat info;
+        GStatBuf info;
         if (g_stat(fName, &info)) // stat returns 0 upon success
         {
             g_warning("SVGPreview::set() : %s : %s", fName, strerror(errno));
-- 
cgit v1.2.3


From 2a903d02506837d99d043d50477950a148c140ab Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 17 Jan 2017 11:33:02 +0100
Subject: Fix regression on selecting objects after locking layers

Fixed bugs:
  - https://launchpad.net/bugs/1656141

(bzr r15419)
---
 src/sp-item.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 05af12229..5d02020c6 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -121,6 +121,7 @@ void SPItem::setLocked(bool locked) {
     setAttribute("sodipodi:insensitive",
                  ( locked ? "1" : NULL ));
     updateRepr();
+    document->_emitModified();
 }
 
 bool SPItem::isHidden() const {
-- 
cgit v1.2.3


From b6875ce1916a57c9e13cfc0b8fd63fa522b1e449 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 17 Jan 2017 17:03:42 +0100
Subject: Actually unsets attribute instead of ignoring it when it's 0

Fixed bugs:
  - https://launchpad.net/bugs/481805

(bzr r15420)
---
 src/sp-rect.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp
index 88dad5354..e69cdfc7b 100644
--- a/src/sp-rect.cpp
+++ b/src/sp-rect.cpp
@@ -120,6 +120,7 @@ void SPRect::set(unsigned key, gchar const *value) {
             SPShape::set(key, value);
             break;
     }
+    updateRepr();
 #ifdef OBJECT_TRACE
     objectTrace( "SPRect::set", false );
 #endif
@@ -171,10 +172,14 @@ Inkscape::XML::Node * SPRect::write(Inkscape::XML::Document *xml_doc, Inkscape::
 
     if (this->rx._set) {
     	sp_repr_set_svg_length(repr, "rx", this->rx);
+    } else {
+        repr->setAttribute("rx", NULL);
     }
 
     if (this->ry._set) {
     	sp_repr_set_svg_length(repr, "ry", this->ry);
+    } else {
+        repr->setAttribute("ry", NULL);
     }
 
     sp_repr_set_svg_length(repr, "x", this->x);
-- 
cgit v1.2.3


From 1dbe6c746f9f5b0ddbce22e228835010c000d67b Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Tue, 17 Jan 2017 23:06:15 +0100
Subject: Partially fix opening of librevenge based input formats (cdr/vsd/wpg)
 on Windows if the filename contains non-ASCII characters

The problem is that "RVNGFileStream" uses "fopen()" internally which only supports ANSI filenames on Windows (i.e. a complete fix would require upstream code changes).

By using "g_win32_locale_filename_from_utf8()" the problem can be worked around in most cases, though:
* the filename is converted to the current codepage (i.e. all 255 characters that are available in the current character encoding are allowed in the filename)
* even if the filename contains a character that's not available in the current character encoding it's attempted to use the alternative short (8.3) file name instead

Therefore the input operation will only fail in the unlikely case that the filename contains a character not available in the current ANSI code page while at the same time short file names are disabled on the file system (which is not the case in standard configurations).

Fixed bugs:
  - https://launchpad.net/bugs/1656763
  - https://launchpad.net/bugs/1656763

(bzr r15421)
---
 src/extension/internal/cdr-input.cpp | 7 +++++++
 src/extension/internal/vsd-input.cpp | 7 +++++++
 src/extension/internal/wpg-input.cpp | 7 +++++++
 3 files changed, 21 insertions(+)

(limited to 'src')

diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index 92a11a6ac..0435f1396 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -214,6 +214,13 @@ void CdrImportDialog::_setPreviewPage()
 
 SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
 {
+     #ifdef WIN32
+          // RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows
+          // therefore attempt to convert uri to the system codepage
+          // even if this is not possible the alternate short (8.3) file name will be used if available
+          uri = g_win32_locale_filename_from_utf8(uri);
+     #endif
+
      RVNGFileStream input(uri);
 
      if (!libcdr::CDRDocument::isSupported(&input)) {
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 2fb4acf22..78783aa2d 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -216,6 +216,13 @@ void VsdImportDialog::_setPreviewPage()
 
 SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
 {
+     #ifdef WIN32
+          // RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows
+          // therefore attempt to convert uri to the system codepage
+          // even if this is not possible the alternate short (8.3) file name will be used if available
+          uri = g_win32_locale_filename_from_utf8(uri);
+     #endif
+
      RVNGFileStream input(uri);
 
      if (!libvisio::VisioDocument::isSupported(&input)) {
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 54a14fc72..12457791b 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -81,6 +81,13 @@ namespace Internal {
 
 SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
 {
+    #ifdef WIN32
+        // RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows
+        // therefore attempt to convert uri to the system codepage
+        // even if this is not possible the alternate short (8.3) file name will be used if available
+        uri = g_win32_locale_filename_from_utf8(uri);
+    #endif
+
     RVNGInputStream* input = new RVNGFileStream(uri);
 #if WITH_LIBWPG03
     if (input->isStructured()) {
-- 
cgit v1.2.3


From 2118ac50fd5fff4306c8882ad230cc4c09c83c60 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Wed, 18 Jan 2017 21:31:12 +0100
Subject: Fix usage information for "--export-pdf-version"

(bzr r15422)
---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index fb627a020..605c1207e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -420,7 +420,7 @@ struct poptOption options[] = {
     {"export-pdf-version", 0,
      POPT_ARG_STRING, &sp_export_pdf_version, SP_ARG_EXPORT_PDF_VERSION,
      // TRANSLATORS: "--export-pdf-version" is an Inkscape command line option; see "inkscape --help"
-     N_("Export PDF to given version. (hint: make sure to input the exact string found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)"),
+     N_("Export PDF to given version. (hint: make sure to input a version found in the PDF export dialog, e.g. \"1.4\" which is PDF-a conformant)"),
      N_("PDF_VERSION")},
 
     {"export-latex", 0,
-- 
cgit v1.2.3


From dda1f59f8916265c7ef0a5de8ef4497a09cfc1da Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Thu, 19 Jan 2017 15:56:11 +0100
Subject: revert 15420 because of severe regression

(bzr r15423)
---
 src/sp-rect.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src')

diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp
index e69cdfc7b..88dad5354 100644
--- a/src/sp-rect.cpp
+++ b/src/sp-rect.cpp
@@ -120,7 +120,6 @@ void SPRect::set(unsigned key, gchar const *value) {
             SPShape::set(key, value);
             break;
     }
-    updateRepr();
 #ifdef OBJECT_TRACE
     objectTrace( "SPRect::set", false );
 #endif
@@ -172,14 +171,10 @@ Inkscape::XML::Node * SPRect::write(Inkscape::XML::Document *xml_doc, Inkscape::
 
     if (this->rx._set) {
     	sp_repr_set_svg_length(repr, "rx", this->rx);
-    } else {
-        repr->setAttribute("rx", NULL);
     }
 
     if (this->ry._set) {
     	sp_repr_set_svg_length(repr, "ry", this->ry);
-    } else {
-        repr->setAttribute("ry", NULL);
     }
 
     sp_repr_set_svg_length(repr, "x", this->x);
-- 
cgit v1.2.3


From 7201350d40601daaa99930be2554c5811eba23b0 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 20 Jan 2017 18:52:27 +0100
Subject: Fix bug 1657591. Crash on ungrouping in v0.92. A unnecesary call to
 update path effect hook the crash, not sure why but this call is unnecesary
 so I remove it

Fixed bugs:
  - https://launchpad.net/bugs/1657591

(bzr r15424)
---
 src/live_effects/lpe-patternalongpath.cpp | 1 -
 src/live_effects/parameter/vector.cpp     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index c1853ef22..f404afe17 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -264,7 +264,6 @@ LPEPatternAlongPath::transform_multiply(Geom::Affine const& postmul, bool set)
         pattern.param_transform_multiply(postmul, set);
         pattern.write_to_SVG();
     }
-    sp_lpe_item_update_patheffect (sp_lpe_item, false, true);
 }
 
 void
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index aa16a2b98..55b4d4b32 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -116,7 +116,7 @@ VectorParam::set_and_write_new_values(Geom::Point const &new_origin, Geom::Point
 void
 VectorParam::param_transform_multiply(Geom::Affine const& postmul, bool /*set*/)
 {
-        set_and_write_new_values( origin * postmul, vector * postmul.withoutTranslation() );
+    set_and_write_new_values( origin * postmul, vector * postmul.withoutTranslation() );
 }
 
 
-- 
cgit v1.2.3


From 8884e1097b5b5c11d9653ff1c9e4d9148fa579dd Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 20 Jan 2017 19:07:28 +0100
Subject: Fix bug 1622388. Insane memory leak and crash with pattern along path

Fixed bugs:
  - https://launchpad.net/bugs/1622388

(bzr r15425)
---
 src/live_effects/lpe-patternalongpath.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index f404afe17..966e9020e 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -11,6 +11,7 @@
 #include <2geom/bezier-to-sbasis.h>
 
 #include "knotholder.h"
+#include <cmath>
 #include <algorithm>
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
@@ -161,7 +162,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
         //        spacing.param_set_range(-pattBndsX.extent()*.9, Geom::infinity());
         //    }
 
-        y0+=noffset;
+        y0 += noffset;
 
         std::vector<Geom::Piecewise<Geom::D2<Geom::SBasis> > > paths_in;
         paths_in = split_at_discontinuities(pwd2_in);
@@ -197,7 +198,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
                     
                 case PAPCT_REPEATED_STRETCHED:
                     // if uskeleton is closed:
-                    if(path_i.segs.front().at0() == path_i.segs.back().at1()){
+                    if (are_near(path_i.segs.front().at0(), path_i.segs.back().at1())){
                         nbCopies = std::max(1, static_cast<int>(std::floor((uskeleton.domain().extent() - toffset)/(pattBndsX->extent()+xspace))));
                         pattBndsX = Interval(pattBndsX->min(),pattBndsX->max()+xspace);
                         scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX->extent());
@@ -213,11 +214,13 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
                     return pwd2_in;
             };
             
+            //Ceil to 6 decimals
+            scaling = ceil(scaling * 1000000) / 1000000;
             double pattWidth = pattBndsX->extent() * scaling;
             
-            x*=scaling;
+            x *= scaling;
             if ( scale_y_rel.get_value() ) {
-                y*=(scaling * prop_scale);
+                y *= prop_scale * scaling;
             } else {
                 y *= prop_scale;
             }
@@ -235,7 +238,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
                 offs+=pattWidth;
             }
         }
-        if (fuse_tolerance > 0){        
+        if (fuse_tolerance > 0){
             pre_output = fuse_nearby_ends(pre_output, fuse_tolerance);
             for (unsigned i=0; i<pre_output.size(); i++){
                 output.concat(pre_output[i]);
-- 
cgit v1.2.3


From 8907ced418b6c40782d2d2c0f3f944edcb3c08df Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 20 Jan 2017 20:19:49 +0100
Subject: Fixes bugs in copy LPE's. #1656093:Paste path effect doesn't work on
 0.92 and #1656527:Copy & paste of group with shaped path corrupts it, in
 v0.92

Fixed bugs:
  - https://launchpad.net/bugs/1656093
  - https://launchpad.net/bugs/1656527

(bzr r15426)
---
 src/file.cpp         |  6 +++++-
 src/ui/clipboard.cpp | 40 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/file.cpp b/src/file.cpp
index 9e96361c3..e8248bb8e 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1631,8 +1631,12 @@ void sp_import_document(SPDesktop *desktop, SPDocument *clipdoc, bool in_place)
     for (Inkscape::XML::Node *obj = clipboard->firstChild() ; obj ; obj = obj->next()) {
     	if(target_document->getObjectById(obj->attribute("id"))) continue;
         Inkscape::XML::Node *obj_copy = obj->duplicate(target_document->getReprDoc());
-        target_parent->appendChild(obj_copy);
+        SPObject * pasted = desktop->currentLayer()->appendChildRepr(obj_copy);
         Inkscape::GC::release(obj_copy);
+        SPLPEItem * pasted_lpe_item = dynamic_cast<SPLPEItem *>(pasted);
+        if (pasted_lpe_item){
+            pasted_lpe_item->forkPathEffectsIfNecessary(1);
+        } 
         pasted_objects_not.push_back(obj_copy);
     }
     Inkscape::Selection *selection = desktop->getSelection();
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index a8e708597..c1e824c1e 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -643,7 +643,6 @@ Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId(SPDesktop *desktop)
     return svgd;
 }
 
-
 /**
  * Iterate over a list of items and copy them to the clipboard.
  */
@@ -689,25 +688,6 @@ void ClipboardManagerImpl::_copySelection(ObjectSet *selection)
             else
                 obj_copy = _copyNode(obj, _doc, _clipnode);
 
-            // For lpe items, copy lpe stack if applicable
-            SPLPEItem *lpeitem = dynamic_cast<SPLPEItem *>(item);
-            if (lpeitem) {
-                Inkscape::SVGOStringStream os;
-                if (lpeitem->hasPathEffect()) {
-                    for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); ++it)
-                    {
-                        LivePathEffectObject *lpeobj = (*it)->lpeobject;
-                        if (lpeobj) {
-                            Inkscape::XML::Node * lpeobjcopy = _copyNode(lpeobj->getRepr(), _doc, _defs);
-                            gchar *new_conflict_id = sp_object_get_unique_id(lpeobj, lpeobj->getAttribute("id"));
-                            lpeobjcopy->setAttribute("id", new_conflict_id);
-                            g_free(new_conflict_id);
-                            os << "#" << lpeobjcopy->attribute("id") << ";";
-                        }
-                    }
-                }
-                obj_copy->setAttribute("inkscape:path-effect", os.str().c_str());
-            }
             // copy complete inherited style
             SPCSSAttr *css = sp_repr_css_attr_inherited(obj, "style");
             sp_repr_css_set(obj_copy, css, "style");
@@ -739,6 +719,13 @@ void ClipboardManagerImpl::_copySelection(ObjectSet *selection)
             sp_repr_css_set(_clipnode, style, "style");
             sp_repr_css_attr_unref(style);
         }
+        // copy path effect from the first path
+        if (object) {
+            gchar const *effect =object->getRepr()->attribute("inkscape:path-effect");
+            if (effect) {
+                _clipnode->setAttribute("inkscape:path-effect", effect);
+            }
+        }
     }
 
     Geom::OptRect size = selection->visualBounds();
@@ -841,6 +828,19 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
         }
     }
 
+    // For lpe items, copy lpe stack if applicable
+    SPLPEItem *lpeitem = dynamic_cast<SPLPEItem *>(item);
+    if (lpeitem) {
+        if (lpeitem->hasPathEffect()) {
+            for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); ++it){
+                LivePathEffectObject *lpeobj = (*it)->lpeobject;
+                if (lpeobj) {
+                  _copyNode(lpeobj->getRepr(), _doc, _defs);
+                }
+            }
+        }
+    }
+
     // recurse
     for(auto& o: item->children) {
         SPItem *childItem = dynamic_cast<SPItem *>(&o);
-- 
cgit v1.2.3


From 208465e82f5563f6b2c7821dc41ed186bf61b87e Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Sat, 21 Jan 2017 17:02:50 +0100
Subject: Fixes typos in strings. Some typos in Inkscape 0.92 LPE UI

Fixed bugs:
  - https://launchpad.net/bugs/1622731

(bzr r15427)
---
 src/live_effects/lpe-perspective-envelope.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index e0dac0687..18b5b724d 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -379,7 +379,7 @@ LPEPerspectiveEnvelope::newWidget()
                         hbox_down_handles->pack_start(*widg, true, true, 2);
                     }
                     if (tip) {
-                        widg->set_tooltip_text(*tip);
+                        widg->set_tooltip_markup(*tip);
                     } else {
                         widg->set_tooltip_text("");
                         widg->set_has_tooltip(false);
-- 
cgit v1.2.3


From e8dcb5062f6114a9fb06d496ab5d906aec405c78 Mon Sep 17 00:00:00 2001
From: "alexandru.roman" <alexroman5g@gmail.com>
Date: Sat, 21 Jan 2017 23:28:05 +0100
Subject: Fix "swap fill and stroke" for multiple objects in selection Add verb
 and shortcut possibility

Fixed bugs:
  - https://launchpad.net/bugs/367360
  - https://launchpad.net/bugs/675690

(bzr r15428)
---
 src/object-set.h                 |  2 +-
 src/selection-chemistry.cpp      | 71 +++++++++++++++++++++++++++++++++++++++-
 src/ui/widget/selected-style.cpp | 57 +-------------------------------
 src/verbs.cpp                    |  5 +++
 src/verbs.h                      |  1 +
 5 files changed, 78 insertions(+), 58 deletions(-)

(limited to 'src')

diff --git a/src/object-set.h b/src/object-set.h
index a89a299bd..7c224f640 100644
--- a/src/object-set.h
+++ b/src/object-set.h
@@ -447,7 +447,7 @@ public:
     // various
     void getExportHints(Glib::ustring &filename, float *xdpi, float *ydpi);
     bool fitCanvas(bool with_margins, bool skip_undo = false);
-    
+    void swapFillStroke();
 
 protected:
     virtual void _connectSignals(SPObject* object) {};
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index f8ab33ac4..67972cabb 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -97,6 +97,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "live_effects/parameter/originalpath.h"
 #include "layer-manager.h"
 #include "object-set.h"
+#include "svg/svg-color.h"
 
 // For clippath editing
 #include "ui/tools/node-tool.h"
@@ -1242,7 +1243,6 @@ void ObjectSet::pasteStyle()
     }
 }
 
-
 void ObjectSet::pastePathEffect()
 {
     Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
@@ -4169,6 +4169,75 @@ bool ObjectSet::fitCanvas(bool with_margins, bool skip_undo)
     }
 }
 
+void ObjectSet::swapFillStroke()
+{
+    if (desktop() == NULL) {
+        return;
+    }
+
+    SPIPaint *paint;
+    SPPaintServer *server;
+    Glib::ustring _paintserver_id;
+
+    auto list= items();
+    for (auto itemlist=list.begin();itemlist!=list.end();++itemlist) {
+        SPItem *item = *itemlist;
+        
+        SPCSSAttr *css = sp_repr_css_attr_new ();
+
+        _paintserver_id.clear();
+        paint = &(item->style->fill);
+        if (paint->set && paint->isNone())
+            sp_repr_css_set_property (css, "stroke", "none");
+        else if (paint->set && paint->isColor()) {
+            guint32 color = paint->value.color.toRGBA32(SP_SCALE24_TO_FLOAT (item->style->fill_opacity.value));
+            gchar c[64];
+            sp_svg_write_color (c, sizeof(c), color);
+            sp_repr_css_set_property (css, "stroke", c);
+        }
+        else if (!paint->set)
+            sp_repr_css_unset_property (css, "stroke");
+        else if (paint->set && paint->isPaintserver()) {
+            server = SP_STYLE_FILL_SERVER(item->style);
+            if (server) {
+                Inkscape::XML::Node *srepr = server->getRepr();
+                _paintserver_id += "url(#";
+                _paintserver_id += srepr->attribute("id");
+                _paintserver_id += ")";
+                sp_repr_css_set_property (css, "stroke", _paintserver_id.c_str());
+            }
+        }
+
+        _paintserver_id.clear();
+        paint = &(item->style->stroke);
+        if (paint->set && paint->isNone())
+            sp_repr_css_set_property (css, "fill", "none");
+        else if (paint->set && paint->isColor()) {
+            guint32 color = paint->value.color.toRGBA32(SP_SCALE24_TO_FLOAT (item->style->stroke_opacity.value));
+            gchar c[64];
+            sp_svg_write_color (c, sizeof(c), color);
+            sp_repr_css_set_property (css, "fill", c);
+        }
+        else if (!paint->set)
+            sp_repr_css_unset_property (css, "fill");
+        else if (paint->set && paint->isPaintserver()) {
+            server = SP_STYLE_STROKE_SERVER(item->style);
+            if (server) {
+                Inkscape::XML::Node *srepr = server->getRepr();
+                _paintserver_id += "url(#";
+                _paintserver_id += srepr->attribute("id");
+                _paintserver_id += ")";
+                sp_repr_css_set_property (css, "fill", _paintserver_id.c_str());
+            }
+        }
+
+        sp_desktop_apply_css_recursive(item, css, true);
+        sp_repr_css_attr_unref (css);
+    }
+
+    DocumentUndo::done(document(), SP_VERB_EDIT_SWAP_FILL_STROKE,
+                _("Swap fill and stroke of an object"));
+}
 
 /**
  * \param with_margins margins defined in the xml under <sodipodi:namedview>
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index fa7a83732..0370d55db 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -781,62 +781,7 @@ void SelectedStyle::on_stroke_paste() {
 }
 
 void SelectedStyle::on_fillstroke_swap() {
-    SPCSSAttr *css = sp_repr_css_attr_new ();
-
-    switch (_mode[SS_FILL]) {
-    case SS_NA:
-    case SS_MANY:
-        break;
-    case SS_NONE:
-        sp_repr_css_set_property (css, "stroke", "none");
-        break;
-    case SS_UNSET:
-        sp_repr_css_unset_property (css, "stroke");
-        break;
-    case SS_COLOR:
-        gchar c[64];
-        sp_svg_write_color (c, sizeof(c), _thisselected[SS_FILL]);
-        sp_repr_css_set_property (css, "stroke", c);
-        break;
-    case SS_LGRADIENT:
-    case SS_RGRADIENT:
-#ifdef WITH_MESH
-    case SS_MGRADIENT:
-#endif
-    case SS_PATTERN:
-        sp_repr_css_set_property (css, "stroke", _paintserver_id[SS_FILL].c_str());
-        break;
-    }
-
-    switch (_mode[SS_STROKE]) {
-    case SS_NA:
-    case SS_MANY:
-        break;
-    case SS_NONE:
-        sp_repr_css_set_property (css, "fill", "none");
-        break;
-    case SS_UNSET:
-        sp_repr_css_unset_property (css, "fill");
-        break;
-    case SS_COLOR:
-        gchar c[64];
-        sp_svg_write_color (c, sizeof(c), _thisselected[SS_STROKE]);
-        sp_repr_css_set_property (css, "fill", c);
-        break;
-    case SS_LGRADIENT:
-    case SS_RGRADIENT:
-#ifdef WITH_MESH
-    case SS_MGRADIENT:
-#endif
-    case SS_PATTERN:
-        sp_repr_css_set_property (css, "fill", _paintserver_id[SS_STROKE].c_str());
-        break;
-    }
-
-    sp_desktop_set_style (_desktop, css);
-    sp_repr_css_attr_unref (css);
-    DocumentUndo::done(_desktop->getDocument(), SP_VERB_DIALOG_FILL_STROKE,
-                       _("Swap fill and stroke"));
+    _desktop->getSelection()->swapFillStroke();
 }
 
 void SelectedStyle::on_fill_edit() {
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 975a3679e..aeb742105 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1086,6 +1086,9 @@ void EditVerb::perform(SPAction *action, void *data)
         case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
             sp_selection_next_patheffect_param(dt);
             break;
+        case SP_VERB_EDIT_SWAP_FILL_STROKE:
+            dt->selection->swapFillStroke();
+            break;
         case SP_VERB_EDIT_LINK_COLOR_PROFILE:
             break;
         case SP_VERB_EDIT_REMOVE_COLOR_PROFILE:
@@ -2585,6 +2588,8 @@ Verb *Verb::_base_verbs[] = {
                  N_("Create four guides aligned with the page borders"), NULL),
     new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next path effect parameter"),
                  N_("Show next editable path effect parameter"), INKSCAPE_ICON("path-effect-parameter-next")),
+    new EditVerb(SP_VERB_EDIT_SWAP_FILL_STROKE, "EditSwapFillStroke", N_("Swap fill and stroke"),
+                 N_("Swap fill and stroke of an object"), NULL),
 
     // Selection
     new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"),
diff --git a/src/verbs.h b/src/verbs.h
index d7e966ae4..76a7d19a6 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -110,6 +110,7 @@ enum {
     SP_VERB_EDIT_GUIDES_TOGGLE_LOCK,
     SP_VERB_EDIT_GUIDES_AROUND_PAGE,
     SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER,
+    SP_VERB_EDIT_SWAP_FILL_STROKE,
     /* Selection */
     SP_VERB_SELECTION_TO_FRONT,
     SP_VERB_SELECTION_TO_BACK,
-- 
cgit v1.2.3