From 6ed2673499ca548767bb7d2edb453a228ece86fd Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sun, 12 Jun 2016 10:25:42 +0200
Subject: Optionally sort attributes and properties into a canonical order.
 Useful for comparing different versions of an SVG file.

(bzr r14980)
---
 src/xml/repr-io.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/xml')

diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 4a6f59b43..6977bc1e2 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -34,6 +34,7 @@
 #include "extension/extension.h"
 
 #include "attribute-rel-util.h"
+#include "attribute-sort-util.h"
 
 #include "preferences.h"
 
@@ -882,6 +883,10 @@ static void sp_repr_write_stream_root_element(Node *repr, Writer &out,
     bool clean = prefs->getBool("/options/svgoutput/check_on_writing");
     if (clean) sp_attribute_clean_tree( repr );
 
+    // Sort attributes in a canonical order (helps with "diffing" SVG files).
+    bool sort = prefs->getBool("/options/svgoutput/sort_attributes");
+    if (sort) sp_attribute_sort_tree( repr );
+
     Glib::QueryQuark xml_prefix=g_quark_from_static_string("xml");
 
     NSMap ns_map;
-- 
cgit v1.2.3


From 1ba616c66fa080af9f6afc94af4e16247ed2dada Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sun, 10 Jul 2016 18:38:29 +0200
Subject: Comment out unused enum.

(bzr r15015)
---
 src/xml/event.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/xml')

diff --git a/src/xml/event.h b/src/xml/event.h
index 73e68daeb..f6b734c29 100644
--- a/src/xml/event.h
+++ b/src/xml/event.h
@@ -33,13 +33,13 @@ namespace XML {
 /**
  * @brief Enumeration of all XML event types
  */
-enum EventType {
-    EVENT_ADD, ///< Child added
-    EVENT_DEL, ///< Child removed
-    EVENT_CHG_ATTR, ///< Attribute changed
-    EVENT_CHG_CONTENT, ///< Content changed
-    EVENT_CHG_ORDER ///< Order of children changed
-};
+// enum EventType {
+//     EVENT_ADD, ///< Child added
+//     EVENT_DEL, ///< Child removed
+//     EVENT_CHG_ATTR, ///< Attribute changed
+//     EVENT_CHG_CONTENT, ///< Content changed
+//     EVENT_CHG_ORDER ///< Order of children changed
+// };
 
 /**
  * @brief Generic XML modification event
-- 
cgit v1.2.3