Update 2geom

Now at d9e4cc11f4df4e71e96617699997c989cc9248a4

This is the last version that does not depend on an external copy of
double-conversion yet.

10 files changed, 685 insertions, 688 deletions

diff --git a/src/2geom/curve.cpp b/src/2geom/curve.cpp
index 387a9180b..8ad0178cf 100644
--- a/src/2geom/curve.cpp
+++ b/src/2geom/curve.cpp
@@ -108,7 +108,7 @@ std::vector<CurveIntersection> Curve::intersectSelf(Coord eps) const
     // Monotonic segments cannot have self-intersections.
     // Thus, we can split the curve at roots and intersect the portions.
     std::vector<Coord> splits;
-    std::auto_ptr<Curve> deriv(derivative());
+    std::unique_ptr<Curve> deriv(derivative());
     splits = deriv->roots(0, X);
     if (splits.empty()) {
         return result;
diff --git a/src/2geom/elliptical-arc-from-sbasis.cpp b/src/2geom/elliptical-arc-from-sbasis.cpp
index 9be2d1265..c536d89ec 100644
--- a/src/2geom/elliptical-arc-from-sbasis.cpp
+++ b/src/2geom/elliptical-arc-from-sbasis.cpp
@@ -304,11 +304,7 @@ bool make_elliptical_arc::make_elliptiarc()
 
     Point inner_point = curve(0.5);
 
-#ifdef CPP11
     std::unique_ptr<EllipticalArc> arc( e.arc(initial_point, inner_point, final_point) );
-#else
-    std::auto_ptr<EllipticalArc> arc( e.arc(initial_point, inner_point, final_point) );
-#endif
     ea = *arc;
 
     if ( !are_near( e.center(),
diff --git a/src/2geom/elliptical-arc.cpp b/src/2geom/elliptical-arc.cpp
index ec62b4be2..b7d60fd17 100644
--- a/src/2geom/elliptical-arc.cpp
+++ b/src/2geom/elliptical-arc.cpp
@@ -262,7 +262,7 @@ EllipticalArc::pointAndDerivatives(Coord t, unsigned int n) const
     std::vector<Point> result;
     result.reserve(nn);
     double angle = angleAt(t);
-    std::auto_ptr<EllipticalArc> ea( static_cast<EllipticalArc*>(duplicate()) );
+    std::unique_ptr<EllipticalArc> ea( static_cast<EllipticalArc*>(duplicate()) );
     ea->_ellipse.setCenter(0, 0);
     unsigned int m = std::min(nn, 4u);
     for ( unsigned int i = 0; i < m; ++i )
diff --git a/src/2geom/geom.cpp b/src/2geom/geom.cpp
index bf9b0a721..71bbbf584 100644
--- a/src/2geom/geom.cpp
+++ b/src/2geom/geom.cpp
@@ -2,9 +2,6 @@
  *  \brief Various geometrical calculations.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <2geom/geom.h>
 #include <2geom/point.h>
 #include <algorithm>
diff --git a/src/2geom/math-utils.h b/src/2geom/math-utils.h
index 246c8dd14..611081325 100644
--- a/src/2geom/math-utils.h
+++ b/src/2geom/math-utils.h
@@ -36,7 +36,6 @@
 #ifndef LIB2GEOM_SEEN_MATH_UTILS_H
 #define LIB2GEOM_SEEN_MATH_UTILS_H
 
-#include "config.h"
 #include <math.h> // sincos is usually only available in math.h
 #include <cmath>
 #include <utility> // for std::pair
diff --git a/src/2geom/pathvector.cpp b/src/2geom/pathvector.cpp
index 28ab26237..88725870d 100644
--- a/src/2geom/pathvector.cpp
+++ b/src/2geom/pathvector.cpp
@@ -172,6 +172,7 @@ public:
 
     Interval itemBounds(ItemIterator ii) {
         OptRect r = ii->path->boundsFast();
+        if (!r) return Interval();
         return (*r)[X];
     }
 
diff --git a/src/2geom/piecewise.h b/src/2geom/piecewise.h
index a085670f3..75b4defe9 100644
--- a/src/2geom/piecewise.h
+++ b/src/2geom/piecewise.h
@@ -143,13 +143,11 @@ class Piecewise {
         push_seg(s);
         push_cut(to);
     }
-#ifdef CPP11
     inline void push(T &&s, double to) {
         assert(cuts.size() - segs.size() == 1);
         push_seg(s);
         push_cut(to);
     }
-#endif
     //Convenience/implementation hiding function to add cuts.
     inline void push_cut(double c) {
         ASSERT_INVARIANTS(cuts.empty() || c > cuts.back());
@@ -157,9 +155,7 @@ class Piecewise {
     }
     //Convenience/implementation hiding function to add segments.
     inline void push_seg(const T &s) { segs.push_back(s); }
-#ifdef CPP11
     inline void push_seg(T &&s) { segs.emplace_back(s); }
-#endif
 
     /**Returns the segment index which corresponds to a 'global' piecewise time.
      * Also takes optional low/high parameters to expedite the search for the segment.
@@ -377,7 +373,7 @@ Piecewise<T> partition(const Piecewise<T> &pw, std::vector<double> const &c) {
     unsigned si = 0, ci = 0;     //Segment index, Cut index
 
     //if the cuts have something earlier than the Piecewise<T>, add portions of the first segment
-    while(c[ci] < pw.cuts.front() && ci < c.size()) {
+    while(ci < c.size() && c[ci] < pw.cuts.front()) {
         bool isLast = (ci == c.size()-1 || c[ci + 1] >= pw.cuts.front());
         ret.push_cut(c[ci]);
         ret.push_seg( elem_portion(pw, 0, c[ci], isLast ? pw.cuts.front() : c[ci + 1]) );
diff --git a/src/2geom/point.h b/src/2geom/point.h
index a66e64647..d91e7d571 100644
--- a/src/2geom/point.h
+++ b/src/2geom/point.h
@@ -35,7 +35,6 @@
 #ifndef LIB2GEOM_SEEN_POINT_H
 #define LIB2GEOM_SEEN_POINT_H
 
-#include "config.h"
 #include <iostream>
 #include <iterator>
 #include <boost/operators.hpp>
diff --git a/src/2geom/polynomial.cpp b/src/2geom/polynomial.cpp
index ca2389f80..7009be1a2 100644
--- a/src/2geom/polynomial.cpp
+++ b/src/2geom/polynomial.cpp
@@ -244,7 +244,8 @@ std::vector<Coord> solve_quadratic(Coord a, Coord b, Coord c)
         // Use different formulas depending on sign of b to preserve
         // numerical stability. See e.g.:
         // http://people.csail.mit.edu/bkph/articles/Quadratics.pdf
-        Coord t = -0.5 * (b + sgn(b) * delta_sqrt);
+        int sign = b >= 0 ? 1 : -1;
+        Coord t = -0.5 * (b + sign * delta_sqrt);
         result.push_back(t / a);
         result.push_back(c / t);
     }
diff --git a/src/2geom/svg-path-parser.cpp b/src/2geom/svg-path-parser.cpp
index 93694156d..033811022 100644
--- a/src/2geom/svg-path-parser.cpp
+++ b/src/2geom/svg-path-parser.cpp
@@ -1,5 +1,5 @@
 
-#line 1 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 1 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 /**
  * \file
  * \brief parse SVG path specifications
@@ -44,7 +44,7 @@
 namespace Geom {
 
 
-#line 48 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.cpp"
+#line 48 "/home/mc/lib2geom/src/2geom/svg-path-parser.cpp"
 static const char _svg_path_actions[] = {
 	0, 1, 0, 1, 1, 1, 2, 1, 
 	3, 1, 4, 1, 5, 1, 15, 2, 
@@ -63,38 +63,38 @@ static const char _svg_path_actions[] = {
 static const short _svg_path_key_offsets[] = {
 	0, 0, 9, 18, 21, 23, 35, 45, 
 	48, 50, 53, 55, 67, 77, 80, 82, 
-	91, 103, 112, 119, 126, 128, 138, 146, 
-	153, 155, 167, 177, 180, 182, 191, 198, 
-	204, 211, 218, 224, 234, 244, 247, 249, 
-	261, 271, 274, 276, 286, 290, 292, 300, 
-	309, 318, 321, 323, 335, 345, 348, 350, 
-	362, 372, 375, 377, 389, 399, 402, 404, 
-	416, 426, 429, 431, 443, 453, 456, 458, 
-	470, 479, 491, 500, 512, 521, 533, 542, 
-	554, 563, 567, 569, 578, 587, 590, 592, 
-	596, 598, 607, 616, 625, 628, 630, 642, 
-	652, 655, 657, 669, 679, 682, 684, 696, 
-	706, 709, 711, 723, 732, 744, 753, 765, 
-	774, 778, 780, 789, 798, 801, 803, 815, 
-	825, 828, 830, 842, 852, 855, 857, 869, 
-	879, 882, 884, 896, 905, 917, 926, 938, 
-	947, 951, 953, 962, 971, 974, 976, 988, 
-	998, 1001, 1003, 1015, 1024, 1028, 1030, 1039, 
-	1048, 1051, 1053, 1057, 1059, 1066, 1075, 1084, 
-	1093, 1102, 1114, 1123, 1127, 1129, 1138, 1147, 
-	1156, 1165, 1169, 1171, 1181, 1185, 1187, 1197, 
-	1201, 1203, 1213, 1217, 1219, 1229, 1233, 1235, 
-	1245, 1249, 1251, 1261, 1265, 1267, 1277, 1281, 
-	1283, 1293, 1297, 1299, 1309, 1313, 1315, 1325, 
-	1329, 1331, 1341, 1345, 1347, 1357, 1361, 1363, 
-	1373, 1377, 1379, 1388, 1392, 1394, 1404, 1416, 
-	1425, 1435, 1442, 1446, 1448, 1455, 1465, 1474, 
-	1478, 1480, 1490, 1502, 1506, 1508, 1512, 1514, 
-	1524, 1530, 1562, 1592, 1624, 1656, 1686, 1714, 
-	1746, 1776, 1808, 1838, 1870, 1900, 1932, 1962, 
-	1994, 2024, 2056, 2086, 2118, 2148, 2180, 2210, 
-	2242, 2272, 2304, 2334, 2366, 2396, 2428, 2458, 
-	2482, 2506, 2538, 2568, 2596, 2626
+	91, 103, 112, 121, 130, 133, 135, 147, 
+	157, 160, 162, 174, 184, 187, 189, 198, 
+	205, 211, 218, 225, 231, 241, 251, 254, 
+	256, 268, 278, 281, 283, 295, 304, 316, 
+	325, 335, 339, 341, 348, 352, 354, 364, 
+	368, 370, 380, 389, 398, 401, 403, 415, 
+	425, 428, 430, 442, 452, 455, 457, 469, 
+	479, 482, 484, 496, 506, 509, 511, 523, 
+	533, 536, 538, 550, 559, 571, 580, 592, 
+	601, 613, 622, 634, 643, 647, 649, 658, 
+	667, 670, 672, 676, 678, 687, 696, 705, 
+	708, 710, 722, 732, 735, 737, 749, 759, 
+	762, 764, 776, 786, 789, 791, 803, 812, 
+	824, 833, 845, 854, 858, 860, 869, 878, 
+	881, 883, 895, 905, 908, 910, 922, 932, 
+	935, 937, 949, 959, 962, 964, 976, 985, 
+	997, 1006, 1018, 1027, 1031, 1033, 1042, 1051, 
+	1054, 1056, 1068, 1078, 1081, 1083, 1095, 1104, 
+	1108, 1110, 1119, 1128, 1131, 1133, 1137, 1139, 
+	1148, 1157, 1166, 1175, 1184, 1196, 1205, 1209, 
+	1211, 1220, 1229, 1238, 1247, 1251, 1253, 1263, 
+	1267, 1269, 1279, 1283, 1285, 1295, 1299, 1301, 
+	1311, 1315, 1317, 1327, 1331, 1333, 1343, 1347, 
+	1349, 1359, 1363, 1365, 1375, 1379, 1381, 1391, 
+	1395, 1397, 1407, 1411, 1413, 1423, 1427, 1429, 
+	1439, 1443, 1445, 1455, 1459, 1461, 1470, 1474, 
+	1476, 1486, 1498, 1507, 1517, 1524, 1528, 1530, 
+	1534, 1536, 1546, 1552, 1584, 1614, 1646, 1678, 
+	1710, 1740, 1772, 1802, 1834, 1864, 1896, 1926, 
+	1958, 1988, 2020, 2050, 2082, 2112, 2144, 2174, 
+	2206, 2236, 2268, 2298, 2330, 2360, 2392, 2422, 
+	2454, 2484, 2508, 2532, 2564, 2594, 2624, 2656
 };
 
 static const char _svg_path_trans_keys[] = {
@@ -112,30 +112,40 @@ static const char _svg_path_trans_keys[] = {
 	10, 48, 57, 13, 32, 44, 46, 69, 
 	101, 9, 10, 43, 45, 48, 57, 13, 
 	32, 43, 45, 46, 9, 10, 48, 57, 
-	13, 32, 46, 9, 10, 48, 57, 13, 
-	32, 46, 9, 10, 48, 57, 48, 57, 
+	13, 32, 43, 45, 46, 9, 10, 48, 
+	57, 13, 32, 43, 45, 46, 9, 10, 
+	48, 57, 46, 48, 57, 48, 57, 13, 
+	32, 44, 46, 69, 101, 9, 10, 43, 
+	45, 48, 57, 13, 32, 44, 46, 9, 
+	10, 43, 45, 48, 57, 46, 48, 57, 
+	48, 57, 13, 32, 44, 46, 69, 101, 
+	9, 10, 43, 45, 48, 57, 13, 32, 
+	44, 46, 9, 10, 43, 45, 48, 57, 
+	46, 48, 57, 48, 57, 13, 32, 44, 
+	69, 101, 9, 10, 48, 57, 13, 32, 
+	44, 48, 49, 9, 10, 13, 32, 48, 
+	49, 9, 10, 13, 32, 44, 48, 49, 
+	9, 10, 13, 32, 44, 48, 49, 9, 
+	10, 13, 32, 48, 49, 9, 10, 13, 
+	32, 44, 46, 9, 10, 43, 45, 48, 
+	57, 13, 32, 44, 46, 9, 10, 43, 
+	45, 48, 57, 46, 48, 57, 48, 57, 
 	13, 32, 44, 46, 69, 101, 9, 10, 
-	48, 57, 13, 32, 44, 46, 9, 10, 
-	48, 57, 13, 32, 46, 9, 10, 48, 
+	43, 45, 48, 57, 13, 32, 44, 46, 
+	9, 10, 43, 45, 48, 57, 46, 48, 
 	57, 48, 57, 13, 32, 44, 46, 69, 
 	101, 9, 10, 43, 45, 48, 57, 13, 
-	32, 44, 46, 9, 10, 43, 45, 48, 
-	57, 46, 48, 57, 48, 57, 13, 32, 
-	44, 69, 101, 9, 10, 48, 57, 13, 
-	32, 44, 48, 49, 9, 10, 13, 32, 
-	48, 49, 9, 10, 13, 32, 44, 48, 
-	49, 9, 10, 13, 32, 44, 48, 49, 
-	9, 10, 13, 32, 48, 49, 9, 10, 
-	13, 32, 44, 46, 9, 10, 43, 45, 
+	32, 43, 45, 46, 9, 10, 48, 57, 
+	13, 32, 44, 46, 69, 101, 9, 10, 
+	43, 45, 48, 57, 13, 32, 43, 45, 
+	46, 9, 10, 48, 57, 13, 32, 44, 
+	46, 69, 101, 9, 10, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	9, 10, 48, 57, 43, 45, 48, 57, 
 	48, 57, 13, 32, 44, 46, 9, 10, 
-	43, 45, 48, 57, 46, 48, 57, 48, 
-	57, 13, 32, 44, 46, 69, 101, 9, 
-	10, 43, 45, 48, 57, 13, 32, 44, 
-	46, 9, 10, 43, 45, 48, 57, 46, 
-	48, 57, 48, 57, 13, 32, 44, 46, 
-	69, 101, 9, 10, 48, 57, 43, 45, 
-	48, 57, 48, 57, 13, 32, 44, 46, 
-	9, 10, 48, 57, 13, 32, 43, 45, 
+	43, 45, 48, 57, 43, 45, 48, 57, 
+	48, 57, 13, 32, 44, 46, 9, 10, 
+	43, 45, 48, 57, 13, 32, 43, 45, 
 	46, 9, 10, 48, 57, 13, 32, 43, 
 	45, 46, 9, 10, 48, 57, 46, 48, 
 	57, 48, 57, 13, 32, 44, 46, 69, 
@@ -230,88 +240,89 @@ static const char _svg_path_trans_keys[] = {
 	43, 45, 46, 9, 10, 48, 57, 13, 
 	32, 43, 45, 46, 9, 10, 48, 57, 
 	46, 48, 57, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 46, 9, 10, 
-	48, 57, 13, 32, 43, 45, 46, 9, 
-	10, 48, 57, 13, 32, 43, 45, 46, 
+	57, 48, 57, 13, 32, 43, 45, 46, 
 	9, 10, 48, 57, 13, 32, 43, 45, 
 	46, 9, 10, 48, 57, 13, 32, 43, 
 	45, 46, 9, 10, 48, 57, 13, 32, 
-	44, 46, 69, 101, 9, 10, 43, 45, 
-	48, 57, 13, 32, 43, 45, 46, 9, 
-	10, 48, 57, 43, 45, 48, 57, 48, 
-	57, 13, 32, 43, 45, 46, 9, 10, 
-	48, 57, 13, 32, 43, 45, 46, 9, 
-	10, 48, 57, 13, 32, 43, 45, 46, 
-	9, 10, 48, 57, 13, 32, 43, 45, 
+	43, 45, 46, 9, 10, 48, 57, 13, 
+	32, 43, 45, 46, 9, 10, 48, 57, 
+	13, 32, 44, 46, 69, 101, 9, 10, 
+	43, 45, 48, 57, 13, 32, 43, 45, 
 	46, 9, 10, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
-	57, 48, 57, 13, 32, 44, 46, 9, 
-	10, 43, 45, 48, 57, 43, 45, 48, 
 	57, 48, 57, 13, 32, 43, 45, 46, 
-	9, 10, 48, 57, 43, 45, 48, 57, 
-	48, 57, 13, 32, 44, 46, 9, 10, 
-	43, 45, 48, 57, 13, 32, 44, 46, 
-	69, 101, 9, 10, 43, 45, 48, 57, 
-	13, 32, 43, 45, 46, 9, 10, 48, 
-	57, 13, 32, 44, 46, 9, 10, 43, 
-	45, 48, 57, 13, 32, 44, 48, 49, 
-	9, 10, 43, 45, 48, 57, 48, 57, 
-	13, 32, 44, 9, 10, 48, 57, 13, 
-	32, 44, 46, 69, 101, 9, 10, 48, 
-	57, 13, 32, 43, 45, 46, 9, 10, 
+	9, 10, 48, 57, 13, 32, 43, 45, 
+	46, 9, 10, 48, 57, 13, 32, 43, 
+	45, 46, 9, 10, 48, 57, 13, 32, 
+	43, 45, 46, 9, 10, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 44, 
+	46, 9, 10, 43, 45, 48, 57, 43, 
+	45, 48, 57, 48, 57, 13, 32, 43, 
+	45, 46, 9, 10, 48, 57, 43, 45, 
+	48, 57, 48, 57, 13, 32, 44, 46, 
+	9, 10, 43, 45, 48, 57, 13, 32, 
+	44, 46, 69, 101, 9, 10, 43, 45, 
+	48, 57, 13, 32, 43, 45, 46, 9, 
+	10, 48, 57, 13, 32, 44, 46, 9, 
+	10, 43, 45, 48, 57, 13, 32, 44, 
+	48, 49, 9, 10, 43, 45, 48, 57, 
 	48, 57, 43, 45, 48, 57, 48, 57, 
 	13, 32, 44, 46, 9, 10, 43, 45, 
-	48, 57, 13, 32, 44, 46, 69, 101, 
-	9, 10, 43, 45, 48, 57, 43, 45, 
-	48, 57, 48, 57, 43, 45, 48, 57, 
-	48, 57, 13, 32, 44, 46, 9, 10, 
-	43, 45, 48, 57, 13, 32, 77, 109, 
-	9, 10, 13, 32, 44, 46, 65, 67, 
-	69, 72, 76, 77, 81, 83, 84, 86, 
-	90, 97, 99, 101, 104, 108, 109, 113, 
-	115, 116, 118, 122, 9, 10, 43, 45, 
-	48, 57, 13, 32, 44, 46, 65, 67, 
-	72, 76, 77, 81, 83, 84, 86, 90, 
-	97, 99, 104, 108, 109, 113, 115, 116, 
-	118, 122, 9, 10, 43, 45, 48, 57, 
+	48, 57, 13, 32, 77, 109, 9, 10, 
 	13, 32, 44, 46, 65, 67, 69, 72, 
 	76, 77, 81, 83, 84, 86, 90, 97, 
 	99, 101, 104, 108, 109, 113, 115, 116, 
 	118, 122, 9, 10, 43, 45, 48, 57, 
-	13, 32, 44, 46, 65, 67, 69, 72, 
-	76, 77, 81, 83, 84, 86, 90, 97, 
-	99, 101, 104, 108, 109, 113, 115, 116, 
-	118, 122, 9, 10, 43, 45, 48, 57, 
-	13, 32, 44, 46, 65, 67, 69, 72, 
-	76, 77, 81, 83, 84, 86, 90, 97, 
-	99, 101, 104, 108, 109, 113, 115, 116, 
-	118, 122, 9, 10, 48, 57, 13, 32, 
+	13, 32, 44, 46, 65, 67, 72, 76, 
+	77, 81, 83, 84, 86, 90, 97, 99, 
+	104, 108, 109, 113, 115, 116, 118, 122, 
+	9, 10, 43, 45, 48, 57, 13, 32, 
+	44, 46, 65, 67, 69, 72, 76, 77, 
+	81, 83, 84, 86, 90, 97, 99, 101, 
+	104, 108, 109, 113, 115, 116, 118, 122, 
+	9, 10, 43, 45, 48, 57, 13, 32, 
+	44, 46, 65, 67, 69, 72, 76, 77, 
+	81, 83, 84, 86, 90, 97, 99, 101, 
+	104, 108, 109, 113, 115, 116, 118, 122, 
+	9, 10, 43, 45, 48, 57, 13, 32, 
+	44, 46, 65, 67, 69, 72, 76, 77, 
+	81, 83, 84, 86, 90, 97, 99, 101, 
+	104, 108, 109, 113, 115, 116, 118, 122, 
+	9, 10, 43, 45, 48, 57, 13, 32, 
 	44, 46, 65, 67, 72, 76, 77, 81, 
 	83, 84, 86, 90, 97, 99, 104, 108, 
 	109, 113, 115, 116, 118, 122, 9, 10, 
+	43, 45, 48, 57, 13, 32, 44, 46, 
+	65, 67, 69, 72, 76, 77, 81, 83, 
+	84, 86, 90, 97, 99, 101, 104, 108, 
+	109, 113, 115, 116, 118, 122, 9, 10, 
+	43, 45, 48, 57, 13, 32, 44, 46, 
+	65, 67, 72, 76, 77, 81, 83, 84, 
+	86, 90, 97, 99, 104, 108, 109, 113, 
+	115, 116, 118, 122, 9, 10, 43, 45, 
 	48, 57, 13, 32, 44, 46, 65, 67, 
 	69, 72, 76, 77, 81, 83, 84, 86, 
 	90, 97, 99, 101, 104, 108, 109, 113, 
@@ -397,7 +408,13 @@ static const char _svg_path_trans_keys[] = {
 	44, 46, 65, 67, 72, 76, 77, 81, 
 	83, 84, 86, 90, 97, 99, 104, 108, 
 	109, 113, 115, 116, 118, 122, 9, 10, 
-	43, 45, 48, 57, 13, 32, 44, 46, 
+	43, 45, 48, 57, 13, 32, 65, 67, 
+	72, 76, 77, 81, 83, 84, 86, 90, 
+	97, 99, 104, 108, 109, 113, 115, 116, 
+	118, 122, 9, 10, 13, 32, 65, 67, 
+	72, 76, 77, 81, 83, 84, 86, 90, 
+	97, 99, 104, 108, 109, 113, 115, 116, 
+	118, 122, 9, 10, 13, 32, 44, 46, 
 	65, 67, 69, 72, 76, 77, 81, 83, 
 	84, 86, 90, 97, 99, 101, 104, 108, 
 	109, 113, 115, 116, 118, 122, 9, 10, 
@@ -405,143 +422,129 @@ static const char _svg_path_trans_keys[] = {
 	65, 67, 72, 76, 77, 81, 83, 84, 
 	86, 90, 97, 99, 104, 108, 109, 113, 
 	115, 116, 118, 122, 9, 10, 43, 45, 
-	48, 57, 13, 32, 65, 67, 72, 76, 
-	77, 81, 83, 84, 86, 90, 97, 99, 
-	104, 108, 109, 113, 115, 116, 118, 122, 
-	9, 10, 13, 32, 65, 67, 72, 76, 
-	77, 81, 83, 84, 86, 90, 97, 99, 
-	104, 108, 109, 113, 115, 116, 118, 122, 
-	9, 10, 13, 32, 44, 46, 65, 67, 
-	69, 72, 76, 77, 81, 83, 84, 86, 
-	90, 97, 99, 101, 104, 108, 109, 113, 
-	115, 116, 118, 122, 9, 10, 43, 45, 
 	48, 57, 13, 32, 44, 46, 65, 67, 
 	72, 76, 77, 81, 83, 84, 86, 90, 
 	97, 99, 104, 108, 109, 113, 115, 116, 
 	118, 122, 9, 10, 43, 45, 48, 57, 
+	13, 32, 44, 46, 65, 67, 69, 72, 
+	76, 77, 81, 83, 84, 86, 90, 97, 
+	99, 101, 104, 108, 109, 113, 115, 116, 
+	118, 122, 9, 10, 43, 45, 48, 57, 
 	13, 32, 44, 46, 65, 67, 72, 76, 
 	77, 81, 83, 84, 86, 90, 97, 99, 
 	104, 108, 109, 113, 115, 116, 118, 122, 
-	9, 10, 48, 57, 13, 32, 44, 46, 
-	65, 67, 69, 72, 76, 77, 81, 83, 
-	84, 86, 90, 97, 99, 101, 104, 108, 
-	109, 113, 115, 116, 118, 122, 9, 10, 
-	48, 57, 13, 32, 44, 46, 65, 67, 
-	72, 76, 77, 81, 83, 84, 86, 90, 
-	97, 99, 104, 108, 109, 113, 115, 116, 
-	118, 122, 9, 10, 43, 45, 48, 57, 
-	0
+	9, 10, 43, 45, 48, 57, 0
 };
 
 static const char _svg_path_single_lengths[] = {
 	0, 5, 5, 1, 0, 6, 4, 1, 
 	0, 1, 0, 6, 4, 1, 0, 5, 
-	6, 5, 3, 3, 0, 6, 4, 3, 
-	0, 6, 4, 1, 0, 5, 5, 4, 
-	5, 5, 4, 4, 4, 1, 0, 6, 
-	4, 1, 0, 6, 2, 0, 4, 5, 
-	5, 1, 0, 6, 4, 1, 0, 6, 
-	4, 1, 0, 6, 4, 1, 0, 6, 
-	4, 1, 0, 6, 4, 1, 0, 6, 
-	5, 6, 5, 6, 5, 6, 5, 6, 
-	5, 2, 0, 5, 5, 1, 0, 2, 
-	0, 5, 5, 5, 1, 0, 6, 4, 
+	6, 5, 5, 5, 1, 0, 6, 4, 
+	1, 0, 6, 4, 1, 0, 5, 5, 
+	4, 5, 5, 4, 4, 4, 1, 0, 
+	6, 4, 1, 0, 6, 5, 6, 5, 
+	6, 2, 0, 3, 2, 0, 4, 2, 
+	0, 4, 5, 5, 1, 0, 6, 4, 
 	1, 0, 6, 4, 1, 0, 6, 4, 
-	1, 0, 6, 5, 6, 5, 6, 5, 
-	2, 0, 5, 5, 1, 0, 6, 4, 
 	1, 0, 6, 4, 1, 0, 6, 4, 
 	1, 0, 6, 5, 6, 5, 6, 5, 
-	2, 0, 5, 5, 1, 0, 6, 4, 
-	1, 0, 6, 5, 2, 0, 5, 5, 
-	1, 0, 2, 0, 3, 5, 5, 5, 
-	5, 6, 5, 2, 0, 5, 5, 5, 
-	5, 2, 0, 4, 2, 0, 4, 2, 
+	6, 5, 6, 5, 2, 0, 5, 5, 
+	1, 0, 2, 0, 5, 5, 5, 1, 
+	0, 6, 4, 1, 0, 6, 4, 1, 
+	0, 6, 4, 1, 0, 6, 5, 6, 
+	5, 6, 5, 2, 0, 5, 5, 1, 
+	0, 6, 4, 1, 0, 6, 4, 1, 
+	0, 6, 4, 1, 0, 6, 5, 6, 
+	5, 6, 5, 2, 0, 5, 5, 1, 
+	0, 6, 4, 1, 0, 6, 5, 2, 
+	0, 5, 5, 1, 0, 2, 0, 5, 
+	5, 5, 5, 5, 6, 5, 2, 0, 
+	5, 5, 5, 5, 2, 0, 4, 2, 
 	0, 4, 2, 0, 4, 2, 0, 4, 
 	2, 0, 4, 2, 0, 4, 2, 0, 
 	4, 2, 0, 4, 2, 0, 4, 2, 
 	0, 4, 2, 0, 4, 2, 0, 4, 
-	2, 0, 5, 2, 0, 4, 6, 5, 
-	4, 5, 2, 0, 3, 6, 5, 2, 
-	0, 4, 6, 2, 0, 2, 0, 4, 
-	4, 26, 24, 26, 26, 26, 24, 26, 
+	2, 0, 4, 2, 0, 5, 2, 0, 
+	4, 6, 5, 4, 5, 2, 0, 2, 
+	0, 4, 4, 26, 24, 26, 26, 26, 
 	24, 26, 24, 26, 24, 26, 24, 26, 
 	24, 26, 24, 26, 24, 26, 24, 26, 
-	24, 26, 24, 26, 24, 26, 24, 22, 
-	22, 26, 24, 24, 26, 24
+	24, 26, 24, 26, 24, 26, 24, 26, 
+	24, 22, 22, 26, 24, 24, 26, 24
 };
 
 static const char _svg_path_range_lengths[] = {
 	0, 2, 2, 1, 1, 3, 3, 1, 
 	1, 1, 1, 3, 3, 1, 1, 2, 
-	3, 2, 2, 2, 1, 2, 2, 2, 
-	1, 3, 3, 1, 1, 2, 1, 1, 
-	1, 1, 1, 3, 3, 1, 1, 3, 
-	3, 1, 1, 2, 1, 1, 2, 2, 
-	2, 1, 1, 3, 3, 1, 1, 3, 
-	3, 1, 1, 3, 3, 1, 1, 3, 
-	3, 1, 1, 3, 3, 1, 1, 3, 
-	2, 3, 2, 3, 2, 3, 2, 3, 
-	2, 1, 1, 2, 2, 1, 1, 1, 
-	1, 2, 2, 2, 1, 1, 3, 3, 
+	3, 2, 2, 2, 1, 1, 3, 3, 
+	1, 1, 3, 3, 1, 1, 2, 1, 
+	1, 1, 1, 1, 3, 3, 1, 1, 
+	3, 3, 1, 1, 3, 2, 3, 2, 
+	2, 1, 1, 2, 1, 1, 3, 1, 
+	1, 3, 2, 2, 1, 1, 3, 3, 
 	1, 1, 3, 3, 1, 1, 3, 3, 
-	1, 1, 3, 2, 3, 2, 3, 2, 
-	1, 1, 2, 2, 1, 1, 3, 3, 
 	1, 1, 3, 3, 1, 1, 3, 3, 
 	1, 1, 3, 2, 3, 2, 3, 2, 
-	1, 1, 2, 2, 1, 1, 3, 3, 
-	1, 1, 3, 2, 1, 1, 2, 2, 
-	1, 1, 1, 1, 2, 2, 2, 2, 
-	2, 3, 2, 1, 1, 2, 2, 2, 
-	2, 1, 1, 3, 1, 1, 3, 1, 
+	3, 2, 3, 2, 1, 1, 2, 2, 
+	1, 1, 1, 1, 2, 2, 2, 1, 
+	1, 3, 3, 1, 1, 3, 3, 1, 
+	1, 3, 3, 1, 1, 3, 2, 3, 
+	2, 3, 2, 1, 1, 2, 2, 1, 
+	1, 3, 3, 1, 1, 3, 3, 1, 
+	1, 3, 3, 1, 1, 3, 2, 3, 
+	2, 3, 2, 1, 1, 2, 2, 1, 
+	1, 3, 3, 1, 1, 3, 2, 1, 
+	1, 2, 2, 1, 1, 1, 1, 2, 
+	2, 2, 2, 2, 3, 2, 1, 1, 
+	2, 2, 2, 2, 1, 1, 3, 1, 
 	1, 3, 1, 1, 3, 1, 1, 3, 
 	1, 1, 3, 1, 1, 3, 1, 1, 
 	3, 1, 1, 3, 1, 1, 3, 1, 
 	1, 3, 1, 1, 3, 1, 1, 3, 
-	1, 1, 2, 1, 1, 3, 3, 2, 
-	3, 1, 1, 1, 2, 2, 2, 1, 
-	1, 3, 3, 1, 1, 1, 1, 3, 
-	1, 3, 3, 3, 3, 2, 2, 3, 
+	1, 1, 3, 1, 1, 2, 1, 1, 
+	3, 3, 2, 3, 1, 1, 1, 1, 
+	1, 3, 1, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
-	3, 3, 3, 3, 3, 3, 3, 1, 
-	1, 3, 3, 2, 2, 3
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 1, 1, 3, 3, 3, 3, 3
 };
 
 static const short _svg_path_index_offsets[] = {
 	0, 0, 8, 16, 19, 21, 31, 39, 
 	42, 44, 47, 49, 59, 67, 70, 72, 
-	80, 90, 98, 104, 110, 112, 121, 128, 
-	134, 136, 146, 154, 157, 159, 167, 174, 
-	180, 187, 194, 200, 208, 216, 219, 221, 
-	231, 239, 242, 244, 253, 257, 259, 266, 
-	274, 282, 285, 287, 297, 305, 308, 310, 
-	320, 328, 331, 333, 343, 351, 354, 356, 
-	366, 374, 377, 379, 389, 397, 400, 402, 
-	412, 420, 430, 438, 448, 456, 466, 474, 
-	484, 492, 496, 498, 506, 514, 517, 519, 
-	523, 525, 533, 541, 549, 552, 554, 564, 
-	572, 575, 577, 587, 595, 598, 600, 610, 
-	618, 621, 623, 633, 641, 651, 659, 669, 
-	677, 681, 683, 691, 699, 702, 704, 714, 
-	722, 725, 727, 737, 745, 748, 750, 760, 
-	768, 771, 773, 783, 791, 801, 809, 819, 
-	827, 831, 833, 841, 849, 852, 854, 864, 
-	872, 875, 877, 887, 895, 899, 901, 909, 
-	917, 920, 922, 926, 928, 934, 942, 950, 
-	958, 966, 976, 984, 988, 990, 998, 1006, 
-	1014, 1022, 1026, 1028, 1036, 1040, 1042, 1050, 
-	1054, 1056, 1064, 1068, 1070, 1078, 1082, 1084, 
-	1092, 1096, 1098, 1106, 1110, 1112, 1120, 1124, 
-	1126, 1134, 1138, 1140, 1148, 1152, 1154, 1162, 
-	1166, 1168, 1176, 1180, 1182, 1190, 1194, 1196, 
-	1204, 1208, 1210, 1218, 1222, 1224, 1232, 1242, 
-	1250, 1258, 1265, 1269, 1271, 1277, 1286, 1294, 
-	1298, 1300, 1308, 1318, 1322, 1324, 1328, 1330, 
-	1338, 1344, 1374, 1402, 1432, 1462, 1491, 1518, 
-	1548, 1576, 1606, 1634, 1664, 1692, 1722, 1750, 
-	1780, 1808, 1838, 1866, 1896, 1924, 1954, 1982, 
-	2012, 2040, 2070, 2098, 2128, 2156, 2186, 2214, 
-	2238, 2262, 2292, 2320, 2347, 2376
+	80, 90, 98, 106, 114, 117, 119, 129, 
+	137, 140, 142, 152, 160, 163, 165, 173, 
+	180, 186, 193, 200, 206, 214, 222, 225, 
+	227, 237, 245, 248, 250, 260, 268, 278, 
+	286, 295, 299, 301, 307, 311, 313, 321, 
+	325, 327, 335, 343, 351, 354, 356, 366, 
+	374, 377, 379, 389, 397, 400, 402, 412, 
+	420, 423, 425, 435, 443, 446, 448, 458, 
+	466, 469, 471, 481, 489, 499, 507, 517, 
+	525, 535, 543, 553, 561, 565, 567, 575, 
+	583, 586, 588, 592, 594, 602, 610, 618, 
+	621, 623, 633, 641, 644, 646, 656, 664, 
+	667, 669, 679, 687, 690, 692, 702, 710, 
+	720, 728, 738, 746, 750, 752, 760, 768, 
+	771, 773, 783, 791, 794, 796, 806, 814, 
+	817, 819, 829, 837, 840, 842, 852, 860, 
+	870, 878, 888, 896, 900, 902, 910, 918, 
+	921, 923, 933, 941, 944, 946, 956, 964, 
+	968, 970, 978, 986, 989, 991, 995, 997, 
+	1005, 1013, 1021, 1029, 1037, 1047, 1055, 1059, 
+	1061, 1069, 1077, 1085, 1093, 1097, 1099, 1107, 
+	1111, 1113, 1121, 1125, 1127, 1135, 1139, 1141, 
+	1149, 1153, 1155, 1163, 1167, 1169, 1177, 1181, 
+	1183, 1191, 1195, 1197, 1205, 1209, 1211, 1219, 
+	1223, 1225, 1233, 1237, 1239, 1247, 1251, 1253, 
+	1261, 1265, 1267, 1275, 1279, 1281, 1289, 1293, 
+	1295, 1303, 1313, 1321, 1329, 1336, 1340, 1342, 
+	1346, 1348, 1356, 1362, 1392, 1420, 1450, 1480, 
+	1510, 1538, 1568, 1596, 1626, 1654, 1684, 1712, 
+	1742, 1770, 1800, 1828, 1858, 1886, 1916, 1944, 
+	1974, 2002, 2032, 2060, 2090, 2118, 2148, 2176, 
+	2206, 2234, 2258, 2282, 2312, 2340, 2368, 2398
 };
 
 static const short _svg_path_indicies[] = {
@@ -557,387 +560,391 @@ static const short _svg_path_indicies[] = {
 	41, 41, 42, 42, 43, 41, 44, 1, 
 	28, 28, 30, 27, 32, 32, 28, 29, 
 	26, 1, 35, 35, 34, 34, 36, 35, 
-	37, 1, 45, 45, 46, 45, 47, 1, 
-	48, 48, 49, 48, 50, 1, 51, 1, 
-	52, 52, 53, 54, 55, 55, 52, 51, 
-	1, 56, 56, 57, 58, 56, 59, 1, 
-	57, 57, 58, 57, 59, 1, 60, 1, 
-	61, 61, 63, 64, 65, 65, 61, 62, 
-	60, 1, 66, 66, 68, 69, 66, 67, 
-	70, 1, 71, 72, 1, 73, 1, 74, 
-	74, 75, 76, 76, 74, 73, 1, 77, 
-	77, 78, 79, 80, 77, 1, 78, 78, 
-	79, 80, 78, 1, 81, 81, 82, 83, 
-	84, 81, 1, 85, 85, 86, 87, 88, 
-	85, 1, 86, 86, 87, 88, 86, 1, 
-	89, 89, 91, 92, 89, 90, 93, 1, 
-	94, 94, 96, 97, 94, 95, 98, 1, 
-	99, 100, 1, 101, 1, 102, 102, 104, 
-	105, 106, 106, 102, 103, 101, 1, 107, 
-	107, 109, 110, 107, 108, 111, 1, 112, 
-	113, 1, 114, 1, 52, 52, 53, 51, 
-	55, 55, 52, 115, 1, 116, 116, 117, 
-	1, 117, 1, 52, 52, 53, 54, 52, 
-	117, 1, 118, 118, 119, 119, 120, 118, 
-	121, 1, 122, 122, 123, 123, 124, 122, 
-	125, 1, 126, 127, 1, 128, 1, 129, 
-	129, 131, 132, 133, 133, 129, 130, 128, 
-	1, 134, 134, 136, 137, 134, 135, 138, 
-	1, 139, 140, 1, 141, 1, 142, 142, 
-	144, 145, 146, 146, 142, 143, 141, 1, 
-	147, 147, 149, 150, 147, 148, 151, 1, 
-	152, 153, 1, 154, 1, 155, 155, 157, 
-	158, 159, 159, 155, 156, 154, 1, 160, 
-	160, 162, 163, 160, 161, 164, 1, 165, 
-	166, 1, 167, 1, 168, 168, 170, 171, 
-	172, 172, 168, 169, 167, 1, 173, 173, 
-	175, 176, 173, 174, 177, 1, 178, 179, 
-	1, 180, 1, 181, 181, 183, 184, 185, 
-	185, 181, 182, 180, 1, 186, 186, 188, 
-	189, 186, 187, 190, 1, 191, 192, 1, 
-	193, 1, 129, 129, 131, 128, 133, 133, 
-	129, 130, 127, 1, 136, 136, 135, 135, 
-	137, 136, 138, 1, 142, 142, 144, 141, 
-	146, 146, 142, 143, 140, 1, 149, 149, 
-	148, 148, 150, 149, 151, 1, 155, 155, 
-	157, 154, 159, 159, 155, 156, 153, 1, 
-	162, 162, 161, 161, 163, 162, 164, 1, 
-	168, 168, 170, 167, 172, 172, 168, 169, 
-	166, 1, 175, 175, 174, 174, 176, 175, 
-	177, 1, 181, 181, 183, 180, 185, 185, 
-	181, 182, 179, 1, 188, 188, 187, 187, 
-	189, 188, 190, 1, 194, 194, 195, 1, 
-	195, 1, 196, 196, 197, 197, 198, 196, 
-	199, 1, 200, 200, 201, 201, 202, 200, 
-	203, 1, 204, 205, 1, 206, 1, 207, 
-	207, 208, 1, 208, 1, 209, 209, 210, 
-	210, 211, 209, 212, 1, 213, 213, 214, 
-	214, 215, 213, 216, 1, 217, 217, 218, 
-	218, 219, 217, 220, 1, 221, 222, 1, 
-	223, 1, 224, 224, 226, 227, 228, 228, 
-	224, 225, 223, 1, 229, 229, 231, 232, 
-	229, 230, 233, 1, 234, 235, 1, 236, 
-	1, 237, 237, 239, 240, 241, 241, 237, 
-	238, 236, 1, 242, 242, 244, 245, 242, 
-	243, 246, 1, 247, 248, 1, 249, 1, 
-	250, 250, 252, 253, 254, 254, 250, 251, 
-	249, 1, 255, 255, 257, 258, 255, 256, 
-	259, 1, 260, 261, 1, 262, 1, 224, 
-	224, 226, 223, 228, 228, 224, 225, 222, 
-	1, 231, 231, 230, 230, 232, 231, 233, 
-	1, 237, 237, 239, 236, 241, 241, 237, 
-	238, 235, 1, 244, 244, 243, 243, 245, 
-	244, 246, 1, 250, 250, 252, 249, 254, 
-	254, 250, 251, 248, 1, 257, 257, 256, 
-	256, 258, 257, 259, 1, 263, 263, 264, 
-	1, 264, 1, 265, 265, 266, 266, 267, 
-	265, 268, 1, 269, 269, 270, 270, 271, 
-	269, 272, 1, 273, 274, 1, 275, 1, 
-	276, 276, 278, 279, 280, 280, 276, 277, 
-	275, 1, 281, 281, 283, 284, 281, 282, 
-	285, 1, 286, 287, 1, 288, 1, 289, 
-	289, 291, 292, 293, 293, 289, 290, 288, 
-	1, 294, 294, 296, 297, 294, 295, 298, 
-	1, 299, 300, 1, 301, 1, 302, 302, 
-	304, 305, 306, 306, 302, 303, 301, 1, 
-	307, 307, 309, 310, 307, 308, 311, 1, 
-	312, 313, 1, 314, 1, 276, 276, 278, 
-	275, 280, 280, 276, 277, 274, 1, 283, 
-	283, 282, 282, 284, 283, 285, 1, 289, 
-	289, 291, 288, 293, 293, 289, 290, 287, 
-	1, 296, 296, 295, 295, 297, 296, 298, 
-	1, 302, 302, 304, 301, 306, 306, 302, 
-	303, 300, 1, 309, 309, 308, 308, 310, 
-	309, 311, 1, 315, 315, 316, 1, 316, 
-	1, 317, 317, 318, 318, 319, 317, 320, 
-	1, 321, 321, 322, 322, 323, 321, 324, 
-	1, 325, 326, 1, 327, 1, 328, 328, 
-	330, 331, 332, 332, 328, 329, 327, 1, 
-	333, 333, 335, 336, 333, 334, 337, 1, 
-	338, 339, 1, 340, 1, 328, 328, 330, 
-	327, 332, 332, 328, 329, 326, 1, 335, 
-	335, 334, 334, 336, 335, 337, 1, 341, 
-	341, 342, 1, 342, 1, 343, 343, 344, 
-	344, 345, 343, 346, 1, 347, 347, 348, 
-	348, 349, 347, 350, 1, 351, 352, 1, 
-	353, 1, 354, 354, 355, 1, 355, 1, 
-	356, 356, 357, 356, 358, 1, 359, 359, 
-	360, 360, 361, 359, 362, 1, 363, 363, 
-	364, 364, 365, 363, 366, 1, 367, 367, 
-	368, 368, 369, 367, 370, 1, 371, 371, 
-	372, 372, 373, 371, 374, 1, 12, 12, 
-	14, 11, 16, 16, 12, 13, 10, 1, 
-	19, 19, 18, 18, 20, 19, 21, 1, 
-	375, 375, 376, 1, 376, 1, 377, 377, 
-	378, 378, 379, 377, 380, 1, 381, 381, 
-	382, 382, 383, 381, 384, 1, 385, 385, 
-	386, 386, 387, 385, 388, 1, 389, 389, 
-	390, 390, 391, 389, 392, 1, 393, 393, 
-	394, 1, 394, 1, 12, 12, 14, 15, 
-	12, 13, 394, 1, 395, 395, 396, 1, 
-	396, 1, 328, 328, 330, 331, 328, 329, 
-	396, 1, 397, 397, 398, 1, 398, 1, 
-	302, 302, 304, 305, 302, 303, 398, 1, 
-	399, 399, 400, 1, 400, 1, 289, 289, 
-	291, 292, 289, 290, 400, 1, 401, 401, 
-	402, 1, 402, 1, 276, 276, 278, 279, 
-	276, 277, 402, 1, 403, 403, 404, 1, 
-	404, 1, 250, 250, 252, 253, 250, 251, 
-	404, 1, 405, 405, 406, 1, 406, 1, 
-	237, 237, 239, 240, 237, 238, 406, 1, 
-	407, 407, 408, 1, 408, 1, 224, 224, 
-	226, 227, 224, 225, 408, 1, 409, 409, 
-	410, 1, 410, 1, 181, 181, 183, 184, 
-	181, 182, 410, 1, 411, 411, 412, 1, 
-	412, 1, 168, 168, 170, 171, 168, 169, 
-	412, 1, 413, 413, 414, 1, 414, 1, 
-	155, 155, 157, 158, 155, 156, 414, 1, 
-	415, 415, 416, 1, 416, 1, 142, 142, 
-	144, 145, 142, 143, 416, 1, 417, 417, 
-	418, 1, 418, 1, 129, 129, 131, 132, 
-	129, 130, 418, 1, 419, 419, 420, 1, 
-	420, 1, 109, 109, 108, 108, 110, 109, 
-	111, 1, 421, 421, 422, 1, 422, 1, 
-	102, 102, 104, 105, 102, 103, 422, 1, 
-	102, 102, 104, 101, 106, 106, 102, 103, 
-	100, 1, 96, 96, 95, 95, 97, 96, 
-	98, 1, 423, 423, 425, 426, 423, 424, 
-	427, 1, 428, 428, 429, 430, 431, 428, 
-	1, 432, 432, 433, 1, 433, 1, 74, 
-	74, 75, 74, 433, 1, 74, 74, 75, 
-	73, 76, 76, 74, 72, 1, 68, 68, 
-	67, 67, 69, 68, 70, 1, 434, 434, 
-	435, 1, 435, 1, 61, 61, 63, 64, 
-	61, 62, 435, 1, 61, 61, 63, 60, 
-	65, 65, 61, 62, 436, 1, 437, 437, 
-	438, 1, 438, 1, 439, 439, 440, 1, 
-	440, 1, 28, 28, 30, 31, 28, 29, 
-	440, 1, 441, 441, 442, 443, 441, 1, 
-	444, 444, 446, 447, 448, 449, 450, 451, 
-	452, 453, 454, 455, 456, 457, 458, 459, 
-	460, 450, 461, 462, 463, 464, 465, 466, 
-	467, 458, 444, 445, 24, 1, 468, 468, 
-	41, 43, 469, 470, 471, 472, 442, 473, 
-	474, 475, 476, 477, 478, 479, 480, 481, 
-	443, 482, 483, 484, 485, 477, 468, 42, 
-	44, 1, 486, 486, 488, 489, 490, 491, 
-	492, 493, 494, 495, 496, 497, 498, 499, 
-	500, 501, 502, 492, 503, 504, 505, 506, 
-	507, 508, 509, 500, 486, 487, 40, 1, 
-	486, 486, 488, 40, 490, 491, 492, 493, 
-	494, 495, 496, 497, 498, 499, 500, 501, 
-	502, 492, 503, 504, 505, 506, 507, 508, 
-	509, 500, 486, 487, 39, 1, 510, 510, 
-	511, 512, 513, 514, 515, 516, 517, 518, 
-	519, 520, 521, 522, 523, 524, 525, 515, 
-	526, 527, 528, 529, 530, 531, 532, 523, 
-	510, 114, 1, 533, 533, 48, 49, 469, 
-	470, 471, 472, 442, 473, 474, 475, 476, 
-	477, 478, 479, 480, 481, 443, 482, 483, 
-	484, 485, 477, 533, 50, 1, 534, 534, 
-	536, 537, 538, 539, 540, 541, 542, 543, 
-	544, 545, 546, 547, 548, 549, 550, 540, 
-	551, 552, 553, 554, 555, 556, 557, 548, 
-	534, 535, 193, 1, 558, 558, 122, 124, 
-	469, 470, 471, 472, 442, 473, 474, 475, 
-	476, 477, 478, 479, 480, 481, 443, 482, 
-	483, 484, 485, 477, 558, 123, 125, 1, 
-	534, 534, 536, 193, 538, 539, 540, 541, 
-	542, 543, 544, 545, 546, 547, 548, 549, 
-	550, 540, 551, 552, 553, 554, 555, 556, 
-	557, 548, 534, 535, 192, 1, 534, 534, 
-	536, 537, 538, 539, 541, 542, 543, 544, 
-	545, 546, 547, 548, 549, 550, 551, 552, 
-	553, 554, 555, 556, 557, 548, 534, 535, 
-	195, 1, 559, 559, 561, 562, 563, 564, 
-	565, 566, 567, 568, 569, 570, 571, 572, 
-	573, 574, 575, 565, 576, 577, 578, 579, 
-	580, 581, 582, 573, 559, 560, 206, 1, 
-	583, 583, 200, 202, 469, 470, 471, 472, 
-	442, 473, 474, 475, 476, 477, 478, 479, 
-	480, 481, 443, 482, 483, 484, 485, 477, 
-	583, 201, 203, 1, 559, 559, 561, 206, 
-	563, 564, 565, 566, 567, 568, 569, 570, 
-	571, 572, 573, 574, 575, 565, 576, 577, 
-	578, 579, 580, 581, 582, 573, 559, 560, 
-	205, 1, 559, 559, 561, 562, 563, 564, 
-	566, 567, 568, 569, 570, 571, 572, 573, 
-	574, 575, 576, 577, 578, 579, 580, 581, 
-	582, 573, 559, 560, 208, 1, 584, 584, 
-	586, 587, 588, 589, 590, 591, 592, 593, 
-	594, 595, 596, 597, 598, 599, 600, 590, 
-	601, 602, 603, 604, 605, 606, 607, 598, 
-	584, 585, 262, 1, 608, 608, 217, 219, 
-	469, 470, 471, 472, 442, 473, 474, 475, 
-	476, 477, 478, 479, 480, 481, 443, 482, 
-	483, 484, 485, 477, 608, 218, 220, 1, 
-	584, 584, 586, 262, 588, 589, 590, 591, 
-	592, 593, 594, 595, 596, 597, 598, 599, 
-	600, 590, 601, 602, 603, 604, 605, 606, 
-	607, 598, 584, 585, 261, 1, 584, 584, 
-	586, 587, 588, 589, 591, 592, 593, 594, 
-	595, 596, 597, 598, 599, 600, 601, 602, 
-	603, 604, 605, 606, 607, 598, 584, 585, 
-	264, 1, 609, 609, 611, 612, 613, 614, 
-	615, 616, 617, 618, 619, 620, 621, 622, 
-	623, 624, 625, 615, 626, 627, 628, 629, 
-	630, 631, 632, 623, 609, 610, 314, 1, 
-	633, 633, 269, 271, 469, 470, 471, 472, 
-	442, 473, 474, 475, 476, 477, 478, 479, 
-	480, 481, 443, 482, 483, 484, 485, 477, 
-	633, 270, 272, 1, 609, 609, 611, 314, 
-	613, 614, 615, 616, 617, 618, 619, 620, 
-	621, 622, 623, 624, 625, 615, 626, 627, 
-	628, 629, 630, 631, 632, 623, 609, 610, 
-	313, 1, 609, 609, 611, 612, 613, 614, 
-	616, 617, 618, 619, 620, 621, 622, 623, 
-	624, 625, 626, 627, 628, 629, 630, 631, 
-	632, 623, 609, 610, 316, 1, 634, 634, 
-	636, 637, 638, 639, 640, 641, 642, 643, 
-	644, 645, 646, 647, 648, 649, 650, 640, 
-	651, 652, 653, 654, 655, 656, 657, 648, 
-	634, 635, 340, 1, 658, 658, 321, 323, 
-	469, 470, 471, 472, 442, 473, 474, 475, 
-	476, 477, 478, 479, 480, 481, 443, 482, 
-	483, 484, 485, 477, 658, 322, 324, 1, 
-	634, 634, 636, 340, 638, 639, 640, 641, 
-	642, 643, 644, 645, 646, 647, 648, 649, 
-	650, 640, 651, 652, 653, 654, 655, 656, 
-	657, 648, 634, 635, 339, 1, 634, 634, 
-	636, 637, 638, 639, 641, 642, 643, 644, 
-	645, 646, 647, 648, 649, 650, 651, 652, 
-	653, 654, 655, 656, 657, 648, 634, 635, 
-	342, 1, 659, 659, 661, 662, 663, 664, 
-	665, 666, 667, 668, 669, 670, 671, 672, 
-	673, 674, 675, 665, 676, 677, 678, 679, 
-	680, 681, 682, 673, 659, 660, 353, 1, 
-	683, 683, 347, 349, 469, 470, 471, 472, 
-	442, 473, 474, 475, 476, 477, 478, 479, 
-	480, 481, 443, 482, 483, 484, 485, 477, 
-	683, 348, 350, 1, 659, 659, 661, 353, 
-	663, 664, 665, 666, 667, 668, 669, 670, 
-	671, 672, 673, 674, 675, 665, 676, 677, 
-	678, 679, 680, 681, 682, 673, 659, 660, 
-	352, 1, 659, 659, 661, 662, 663, 664, 
-	666, 667, 668, 669, 670, 671, 672, 673, 
-	674, 675, 676, 677, 678, 679, 680, 681, 
-	682, 673, 659, 660, 355, 1, 684, 684, 
-	685, 686, 687, 688, 689, 690, 691, 692, 
-	693, 694, 695, 696, 697, 698, 699, 700, 
-	701, 702, 703, 694, 684, 1, 704, 704, 
-	469, 470, 471, 472, 442, 473, 474, 475, 
-	476, 477, 478, 479, 480, 481, 443, 482, 
-	483, 484, 485, 477, 704, 1, 444, 444, 
-	446, 24, 448, 449, 450, 451, 452, 453, 
-	454, 455, 456, 457, 458, 459, 460, 450, 
-	461, 462, 463, 464, 465, 466, 467, 458, 
-	444, 445, 23, 1, 444, 444, 446, 447, 
-	448, 449, 451, 452, 453, 454, 455, 456, 
+	37, 1, 45, 45, 46, 46, 47, 45, 
+	48, 1, 49, 49, 50, 50, 51, 49, 
+	52, 1, 53, 54, 1, 55, 1, 56, 
+	56, 58, 59, 60, 60, 56, 57, 55, 
+	1, 61, 61, 63, 64, 61, 62, 65, 
+	1, 66, 67, 1, 68, 1, 69, 69, 
+	71, 72, 73, 73, 69, 70, 68, 1, 
+	74, 74, 76, 77, 74, 75, 78, 1, 
+	79, 80, 1, 81, 1, 82, 82, 83, 
+	84, 84, 82, 81, 1, 85, 85, 86, 
+	87, 88, 85, 1, 86, 86, 87, 88, 
+	86, 1, 89, 89, 90, 91, 92, 89, 
+	1, 93, 93, 94, 95, 96, 93, 1, 
+	94, 94, 95, 96, 94, 1, 97, 97, 
+	99, 100, 97, 98, 101, 1, 102, 102, 
+	104, 105, 102, 103, 106, 1, 107, 108, 
+	1, 109, 1, 110, 110, 112, 113, 114, 
+	114, 110, 111, 109, 1, 115, 115, 117, 
+	118, 115, 116, 119, 1, 120, 121, 1, 
+	122, 1, 56, 56, 58, 55, 60, 60, 
+	56, 57, 54, 1, 63, 63, 62, 62, 
+	64, 63, 65, 1, 69, 69, 71, 68, 
+	73, 73, 69, 70, 67, 1, 76, 76, 
+	75, 75, 77, 76, 78, 1, 82, 82, 
+	83, 81, 84, 84, 82, 80, 1, 123, 
+	123, 124, 1, 124, 1, 82, 82, 83, 
+	82, 124, 1, 125, 125, 126, 1, 126, 
+	1, 69, 69, 71, 72, 69, 70, 126, 
+	1, 127, 127, 128, 1, 128, 1, 56, 
+	56, 58, 59, 56, 57, 128, 1, 129, 
+	129, 130, 130, 131, 129, 132, 1, 133, 
+	133, 134, 134, 135, 133, 136, 1, 137, 
+	138, 1, 139, 1, 140, 140, 142, 143, 
+	144, 144, 140, 141, 139, 1, 145, 145, 
+	147, 148, 145, 146, 149, 1, 150, 151, 
+	1, 152, 1, 153, 153, 155, 156, 157, 
+	157, 153, 154, 152, 1, 158, 158, 160, 
+	161, 158, 159, 162, 1, 163, 164, 1, 
+	165, 1, 166, 166, 168, 169, 170, 170, 
+	166, 167, 165, 1, 171, 171, 173, 174, 
+	171, 172, 175, 1, 176, 177, 1, 178, 
+	1, 179, 179, 181, 182, 183, 183, 179, 
+	180, 178, 1, 184, 184, 186, 187, 184, 
+	185, 188, 1, 189, 190, 1, 191, 1, 
+	192, 192, 194, 195, 196, 196, 192, 193, 
+	191, 1, 197, 197, 199, 200, 197, 198, 
+	201, 1, 202, 203, 1, 204, 1, 140, 
+	140, 142, 139, 144, 144, 140, 141, 138, 
+	1, 147, 147, 146, 146, 148, 147, 149, 
+	1, 153, 153, 155, 152, 157, 157, 153, 
+	154, 151, 1, 160, 160, 159, 159, 161, 
+	160, 162, 1, 166, 166, 168, 165, 170, 
+	170, 166, 167, 164, 1, 173, 173, 172, 
+	172, 174, 173, 175, 1, 179, 179, 181, 
+	178, 183, 183, 179, 180, 177, 1, 186, 
+	186, 185, 185, 187, 186, 188, 1, 192, 
+	192, 194, 191, 196, 196, 192, 193, 190, 
+	1, 199, 199, 198, 198, 200, 199, 201, 
+	1, 205, 205, 206, 1, 206, 1, 207, 
+	207, 208, 208, 209, 207, 210, 1, 211, 
+	211, 212, 212, 213, 211, 214, 1, 215, 
+	216, 1, 217, 1, 218, 218, 219, 1, 
+	219, 1, 220, 220, 221, 221, 222, 220, 
+	223, 1, 224, 224, 225, 225, 226, 224, 
+	227, 1, 228, 228, 229, 229, 230, 228, 
+	231, 1, 232, 233, 1, 234, 1, 235, 
+	235, 237, 238, 239, 239, 235, 236, 234, 
+	1, 240, 240, 242, 243, 240, 241, 244, 
+	1, 245, 246, 1, 247, 1, 248, 248, 
+	250, 251, 252, 252, 248, 249, 247, 1, 
+	253, 253, 255, 256, 253, 254, 257, 1, 
+	258, 259, 1, 260, 1, 261, 261, 263, 
+	264, 265, 265, 261, 262, 260, 1, 266, 
+	266, 268, 269, 266, 267, 270, 1, 271, 
+	272, 1, 273, 1, 235, 235, 237, 234, 
+	239, 239, 235, 236, 233, 1, 242, 242, 
+	241, 241, 243, 242, 244, 1, 248, 248, 
+	250, 247, 252, 252, 248, 249, 246, 1, 
+	255, 255, 254, 254, 256, 255, 257, 1, 
+	261, 261, 263, 260, 265, 265, 261, 262, 
+	259, 1, 268, 268, 267, 267, 269, 268, 
+	270, 1, 274, 274, 275, 1, 275, 1, 
+	276, 276, 277, 277, 278, 276, 279, 1, 
+	280, 280, 281, 281, 282, 280, 283, 1, 
+	284, 285, 1, 286, 1, 287, 287, 289, 
+	290, 291, 291, 287, 288, 286, 1, 292, 
+	292, 294, 295, 292, 293, 296, 1, 297, 
+	298, 1, 299, 1, 300, 300, 302, 303, 
+	304, 304, 300, 301, 299, 1, 305, 305, 
+	307, 308, 305, 306, 309, 1, 310, 311, 
+	1, 312, 1, 313, 313, 315, 316, 317, 
+	317, 313, 314, 312, 1, 318, 318, 320, 
+	321, 318, 319, 322, 1, 323, 324, 1, 
+	325, 1, 287, 287, 289, 286, 291, 291, 
+	287, 288, 285, 1, 294, 294, 293, 293, 
+	295, 294, 296, 1, 300, 300, 302, 299, 
+	304, 304, 300, 301, 298, 1, 307, 307, 
+	306, 306, 308, 307, 309, 1, 313, 313, 
+	315, 312, 317, 317, 313, 314, 311, 1, 
+	320, 320, 319, 319, 321, 320, 322, 1, 
+	326, 326, 327, 1, 327, 1, 328, 328, 
+	329, 329, 330, 328, 331, 1, 332, 332, 
+	333, 333, 334, 332, 335, 1, 336, 337, 
+	1, 338, 1, 339, 339, 341, 342, 343, 
+	343, 339, 340, 338, 1, 344, 344, 346, 
+	347, 344, 345, 348, 1, 349, 350, 1, 
+	351, 1, 339, 339, 341, 338, 343, 343, 
+	339, 340, 337, 1, 346, 346, 345, 345, 
+	347, 346, 348, 1, 352, 352, 353, 1, 
+	353, 1, 354, 354, 355, 355, 356, 354, 
+	357, 1, 358, 358, 359, 359, 360, 358, 
+	361, 1, 362, 363, 1, 364, 1, 365, 
+	365, 366, 1, 366, 1, 367, 367, 368, 
+	368, 369, 367, 370, 1, 371, 371, 372, 
+	372, 373, 371, 374, 1, 375, 375, 376, 
+	376, 377, 375, 378, 1, 379, 379, 380, 
+	380, 381, 379, 382, 1, 383, 383, 384, 
+	384, 385, 383, 386, 1, 12, 12, 14, 
+	11, 16, 16, 12, 13, 10, 1, 19, 
+	19, 18, 18, 20, 19, 21, 1, 387, 
+	387, 388, 1, 388, 1, 389, 389, 390, 
+	390, 391, 389, 392, 1, 393, 393, 394, 
+	394, 395, 393, 396, 1, 397, 397, 398, 
+	398, 399, 397, 400, 1, 401, 401, 402, 
+	402, 403, 401, 404, 1, 405, 405, 406, 
+	1, 406, 1, 12, 12, 14, 15, 12, 
+	13, 406, 1, 407, 407, 408, 1, 408, 
+	1, 339, 339, 341, 342, 339, 340, 408, 
+	1, 409, 409, 410, 1, 410, 1, 313, 
+	313, 315, 316, 313, 314, 410, 1, 411, 
+	411, 412, 1, 412, 1, 300, 300, 302, 
+	303, 300, 301, 412, 1, 413, 413, 414, 
+	1, 414, 1, 287, 287, 289, 290, 287, 
+	288, 414, 1, 415, 415, 416, 1, 416, 
+	1, 261, 261, 263, 264, 261, 262, 416, 
+	1, 417, 417, 418, 1, 418, 1, 248, 
+	248, 250, 251, 248, 249, 418, 1, 419, 
+	419, 420, 1, 420, 1, 235, 235, 237, 
+	238, 235, 236, 420, 1, 421, 421, 422, 
+	1, 422, 1, 192, 192, 194, 195, 192, 
+	193, 422, 1, 423, 423, 424, 1, 424, 
+	1, 179, 179, 181, 182, 179, 180, 424, 
+	1, 425, 425, 426, 1, 426, 1, 166, 
+	166, 168, 169, 166, 167, 426, 1, 427, 
+	427, 428, 1, 428, 1, 153, 153, 155, 
+	156, 153, 154, 428, 1, 429, 429, 430, 
+	1, 430, 1, 140, 140, 142, 143, 140, 
+	141, 430, 1, 431, 431, 432, 1, 432, 
+	1, 117, 117, 116, 116, 118, 117, 119, 
+	1, 433, 433, 434, 1, 434, 1, 110, 
+	110, 112, 113, 110, 111, 434, 1, 110, 
+	110, 112, 109, 114, 114, 110, 111, 108, 
+	1, 104, 104, 103, 103, 105, 104, 106, 
+	1, 435, 435, 437, 438, 435, 436, 439, 
+	1, 440, 440, 441, 442, 443, 440, 1, 
+	444, 444, 445, 1, 445, 1, 446, 446, 
+	447, 1, 447, 1, 28, 28, 30, 31, 
+	28, 29, 447, 1, 448, 448, 449, 450, 
+	448, 1, 451, 451, 453, 454, 455, 456, 
+	457, 458, 459, 460, 461, 462, 463, 464, 
+	465, 466, 467, 457, 468, 469, 470, 471, 
+	472, 473, 474, 465, 451, 452, 24, 1, 
+	475, 475, 41, 43, 476, 477, 478, 479, 
+	449, 480, 481, 482, 483, 484, 485, 486, 
+	487, 488, 450, 489, 490, 491, 492, 484, 
+	475, 42, 44, 1, 493, 493, 495, 496, 
+	497, 498, 499, 500, 501, 502, 503, 504, 
+	505, 506, 507, 508, 509, 499, 510, 511, 
+	512, 513, 514, 515, 516, 507, 493, 494, 
+	40, 1, 493, 493, 495, 40, 497, 498, 
+	499, 500, 501, 502, 503, 504, 505, 506, 
+	507, 508, 509, 499, 510, 511, 512, 513, 
+	514, 515, 516, 507, 493, 494, 39, 1, 
+	517, 517, 519, 520, 521, 522, 523, 524, 
+	525, 526, 527, 528, 529, 530, 531, 532, 
+	533, 523, 534, 535, 536, 537, 538, 539, 
+	540, 531, 517, 518, 122, 1, 541, 541, 
+	49, 51, 476, 477, 478, 479, 449, 480, 
+	481, 482, 483, 484, 485, 486, 487, 488, 
+	450, 489, 490, 491, 492, 484, 541, 50, 
+	52, 1, 542, 542, 544, 545, 546, 547, 
+	548, 549, 550, 551, 552, 553, 554, 555, 
+	556, 557, 558, 548, 559, 560, 561, 562, 
+	563, 564, 565, 556, 542, 543, 204, 1, 
+	566, 566, 133, 135, 476, 477, 478, 479, 
+	449, 480, 481, 482, 483, 484, 485, 486, 
+	487, 488, 450, 489, 490, 491, 492, 484, 
+	566, 134, 136, 1, 542, 542, 544, 204, 
+	546, 547, 548, 549, 550, 551, 552, 553, 
+	554, 555, 556, 557, 558, 548, 559, 560, 
+	561, 562, 563, 564, 565, 556, 542, 543, 
+	203, 1, 542, 542, 544, 545, 546, 547, 
+	549, 550, 551, 552, 553, 554, 555, 556, 
+	557, 558, 559, 560, 561, 562, 563, 564, 
+	565, 556, 542, 543, 206, 1, 567, 567, 
+	569, 570, 571, 572, 573, 574, 575, 576, 
+	577, 578, 579, 580, 581, 582, 583, 573, 
+	584, 585, 586, 587, 588, 589, 590, 581, 
+	567, 568, 217, 1, 591, 591, 211, 213, 
+	476, 477, 478, 479, 449, 480, 481, 482, 
+	483, 484, 485, 486, 487, 488, 450, 489, 
+	490, 491, 492, 484, 591, 212, 214, 1, 
+	567, 567, 569, 217, 571, 572, 573, 574, 
+	575, 576, 577, 578, 579, 580, 581, 582, 
+	583, 573, 584, 585, 586, 587, 588, 589, 
+	590, 581, 567, 568, 216, 1, 567, 567, 
+	569, 570, 571, 572, 574, 575, 576, 577, 
+	578, 579, 580, 581, 582, 583, 584, 585, 
+	586, 587, 588, 589, 590, 581, 567, 568, 
+	219, 1, 592, 592, 594, 595, 596, 597, 
+	598, 599, 600, 601, 602, 603, 604, 605, 
+	606, 607, 608, 598, 609, 610, 611, 612, 
+	613, 614, 615, 606, 592, 593, 273, 1, 
+	616, 616, 228, 230, 476, 477, 478, 479, 
+	449, 480, 481, 482, 483, 484, 485, 486, 
+	487, 488, 450, 489, 490, 491, 492, 484, 
+	616, 229, 231, 1, 592, 592, 594, 273, 
+	596, 597, 598, 599, 600, 601, 602, 603, 
+	604, 605, 606, 607, 608, 598, 609, 610, 
+	611, 612, 613, 614, 615, 606, 592, 593, 
+	272, 1, 592, 592, 594, 595, 596, 597, 
+	599, 600, 601, 602, 603, 604, 605, 606, 
+	607, 608, 609, 610, 611, 612, 613, 614, 
+	615, 606, 592, 593, 275, 1, 617, 617, 
+	619, 620, 621, 622, 623, 624, 625, 626, 
+	627, 628, 629, 630, 631, 632, 633, 623, 
+	634, 635, 636, 637, 638, 639, 640, 631, 
+	617, 618, 325, 1, 641, 641, 280, 282, 
+	476, 477, 478, 479, 449, 480, 481, 482, 
+	483, 484, 485, 486, 487, 488, 450, 489, 
+	490, 491, 492, 484, 641, 281, 283, 1, 
+	617, 617, 619, 325, 621, 622, 623, 624, 
+	625, 626, 627, 628, 629, 630, 631, 632, 
+	633, 623, 634, 635, 636, 637, 638, 639, 
+	640, 631, 617, 618, 324, 1, 617, 617, 
+	619, 620, 621, 622, 624, 625, 626, 627, 
+	628, 629, 630, 631, 632, 633, 634, 635, 
+	636, 637, 638, 639, 640, 631, 617, 618, 
+	327, 1, 642, 642, 644, 645, 646, 647, 
+	648, 649, 650, 651, 652, 653, 654, 655, 
+	656, 657, 658, 648, 659, 660, 661, 662, 
+	663, 664, 665, 656, 642, 643, 351, 1, 
+	666, 666, 332, 334, 476, 477, 478, 479, 
+	449, 480, 481, 482, 483, 484, 485, 486, 
+	487, 488, 450, 489, 490, 491, 492, 484, 
+	666, 333, 335, 1, 642, 642, 644, 351, 
+	646, 647, 648, 649, 650, 651, 652, 653, 
+	654, 655, 656, 657, 658, 648, 659, 660, 
+	661, 662, 663, 664, 665, 656, 642, 643, 
+	350, 1, 642, 642, 644, 645, 646, 647, 
+	649, 650, 651, 652, 653, 654, 655, 656, 
+	657, 658, 659, 660, 661, 662, 663, 664, 
+	665, 656, 642, 643, 353, 1, 667, 667, 
+	669, 670, 671, 672, 673, 674, 675, 676, 
+	677, 678, 679, 680, 681, 682, 683, 673, 
+	684, 685, 686, 687, 688, 689, 690, 681, 
+	667, 668, 364, 1, 691, 691, 358, 360, 
+	476, 477, 478, 479, 449, 480, 481, 482, 
+	483, 484, 485, 486, 487, 488, 450, 489, 
+	490, 491, 492, 484, 691, 359, 361, 1, 
+	667, 667, 669, 364, 671, 672, 673, 674, 
+	675, 676, 677, 678, 679, 680, 681, 682, 
+	683, 673, 684, 685, 686, 687, 688, 689, 
+	690, 681, 667, 668, 363, 1, 667, 667, 
+	669, 670, 671, 672, 674, 675, 676, 677, 
+	678, 679, 680, 681, 682, 683, 684, 685, 
+	686, 687, 688, 689, 690, 681, 667, 668, 
+	366, 1, 692, 692, 693, 694, 695, 696, 
+	697, 698, 699, 700, 701, 702, 703, 704, 
+	705, 706, 707, 708, 709, 710, 711, 702, 
+	692, 1, 712, 712, 476, 477, 478, 479, 
+	449, 480, 481, 482, 483, 484, 485, 486, 
+	487, 488, 450, 489, 490, 491, 492, 484, 
+	712, 1, 451, 451, 453, 24, 455, 456, 
 	457, 458, 459, 460, 461, 462, 463, 464, 
-	465, 466, 467, 458, 444, 445, 376, 1, 
-	510, 510, 511, 512, 513, 514, 516, 517, 
-	518, 519, 520, 521, 522, 523, 524, 525, 
-	526, 527, 528, 529, 530, 531, 532, 523, 
-	510, 420, 1, 510, 510, 511, 114, 513, 
-	514, 515, 516, 517, 518, 519, 520, 521, 
-	522, 523, 524, 525, 515, 526, 527, 528, 
-	529, 530, 531, 532, 523, 510, 113, 1, 
-	486, 486, 488, 489, 490, 491, 493, 494, 
-	495, 496, 497, 498, 499, 500, 501, 502, 
-	503, 504, 505, 506, 507, 508, 509, 500, 
-	486, 487, 438, 1, 0
+	465, 466, 467, 457, 468, 469, 470, 471, 
+	472, 473, 474, 465, 451, 452, 23, 1, 
+	451, 451, 453, 454, 455, 456, 458, 459, 
+	460, 461, 462, 463, 464, 465, 466, 467, 
+	468, 469, 470, 471, 472, 473, 474, 465, 
+	451, 452, 388, 1, 517, 517, 519, 520, 
+	521, 522, 524, 525, 526, 527, 528, 529, 
+	530, 531, 532, 533, 534, 535, 536, 537, 
+	538, 539, 540, 531, 517, 518, 432, 1, 
+	517, 517, 519, 122, 521, 522, 523, 524, 
+	525, 526, 527, 528, 529, 530, 531, 532, 
+	533, 523, 534, 535, 536, 537, 538, 539, 
+	540, 531, 517, 518, 121, 1, 493, 493, 
+	495, 496, 497, 498, 500, 501, 502, 503, 
+	504, 505, 506, 507, 508, 509, 510, 511, 
+	512, 513, 514, 515, 516, 507, 493, 494, 
+	445, 1, 0
 };
 
 static const short _svg_path_trans_targs[] = {
-	2, 0, 3, 4, 161, 2, 3, 4, 
-	161, 4, 161, 5, 6, 7, 162, 8, 
-	169, 6, 7, 162, 8, 265, 8, 265, 
-	233, 10, 16, 11, 12, 13, 17, 14, 
-	229, 12, 13, 17, 14, 236, 14, 236, 
-	235, 15, 9, 10, 16, 19, 20, 43, 
-	19, 20, 43, 21, 22, 23, 24, 44, 
-	22, 23, 24, 226, 25, 26, 27, 222, 
-	28, 223, 26, 27, 222, 28, 221, 28, 
-	221, 29, 30, 31, 218, 30, 31, 32, 
-	217, 33, 34, 35, 216, 33, 34, 35, 
-	216, 36, 37, 215, 38, 214, 36, 37, 
-	215, 38, 214, 38, 214, 39, 40, 41, 
-	210, 42, 211, 40, 41, 210, 42, 268, 
-	42, 268, 237, 43, 45, 46, 48, 49, 
-	50, 71, 48, 49, 50, 71, 50, 71, 
-	51, 52, 53, 72, 54, 205, 52, 53, 
-	72, 54, 73, 54, 73, 55, 56, 57, 
-	74, 58, 202, 56, 57, 74, 58, 75, 
-	58, 75, 59, 60, 61, 76, 62, 199, 
-	60, 61, 76, 62, 77, 62, 77, 63, 
-	64, 65, 78, 66, 196, 64, 65, 78, 
-	66, 79, 66, 79, 67, 68, 69, 80, 
-	70, 193, 68, 69, 80, 70, 241, 70, 
-	241, 239, 82, 242, 84, 85, 86, 245, 
-	84, 85, 86, 245, 86, 245, 243, 88, 
-	246, 15, 9, 10, 16, 91, 92, 93, 
-	106, 91, 92, 93, 106, 93, 106, 94, 
-	95, 96, 107, 97, 190, 95, 96, 107, 
-	97, 108, 97, 108, 98, 99, 100, 109, 
-	101, 187, 99, 100, 109, 101, 110, 101, 
-	110, 102, 103, 104, 111, 105, 184, 103, 
-	104, 111, 105, 249, 105, 249, 247, 113, 
-	250, 115, 116, 117, 130, 115, 116, 117, 
-	130, 117, 130, 118, 119, 120, 131, 121, 
-	181, 119, 120, 131, 121, 132, 121, 132, 
-	122, 123, 124, 133, 125, 178, 123, 124, 
-	133, 125, 134, 125, 134, 126, 127, 128, 
-	135, 129, 175, 127, 128, 135, 129, 253, 
-	129, 253, 251, 137, 254, 139, 140, 141, 
-	146, 139, 140, 141, 146, 141, 146, 142, 
-	143, 144, 147, 145, 172, 143, 144, 147, 
-	145, 257, 145, 257, 255, 149, 258, 151, 
-	152, 153, 261, 151, 152, 153, 261, 153, 
-	261, 259, 155, 262, 19, 20, 43, 48, 
-	49, 50, 71, 84, 85, 86, 245, 15, 
-	9, 10, 16, 2, 3, 4, 161, 164, 
-	266, 91, 92, 93, 106, 115, 116, 117, 
-	130, 139, 140, 141, 146, 151, 152, 153, 
-	261, 170, 171, 173, 174, 176, 177, 179, 
-	180, 182, 183, 185, 186, 188, 189, 191, 
-	192, 194, 195, 197, 198, 200, 201, 203, 
-	204, 206, 207, 209, 267, 212, 213, 36, 
-	37, 215, 38, 214, 33, 34, 35, 216, 
-	219, 220, 224, 225, 226, 228, 269, 230, 
-	231, 232, 1, 160, 234, 9, 15, 10, 
-	18, 47, 163, 83, 89, 1, 90, 114, 
-	138, 150, 263, 156, 157, 158, 159, 160, 
-	165, 166, 167, 168, 234, 18, 47, 83, 
-	89, 90, 114, 138, 150, 263, 156, 157, 
-	158, 159, 165, 166, 167, 168, 234, 9, 
-	15, 10, 18, 47, 227, 83, 89, 1, 
-	90, 114, 138, 150, 263, 156, 157, 158, 
-	159, 160, 165, 166, 167, 168, 238, 19, 
-	20, 18, 47, 208, 83, 89, 1, 90, 
-	114, 138, 150, 263, 156, 157, 158, 159, 
-	160, 165, 166, 167, 168, 238, 240, 49, 
-	48, 50, 18, 47, 81, 83, 89, 1, 
-	90, 114, 138, 150, 263, 156, 157, 158, 
-	159, 160, 165, 166, 167, 168, 240, 244, 
-	85, 84, 86, 18, 47, 87, 83, 89, 
-	1, 90, 114, 138, 150, 263, 156, 157, 
-	158, 159, 160, 165, 166, 167, 168, 244, 
-	248, 92, 91, 93, 18, 47, 112, 83, 
-	89, 1, 90, 114, 138, 150, 263, 156, 
-	157, 158, 159, 160, 165, 166, 167, 168, 
-	248, 252, 116, 115, 117, 18, 47, 136, 
-	83, 89, 1, 90, 114, 138, 150, 263, 
-	156, 157, 158, 159, 160, 165, 166, 167, 
-	168, 252, 256, 140, 139, 141, 18, 47, 
-	148, 83, 89, 1, 90, 114, 138, 150, 
-	263, 156, 157, 158, 159, 160, 165, 166, 
-	167, 168, 256, 260, 152, 151, 153, 18, 
-	47, 154, 83, 89, 1, 90, 114, 138, 
-	150, 263, 156, 157, 158, 159, 160, 165, 
-	166, 167, 168, 260, 264, 18, 47, 83, 
-	89, 1, 90, 114, 138, 150, 263, 156, 
-	157, 158, 159, 160, 165, 166, 167, 168, 
-	264
+	2, 0, 3, 4, 172, 2, 3, 4, 
+	172, 4, 172, 5, 6, 7, 173, 8, 
+	180, 6, 7, 173, 8, 267, 8, 267, 
+	235, 10, 16, 11, 12, 13, 17, 14, 
+	231, 12, 13, 17, 14, 238, 14, 238, 
+	237, 15, 9, 10, 16, 19, 20, 21, 
+	44, 19, 20, 21, 44, 21, 44, 22, 
+	23, 24, 45, 25, 55, 23, 24, 45, 
+	25, 46, 25, 46, 26, 27, 28, 47, 
+	29, 52, 27, 28, 47, 29, 48, 29, 
+	48, 30, 31, 32, 49, 31, 32, 33, 
+	228, 34, 35, 36, 227, 34, 35, 36, 
+	227, 37, 38, 226, 39, 225, 37, 38, 
+	226, 39, 225, 39, 225, 40, 41, 42, 
+	221, 43, 222, 41, 42, 221, 43, 270, 
+	43, 270, 239, 50, 51, 53, 54, 56, 
+	57, 59, 60, 61, 82, 59, 60, 61, 
+	82, 61, 82, 62, 63, 64, 83, 65, 
+	216, 63, 64, 83, 65, 84, 65, 84, 
+	66, 67, 68, 85, 69, 213, 67, 68, 
+	85, 69, 86, 69, 86, 70, 71, 72, 
+	87, 73, 210, 71, 72, 87, 73, 88, 
+	73, 88, 74, 75, 76, 89, 77, 207, 
+	75, 76, 89, 77, 90, 77, 90, 78, 
+	79, 80, 91, 81, 204, 79, 80, 91, 
+	81, 243, 81, 243, 241, 93, 244, 95, 
+	96, 97, 247, 95, 96, 97, 247, 97, 
+	247, 245, 99, 248, 15, 9, 10, 16, 
+	102, 103, 104, 117, 102, 103, 104, 117, 
+	104, 117, 105, 106, 107, 118, 108, 201, 
+	106, 107, 118, 108, 119, 108, 119, 109, 
+	110, 111, 120, 112, 198, 110, 111, 120, 
+	112, 121, 112, 121, 113, 114, 115, 122, 
+	116, 195, 114, 115, 122, 116, 251, 116, 
+	251, 249, 124, 252, 126, 127, 128, 141, 
+	126, 127, 128, 141, 128, 141, 129, 130, 
+	131, 142, 132, 192, 130, 131, 142, 132, 
+	143, 132, 143, 133, 134, 135, 144, 136, 
+	189, 134, 135, 144, 136, 145, 136, 145, 
+	137, 138, 139, 146, 140, 186, 138, 139, 
+	146, 140, 255, 140, 255, 253, 148, 256, 
+	150, 151, 152, 157, 150, 151, 152, 157, 
+	152, 157, 153, 154, 155, 158, 156, 183, 
+	154, 155, 158, 156, 259, 156, 259, 257, 
+	160, 260, 162, 163, 164, 263, 162, 163, 
+	164, 263, 164, 263, 261, 166, 264, 19, 
+	20, 21, 44, 59, 60, 61, 82, 95, 
+	96, 97, 247, 15, 9, 10, 16, 2, 
+	3, 4, 172, 175, 268, 102, 103, 104, 
+	117, 126, 127, 128, 141, 150, 151, 152, 
+	157, 162, 163, 164, 263, 181, 182, 184, 
+	185, 187, 188, 190, 191, 193, 194, 196, 
+	197, 199, 200, 202, 203, 205, 206, 208, 
+	209, 211, 212, 214, 215, 217, 218, 220, 
+	269, 223, 224, 37, 38, 226, 39, 225, 
+	34, 35, 36, 227, 230, 271, 232, 233, 
+	234, 1, 171, 236, 9, 15, 10, 18, 
+	58, 174, 94, 100, 1, 101, 125, 149, 
+	161, 265, 167, 168, 169, 170, 171, 176, 
+	177, 178, 179, 236, 18, 58, 94, 100, 
+	101, 125, 149, 161, 265, 167, 168, 169, 
+	170, 176, 177, 178, 179, 236, 9, 15, 
+	10, 18, 58, 229, 94, 100, 1, 101, 
+	125, 149, 161, 265, 167, 168, 169, 170, 
+	171, 176, 177, 178, 179, 240, 20, 19, 
+	21, 18, 58, 219, 94, 100, 1, 101, 
+	125, 149, 161, 265, 167, 168, 169, 170, 
+	171, 176, 177, 178, 179, 240, 242, 60, 
+	59, 61, 18, 58, 92, 94, 100, 1, 
+	101, 125, 149, 161, 265, 167, 168, 169, 
+	170, 171, 176, 177, 178, 179, 242, 246, 
+	96, 95, 97, 18, 58, 98, 94, 100, 
+	1, 101, 125, 149, 161, 265, 167, 168, 
+	169, 170, 171, 176, 177, 178, 179, 246, 
+	250, 103, 102, 104, 18, 58, 123, 94, 
+	100, 1, 101, 125, 149, 161, 265, 167, 
+	168, 169, 170, 171, 176, 177, 178, 179, 
+	250, 254, 127, 126, 128, 18, 58, 147, 
+	94, 100, 1, 101, 125, 149, 161, 265, 
+	167, 168, 169, 170, 171, 176, 177, 178, 
+	179, 254, 258, 151, 150, 152, 18, 58, 
+	159, 94, 100, 1, 101, 125, 149, 161, 
+	265, 167, 168, 169, 170, 171, 176, 177, 
+	178, 179, 258, 262, 163, 162, 164, 18, 
+	58, 165, 94, 100, 1, 101, 125, 149, 
+	161, 265, 167, 168, 169, 170, 171, 176, 
+	177, 178, 179, 262, 266, 18, 58, 94, 
+	100, 1, 101, 125, 149, 161, 265, 167, 
+	168, 169, 170, 171, 176, 177, 178, 179, 
+	266
 };
 
 static const char _svg_path_trans_actions[] = {
@@ -947,64 +954,65 @@ static const char _svg_path_trans_actions[] = {
 	0, 0, 0, 0, 3, 15, 3, 15, 
 	0, 0, 1, 0, 1, 1, 0, 0, 
 	0, 0, 1, 1, 1, 9, 51, 51, 
-	0, 1, 1, 0, 3, 3, 15, 0, 
-	0, 0, 1, 1, 0, 3, 15, 3, 
+	51, 0, 1, 1, 1, 0, 0, 0, 
+	3, 15, 3, 15, 0, 0, 1, 0, 
+	1, 1, 0, 0, 0, 3, 15, 3, 
 	15, 0, 0, 1, 0, 1, 1, 0, 
 	0, 0, 3, 3, 0, 0, 0, 0, 
 	0, 7, 7, 7, 7, 0, 0, 0, 
 	0, 7, 48, 7, 48, 48, 0, 1, 
 	0, 1, 1, 0, 0, 0, 3, 15, 
 	3, 15, 0, 0, 1, 0, 1, 1, 
-	0, 0, 0, 0, 0, 0, 9, 51, 
-	51, 51, 0, 1, 1, 1, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 9, 51, 51, 51, 0, 1, 1, 
+	1, 0, 0, 0, 3, 15, 3, 15, 
+	0, 0, 1, 0, 1, 1, 0, 0, 
 	0, 3, 15, 3, 15, 0, 0, 1, 
 	0, 1, 1, 0, 0, 0, 3, 15, 
 	3, 15, 0, 0, 1, 0, 1, 1, 
 	0, 0, 0, 3, 15, 3, 15, 0, 
 	0, 1, 0, 1, 1, 0, 0, 0, 
 	3, 15, 3, 15, 0, 0, 1, 0, 
-	1, 1, 0, 0, 0, 3, 15, 3, 
-	15, 0, 0, 1, 0, 1, 1, 0, 
+	1, 1, 0, 0, 0, 0, 0, 9, 
+	51, 51, 51, 0, 1, 1, 1, 0, 
 	0, 0, 0, 0, 9, 51, 51, 51, 
-	0, 1, 1, 1, 0, 0, 0, 0, 
-	0, 9, 51, 51, 51, 9, 51, 51, 
-	51, 0, 1, 1, 1, 0, 0, 0, 
+	9, 51, 51, 51, 0, 1, 1, 1, 
+	0, 0, 0, 3, 15, 3, 15, 0, 
+	0, 1, 0, 1, 1, 0, 0, 0, 
 	3, 15, 3, 15, 0, 0, 1, 0, 
 	1, 1, 0, 0, 0, 3, 15, 3, 
 	15, 0, 0, 1, 0, 1, 1, 0, 
-	0, 0, 3, 15, 3, 15, 0, 0, 
-	1, 0, 1, 1, 0, 0, 0, 0, 
-	0, 9, 51, 51, 51, 0, 1, 1, 
+	0, 0, 0, 0, 9, 51, 51, 51, 
+	0, 1, 1, 1, 0, 0, 0, 3, 
+	15, 3, 15, 0, 0, 1, 0, 1, 
 	1, 0, 0, 0, 3, 15, 3, 15, 
 	0, 0, 1, 0, 1, 1, 0, 0, 
 	0, 3, 15, 3, 15, 0, 0, 1, 
-	0, 1, 1, 0, 0, 0, 3, 15, 
-	3, 15, 0, 0, 1, 0, 1, 1, 
-	0, 0, 0, 0, 0, 9, 51, 51, 
-	51, 0, 1, 1, 1, 0, 0, 0, 
-	3, 15, 3, 15, 0, 0, 1, 0, 
-	1, 1, 0, 0, 0, 0, 0, 9, 
-	51, 51, 51, 0, 1, 1, 1, 0, 
-	0, 0, 0, 0, 11, 54, 54, 11, 
+	0, 1, 1, 0, 0, 0, 0, 0, 
+	9, 51, 51, 51, 0, 1, 1, 1, 
+	0, 0, 0, 3, 15, 3, 15, 0, 
+	0, 1, 0, 1, 1, 0, 0, 0, 
+	0, 0, 9, 51, 51, 51, 0, 1, 
+	1, 1, 0, 0, 0, 0, 0, 11, 
+	54, 54, 54, 11, 54, 54, 54, 11, 
 	54, 54, 54, 11, 54, 54, 54, 11, 
-	54, 54, 54, 11, 54, 54, 54, 0, 
-	0, 11, 54, 54, 54, 11, 54, 54, 
+	54, 54, 54, 0, 0, 11, 54, 54, 
 	54, 11, 54, 54, 54, 11, 54, 54, 
-	54, 0, 0, 0, 0, 0, 0, 0, 
+	54, 11, 54, 54, 54, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 5, 
-	45, 5, 45, 45, 5, 5, 5, 5, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 18, 57, 18, 57, 
-	18, 18, 0, 18, 18, 18, 18, 18, 
+	0, 0, 0, 5, 45, 5, 45, 45, 
+	5, 5, 5, 5, 0, 0, 0, 0, 
+	0, 0, 0, 18, 57, 18, 57, 18, 
+	18, 0, 18, 18, 18, 18, 18, 18, 
 	18, 18, 18, 18, 18, 18, 18, 18, 
-	18, 18, 18, 18, 0, 0, 0, 0, 
+	18, 18, 18, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 21, 61, 
-	21, 61, 21, 21, 0, 21, 21, 21, 
+	0, 0, 0, 0, 0, 21, 61, 21, 
+	61, 21, 21, 0, 21, 21, 21, 21, 
 	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 42, 42, 
+	21, 21, 21, 21, 21, 42, 89, 42, 
 	89, 42, 42, 0, 42, 42, 42, 42, 
 	42, 42, 42, 42, 42, 42, 42, 42, 
 	42, 42, 42, 42, 42, 0, 30, 73, 
@@ -1062,20 +1070,20 @@ static const char _svg_path_eof_actions[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 18, 0, 21, 21, 42, 0, 30, 
-	0, 30, 30, 24, 0, 24, 24, 36, 
-	0, 36, 36, 33, 0, 33, 33, 39, 
-	0, 39, 39, 27, 0, 27, 27, 13, 
-	0, 18, 18, 42, 42, 21
+	0, 0, 0, 18, 0, 21, 21, 42, 
+	0, 30, 0, 30, 30, 24, 0, 24, 
+	24, 36, 0, 36, 36, 33, 0, 33, 
+	33, 39, 0, 39, 39, 27, 0, 27, 
+	27, 13, 0, 18, 18, 42, 42, 21
 };
 
-static const int svg_path_start = 232;
-static const int svg_path_first_final = 232;
+static const int svg_path_start = 234;
+static const int svg_path_first_final = 234;
 
-static const int svg_path_en_main = 232;
+static const int svg_path_en_main = 234;
 
 
-#line 47 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 47 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 
 
 SVGPathParser::SVGPathParser(PathSink &sink)
@@ -1101,12 +1109,12 @@ void SVGPathParser::reset() {
     _curve = NULL;
 
     
-#line 1105 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.cpp"
+#line 1113 "/home/mc/lib2geom/src/2geom/svg-path-parser.cpp"
 	{
 	cs = svg_path_start;
 	}
 
-#line 73 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 73 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 
 }
 
@@ -1209,7 +1217,7 @@ void SVGPathParser::_arcTo(Coord rx, Coord ry, Coord angle,
         return; // ignore invalid (ambiguous) arc segments where start and end point are the same (per SVG spec)
     }
 
-    _pushCurve(new EllipticalArc(_current, rx, ry, angle, large_arc, sweep, p));
+    _pushCurve(new EllipticalArc(_current, fabs(rx), fabs(ry), angle, large_arc, sweep, p));
     _quad_tangent = _cubic_tangent = _current = p;
 }
 
@@ -1243,7 +1251,7 @@ void SVGPathParser::_parse(char const *str, char const *strend, bool finish)
     char const *start = NULL;
 
     
-#line 1247 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.cpp"
+#line 1255 "/home/mc/lib2geom/src/2geom/svg-path-parser.cpp"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1318,13 +1326,13 @@ _match:
 		switch ( *_acts++ )
 		{
 	case 0:
-#line 209 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 209 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             start = p;
         }
 	break;
 	case 1:
-#line 213 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 213 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             if (start) {
                 std::string buf(start, p);
@@ -1338,56 +1346,56 @@ _match:
         }
 	break;
 	case 2:
-#line 225 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 225 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _push(1.0);
         }
 	break;
 	case 3:
-#line 229 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 229 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _push(0.0);
         }
 	break;
 	case 4:
-#line 233 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 233 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _absolute = true;
         }
 	break;
 	case 5:
-#line 237 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 237 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _absolute = false;
         }
 	break;
 	case 6:
-#line 241 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 241 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _moveto_was_absolute = _absolute;
             _moveTo(_pop_point());
         }
 	break;
 	case 7:
-#line 246 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 246 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _lineTo(_pop_point());
         }
 	break;
 	case 8:
-#line 250 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 250 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _lineTo(Point(_pop_coord(X), _current[Y]));
         }
 	break;
 	case 9:
-#line 254 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 254 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _lineTo(Point(_current[X], _pop_coord(Y)));
         }
 	break;
 	case 10:
-#line 258 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 258 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             Point c1 = _pop_point();
@@ -1396,7 +1404,7 @@ _match:
         }
 	break;
 	case 11:
-#line 265 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 265 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             Point c1 = _pop_point();
@@ -1404,7 +1412,7 @@ _match:
         }
 	break;
 	case 12:
-#line 271 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 271 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             Point c = _pop_point();
@@ -1412,14 +1420,14 @@ _match:
         }
 	break;
 	case 13:
-#line 277 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 277 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             _quadTo(_quad_tangent, p);
         }
 	break;
 	case 14:
-#line 282 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 282 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point point = _pop_point();
             bool sweep = _pop_flag();
@@ -1432,12 +1440,12 @@ _match:
         }
 	break;
 	case 15:
-#line 293 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 293 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _closePath();
         }
 	break;
-#line 1441 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.cpp"
+#line 1449 "/home/mc/lib2geom/src/2geom/svg-path-parser.cpp"
 		}
 	}
 
@@ -1454,7 +1462,7 @@ _again:
 	while ( __nacts-- > 0 ) {
 		switch ( *__acts++ ) {
 	case 1:
-#line 213 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 213 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             if (start) {
                 std::string buf(start, p);
@@ -1468,32 +1476,32 @@ _again:
         }
 	break;
 	case 6:
-#line 241 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 241 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _moveto_was_absolute = _absolute;
             _moveTo(_pop_point());
         }
 	break;
 	case 7:
-#line 246 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 246 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _lineTo(_pop_point());
         }
 	break;
 	case 8:
-#line 250 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 250 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _lineTo(Point(_pop_coord(X), _current[Y]));
         }
 	break;
 	case 9:
-#line 254 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 254 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _lineTo(Point(_current[X], _pop_coord(Y)));
         }
 	break;
 	case 10:
-#line 258 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 258 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             Point c1 = _pop_point();
@@ -1502,7 +1510,7 @@ _again:
         }
 	break;
 	case 11:
-#line 265 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 265 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             Point c1 = _pop_point();
@@ -1510,7 +1518,7 @@ _again:
         }
 	break;
 	case 12:
-#line 271 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 271 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             Point c = _pop_point();
@@ -1518,14 +1526,14 @@ _again:
         }
 	break;
 	case 13:
-#line 277 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 277 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point p = _pop_point();
             _quadTo(_quad_tangent, p);
         }
 	break;
 	case 14:
-#line 282 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 282 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             Point point = _pop_point();
             bool sweep = _pop_flag();
@@ -1538,12 +1546,12 @@ _again:
         }
 	break;
 	case 15:
-#line 293 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 293 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 	{
             _closePath();
         }
 	break;
-#line 1547 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.cpp"
+#line 1555 "/home/mc/lib2geom/src/2geom/svg-path-parser.cpp"
 		}
 	}
 	}
@@ -1551,7 +1559,7 @@ _again:
 	_out: {}
 	}
 
-#line 435 "/home/tweenk/src/lib2geom/src/2geom/svg-path-parser.rl"
+#line 435 "/home/mc/lib2geom/src/2geom/svg-path-parser.rl"
 
 
     if (finish) {