← Back to team overview

zeitgeist team mailing list archive

[Merge] lp:~zeitgeist/zeitgeist/benchmark-tools into lp:zeitgeist

 

Seif Lotfy has proposed merging lp:~zeitgeist/zeitgeist/benchmark-tools into lp:zeitgeist.

Requested reviews:
  Zeitgeist Framework Team (zeitgeist)

For more details, see:
https://code.launchpad.net/~zeitgeist/zeitgeist/benchmark-tools/+merge/86867

Added Benchmarking tools:
- Extension to plot...
- Plotting tools

-- 
https://code.launchpad.net/~zeitgeist/zeitgeist/benchmark-tools/+merge/86867
Your team Zeitgeist Framework Team is requested to review the proposed merge of lp:~zeitgeist/zeitgeist/benchmark-tools into lp:zeitgeist.
=== modified file 'extensions/Makefile.am'
--- extensions/Makefile.am	2011-10-31 15:28:09 +0000
+++ extensions/Makefile.am	2011-12-25 16:30:29 +0000
@@ -3,7 +3,7 @@
 NULL =
 
 #extensionsdir = $(libdir)/zeitgeist/extensions
-noinst_LTLIBRARIES = ds-registry.la blacklist.la storage-monitor.la fts.la
+noinst_LTLIBRARIES = ds-registry.la blacklist.la storage-monitor.la fts.la benchmark.la
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
@@ -60,3 +60,13 @@
 fts_la_LIBADD = \
 	$(ZEITGEIST_LIBS) \
 	$(NULL)
+	
+benchmark_la_SOURCES = \
+	benchmark.vala \
+	$(NULL)
+
+benchmark_la_LDFLAGS = -module -avoid-version
+
+benchmark_la_LIBADD = \
+	$(ZEITGEIST_LIBS) \
+	$(NULL)

=== added file 'extensions/benchmark.vala'
--- extensions/benchmark.vala	1970-01-01 00:00:00 +0000
+++ extensions/benchmark.vala	2011-12-25 16:30:29 +0000
@@ -0,0 +1,108 @@
+/* fts.vala
+ *
+ * Copyright © 2011 Collabora Ltd.
+ *             By Seif Lotfy <seif@xxxxxxxxx>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Zeitgeist
+{
+    [DBus (name = "org.gnome.zeitgeist.Benchmark")]
+    public interface RemoteBenchmarker: Object
+    {
+        public abstract async HashTable<string, Variant> find_events (
+            [DBus (signature = "(xx)")] Variant time_range,
+            [DBus (signature = "a(asaasay)")] Variant event_templates,
+            uint storage_state, uint num_events, uint result_type)
+            throws Error;
+    }
+
+    class Benchmarker: Extension, RemoteBenchmarker
+    {
+
+        private uint registration_id;
+
+        Benchmarker ()
+        {
+            Object ();
+        }
+
+        construct
+        {
+            try
+            {
+                var connection = Bus.get_sync (BusType.SESSION, null);
+                registration_id = connection.register_object<RemoteBenchmarker> (
+                    "/org/gnome/zeitgeist/benchmark", this);
+            }
+            catch (Error err)
+            {
+                warning ("%s", err.message);
+            }
+        }
+
+        public async HashTable<string, Variant> find_events (Variant time_range,
+            Variant filter_templates, uint storage_state, uint num_events, 
+            uint result_type)
+            throws Error
+        {
+            var extra_data = new HashTable<string, Variant> (str_hash, str_equal);
+         
+            var find_event_ids_timer = new Timer ();
+            var ids = engine.find_event_ids (
+                new TimeRange.from_variant (time_range),
+                Events.from_variant (filter_templates),
+                storage_state, num_events, result_type); 
+            var find_event_ids_elapsed = find_event_ids_timer.elapsed();
+            
+            var get_events_timer = new Timer ();
+            var events = engine.get_events (ids);
+            var get_events_elapsed = get_events_timer.elapsed();
+            
+            var marsh_events_timer = new Timer ();
+            var marsh_events = Events.to_variant(events);
+            var marsh_events_elapsed = marsh_events_timer.elapsed();
+            
+            var find_events_elapsed = get_events_elapsed + find_event_ids_elapsed + marsh_events_elapsed;
+            
+            extra_data.insert("find_event_ids", 
+                new Variant.double(find_event_ids_elapsed));
+            extra_data.insert("get_events", 
+                new Variant.double(get_events_elapsed));
+            extra_data.insert("find_events", 
+                new Variant.double(find_events_elapsed));
+            extra_data.insert("marsh_events", 
+                new Variant.double(marsh_events_elapsed));
+            extra_data.insert("events", marsh_events);
+            
+            return extra_data;
+        }
+
+    }
+
+    [ModuleInit]
+#if BUILTIN_EXTENSIONS
+    public static Type benchmark_init (TypeModule module)
+    {
+#else
+    public static Type extension_register (TypeModule module)
+    {
+#endif
+        return typeof (Benchmarker);
+    }
+}
+
+// vim:expandtab:ts=4:sw=4

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-11-01 18:30:37 +0000
+++ src/Makefile.am	2011-12-25 16:30:29 +0000
@@ -25,6 +25,7 @@
 	ext-histogram.vala \
 	ext-storage-monitor.vala \
 	ext-fts.vala \
+	ext-benchmark.vala \
 	$(NULL)
 
 zeitgeist_daemon_VALASOURCES = \

=== added symlink 'src/ext-benchmark.vala'
=== target is u'/home/seif/Projects/zeitgeist/extensions/benchmark.vala'
=== modified file 'src/extension-collection.vala'
--- src/extension-collection.vala	2011-10-20 11:20:36 +0000
+++ src/extension-collection.vala	2011-12-25 16:30:29 +0000
@@ -48,7 +48,8 @@
                 blacklist_init,
                 histogram_init,
                 storage_monitor_init,
-                fts_init
+                fts_init,
+                benchmark_init
             };
 
             foreach (var func in builtins)
@@ -163,6 +164,7 @@
     private extern static Type histogram_init (TypeModule mod);
     private extern static Type storage_monitor_init (TypeModule mod);
     private extern static Type fts_init (TypeModule mod);
+    private extern static Type benchmark_init (TypeModule mod);
 #endif
 
 }

=== added directory 'tools'
=== added directory 'tools/development'
=== added file 'tools/development/README'
--- tools/development/README	1970-01-01 00:00:00 +0000
+++ tools/development/README	2011-12-25 16:30:29 +0000
@@ -0,0 +1,24 @@
+# USAGE
+#
+# To run the benchmarks on a certain branch of zeitgeist make sure you are
+# running and instance of the branch. Make sure the branch includes the benchmark
+# extension.
+# 
+# To benchmark and output timing to 'output.json' run
+#  ./query_timings.py -o output.json
+# If you already have data in the output file and want to merge both
+# data sets (build avg.) run
+#  ./query_timings.py -m -o output.json
+# To plot the data use the '--plot' argument, multible '--plot' arguments
+# When plotting one needs to choose between several types of plots such using 
+# --type with arguments marsh_time, get_events_time, find_ids_time, find_events, overall)
+#
+# will define multible series.
+#  ./query_timings.py --plot output.json --plot output1.json -o plot.svg
+# In short, a run always looks like:
+#  tools/development/query_timings.py --name "lp:zeitgeist" -o trunk.json \
+#       --queries tools/development/query_sets/timerange_always.txt
+#  tools/development/query_timings.py --name "lp:some-branch" -o somebranch.json \
+#       --queries tools/development/query_sets/timerange_always.txt
+#  tools/development/query_timings.py --plot --type marsh_time somebranch.json --plot trunk.json -o benchmark.svg
+

=== added file 'tools/development/benchmark.py'
--- tools/development/benchmark.py	1970-01-01 00:00:00 +0000
+++ tools/development/benchmark.py	2011-12-25 16:30:29 +0000
@@ -0,0 +1,17 @@
+import dbus
+
+BUS_NAME = "org.gnome.zeitgeist.Engine"
+INTERFACE_NAME = "org.gnome.zeitgeist.Benchmark"
+OBJECT_PATH = "/org/gnome/zeitgeist/benchmark"
+ 
+bus = dbus.SessionBus()
+benchmark_obj = bus.get_object(BUS_NAME, OBJECT_PATH)
+benchmark_interface = dbus.Interface(benchmark_obj,
+    dbus_interface = INTERFACE_NAME)
+
+def find_events(time_frame, templates, storage_type, num_events, result_type):
+    return benchmark_interface.FindEvents(time_frame, templates, storage_type, 
+        num_events, result_type)
+        
+if __name__ == "__main__":
+    print find_events([0,9999999999990], [], 2, 20, 2).keys()

=== added file 'tools/development/benchmark.svg'
--- tools/development/benchmark.svg	1970-01-01 00:00:00 +0000
+++ tools/development/benchmark.svg	2011-12-25 16:30:29 +0000
@@ -0,0 +1,1090 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="3600pt" height="600pt" viewBox="0 0 3600 600" version="1.1">
+<defs>
+<g>
+<symbol overflow="visible" id="glyph0-0">
+<path style="stroke:none;" d="M -0.03125 -5.828125 L 4.90625 -5.828125 L 4.90625 -5.171875 L 2.84375 -5.171875 L 2.84375 0 L 2.046875 0 L 2.046875 -5.171875 L -0.03125 -5.171875 Z M -0.03125 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-1">
+<path style="stroke:none;" d="M 0.75 -4.375 L 1.46875 -4.375 L 1.46875 0 L 0.75 0 Z M 0.75 -6.078125 L 1.46875 -6.078125 L 1.46875 -5.171875 L 0.75 -5.171875 Z M 0.75 -6.078125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-2">
+<path style="stroke:none;" d="M 4.15625 -3.53125 C 4.339844 -3.851562 4.5625 -4.09375 4.8125 -4.25 C 5.058594 -4.402344 5.351562 -4.484375 5.6875 -4.484375 C 6.144531 -4.484375 6.492188 -4.320312 6.734375 -4 C 6.980469 -3.6875 7.109375 -3.230469 7.109375 -2.640625 L 7.109375 0 L 6.390625 0 L 6.390625 -2.625 C 6.390625 -3.039062 6.316406 -3.347656 6.171875 -3.546875 C 6.023438 -3.753906 5.792969 -3.859375 5.484375 -3.859375 C 5.117188 -3.859375 4.824219 -3.730469 4.609375 -3.484375 C 4.390625 -3.234375 4.28125 -2.894531 4.28125 -2.46875 L 4.28125 0 L 3.5625 0 L 3.5625 -2.625 C 3.5625 -3.039062 3.480469 -3.347656 3.328125 -3.546875 C 3.179688 -3.753906 2.957031 -3.859375 2.65625 -3.859375 C 2.28125 -3.859375 1.980469 -3.730469 1.765625 -3.484375 C 1.554688 -3.234375 1.453125 -2.894531 1.453125 -2.46875 L 1.453125 0 L 0.734375 0 L 0.734375 -4.375 L 1.453125 -4.375 L 1.453125 -3.703125 C 1.617188 -3.960938 1.816406 -4.15625 2.046875 -4.28125 C 2.273438 -4.414062 2.546875 -4.484375 2.859375 -4.484375 C 3.167969 -4.484375 3.4375 -4.398438 3.65625 -4.234375 C 3.882812 -4.078125 4.050781 -3.839844 4.15625 -3.53125 Z M 4.15625 -3.53125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-3">
+<path style="stroke:none;" d="M 4.5 -2.375 L 4.5 -2.015625 L 1.1875 -2.015625 C 1.214844 -1.523438 1.367188 -1.148438 1.640625 -0.890625 C 1.910156 -0.628906 2.28125 -0.5 2.75 -0.5 C 3.027344 -0.5 3.300781 -0.53125 3.5625 -0.59375 C 3.820312 -0.664062 4.078125 -0.769531 4.328125 -0.90625 L 4.328125 -0.21875 C 4.066406 -0.113281 3.800781 -0.0351562 3.53125 0.015625 C 3.257812 0.0742188 2.988281 0.109375 2.71875 0.109375 C 2.019531 0.109375 1.460938 -0.09375 1.046875 -0.5 C 0.640625 -0.902344 0.4375 -1.453125 0.4375 -2.140625 C 0.4375 -2.855469 0.628906 -3.425781 1.015625 -3.84375 C 1.410156 -4.269531 1.9375 -4.484375 2.59375 -4.484375 C 3.175781 -4.484375 3.640625 -4.289062 3.984375 -3.90625 C 4.324219 -3.53125 4.5 -3.019531 4.5 -2.375 Z M 3.78125 -2.578125 C 3.769531 -2.972656 3.652344 -3.285156 3.4375 -3.515625 C 3.226562 -3.753906 2.945312 -3.875 2.59375 -3.875 C 2.195312 -3.875 1.871094 -3.757812 1.625 -3.53125 C 1.382812 -3.300781 1.246094 -2.980469 1.21875 -2.578125 Z M 3.78125 -2.578125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-4">
+<path style="stroke:none;" d="M 3.546875 -2.734375 C 3.722656 -2.679688 3.890625 -2.558594 4.046875 -2.375 C 4.199219 -2.1875 4.363281 -1.925781 4.53125 -1.59375 L 5.328125 0 L 4.484375 0 L 3.734375 -1.5 C 3.546875 -1.882812 3.355469 -2.140625 3.171875 -2.265625 C 2.992188 -2.398438 2.746094 -2.46875 2.4375 -2.46875 L 1.578125 -2.46875 L 1.578125 0 L 0.78125 0 L 0.78125 -5.828125 L 2.5625 -5.828125 C 3.226562 -5.828125 3.722656 -5.683594 4.046875 -5.40625 C 4.378906 -5.132812 4.546875 -4.714844 4.546875 -4.15625 C 4.546875 -3.789062 4.460938 -3.480469 4.296875 -3.234375 C 4.128906 -2.992188 3.878906 -2.824219 3.546875 -2.734375 Z M 1.578125 -5.1875 L 1.578125 -3.109375 L 2.5625 -3.109375 C 2.945312 -3.109375 3.234375 -3.195312 3.421875 -3.375 C 3.617188 -3.550781 3.71875 -3.8125 3.71875 -4.15625 C 3.71875 -4.496094 3.617188 -4.753906 3.421875 -4.921875 C 3.234375 -5.097656 2.945312 -5.1875 2.5625 -5.1875 Z M 1.578125 -5.1875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-5">
+<path style="stroke:none;" d="M 2.75 -2.203125 C 2.164062 -2.203125 1.757812 -2.132812 1.53125 -2 C 1.3125 -1.863281 1.203125 -1.636719 1.203125 -1.328125 C 1.203125 -1.066406 1.285156 -0.855469 1.453125 -0.703125 C 1.617188 -0.554688 1.847656 -0.484375 2.140625 -0.484375 C 2.535156 -0.484375 2.851562 -0.625 3.09375 -0.90625 C 3.332031 -1.195312 3.453125 -1.578125 3.453125 -2.046875 L 3.453125 -2.203125 Z M 4.171875 -2.5 L 4.171875 0 L 3.453125 0 L 3.453125 -0.671875 C 3.296875 -0.398438 3.089844 -0.199219 2.84375 -0.078125 C 2.601562 0.0429688 2.304688 0.109375 1.953125 0.109375 C 1.503906 0.109375 1.144531 -0.015625 0.875 -0.265625 C 0.613281 -0.511719 0.484375 -0.851562 0.484375 -1.28125 C 0.484375 -1.769531 0.644531 -2.140625 0.96875 -2.390625 C 1.300781 -2.636719 1.796875 -2.765625 2.453125 -2.765625 L 3.453125 -2.765625 L 3.453125 -2.828125 C 3.453125 -3.160156 3.339844 -3.414062 3.125 -3.59375 C 2.914062 -3.777344 2.613281 -3.875 2.21875 -3.875 C 1.96875 -3.875 1.722656 -3.839844 1.484375 -3.78125 C 1.242188 -3.71875 1.011719 -3.628906 0.796875 -3.515625 L 0.796875 -4.171875 C 1.066406 -4.273438 1.320312 -4.351562 1.5625 -4.40625 C 1.808594 -4.457031 2.054688 -4.484375 2.296875 -4.484375 C 2.917969 -4.484375 3.390625 -4.316406 3.703125 -3.984375 C 4.011719 -3.660156 4.171875 -3.164062 4.171875 -2.5 Z M 4.171875 -2.5 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-6">
+<path style="stroke:none;" d="M 4.390625 -2.640625 L 4.390625 0 L 3.671875 0 L 3.671875 -2.625 C 3.671875 -3.027344 3.585938 -3.335938 3.421875 -3.546875 C 3.265625 -3.753906 3.023438 -3.859375 2.703125 -3.859375 C 2.316406 -3.859375 2.007812 -3.730469 1.78125 -3.484375 C 1.5625 -3.234375 1.453125 -2.894531 1.453125 -2.46875 L 1.453125 0 L 0.734375 0 L 0.734375 -4.375 L 1.453125 -4.375 L 1.453125 -3.703125 C 1.617188 -3.960938 1.816406 -4.15625 2.046875 -4.28125 C 2.285156 -4.414062 2.554688 -4.484375 2.859375 -4.484375 C 3.367188 -4.484375 3.75 -4.324219 4 -4.015625 C 4.257812 -3.703125 4.390625 -3.242188 4.390625 -2.640625 Z M 4.390625 -2.640625 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-7">
+<path style="stroke:none;" d="M 3.640625 -2.234375 C 3.640625 -2.753906 3.527344 -3.15625 3.3125 -3.4375 C 3.09375 -3.726562 2.789062 -3.875 2.40625 -3.875 C 2.019531 -3.875 1.714844 -3.726562 1.5 -3.4375 C 1.289062 -3.15625 1.1875 -2.753906 1.1875 -2.234375 C 1.1875 -1.722656 1.289062 -1.320312 1.5 -1.03125 C 1.714844 -0.75 2.019531 -0.609375 2.40625 -0.609375 C 2.789062 -0.609375 3.09375 -0.75 3.3125 -1.03125 C 3.527344 -1.320312 3.640625 -1.722656 3.640625 -2.234375 Z M 4.359375 -0.546875 C 4.359375 0.199219 4.191406 0.757812 3.859375 1.125 C 3.523438 1.488281 3.019531 1.671875 2.34375 1.671875 C 2.082031 1.671875 1.835938 1.648438 1.609375 1.609375 C 1.390625 1.566406 1.175781 1.507812 0.96875 1.4375 L 0.96875 0.734375 C 1.175781 0.847656 1.382812 0.929688 1.59375 0.984375 C 1.800781 1.042969 2.007812 1.078125 2.21875 1.078125 C 2.695312 1.078125 3.050781 0.949219 3.28125 0.703125 C 3.519531 0.453125 3.640625 0.0742188 3.640625 -0.421875 L 3.640625 -0.765625 C 3.484375 -0.515625 3.289062 -0.320312 3.0625 -0.1875 C 2.832031 -0.0625 2.554688 0 2.234375 0 C 1.691406 0 1.253906 -0.203125 0.921875 -0.609375 C 0.597656 -1.023438 0.4375 -1.566406 0.4375 -2.234375 C 0.4375 -2.910156 0.597656 -3.453125 0.921875 -3.859375 C 1.253906 -4.273438 1.691406 -4.484375 2.234375 -4.484375 C 2.554688 -4.484375 2.832031 -4.414062 3.0625 -4.28125 C 3.289062 -4.15625 3.484375 -3.964844 3.640625 -3.71875 L 3.640625 -4.375 L 4.359375 -4.375 Z M 4.359375 -0.546875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-8">
+<path style="stroke:none;" d="M 0.859375 -1 L 1.6875 -1 L 1.6875 0 L 0.859375 0 Z M 0.859375 -1 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-9">
+<path style="stroke:none;" d="M 0.75 -6.078125 L 1.46875 -6.078125 L 1.46875 0 L 0.75 0 Z M 0.75 -6.078125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-10">
+<path style="stroke:none;" d="M 0.34375 -4.375 L 1.0625 -4.375 L 1.953125 -0.96875 L 2.84375 -4.375 L 3.703125 -4.375 L 4.59375 -0.96875 L 5.484375 -4.375 L 6.203125 -4.375 L 5.0625 0 L 4.21875 0 L 3.28125 -3.59375 L 2.328125 0 L 1.484375 0 Z M 0.34375 -4.375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-11">
+<path style="stroke:none;" d="M 2.578125 0.40625 C 2.367188 0.925781 2.164062 1.265625 1.96875 1.421875 C 1.78125 1.585938 1.523438 1.671875 1.203125 1.671875 L 0.640625 1.671875 L 0.640625 1.0625 L 1.0625 1.0625 C 1.257812 1.0625 1.410156 1.011719 1.515625 0.921875 C 1.628906 0.828125 1.75 0.605469 1.875 0.265625 L 2.015625 -0.078125 L 0.234375 -4.375 L 1 -4.375 L 2.375 -0.953125 L 3.734375 -4.375 L 4.5 -4.375 Z M 2.578125 0.40625 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-12">
+<path style="stroke:none;" d="M 3.546875 -4.25 L 3.546875 -3.5625 C 3.335938 -3.664062 3.121094 -3.742188 2.90625 -3.796875 C 2.6875 -3.847656 2.460938 -3.875 2.234375 -3.875 C 1.878906 -3.875 1.605469 -3.816406 1.421875 -3.703125 C 1.242188 -3.597656 1.15625 -3.433594 1.15625 -3.21875 C 1.15625 -3.050781 1.21875 -2.917969 1.34375 -2.828125 C 1.476562 -2.734375 1.738281 -2.644531 2.125 -2.5625 L 2.375 -2.5 C 2.882812 -2.394531 3.242188 -2.242188 3.453125 -2.046875 C 3.667969 -1.847656 3.78125 -1.566406 3.78125 -1.203125 C 3.78125 -0.796875 3.617188 -0.472656 3.296875 -0.234375 C 2.972656 -0.00390625 2.527344 0.109375 1.96875 0.109375 C 1.738281 0.109375 1.492188 0.0820312 1.234375 0.03125 C 0.984375 -0.0078125 0.714844 -0.0703125 0.4375 -0.15625 L 0.4375 -0.90625 C 0.695312 -0.769531 0.957031 -0.664062 1.21875 -0.59375 C 1.476562 -0.519531 1.734375 -0.484375 1.984375 -0.484375 C 2.324219 -0.484375 2.585938 -0.539062 2.765625 -0.65625 C 2.949219 -0.777344 3.046875 -0.945312 3.046875 -1.15625 C 3.046875 -1.351562 2.976562 -1.503906 2.84375 -1.609375 C 2.707031 -1.710938 2.417969 -1.8125 1.984375 -1.90625 L 1.734375 -1.96875 C 1.285156 -2.058594 0.960938 -2.203125 0.765625 -2.390625 C 0.566406 -2.585938 0.46875 -2.851562 0.46875 -3.1875 C 0.46875 -3.601562 0.613281 -3.921875 0.90625 -4.140625 C 1.195312 -4.367188 1.609375 -4.484375 2.140625 -4.484375 C 2.410156 -4.484375 2.660156 -4.460938 2.890625 -4.421875 C 3.128906 -4.378906 3.347656 -4.320312 3.546875 -4.25 Z M 3.546875 -4.25 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-13">
+<path style="stroke:none;" d="M 2.484375 -6.078125 C 2.128906 -5.472656 1.867188 -4.878906 1.703125 -4.296875 C 1.535156 -3.710938 1.453125 -3.117188 1.453125 -2.515625 C 1.453125 -1.910156 1.535156 -1.308594 1.703125 -0.71875 C 1.878906 -0.132812 2.140625 0.457031 2.484375 1.0625 L 1.859375 1.0625 C 1.460938 0.445312 1.164062 -0.15625 0.96875 -0.75 C 0.78125 -1.339844 0.6875 -1.929688 0.6875 -2.515625 C 0.6875 -3.097656 0.78125 -3.679688 0.96875 -4.265625 C 1.164062 -4.855469 1.460938 -5.460938 1.859375 -6.078125 Z M 2.484375 -6.078125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-14">
+<path style="stroke:none;" d="M 0.640625 -6.078125 L 1.265625 -6.078125 C 1.660156 -5.460938 1.953125 -4.855469 2.140625 -4.265625 C 2.335938 -3.679688 2.4375 -3.097656 2.4375 -2.515625 C 2.4375 -1.929688 2.335938 -1.339844 2.140625 -0.75 C 1.953125 -0.15625 1.660156 0.445312 1.265625 1.0625 L 0.640625 1.0625 C 0.980469 0.457031 1.238281 -0.132812 1.40625 -0.71875 C 1.582031 -1.308594 1.671875 -1.910156 1.671875 -2.515625 C 1.671875 -3.117188 1.582031 -3.710938 1.40625 -4.296875 C 1.238281 -4.878906 0.980469 -5.472656 0.640625 -6.078125 Z M 0.640625 -6.078125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-15">
+<path style="stroke:none;" d="M 0.9375 -1 L 1.765625 -1 L 1.765625 -0.328125 L 1.125 0.9375 L 0.625 0.9375 L 0.9375 -0.328125 Z M 0.9375 -1 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-16">
+<path style="stroke:none;" d=""/>
+</symbol>
+<symbol overflow="visible" id="glyph0-17">
+<path style="stroke:none;" d="M 0.6875 -6.078125 L 2.34375 -6.078125 L 2.34375 -5.515625 L 1.40625 -5.515625 L 1.40625 0.5 L 2.34375 0.5 L 2.34375 1.0625 L 0.6875 1.0625 Z M 0.6875 -6.078125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-18">
+<path style="stroke:none;" d="M 2.4375 -6.078125 L 2.4375 1.0625 L 0.78125 1.0625 L 0.78125 0.5 L 1.71875 0.5 L 1.71875 -5.515625 L 0.78125 -5.515625 L 0.78125 -6.078125 Z M 2.4375 -6.078125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-19">
+<path style="stroke:none;" d="M 4.28125 -5.640625 L 4.28125 -4.875 C 3.976562 -5.019531 3.691406 -5.125 3.421875 -5.1875 C 3.160156 -5.257812 2.910156 -5.296875 2.671875 -5.296875 C 2.234375 -5.296875 1.898438 -5.210938 1.671875 -5.046875 C 1.441406 -4.878906 1.328125 -4.644531 1.328125 -4.34375 C 1.328125 -4.082031 1.398438 -3.882812 1.546875 -3.75 C 1.699219 -3.625 2 -3.519531 2.4375 -3.4375 L 2.90625 -3.34375 C 3.496094 -3.226562 3.9375 -3.027344 4.21875 -2.75 C 4.496094 -2.46875 4.640625 -2.085938 4.640625 -1.609375 C 4.640625 -1.046875 4.445312 -0.617188 4.0625 -0.328125 C 3.6875 -0.0351562 3.132812 0.109375 2.40625 0.109375 C 2.125 0.109375 1.824219 0.0742188 1.515625 0.015625 C 1.203125 -0.0429688 0.878906 -0.140625 0.546875 -0.265625 L 0.546875 -1.078125 C 0.867188 -0.890625 1.179688 -0.746094 1.484375 -0.65625 C 1.792969 -0.570312 2.101562 -0.53125 2.40625 -0.53125 C 2.851562 -0.53125 3.195312 -0.617188 3.4375 -0.796875 C 3.683594 -0.972656 3.8125 -1.222656 3.8125 -1.546875 C 3.8125 -1.835938 3.722656 -2.0625 3.546875 -2.21875 C 3.367188 -2.382812 3.082031 -2.507812 2.6875 -2.59375 L 2.203125 -2.6875 C 1.609375 -2.800781 1.179688 -2.984375 0.921875 -3.234375 C 0.660156 -3.480469 0.53125 -3.832031 0.53125 -4.28125 C 0.53125 -4.789062 0.710938 -5.191406 1.078125 -5.484375 C 1.441406 -5.785156 1.941406 -5.9375 2.578125 -5.9375 C 2.847656 -5.9375 3.125 -5.910156 3.40625 -5.859375 C 3.695312 -5.816406 3.988281 -5.742188 4.28125 -5.640625 Z M 4.28125 -5.640625 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-20">
+<path style="stroke:none;" d="M 1.46875 -5.625 L 1.46875 -4.375 L 2.953125 -4.375 L 2.953125 -3.8125 L 1.46875 -3.8125 L 1.46875 -1.4375 C 1.46875 -1.082031 1.515625 -0.851562 1.609375 -0.75 C 1.710938 -0.65625 1.910156 -0.609375 2.203125 -0.609375 L 2.953125 -0.609375 L 2.953125 0 L 2.203125 0 C 1.648438 0 1.269531 -0.101562 1.0625 -0.3125 C 0.851562 -0.519531 0.75 -0.894531 0.75 -1.4375 L 0.75 -3.8125 L 0.21875 -3.8125 L 0.21875 -4.375 L 0.75 -4.375 L 0.75 -5.625 Z M 1.46875 -5.625 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-21">
+<path style="stroke:none;" d="M 2.453125 -3.875 C 2.066406 -3.875 1.757812 -3.722656 1.53125 -3.421875 C 1.3125 -3.117188 1.203125 -2.707031 1.203125 -2.1875 C 1.203125 -1.664062 1.3125 -1.253906 1.53125 -0.953125 C 1.757812 -0.648438 2.066406 -0.5 2.453125 -0.5 C 2.835938 -0.5 3.140625 -0.648438 3.359375 -0.953125 C 3.585938 -1.253906 3.703125 -1.664062 3.703125 -2.1875 C 3.703125 -2.707031 3.585938 -3.117188 3.359375 -3.421875 C 3.140625 -3.722656 2.835938 -3.875 2.453125 -3.875 Z M 2.453125 -4.484375 C 3.074219 -4.484375 3.566406 -4.277344 3.921875 -3.875 C 4.273438 -3.46875 4.453125 -2.902344 4.453125 -2.1875 C 4.453125 -1.46875 4.273438 -0.902344 3.921875 -0.5 C 3.566406 -0.09375 3.074219 0.109375 2.453125 0.109375 C 1.828125 0.109375 1.332031 -0.09375 0.96875 -0.5 C 0.613281 -0.902344 0.4375 -1.46875 0.4375 -2.1875 C 0.4375 -2.902344 0.613281 -3.46875 0.96875 -3.875 C 1.332031 -4.277344 1.828125 -4.484375 2.453125 -4.484375 Z M 2.453125 -4.484375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-22">
+<path style="stroke:none;" d="M 3.296875 -3.703125 C 3.210938 -3.753906 3.121094 -3.789062 3.03125 -3.8125 C 2.9375 -3.832031 2.832031 -3.84375 2.71875 -3.84375 C 2.3125 -3.84375 1.996094 -3.707031 1.78125 -3.4375 C 1.5625 -3.175781 1.453125 -2.800781 1.453125 -2.3125 L 1.453125 0 L 0.734375 0 L 0.734375 -4.375 L 1.453125 -4.375 L 1.453125 -3.703125 C 1.597656 -3.960938 1.789062 -4.15625 2.03125 -4.28125 C 2.277344 -4.414062 2.578125 -4.484375 2.921875 -4.484375 C 2.972656 -4.484375 3.023438 -4.476562 3.078125 -4.46875 C 3.136719 -4.46875 3.207031 -4.457031 3.28125 -4.4375 Z M 3.296875 -3.703125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-23">
+<path style="stroke:none;" d="M 2.734375 -5.0625 L 1.671875 -2.15625 L 3.8125 -2.15625 Z M 2.296875 -5.828125 L 3.1875 -5.828125 L 5.40625 0 L 4.59375 0 L 4.0625 -1.5 L 1.421875 -1.5 L 0.890625 0 L 0.0625 0 Z M 2.296875 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-24">
+<path style="stroke:none;" d="M 1 -0.671875 L 2.28125 -0.671875 L 2.28125 -5.109375 L 0.875 -4.828125 L 0.875 -5.546875 L 2.28125 -5.828125 L 3.0625 -5.828125 L 3.0625 -0.671875 L 4.359375 -0.671875 L 4.359375 0 L 1 0 Z M 1 -0.671875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-25">
+<path style="stroke:none;" d="M 2.546875 -5.3125 C 2.140625 -5.3125 1.832031 -5.105469 1.625 -4.703125 C 1.425781 -4.304688 1.328125 -3.707031 1.328125 -2.90625 C 1.328125 -2.113281 1.425781 -1.511719 1.625 -1.109375 C 1.832031 -0.710938 2.140625 -0.515625 2.546875 -0.515625 C 2.949219 -0.515625 3.253906 -0.710938 3.453125 -1.109375 C 3.660156 -1.511719 3.765625 -2.113281 3.765625 -2.90625 C 3.765625 -3.707031 3.660156 -4.304688 3.453125 -4.703125 C 3.253906 -5.105469 2.949219 -5.3125 2.546875 -5.3125 Z M 2.546875 -5.9375 C 3.199219 -5.9375 3.703125 -5.675781 4.046875 -5.15625 C 4.386719 -4.644531 4.5625 -3.894531 4.5625 -2.90625 C 4.5625 -1.925781 4.386719 -1.175781 4.046875 -0.65625 C 3.703125 -0.144531 3.199219 0.109375 2.546875 0.109375 C 1.890625 0.109375 1.386719 -0.144531 1.046875 -0.65625 C 0.703125 -1.175781 0.53125 -1.925781 0.53125 -2.90625 C 0.53125 -3.894531 0.703125 -4.644531 1.046875 -5.15625 C 1.386719 -5.675781 1.890625 -5.9375 2.546875 -5.9375 Z M 2.546875 -5.9375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-26">
+<path style="stroke:none;" d="M 0.6875 -1.734375 L 0.6875 -4.375 L 1.40625 -4.375 L 1.40625 -1.75 C 1.40625 -1.34375 1.484375 -1.035156 1.640625 -0.828125 C 1.804688 -0.617188 2.050781 -0.515625 2.375 -0.515625 C 2.757812 -0.515625 3.0625 -0.632812 3.28125 -0.875 C 3.507812 -1.121094 3.625 -1.460938 3.625 -1.890625 L 3.625 -4.375 L 4.34375 -4.375 L 4.34375 0 L 3.625 0 L 3.625 -0.671875 C 3.445312 -0.410156 3.242188 -0.210938 3.015625 -0.078125 C 2.785156 0.0429688 2.519531 0.109375 2.21875 0.109375 C 1.71875 0.109375 1.335938 -0.046875 1.078125 -0.359375 C 0.816406 -0.667969 0.6875 -1.128906 0.6875 -1.734375 Z M 2.484375 -4.484375 Z M 2.484375 -4.484375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-27">
+<path style="stroke:none;" d="M 1.453125 -0.65625 L 1.453125 1.671875 L 0.734375 1.671875 L 0.734375 -4.375 L 1.453125 -4.375 L 1.453125 -3.71875 C 1.597656 -3.976562 1.785156 -4.171875 2.015625 -4.296875 C 2.253906 -4.417969 2.53125 -4.484375 2.84375 -4.484375 C 3.371094 -4.484375 3.804688 -4.269531 4.140625 -3.84375 C 4.472656 -3.425781 4.640625 -2.871094 4.640625 -2.1875 C 4.640625 -1.5 4.472656 -0.941406 4.140625 -0.515625 C 3.804688 -0.0976562 3.371094 0.109375 2.84375 0.109375 C 2.53125 0.109375 2.253906 0.0429688 2.015625 -0.078125 C 1.785156 -0.199219 1.597656 -0.394531 1.453125 -0.65625 Z M 3.890625 -2.1875 C 3.890625 -2.714844 3.777344 -3.128906 3.5625 -3.421875 C 3.351562 -3.722656 3.054688 -3.875 2.671875 -3.875 C 2.296875 -3.875 1.996094 -3.722656 1.78125 -3.421875 C 1.5625 -3.128906 1.453125 -2.714844 1.453125 -2.1875 C 1.453125 -1.65625 1.5625 -1.238281 1.78125 -0.9375 C 1.996094 -0.632812 2.296875 -0.484375 2.671875 -0.484375 C 3.054688 -0.484375 3.351562 -0.632812 3.5625 -0.9375 C 3.777344 -1.238281 3.890625 -1.65625 3.890625 -2.1875 Z M 3.890625 -2.1875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-28">
+<path style="stroke:none;" d="M 0.78125 -5.828125 L 1.96875 -5.828125 L 3.453125 -1.859375 L 4.953125 -5.828125 L 6.125 -5.828125 L 6.125 0 L 5.359375 0 L 5.359375 -5.125 L 3.84375 -1.125 L 3.0625 -1.125 L 1.546875 -5.125 L 1.546875 0 L 0.78125 0 Z M 0.78125 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-29">
+<path style="stroke:none;" d="M 1.578125 -5.1875 L 1.578125 -3 L 2.5625 -3 C 2.933594 -3 3.222656 -3.09375 3.421875 -3.28125 C 3.617188 -3.464844 3.71875 -3.738281 3.71875 -4.09375 C 3.71875 -4.433594 3.617188 -4.703125 3.421875 -4.890625 C 3.222656 -5.085938 2.933594 -5.1875 2.5625 -5.1875 Z M 0.78125 -5.828125 L 2.5625 -5.828125 C 3.214844 -5.828125 3.710938 -5.679688 4.046875 -5.390625 C 4.378906 -5.097656 4.546875 -4.664062 4.546875 -4.09375 C 4.546875 -3.519531 4.378906 -3.082031 4.046875 -2.78125 C 3.710938 -2.488281 3.214844 -2.34375 2.5625 -2.34375 L 1.578125 -2.34375 L 1.578125 0 L 0.78125 0 Z M 0.78125 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-30">
+<path style="stroke:none;" d="M 3.90625 -4.203125 L 3.90625 -3.53125 C 3.695312 -3.644531 3.488281 -3.726562 3.28125 -3.78125 C 3.082031 -3.839844 2.878906 -3.875 2.671875 -3.875 C 2.203125 -3.875 1.835938 -3.722656 1.578125 -3.421875 C 1.328125 -3.128906 1.203125 -2.714844 1.203125 -2.1875 C 1.203125 -1.65625 1.328125 -1.238281 1.578125 -0.9375 C 1.835938 -0.644531 2.203125 -0.5 2.671875 -0.5 C 2.878906 -0.5 3.082031 -0.523438 3.28125 -0.578125 C 3.488281 -0.636719 3.695312 -0.722656 3.90625 -0.828125 L 3.90625 -0.171875 C 3.707031 -0.078125 3.496094 -0.0078125 3.28125 0.03125 C 3.0625 0.0820312 2.832031 0.109375 2.59375 0.109375 C 1.9375 0.109375 1.410156 -0.09375 1.015625 -0.5 C 0.628906 -0.914062 0.4375 -1.476562 0.4375 -2.1875 C 0.4375 -2.894531 0.632812 -3.453125 1.03125 -3.859375 C 1.425781 -4.273438 1.960938 -4.484375 2.640625 -4.484375 C 2.855469 -4.484375 3.070312 -4.457031 3.28125 -4.40625 C 3.496094 -4.363281 3.707031 -4.292969 3.90625 -4.203125 Z M 3.90625 -4.203125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-31">
+<path style="stroke:none;" d="M 3.890625 -2.1875 C 3.890625 -2.714844 3.777344 -3.128906 3.5625 -3.421875 C 3.351562 -3.722656 3.054688 -3.875 2.671875 -3.875 C 2.296875 -3.875 1.996094 -3.722656 1.78125 -3.421875 C 1.5625 -3.128906 1.453125 -2.714844 1.453125 -2.1875 C 1.453125 -1.65625 1.5625 -1.238281 1.78125 -0.9375 C 1.996094 -0.632812 2.296875 -0.484375 2.671875 -0.484375 C 3.054688 -0.484375 3.351562 -0.632812 3.5625 -0.9375 C 3.777344 -1.238281 3.890625 -1.65625 3.890625 -2.1875 Z M 1.453125 -3.71875 C 1.597656 -3.976562 1.785156 -4.171875 2.015625 -4.296875 C 2.253906 -4.417969 2.53125 -4.484375 2.84375 -4.484375 C 3.371094 -4.484375 3.804688 -4.269531 4.140625 -3.84375 C 4.472656 -3.425781 4.640625 -2.871094 4.640625 -2.1875 C 4.640625 -1.5 4.472656 -0.941406 4.140625 -0.515625 C 3.804688 -0.0976562 3.371094 0.109375 2.84375 0.109375 C 2.53125 0.109375 2.253906 0.0429688 2.015625 -0.078125 C 1.785156 -0.199219 1.597656 -0.394531 1.453125 -0.65625 L 1.453125 0 L 0.734375 0 L 0.734375 -6.078125 L 1.453125 -6.078125 Z M 1.453125 -3.71875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-32">
+<path style="stroke:none;" d="M 0.75 -4.375 L 1.46875 -4.375 L 1.46875 0.078125 C 1.46875 0.636719 1.363281 1.046875 1.15625 1.296875 C 0.945312 1.542969 0.601562 1.671875 0.125 1.671875 L -0.140625 1.671875 L -0.140625 1.0625 L 0.046875 1.0625 C 0.316406 1.0625 0.5 0.992188 0.59375 0.859375 C 0.695312 0.734375 0.75 0.472656 0.75 0.078125 Z M 0.75 -6.078125 L 1.46875 -6.078125 L 1.46875 -5.171875 L 0.75 -5.171875 Z M 0.75 -6.078125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-33">
+<path style="stroke:none;" d="M 0.78125 -5.828125 L 1.578125 -5.828125 L 1.578125 0 L 0.78125 0 Z M 0.78125 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-34">
+<path style="stroke:none;" d="M 0.78125 -5.828125 L 4.46875 -5.828125 L 4.46875 -5.171875 L 1.578125 -5.171875 L 1.578125 -3.4375 L 4.359375 -3.4375 L 4.359375 -2.78125 L 1.578125 -2.78125 L 1.578125 -0.671875 L 4.546875 -0.671875 L 4.546875 0 L 0.78125 0 Z M 0.78125 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-35">
+<path style="stroke:none;" d="M 0.234375 -4.375 L 1 -4.375 L 2.375 -0.703125 L 3.734375 -4.375 L 4.5 -4.375 L 2.859375 0 L 1.875 0 Z M 0.234375 -4.375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-36">
+<path style="stroke:none;" d="M 1.53125 -0.671875 L 4.296875 -0.671875 L 4.296875 0 L 0.59375 0 L 0.59375 -0.671875 C 0.882812 -0.972656 1.289062 -1.382812 1.8125 -1.90625 C 2.332031 -2.433594 2.65625 -2.773438 2.78125 -2.921875 C 3.039062 -3.199219 3.21875 -3.441406 3.3125 -3.640625 C 3.414062 -3.835938 3.46875 -4.03125 3.46875 -4.21875 C 3.46875 -4.527344 3.355469 -4.785156 3.140625 -4.984375 C 2.921875 -5.179688 2.636719 -5.28125 2.296875 -5.28125 C 2.046875 -5.28125 1.777344 -5.230469 1.5 -5.140625 C 1.226562 -5.054688 0.933594 -4.925781 0.625 -4.75 L 0.625 -5.546875 C 0.945312 -5.679688 1.242188 -5.78125 1.515625 -5.84375 C 1.792969 -5.902344 2.050781 -5.9375 2.28125 -5.9375 C 2.882812 -5.9375 3.363281 -5.785156 3.71875 -5.484375 C 4.082031 -5.179688 4.265625 -4.777344 4.265625 -4.28125 C 4.265625 -4.039062 4.214844 -3.808594 4.125 -3.59375 C 4.03125 -3.375 3.867188 -3.117188 3.640625 -2.828125 C 3.566406 -2.753906 3.351562 -2.535156 3 -2.171875 C 2.65625 -1.816406 2.164062 -1.316406 1.53125 -0.671875 Z M 1.53125 -0.671875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-37">
+<path style="stroke:none;" d="M 2.546875 -2.765625 C 2.171875 -2.765625 1.871094 -2.664062 1.65625 -2.46875 C 1.445312 -2.269531 1.34375 -1.992188 1.34375 -1.640625 C 1.34375 -1.285156 1.445312 -1.007812 1.65625 -0.8125 C 1.871094 -0.613281 2.171875 -0.515625 2.546875 -0.515625 C 2.917969 -0.515625 3.210938 -0.613281 3.421875 -0.8125 C 3.636719 -1.019531 3.75 -1.296875 3.75 -1.640625 C 3.75 -1.992188 3.636719 -2.269531 3.421875 -2.46875 C 3.210938 -2.664062 2.917969 -2.765625 2.546875 -2.765625 Z M 1.75 -3.109375 C 1.414062 -3.191406 1.152344 -3.347656 0.96875 -3.578125 C 0.78125 -3.804688 0.6875 -4.085938 0.6875 -4.421875 C 0.6875 -4.886719 0.847656 -5.257812 1.171875 -5.53125 C 1.503906 -5.800781 1.960938 -5.9375 2.546875 -5.9375 C 3.128906 -5.9375 3.582031 -5.800781 3.90625 -5.53125 C 4.238281 -5.257812 4.40625 -4.886719 4.40625 -4.421875 C 4.40625 -4.085938 4.308594 -3.804688 4.125 -3.578125 C 3.9375 -3.347656 3.675781 -3.191406 3.34375 -3.109375 C 3.714844 -3.015625 4.007812 -2.835938 4.21875 -2.578125 C 4.433594 -2.328125 4.546875 -2.011719 4.546875 -1.640625 C 4.546875 -1.078125 4.371094 -0.644531 4.03125 -0.34375 C 3.6875 -0.0390625 3.191406 0.109375 2.546875 0.109375 C 1.898438 0.109375 1.402344 -0.0390625 1.0625 -0.34375 C 0.71875 -0.644531 0.546875 -1.078125 0.546875 -1.640625 C 0.546875 -2.011719 0.648438 -2.328125 0.859375 -2.578125 C 1.074219 -2.835938 1.375 -3.015625 1.75 -3.109375 Z M 1.46875 -4.359375 C 1.46875 -4.054688 1.5625 -3.816406 1.75 -3.640625 C 1.933594 -3.472656 2.203125 -3.390625 2.546875 -3.390625 C 2.878906 -3.390625 3.140625 -3.472656 3.328125 -3.640625 C 3.523438 -3.816406 3.625 -4.054688 3.625 -4.359375 C 3.625 -4.660156 3.523438 -4.894531 3.328125 -5.0625 C 3.140625 -5.226562 2.878906 -5.3125 2.546875 -5.3125 C 2.203125 -5.3125 1.933594 -5.226562 1.75 -5.0625 C 1.5625 -4.894531 1.46875 -4.660156 1.46875 -4.359375 Z M 1.46875 -4.359375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-38">
+<path style="stroke:none;" d="M 0.875 -0.125 L 0.875 -0.84375 C 1.070312 -0.75 1.269531 -0.675781 1.46875 -0.625 C 1.675781 -0.570312 1.878906 -0.546875 2.078125 -0.546875 C 2.597656 -0.546875 2.992188 -0.722656 3.265625 -1.078125 C 3.542969 -1.429688 3.707031 -1.960938 3.75 -2.671875 C 3.59375 -2.453125 3.398438 -2.277344 3.171875 -2.15625 C 2.941406 -2.039062 2.683594 -1.984375 2.40625 -1.984375 C 1.820312 -1.984375 1.355469 -2.15625 1.015625 -2.5 C 0.671875 -2.851562 0.5 -3.335938 0.5 -3.953125 C 0.5 -4.554688 0.675781 -5.035156 1.03125 -5.390625 C 1.382812 -5.753906 1.859375 -5.9375 2.453125 -5.9375 C 3.128906 -5.9375 3.644531 -5.675781 4 -5.15625 C 4.351562 -4.644531 4.53125 -3.894531 4.53125 -2.90625 C 4.53125 -1.988281 4.308594 -1.253906 3.875 -0.703125 C 3.4375 -0.160156 2.847656 0.109375 2.109375 0.109375 C 1.910156 0.109375 1.707031 0.0859375 1.5 0.046875 C 1.300781 0.015625 1.089844 -0.0390625 0.875 -0.125 Z M 2.453125 -2.59375 C 2.804688 -2.59375 3.085938 -2.710938 3.296875 -2.953125 C 3.503906 -3.199219 3.609375 -3.535156 3.609375 -3.953125 C 3.609375 -4.367188 3.503906 -4.695312 3.296875 -4.9375 C 3.085938 -5.183594 2.804688 -5.3125 2.453125 -5.3125 C 2.097656 -5.3125 1.816406 -5.183594 1.609375 -4.9375 C 1.398438 -4.695312 1.296875 -4.367188 1.296875 -3.953125 C 1.296875 -3.535156 1.398438 -3.199219 1.609375 -2.953125 C 1.816406 -2.710938 2.097656 -2.59375 2.453125 -2.59375 Z M 2.453125 -2.59375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-39">
+<path style="stroke:none;" d="M 2.640625 -3.234375 C 2.285156 -3.234375 2.003906 -3.105469 1.796875 -2.859375 C 1.585938 -2.617188 1.484375 -2.289062 1.484375 -1.875 C 1.484375 -1.457031 1.585938 -1.121094 1.796875 -0.875 C 2.003906 -0.632812 2.285156 -0.515625 2.640625 -0.515625 C 2.992188 -0.515625 3.273438 -0.632812 3.484375 -0.875 C 3.691406 -1.121094 3.796875 -1.457031 3.796875 -1.875 C 3.796875 -2.289062 3.691406 -2.617188 3.484375 -2.859375 C 3.273438 -3.105469 2.992188 -3.234375 2.640625 -3.234375 Z M 4.203125 -5.703125 L 4.203125 -4.984375 C 4.003906 -5.074219 3.804688 -5.148438 3.609375 -5.203125 C 3.410156 -5.253906 3.210938 -5.28125 3.015625 -5.28125 C 2.492188 -5.28125 2.089844 -5.101562 1.8125 -4.75 C 1.539062 -4.394531 1.382812 -3.863281 1.34375 -3.15625 C 1.496094 -3.382812 1.691406 -3.554688 1.921875 -3.671875 C 2.148438 -3.792969 2.40625 -3.859375 2.6875 -3.859375 C 3.269531 -3.859375 3.734375 -3.679688 4.078125 -3.328125 C 4.417969 -2.972656 4.59375 -2.488281 4.59375 -1.875 C 4.59375 -1.269531 4.414062 -0.785156 4.0625 -0.421875 C 3.707031 -0.0664062 3.230469 0.109375 2.640625 0.109375 C 1.960938 0.109375 1.445312 -0.144531 1.09375 -0.65625 C 0.738281 -1.175781 0.5625 -1.925781 0.5625 -2.90625 C 0.5625 -3.832031 0.78125 -4.566406 1.21875 -5.109375 C 1.652344 -5.660156 2.242188 -5.9375 2.984375 -5.9375 C 3.179688 -5.9375 3.378906 -5.914062 3.578125 -5.875 C 3.773438 -5.84375 3.984375 -5.785156 4.203125 -5.703125 Z M 4.203125 -5.703125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-40">
+<path style="stroke:none;" d="M 3.03125 -5.140625 L 1.03125 -2.03125 L 3.03125 -2.03125 Z M 2.8125 -5.828125 L 3.8125 -5.828125 L 3.8125 -2.03125 L 4.640625 -2.03125 L 4.640625 -1.375 L 3.8125 -1.375 L 3.8125 0 L 3.03125 0 L 3.03125 -1.375 L 0.390625 -1.375 L 0.390625 -2.140625 Z M 2.8125 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-41">
+<path style="stroke:none;" d="M 0.65625 -5.828125 L 4.40625 -5.828125 L 4.40625 -5.5 L 2.296875 0 L 1.46875 0 L 3.453125 -5.171875 L 0.65625 -5.171875 Z M 0.65625 -5.828125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-0">
+<path style="stroke:none;" d="M 0.9375 -7.59375 L 1.84375 -7.59375 L 1.84375 0 L 0.9375 0 Z M 0.9375 -7.59375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-1">
+<path style="stroke:none;" d="M 1.8125 -0.828125 L 1.8125 2.078125 L 0.90625 2.078125 L 0.90625 -5.46875 L 1.8125 -5.46875 L 1.8125 -4.640625 C 1.996094 -4.960938 2.234375 -5.203125 2.515625 -5.359375 C 2.804688 -5.511719 3.15625 -5.59375 3.5625 -5.59375 C 4.226562 -5.59375 4.765625 -5.324219 5.171875 -4.796875 C 5.585938 -4.273438 5.796875 -3.585938 5.796875 -2.734375 C 5.796875 -1.867188 5.585938 -1.167969 5.171875 -0.640625 C 4.765625 -0.117188 4.226562 0.140625 3.5625 0.140625 C 3.15625 0.140625 2.804688 0.0585938 2.515625 -0.09375 C 2.234375 -0.246094 1.996094 -0.492188 1.8125 -0.828125 Z M 4.875 -2.734375 C 4.875 -3.386719 4.730469 -3.90625 4.453125 -4.28125 C 4.179688 -4.652344 3.808594 -4.84375 3.34375 -4.84375 C 2.863281 -4.84375 2.488281 -4.652344 2.21875 -4.28125 C 1.945312 -3.90625 1.8125 -3.386719 1.8125 -2.734375 C 1.8125 -2.066406 1.945312 -1.542969 2.21875 -1.171875 C 2.488281 -0.796875 2.863281 -0.609375 3.34375 -0.609375 C 3.808594 -0.609375 4.179688 -0.796875 4.453125 -1.171875 C 4.730469 -1.542969 4.875 -2.066406 4.875 -2.734375 Z M 4.875 -2.734375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-2">
+<path style="stroke:none;" d="M 1.171875 -1.234375 L 2.203125 -1.234375 L 2.203125 0 L 1.171875 0 Z M 1.171875 -5.171875 L 2.203125 -5.171875 L 2.203125 -3.9375 L 1.171875 -3.9375 Z M 1.171875 -5.171875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-3">
+<path style="stroke:none;" d="M 0.546875 -5.46875 L 4.8125 -5.46875 L 4.8125 -4.65625 L 1.4375 -0.71875 L 4.8125 -0.71875 L 4.8125 0 L 0.4375 0 L 0.4375 -0.828125 L 3.8125 -4.75 L 0.546875 -4.75 Z M 0.546875 -5.46875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-4">
+<path style="stroke:none;" d="M 5.625 -2.953125 L 5.625 -2.515625 L 1.484375 -2.515625 C 1.523438 -1.898438 1.710938 -1.429688 2.046875 -1.109375 C 2.378906 -0.785156 2.84375 -0.625 3.4375 -0.625 C 3.777344 -0.625 4.113281 -0.664062 4.4375 -0.75 C 4.769531 -0.832031 5.09375 -0.957031 5.40625 -1.125 L 5.40625 -0.28125 C 5.082031 -0.144531 4.746094 -0.0390625 4.40625 0.03125 C 4.070312 0.101562 3.730469 0.140625 3.390625 0.140625 C 2.515625 0.140625 1.820312 -0.109375 1.3125 -0.609375 C 0.800781 -1.117188 0.546875 -1.8125 0.546875 -2.6875 C 0.546875 -3.582031 0.785156 -4.289062 1.265625 -4.8125 C 1.753906 -5.332031 2.410156 -5.59375 3.234375 -5.59375 C 3.972656 -5.59375 4.554688 -5.355469 4.984375 -4.890625 C 5.410156 -4.421875 5.625 -3.773438 5.625 -2.953125 Z M 4.71875 -3.21875 C 4.71875 -3.707031 4.582031 -4.097656 4.3125 -4.390625 C 4.039062 -4.691406 3.683594 -4.84375 3.25 -4.84375 C 2.738281 -4.84375 2.332031 -4.695312 2.03125 -4.40625 C 1.738281 -4.125 1.566406 -3.726562 1.515625 -3.21875 Z M 4.71875 -3.21875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-5">
+<path style="stroke:none;" d="M 0.9375 -5.46875 L 1.84375 -5.46875 L 1.84375 0 L 0.9375 0 Z M 0.9375 -7.59375 L 1.84375 -7.59375 L 1.84375 -6.453125 L 0.9375 -6.453125 Z M 0.9375 -7.59375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-6">
+<path style="stroke:none;" d="M 1.828125 -7.015625 L 1.828125 -5.46875 L 3.6875 -5.46875 L 3.6875 -4.765625 L 1.828125 -4.765625 L 1.828125 -1.796875 C 1.828125 -1.359375 1.890625 -1.070312 2.015625 -0.9375 C 2.136719 -0.8125 2.390625 -0.75 2.765625 -0.75 L 3.6875 -0.75 L 3.6875 0 L 2.765625 0 C 2.066406 0 1.582031 -0.128906 1.3125 -0.390625 C 1.050781 -0.648438 0.921875 -1.117188 0.921875 -1.796875 L 0.921875 -4.765625 L 0.265625 -4.765625 L 0.265625 -5.46875 L 0.921875 -5.46875 L 0.921875 -7.015625 Z M 1.828125 -7.015625 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-7">
+<path style="stroke:none;" d="M 4.546875 -2.796875 C 4.546875 -3.449219 4.410156 -3.957031 4.140625 -4.3125 C 3.867188 -4.664062 3.492188 -4.84375 3.015625 -4.84375 C 2.523438 -4.84375 2.144531 -4.664062 1.875 -4.3125 C 1.613281 -3.957031 1.484375 -3.449219 1.484375 -2.796875 C 1.484375 -2.148438 1.613281 -1.644531 1.875 -1.28125 C 2.144531 -0.925781 2.523438 -0.75 3.015625 -0.75 C 3.492188 -0.75 3.867188 -0.925781 4.140625 -1.28125 C 4.410156 -1.644531 4.546875 -2.148438 4.546875 -2.796875 Z M 5.4375 -0.671875 C 5.4375 0.253906 5.226562 0.941406 4.8125 1.390625 C 4.40625 1.847656 3.773438 2.078125 2.921875 2.078125 C 2.609375 2.078125 2.308594 2.050781 2.03125 2 C 1.75 1.957031 1.476562 1.886719 1.21875 1.796875 L 1.21875 0.921875 C 1.476562 1.066406 1.734375 1.171875 1.984375 1.234375 C 2.242188 1.304688 2.507812 1.34375 2.78125 1.34375 C 3.363281 1.34375 3.800781 1.183594 4.09375 0.875 C 4.394531 0.570312 4.546875 0.105469 4.546875 -0.515625 L 4.546875 -0.96875 C 4.359375 -0.644531 4.117188 -0.398438 3.828125 -0.234375 C 3.535156 -0.078125 3.183594 0 2.78125 0 C 2.113281 0 1.570312 -0.253906 1.15625 -0.765625 C 0.75 -1.273438 0.546875 -1.953125 0.546875 -2.796875 C 0.546875 -3.636719 0.75 -4.316406 1.15625 -4.828125 C 1.570312 -5.335938 2.113281 -5.59375 2.78125 -5.59375 C 3.183594 -5.59375 3.535156 -5.511719 3.828125 -5.359375 C 4.117188 -5.203125 4.359375 -4.960938 4.546875 -4.640625 L 4.546875 -5.46875 L 5.4375 -5.46875 Z M 5.4375 -0.671875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-8">
+<path style="stroke:none;" d="M 4.421875 -5.3125 L 4.421875 -4.453125 C 4.171875 -4.585938 3.910156 -4.6875 3.640625 -4.75 C 3.367188 -4.808594 3.082031 -4.84375 2.78125 -4.84375 C 2.34375 -4.84375 2.007812 -4.773438 1.78125 -4.640625 C 1.5625 -4.503906 1.453125 -4.300781 1.453125 -4.03125 C 1.453125 -3.820312 1.53125 -3.652344 1.6875 -3.53125 C 1.839844 -3.414062 2.164062 -3.304688 2.65625 -3.203125 L 2.953125 -3.125 C 3.597656 -2.988281 4.050781 -2.792969 4.3125 -2.546875 C 4.582031 -2.296875 4.71875 -1.949219 4.71875 -1.515625 C 4.71875 -1.003906 4.511719 -0.597656 4.109375 -0.296875 C 3.710938 -0.00390625 3.164062 0.140625 2.46875 0.140625 C 2.164062 0.140625 1.851562 0.105469 1.53125 0.046875 C 1.21875 -0.00390625 0.886719 -0.0859375 0.546875 -0.203125 L 0.546875 -1.125 C 0.878906 -0.957031 1.203125 -0.824219 1.515625 -0.734375 C 1.835938 -0.648438 2.160156 -0.609375 2.484375 -0.609375 C 2.898438 -0.609375 3.222656 -0.679688 3.453125 -0.828125 C 3.679688 -0.972656 3.796875 -1.175781 3.796875 -1.4375 C 3.796875 -1.683594 3.710938 -1.875 3.546875 -2 C 3.390625 -2.132812 3.027344 -2.257812 2.46875 -2.375 L 2.15625 -2.453125 C 1.601562 -2.566406 1.199219 -2.742188 0.953125 -2.984375 C 0.703125 -3.230469 0.578125 -3.566406 0.578125 -3.984375 C 0.578125 -4.503906 0.757812 -4.898438 1.125 -5.171875 C 1.488281 -5.449219 2.007812 -5.59375 2.6875 -5.59375 C 3.007812 -5.59375 3.316406 -5.566406 3.609375 -5.515625 C 3.910156 -5.472656 4.179688 -5.402344 4.421875 -5.3125 Z M 4.421875 -5.3125 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-9">
+<path style="stroke:none;" d="M 0.484375 -3.140625 L 3.125 -3.140625 L 3.125 -2.34375 L 0.484375 -2.34375 Z M 0.484375 -3.140625 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-10">
+<path style="stroke:none;" d="M 5.203125 -4.421875 C 5.417969 -4.824219 5.6875 -5.125 6 -5.3125 C 6.308594 -5.496094 6.679688 -5.59375 7.109375 -5.59375 C 7.679688 -5.59375 8.117188 -5.394531 8.421875 -5 C 8.730469 -4.601562 8.890625 -4.035156 8.890625 -3.296875 L 8.890625 0 L 7.984375 0 L 7.984375 -3.265625 C 7.984375 -3.792969 7.886719 -4.1875 7.703125 -4.4375 C 7.523438 -4.683594 7.242188 -4.8125 6.859375 -4.8125 C 6.390625 -4.8125 6.019531 -4.652344 5.75 -4.34375 C 5.488281 -4.039062 5.359375 -3.621094 5.359375 -3.09375 L 5.359375 0 L 4.453125 0 L 4.453125 -3.265625 C 4.453125 -3.792969 4.355469 -4.1875 4.171875 -4.4375 C 3.984375 -4.683594 3.695312 -4.8125 3.3125 -4.8125 C 2.851562 -4.8125 2.488281 -4.652344 2.21875 -4.34375 C 1.945312 -4.039062 1.8125 -3.621094 1.8125 -3.09375 L 1.8125 0 L 0.90625 0 L 0.90625 -5.46875 L 1.8125 -5.46875 L 1.8125 -4.625 C 2.019531 -4.957031 2.265625 -5.203125 2.546875 -5.359375 C 2.835938 -5.511719 3.175781 -5.59375 3.5625 -5.59375 C 3.964844 -5.59375 4.304688 -5.492188 4.578125 -5.296875 C 4.855469 -5.097656 5.066406 -4.804688 5.203125 -4.421875 Z M 5.203125 -4.421875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-11">
+<path style="stroke:none;" d="M 3.0625 -4.84375 C 2.582031 -4.84375 2.199219 -4.652344 1.921875 -4.28125 C 1.640625 -3.90625 1.5 -3.386719 1.5 -2.734375 C 1.5 -2.078125 1.632812 -1.558594 1.90625 -1.1875 C 2.183594 -0.8125 2.570312 -0.625 3.0625 -0.625 C 3.539062 -0.625 3.921875 -0.8125 4.203125 -1.1875 C 4.480469 -1.558594 4.625 -2.078125 4.625 -2.734375 C 4.625 -3.378906 4.480469 -3.890625 4.203125 -4.265625 C 3.921875 -4.648438 3.539062 -4.84375 3.0625 -4.84375 Z M 3.0625 -5.59375 C 3.839844 -5.59375 4.457031 -5.335938 4.90625 -4.828125 C 5.351562 -4.328125 5.578125 -3.628906 5.578125 -2.734375 C 5.578125 -1.835938 5.351562 -1.132812 4.90625 -0.625 C 4.457031 -0.113281 3.839844 0.140625 3.0625 0.140625 C 2.28125 0.140625 1.664062 -0.113281 1.21875 -0.625 C 0.769531 -1.132812 0.546875 -1.835938 0.546875 -2.734375 C 0.546875 -3.628906 0.769531 -4.328125 1.21875 -4.828125 C 1.664062 -5.335938 2.28125 -5.59375 3.0625 -5.59375 Z M 3.0625 -5.59375 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-12">
+<path style="stroke:none;" d="M 4.109375 -4.625 C 4.003906 -4.683594 3.894531 -4.726562 3.78125 -4.75 C 3.664062 -4.777344 3.535156 -4.796875 3.390625 -4.796875 C 2.878906 -4.796875 2.488281 -4.628906 2.21875 -4.296875 C 1.945312 -3.972656 1.8125 -3.496094 1.8125 -2.875 L 1.8125 0 L 0.90625 0 L 0.90625 -5.46875 L 1.8125 -5.46875 L 1.8125 -4.625 C 1.996094 -4.957031 2.242188 -5.203125 2.546875 -5.359375 C 2.847656 -5.511719 3.21875 -5.59375 3.65625 -5.59375 C 3.714844 -5.59375 3.785156 -5.585938 3.859375 -5.578125 C 3.929688 -5.578125 4.015625 -5.566406 4.109375 -5.546875 Z M 4.109375 -4.625 "/>
+</symbol>
+<symbol overflow="visible" id="glyph1-13">
+<path style="stroke:none;" d="M 3.21875 0.515625 C 2.96875 1.160156 2.714844 1.582031 2.46875 1.78125 C 2.226562 1.976562 1.910156 2.078125 1.515625 2.078125 L 0.796875 2.078125 L 0.796875 1.328125 L 1.3125 1.328125 C 1.558594 1.328125 1.753906 1.269531 1.890625 1.15625 C 2.023438 1.039062 2.175781 0.761719 2.34375 0.328125 L 2.515625 -0.09375 L 0.296875 -5.46875 L 1.25 -5.46875 L 2.953125 -1.1875 L 4.671875 -5.46875 L 5.625 -5.46875 Z M 3.21875 0.515625 "/>
+</symbol>
+</g>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="1800" y1="0" x2="1800" y2="600" >
+<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90%,90%,90%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="85.910156" y1="272.445312" x2="263.390625" y2="272.445312" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="263.390625" y1="195.960938" x2="440.871094" y2="195.960938" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="476.367188" y1="280.65625" x2="653.84375" y2="280.65625" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="653.84375" y1="202" x2="831.324219" y2="202" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="866.820312" y1="59.34375" x2="1044.296875" y2="59.34375" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="1044.296875" y1="45.324219" x2="1221.777344" y2="45.324219" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear7" gradientUnits="userSpaceOnUse" x1="1257.273438" y1="278.796875" x2="1434.753906" y2="278.796875" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear8" gradientUnits="userSpaceOnUse" x1="1434.753906" y1="195.925781" x2="1612.234375" y2="195.925781" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="1647.726562" y1="266.96875" x2="1825.207031" y2="266.96875" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear10" gradientUnits="userSpaceOnUse" x1="1825.207031" y1="193.085938" x2="2002.6875" y2="193.085938" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear11" gradientUnits="userSpaceOnUse" x1="2038.183594" y1="266.4375" x2="2215.660156" y2="266.4375" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear12" gradientUnits="userSpaceOnUse" x1="2215.660156" y1="192.890625" x2="2393.140625" y2="192.890625" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear13" gradientUnits="userSpaceOnUse" x1="2428.636719" y1="276.816406" x2="2606.117188" y2="276.816406" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear14" gradientUnits="userSpaceOnUse" x1="2606.117188" y1="197.066406" x2="2783.59375" y2="197.066406" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear15" gradientUnits="userSpaceOnUse" x1="2819.089844" y1="60.53125" x2="2996.570312" y2="60.53125" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear16" gradientUnits="userSpaceOnUse" x1="2996.570312" y1="45.753906" x2="3174.050781" y2="45.753906" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear17" gradientUnits="userSpaceOnUse" x1="3209.546875" y1="269.269531" x2="3387.023438" y2="269.269531" >
+<stop offset="0" style="stop-color:rgb(66.922399%,66.347924%,3.958596%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.603427%,94.782749%,5.655137%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear18" gradientUnits="userSpaceOnUse" x1="3387.023438" y1="192.042969" x2="3564.503906" y2="192.042969" >
+<stop offset="0" style="stop-color:rgb(5.94104%,58.484921%,51.517899%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(8.4872%,83.549888%,73.596999%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<rect x="0" y="0" width="3600" height="600" style="fill:url(#linear0);stroke:none;"/>
+<path style="fill:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(50%,50%,50%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0 0 L 3600 0 L 3600 600 L 0 600 Z M 0 0 "/>
+<path style="fill:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(80%,80%,80%);stroke-opacity:1;stroke-miterlimit:10;" d="M 50.414062 19.34375 L 3600 19.34375 "/>
+<path style="fill:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(80%,80%,80%);stroke-opacity:1;stroke-miterlimit:10;" d="M 50.414062 159.671875 L 3600 159.671875 "/>
+<path style="fill:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(80%,80%,80%);stroke-opacity:1;stroke-miterlimit:10;" d="M 50.414062 300 L 3600 300 "/>
+<path style="fill:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(80%,80%,80%);stroke-opacity:1;stroke-miterlimit:10;" d="M 50.414062 440.328125 L 3600 440.328125 "/>
+<path style="fill:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(80%,80%,80%);stroke-opacity:1;stroke-miterlimit:10;" d="M 50.414062 580.65625 L 3600 580.65625 "/>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="107.578125" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="112.464844" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="114.6875" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="122.480469" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="127.402344" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="132.960938" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="137.863281" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="142.933594" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="148.011719" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="152.933594" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="155.476562" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="160.378906" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="162.601562" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="169.144531" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="174.046875" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="178.78125" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="182.949219" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="186.070312" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="189.191406" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="191.734375" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="194.277344" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="197.398438" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="200.519531" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="203.0625" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="205.605469" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="210.683594" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="213.820312" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="218.714844" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="222.003906" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="226.90625" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="231.984375" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="236.90625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="241.984375" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="245.121094" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="250.023438" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="253.160156" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="258.082031" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="260.625" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="266.097656" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="271.167969" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="275.902344" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="278.445312" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="280.988281" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="286.078125" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="291.167969" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="296.257812" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="298.800781" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="301.34375" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="306.902344" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="311.824219" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="315.992188" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="321.0625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="323.285156" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="326.421875" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="331.308594" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="336.042969" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="341.121094" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="346.042969" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="348.585938" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="355.488281" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="360.382812" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="364.550781" y="596.328125"/>
+  <use xlink:href="#glyph0-29" x="367.6875" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="372.511719" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="377.40625" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="382.484375" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="387.554688" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="389.777344" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="394.679688" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="397.96875" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="403.441406" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="407.839844" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="410.976562" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="415.871094" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="488.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="493" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="495.222656" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="503.015625" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="507.9375" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="513.496094" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="518.398438" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="523.46875" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="528.546875" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="533.46875" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="536.011719" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="540.914062" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="543.136719" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="549.679688" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="554.582031" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="559.316406" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="563.484375" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="566.605469" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="569.726562" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="572.269531" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="574.8125" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="577.933594" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="581.054688" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="583.597656" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="586.140625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="591.21875" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="594.355469" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="599.25" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="602.539062" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="607.441406" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="612.519531" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="617.441406" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="622.519531" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="625.65625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="630.558594" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="633.695312" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="638.617188" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="641.160156" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="646.632812" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="651.703125" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="656.4375" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="658.980469" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="661.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="666.613281" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="671.703125" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="676.792969" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="679.335938" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="681.878906" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="687.4375" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="692.359375" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="696.527344" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="701.597656" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="703.820312" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="706.957031" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="711.84375" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="716.578125" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="721.65625" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="726.578125" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="729.121094" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="736.023438" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="740.917969" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="745.085938" y="596.328125"/>
+  <use xlink:href="#glyph0-29" x="748.222656" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="753.046875" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="757.941406" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="763.019531" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="768.089844" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="770.3125" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="775.214844" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="778.503906" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="785.40625" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="787.628906" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="795.421875" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="800.34375" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="805.230469" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="809.964844" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="815.042969" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="856.757812" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="861.644531" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="863.867188" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="871.660156" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="876.582031" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="882.140625" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="887.042969" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="892.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="897.191406" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="902.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="904.65625" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="909.558594" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="911.78125" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="918.324219" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="923.226562" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="927.960938" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="932.128906" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="935.25" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="938.371094" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="940.914062" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="943.457031" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="946.578125" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="949.699219" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="952.242188" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="954.785156" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="959.863281" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="963" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="967.894531" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="971.183594" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="976.085938" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="981.164062" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="986.085938" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="991.164062" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="994.300781" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="999.203125" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1002.339844" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1007.261719" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="1009.804688" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1015.277344" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1020.347656" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1025.082031" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1027.625" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="1030.167969" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="1035.257812" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="1040.347656" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1045.4375" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1047.980469" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="1050.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1056.082031" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1061.003906" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="1065.171875" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="1070.242188" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1072.464844" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="1075.601562" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1080.488281" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="1085.222656" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1090.300781" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1095.222656" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="1097.765625" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1104.667969" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1109.5625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1113.730469" y="596.328125"/>
+  <use xlink:href="#glyph0-29" x="1116.867188" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1121.691406" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="1126.585938" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="1131.664062" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="1136.734375" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1138.957031" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="1143.859375" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="1147.148438" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="1152.226562" y="596.328125"/>
+  <use xlink:href="#glyph0-31" x="1157.296875" y="596.328125"/>
+  <use xlink:href="#glyph0-32" x="1162.375" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1164.597656" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="1169.519531" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1173.917969" y="596.328125"/>
+  <use xlink:href="#glyph0-33" x="1177.054688" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1179.414062" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1184.484375" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1187.621094" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="1192.542969" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="1195.832031" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="1200.910156" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1204.199219" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1209.121094" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1212.257812" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1217.160156" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="1220.296875" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1222.519531" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1227.414062" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="1272.699219" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="1277.585938" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="1279.808594" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1287.601562" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="1292.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1298.082031" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1302.984375" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="1308.054688" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1313.132812" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1318.054688" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1320.597656" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="1325.5" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="1327.722656" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1334.265625" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1339.167969" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1343.902344" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="1348.070312" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="1351.191406" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1354.3125" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1356.855469" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="1359.398438" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="1362.519531" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1365.640625" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1368.183594" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="1370.726562" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1375.804688" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1378.941406" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="1383.835938" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1387.125" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="1392.027344" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1397.105469" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="1402.027344" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1407.105469" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1410.242188" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1415.144531" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1418.28125" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1423.203125" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="1425.746094" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1431.21875" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1436.289062" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1441.023438" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1443.566406" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="1446.109375" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="1451.199219" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="1456.289062" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1461.378906" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1463.921875" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="1466.464844" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1472.023438" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1476.945312" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="1481.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="1486.183594" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1488.40625" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="1491.542969" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1496.429688" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="1501.164062" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1506.242188" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1511.164062" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="1513.707031" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1520.609375" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1525.503906" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1529.671875" y="596.328125"/>
+  <use xlink:href="#glyph0-29" x="1532.808594" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1537.632812" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="1542.527344" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="1547.605469" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="1552.675781" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1554.898438" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="1559.800781" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="1563.089844" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="1568.167969" y="596.328125"/>
+  <use xlink:href="#glyph0-31" x="1573.238281" y="596.328125"/>
+  <use xlink:href="#glyph0-32" x="1578.316406" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1580.539062" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="1585.460938" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1589.859375" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1592.996094" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="1670.535156" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="1675.421875" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="1677.644531" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1685.4375" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="1690.359375" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1695.917969" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1700.820312" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="1705.890625" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1710.96875" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1715.890625" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1718.433594" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="1723.335938" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="1725.558594" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1732.101562" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1737.003906" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1741.738281" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="1745.90625" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="1749.027344" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1752.148438" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1754.691406" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="1757.234375" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="1760.355469" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1763.476562" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1766.019531" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="1768.5625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1773.640625" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1776.777344" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="1781.671875" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1784.960938" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="1789.863281" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1794.941406" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="1799.863281" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1804.941406" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="1808.078125" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1812.980469" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1816.117188" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1821.039062" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="1823.582031" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1829.054688" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1834.125" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1838.859375" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1841.402344" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="1843.945312" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="1849.035156" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="1854.125" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="1859.214844" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="1861.757812" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="1864.300781" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1869.859375" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1874.78125" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="1878.949219" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="1884.019531" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1886.242188" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="1889.378906" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="1894.265625" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="1899" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1904.078125" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="1909" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="1911.542969" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1918.445312" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="1923.339844" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1927.507812" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="1930.644531" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1936.203125" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="1941.125" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="1945.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="1950.445312" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1955.515625" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="1958.652344" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="1964.125" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="1968.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="1971.660156" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="1976.554688" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="2058.238281" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="2063.125" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="2065.347656" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2073.140625" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="2078.0625" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2083.621094" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2088.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="2093.59375" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2098.671875" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2103.59375" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2106.136719" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="2111.039062" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="2113.261719" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2119.804688" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2124.707031" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2129.441406" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="2133.609375" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="2136.730469" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2139.851562" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2142.394531" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="2144.9375" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="2148.058594" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2151.179688" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2153.722656" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="2156.265625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2161.34375" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="2164.480469" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="2169.375" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2172.664062" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="2177.566406" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2182.644531" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="2187.566406" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2192.644531" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2195.78125" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2200.683594" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2203.820312" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2208.742188" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="2211.285156" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2216.757812" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2221.828125" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2226.5625" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2229.105469" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="2231.648438" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="2236.738281" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="2241.828125" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2246.917969" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2249.460938" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="2252.003906" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2257.5625" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2262.484375" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="2266.652344" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="2271.722656" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2273.945312" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="2277.082031" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2281.96875" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="2286.703125" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2291.78125" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2296.703125" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="2299.246094" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="2306.148438" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2311.042969" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2315.210938" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="2318.347656" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2323.90625" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="2328.828125" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2333.226562" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2338.148438" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2343.21875" y="596.328125"/>
+  <use xlink:href="#glyph0-34" x="2346.355469" y="596.328125"/>
+  <use xlink:href="#glyph0-35" x="2351.410156" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2356.144531" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2361.066406" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2366.136719" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2369.273438" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="2441.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="2446.410156" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="2448.632812" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2456.425781" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="2461.347656" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2466.90625" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2471.808594" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="2476.878906" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2481.957031" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2486.878906" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2489.421875" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="2494.324219" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="2496.546875" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2503.089844" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2507.992188" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2512.726562" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="2516.894531" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="2520.015625" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2523.136719" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2525.679688" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="2528.222656" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="2531.34375" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2534.464844" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2537.007812" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="2539.550781" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2544.628906" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="2547.765625" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="2552.660156" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2555.949219" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="2560.851562" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2565.929688" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="2570.851562" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2575.929688" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2579.066406" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2583.96875" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2587.105469" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2592.027344" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="2594.570312" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2600.042969" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2605.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2609.847656" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2612.390625" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="2614.933594" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="2620.023438" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="2625.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2630.203125" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2632.746094" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="2635.289062" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2640.847656" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2645.769531" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="2649.9375" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="2655.007812" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2657.230469" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="2660.367188" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2665.253906" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="2669.988281" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2675.066406" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2679.988281" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="2682.53125" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="2689.433594" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2694.328125" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2698.496094" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="2701.632812" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2707.191406" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="2712.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2716.511719" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2721.433594" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2726.503906" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="2729.640625" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="2736.542969" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="2738.765625" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2746.558594" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="2751.480469" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2756.367188" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="2761.101562" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2766.179688" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="2810.167969" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="2815.054688" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="2817.277344" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2825.070312" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="2829.992188" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2835.550781" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2840.453125" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="2845.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2850.601562" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2855.523438" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2858.066406" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="2862.96875" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="2865.191406" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2871.734375" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2876.636719" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="2881.371094" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="2885.539062" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="2888.660156" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2891.78125" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2894.324219" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="2896.867188" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="2899.988281" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2903.109375" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2905.652344" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="2908.195312" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2913.273438" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="2916.410156" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="2921.304688" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2924.59375" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="2929.496094" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2934.574219" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="2939.496094" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2944.574219" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="2947.710938" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="2952.613281" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="2955.75" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="2960.671875" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="2963.214844" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="2968.6875" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="2973.757812" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2978.492188" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="2981.035156" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="2983.578125" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="2988.667969" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="2993.757812" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="2998.847656" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="3001.390625" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="3003.933594" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3009.492188" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="3014.414062" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="3018.582031" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="3023.652344" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3025.875" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="3029.011719" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="3033.898438" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="3038.632812" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3043.710938" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="3048.632812" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="3051.175781" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="3058.078125" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="3062.972656" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3067.140625" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="3070.277344" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3075.835938" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="3080.757812" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3085.15625" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="3090.078125" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3095.148438" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="3098.285156" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="3103.363281" y="596.328125"/>
+  <use xlink:href="#glyph0-31" x="3108.433594" y="596.328125"/>
+  <use xlink:href="#glyph0-32" x="3113.511719" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3115.734375" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="3120.65625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3125.054688" y="596.328125"/>
+  <use xlink:href="#glyph0-33" x="3128.191406" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="3130.550781" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3135.621094" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3138.757812" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="3143.679688" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="3146.96875" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="3152.046875" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3155.335938" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3160.257812" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="3163.394531" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3168.296875" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="3171.433594" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="3173.65625" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="3178.550781" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-0" x="3226.105469" y="596.328125"/>
+  <use xlink:href="#glyph0-1" x="3230.992188" y="596.328125"/>
+  <use xlink:href="#glyph0-2" x="3233.214844" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3241.007812" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="3245.929688" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="3251.488281" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="3256.390625" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="3261.460938" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3266.539062" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="3271.460938" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="3274.003906" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="3278.90625" y="596.328125"/>
+  <use xlink:href="#glyph0-10" x="3281.128906" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="3287.671875" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="3292.574219" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="3297.308594" y="596.328125"/>
+  <use xlink:href="#glyph0-13" x="3301.476562" y="596.328125"/>
+  <use xlink:href="#glyph0-14" x="3304.597656" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="3307.71875" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="3310.261719" y="596.328125"/>
+  <use xlink:href="#glyph0-17" x="3312.804688" y="596.328125"/>
+  <use xlink:href="#glyph0-18" x="3315.925781" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="3319.046875" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="3321.589844" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="3324.132812" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3329.210938" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="3332.347656" y="596.328125"/>
+  <use xlink:href="#glyph0-22" x="3337.242188" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="3340.53125" y="596.328125"/>
+  <use xlink:href="#glyph0-7" x="3345.433594" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3350.511719" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="3355.433594" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3360.511719" y="596.328125"/>
+  <use xlink:href="#glyph0-5" x="3363.648438" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3368.550781" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3371.6875" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="3376.609375" y="596.328125"/>
+  <use xlink:href="#glyph0-23" x="3379.152344" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="3384.625" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="3389.695312" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="3394.429688" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="3396.972656" y="596.328125"/>
+  <use xlink:href="#glyph0-24" x="3399.515625" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="3404.605469" y="596.328125"/>
+  <use xlink:href="#glyph0-25" x="3409.695312" y="596.328125"/>
+  <use xlink:href="#glyph0-15" x="3414.785156" y="596.328125"/>
+  <use xlink:href="#glyph0-16" x="3417.328125" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="3419.871094" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3425.429688" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="3430.351562" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="3434.519531" y="596.328125"/>
+  <use xlink:href="#glyph0-9" x="3439.589844" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3441.8125" y="596.328125"/>
+  <use xlink:href="#glyph0-0" x="3444.949219" y="596.328125"/>
+  <use xlink:href="#glyph0-11" x="3449.835938" y="596.328125"/>
+  <use xlink:href="#glyph0-27" x="3454.570312" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3459.648438" y="596.328125"/>
+  <use xlink:href="#glyph0-8" x="3464.570312" y="596.328125"/>
+  <use xlink:href="#glyph0-28" x="3467.113281" y="596.328125"/>
+  <use xlink:href="#glyph0-21" x="3474.015625" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="3478.910156" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3483.078125" y="596.328125"/>
+  <use xlink:href="#glyph0-4" x="3486.214844" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3491.773438" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="3496.695312" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3501.09375" y="596.328125"/>
+  <use xlink:href="#glyph0-6" x="3506.015625" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3511.085938" y="596.328125"/>
+  <use xlink:href="#glyph0-19" x="3514.222656" y="596.328125"/>
+  <use xlink:href="#glyph0-26" x="3519.300781" y="596.328125"/>
+  <use xlink:href="#glyph0-31" x="3524.371094" y="596.328125"/>
+  <use xlink:href="#glyph0-32" x="3529.449219" y="596.328125"/>
+  <use xlink:href="#glyph0-3" x="3531.671875" y="596.328125"/>
+  <use xlink:href="#glyph0-30" x="3536.59375" y="596.328125"/>
+  <use xlink:href="#glyph0-20" x="3540.992188" y="596.328125"/>
+  <use xlink:href="#glyph0-12" x="3544.128906" y="596.328125"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-25" x="9.082031" y="22.367188"/>
+  <use xlink:href="#glyph0-8" x="14.171875" y="22.367188"/>
+  <use xlink:href="#glyph0-25" x="16.714844" y="22.367188"/>
+  <use xlink:href="#glyph0-25" x="21.804688" y="22.367188"/>
+  <use xlink:href="#glyph0-36" x="26.894531" y="22.367188"/>
+  <use xlink:href="#glyph0-37" x="31.984375" y="22.367188"/>
+  <use xlink:href="#glyph0-38" x="37.074219" y="22.367188"/>
+  <use xlink:href="#glyph0-12" x="42.164062" y="22.367188"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-25" x="9.082031" y="162.695312"/>
+  <use xlink:href="#glyph0-8" x="14.171875" y="162.695312"/>
+  <use xlink:href="#glyph0-25" x="16.714844" y="162.695312"/>
+  <use xlink:href="#glyph0-25" x="21.804688" y="162.695312"/>
+  <use xlink:href="#glyph0-36" x="26.894531" y="162.695312"/>
+  <use xlink:href="#glyph0-24" x="31.984375" y="162.695312"/>
+  <use xlink:href="#glyph0-39" x="37.074219" y="162.695312"/>
+  <use xlink:href="#glyph0-12" x="42.164062" y="162.695312"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-25" x="9.082031" y="303.023438"/>
+  <use xlink:href="#glyph0-8" x="14.171875" y="303.023438"/>
+  <use xlink:href="#glyph0-25" x="16.714844" y="303.023438"/>
+  <use xlink:href="#glyph0-25" x="21.804688" y="303.023438"/>
+  <use xlink:href="#glyph0-24" x="26.894531" y="303.023438"/>
+  <use xlink:href="#glyph0-40" x="31.984375" y="303.023438"/>
+  <use xlink:href="#glyph0-40" x="37.074219" y="303.023438"/>
+  <use xlink:href="#glyph0-12" x="42.164062" y="303.023438"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-25" x="9.082031" y="443.351562"/>
+  <use xlink:href="#glyph0-8" x="14.171875" y="443.351562"/>
+  <use xlink:href="#glyph0-25" x="16.714844" y="443.351562"/>
+  <use xlink:href="#glyph0-25" x="21.804688" y="443.351562"/>
+  <use xlink:href="#glyph0-25" x="26.894531" y="443.351562"/>
+  <use xlink:href="#glyph0-41" x="31.984375" y="443.351562"/>
+  <use xlink:href="#glyph0-36" x="37.074219" y="443.351562"/>
+  <use xlink:href="#glyph0-12" x="42.164062" y="443.351562"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-25" x="9.082031" y="583.679688"/>
+  <use xlink:href="#glyph0-8" x="14.171875" y="583.679688"/>
+  <use xlink:href="#glyph0-25" x="16.714844" y="583.679688"/>
+  <use xlink:href="#glyph0-25" x="21.804688" y="583.679688"/>
+  <use xlink:href="#glyph0-25" x="26.894531" y="583.679688"/>
+  <use xlink:href="#glyph0-25" x="31.984375" y="583.679688"/>
+  <use xlink:href="#glyph0-25" x="37.074219" y="583.679688"/>
+  <use xlink:href="#glyph0-12" x="42.164062" y="583.679688"/>
+</g>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 85.910156 35.769531 L 263.390625 35.769531 L 263.390625 580.65625 L 85.910156 580.65625 Z M 85.910156 35.769531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 263.390625 188.734375 L 440.871094 188.734375 L 440.871094 580.65625 L 263.390625 580.65625 Z M 263.390625 188.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 476.367188 19.34375 L 653.847656 19.34375 L 653.847656 580.65625 L 476.367188 580.65625 Z M 476.367188 19.34375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear4);" d="M 653.84375 176.65625 L 831.324219 176.65625 L 831.324219 580.65625 L 653.84375 580.65625 Z M 653.84375 176.65625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear5);" d="M 866.820312 461.96875 L 1044.300781 461.96875 L 1044.300781 580.65625 L 866.820312 580.65625 Z M 866.820312 461.96875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear6);" d="M 1044.296875 490.007812 L 1221.777344 490.007812 L 1221.777344 580.65625 L 1044.296875 580.65625 Z M 1044.296875 490.007812 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear7);" d="M 1257.273438 23.0625 L 1434.753906 23.0625 L 1434.753906 580.65625 L 1257.273438 580.65625 Z M 1257.273438 23.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear8);" d="M 1434.753906 188.804688 L 1612.234375 188.804688 L 1612.234375 580.65625 L 1434.753906 580.65625 Z M 1434.753906 188.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear9);" d="M 1647.726562 46.722656 L 1825.207031 46.722656 L 1825.207031 580.65625 L 1647.726562 580.65625 Z M 1647.726562 46.722656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear10);" d="M 1825.207031 194.488281 L 2002.6875 194.488281 L 2002.6875 580.65625 L 1825.207031 580.65625 Z M 1825.207031 194.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear11);" d="M 2038.183594 47.78125 L 2215.664062 47.78125 L 2215.664062 580.65625 L 2038.183594 580.65625 Z M 2038.183594 47.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear12);" d="M 2215.660156 194.875 L 2393.140625 194.875 L 2393.140625 580.65625 L 2215.660156 580.65625 Z M 2215.660156 194.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear13);" d="M 2428.636719 27.023438 L 2606.117188 27.023438 L 2606.117188 580.65625 L 2428.636719 580.65625 Z M 2428.636719 27.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear14);" d="M 2606.117188 186.527344 L 2783.597656 186.527344 L 2783.597656 580.65625 L 2606.117188 580.65625 Z M 2606.117188 186.527344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear15);" d="M 2819.089844 459.589844 L 2996.570312 459.589844 L 2996.570312 580.65625 L 2819.089844 580.65625 Z M 2819.089844 459.589844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear16);" d="M 2996.570312 489.152344 L 3174.050781 489.152344 L 3174.050781 580.65625 L 2996.570312 580.65625 Z M 2996.570312 489.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear17);" d="M 3209.546875 42.113281 L 3387.027344 42.113281 L 3387.027344 580.65625 L 3209.546875 580.65625 Z M 3209.546875 42.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear18);" d="M 3387.023438 196.570312 L 3564.503906 196.570312 L 3564.503906 580.65625 L 3387.023438 580.65625 Z M 3387.023438 196.570312 "/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(50%,50%,50%);stroke-opacity:1;stroke-miterlimit:10;" d="M 3470.195312 0 L 3600 0 L 3600 39.097656 L 3470.195312 39.097656 Z M 3470.195312 0 "/>
+<path style="fill-rule:nonzero;fill:rgb(95.603427%,94.782749%,5.655137%);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 3475.195312 7.820312 L 3490.835938 7.820312 L 3490.835938 15.640625 L 3475.195312 15.640625 Z M 3475.195312 7.820312 "/>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph1-0" x="3495.835938" y="15.640625"/>
+  <use xlink:href="#glyph1-1" x="3498.614258" y="15.640625"/>
+  <use xlink:href="#glyph1-2" x="3504.961914" y="15.640625"/>
+  <use xlink:href="#glyph1-3" x="3508.331055" y="15.640625"/>
+  <use xlink:href="#glyph1-4" x="3513.580078" y="15.640625"/>
+  <use xlink:href="#glyph1-5" x="3519.732422" y="15.640625"/>
+  <use xlink:href="#glyph1-6" x="3522.510742" y="15.640625"/>
+  <use xlink:href="#glyph1-7" x="3526.431641" y="15.640625"/>
+  <use xlink:href="#glyph1-4" x="3532.779297" y="15.640625"/>
+  <use xlink:href="#glyph1-5" x="3538.931641" y="15.640625"/>
+  <use xlink:href="#glyph1-8" x="3541.709961" y="15.640625"/>
+  <use xlink:href="#glyph1-6" x="3546.919922" y="15.640625"/>
+  <use xlink:href="#glyph1-9" x="3550.84082" y="15.640625"/>
+  <use xlink:href="#glyph1-10" x="3554.449219" y="15.640625"/>
+  <use xlink:href="#glyph1-4" x="3564.19043" y="15.640625"/>
+  <use xlink:href="#glyph1-10" x="3570.342773" y="15.640625"/>
+  <use xlink:href="#glyph1-11" x="3580.083984" y="15.640625"/>
+  <use xlink:href="#glyph1-12" x="3586.202148" y="15.640625"/>
+  <use xlink:href="#glyph1-13" x="3590.313477" y="15.640625"/>
+</g>
+<path style="fill-rule:nonzero;fill:rgb(8.4872%,83.549888%,73.596999%);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 3475.195312 23.457031 L 3490.835938 23.457031 L 3490.835938 31.277344 L 3475.195312 31.277344 Z M 3475.195312 23.457031 "/>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph1-0" x="3495.835938" y="31.277344"/>
+  <use xlink:href="#glyph1-1" x="3498.614258" y="31.277344"/>
+  <use xlink:href="#glyph1-2" x="3504.961914" y="31.277344"/>
+  <use xlink:href="#glyph1-3" x="3508.331055" y="31.277344"/>
+  <use xlink:href="#glyph1-4" x="3513.580078" y="31.277344"/>
+  <use xlink:href="#glyph1-5" x="3519.732422" y="31.277344"/>
+  <use xlink:href="#glyph1-6" x="3522.510742" y="31.277344"/>
+  <use xlink:href="#glyph1-7" x="3526.431641" y="31.277344"/>
+  <use xlink:href="#glyph1-4" x="3532.779297" y="31.277344"/>
+  <use xlink:href="#glyph1-5" x="3538.931641" y="31.277344"/>
+  <use xlink:href="#glyph1-8" x="3541.709961" y="31.277344"/>
+  <use xlink:href="#glyph1-6" x="3546.919922" y="31.277344"/>
+</g>
+</g>
+</svg>

=== added file 'tools/development/cairoplot.py'
--- tools/development/cairoplot.py	1970-01-01 00:00:00 +0000
+++ tools/development/cairoplot.py	2011-12-25 16:30:29 +0000
@@ -0,0 +1,2371 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# CairoPlot.py
+#
+# Copyright (c) 2008 Rodrigo Moreira Araújo
+#
+# Author: Rodrigo Moreiro Araujo <alf.rodrigo@xxxxxxxxx>
+#         Markus Korn <thekorn@xxxxxx>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+#Contributor: João S. O. Bueno
+
+#TODO: review BarPlot Code
+#TODO: x_label colision problem on Horizontal Bar Plot
+#TODO: y_label's eat too much space on HBP
+
+# thekorn: added optional borders around vertical bars in VerticalBarPlot
+# thekorn: break long x-axis labels into two lines
+
+__version__ = 1.1
+
+import cairo
+import math
+import random
+from series import Series, Group, Data
+
+HORZ = 0
+VERT = 1
+NORM = 2
+
+COLORS = {"red"    : (1.0,0.0,0.0,1.0), "lime"    : (0.0,1.0,0.0,1.0), "blue"   : (0.0,0.0,1.0,1.0),
+          "maroon" : (0.5,0.0,0.0,1.0), "green"   : (0.0,0.5,0.0,1.0), "navy"   : (0.0,0.0,0.5,1.0),
+          "yellow" : (1.0,1.0,0.0,1.0), "magenta" : (1.0,0.0,1.0,1.0), "cyan"   : (0.0,1.0,1.0,1.0),
+          "orange" : (1.0,0.5,0.0,1.0), "white"   : (1.0,1.0,1.0,1.0), "black"  : (0.0,0.0,0.0,1.0),
+          "gray" : (0.5,0.5,0.5,1.0), "light_gray" : (0.9,0.9,0.9,1.0),
+          "transparent" : (0.0,0.0,0.0,0.0)}
+
+THEMES = {"black_red"         : [(0.0,0.0,0.0,1.0), (1.0,0.0,0.0,1.0)],
+          "red_green_blue"    : [(1.0,0.0,0.0,1.0), (0.0,1.0,0.0,1.0), (0.0,0.0,1.0,1.0)],
+          "red_orange_yellow" : [(1.0,0.2,0.0,1.0), (1.0,0.7,0.0,1.0), (1.0,1.0,0.0,1.0)],
+          "yellow_orange_red" : [(1.0,1.0,0.0,1.0), (1.0,0.7,0.0,1.0), (1.0,0.2,0.0,1.0)],
+          "rainbow"           : [(1.0,0.0,0.0,1.0), (1.0,0.5,0.0,1.0), (1.0,1.0,0.0,1.0), (0.0,1.0,0.0,1.0), (0.0,0.0,1.0,1.0), (0.3, 0.0, 0.5,1.0), (0.5, 0.0, 1.0, 1.0)]}
+
+def colors_from_theme( theme, series_length, mode = 'solid' ):
+    colors = []
+    if theme not in THEMES.keys() :
+        raise Exception, "Theme not defined" 
+    color_steps = THEMES[theme]
+    n_colors = len(color_steps)
+    if series_length <= n_colors:
+        colors = [color + tuple([mode]) for color in color_steps[0:n_colors]]
+    else:
+        iterations = [(series_length - n_colors)/(n_colors - 1) for i in color_steps[:-1]]
+        over_iterations = (series_length - n_colors) % (n_colors - 1)
+        for i in range(n_colors - 1):
+            if over_iterations <= 0:
+                break
+            iterations[i] += 1
+            over_iterations -= 1
+        for index,color in enumerate(color_steps[:-1]):
+            colors.append(color + tuple([mode]))
+            if iterations[index] == 0:
+                continue
+            next_color = color_steps[index+1]
+            color_step = ((next_color[0] - color[0])/(iterations[index] + 1),
+                          (next_color[1] - color[1])/(iterations[index] + 1),
+                          (next_color[2] - color[2])/(iterations[index] + 1),
+                          (next_color[3] - color[3])/(iterations[index] + 1))
+            for i in range( iterations[index] ):
+                colors.append((color[0] + color_step[0]*(i+1), 
+                               color[1] + color_step[1]*(i+1), 
+                               color[2] + color_step[2]*(i+1),
+                               color[3] + color_step[3]*(i+1),
+                               mode))
+        colors.append(color_steps[-1] + tuple([mode]))
+    return colors
+        
+
+def other_direction(direction):
+    "explicit is better than implicit"
+    if direction == HORZ:
+        return VERT
+    else:
+        return HORZ
+
+#Class definition
+
+class Plot(object):
+    def __init__(self, 
+                 surface=None,
+                 data=None,
+                 width=640,
+                 height=480,
+                 background=None,
+                 border = 0,
+                 x_labels = None,
+                 y_labels = None,
+                 series_colors = None):
+        random.seed(2)
+        self.create_surface(surface, width, height)
+        self.dimensions = {}
+        self.dimensions[HORZ] = width
+        self.dimensions[VERT] = height
+        self.context = cairo.Context(self.surface)
+        self.labels={}
+        self.labels[HORZ] = x_labels
+        self.labels[VERT] = y_labels
+        self.load_series(data, x_labels, y_labels, series_colors)
+        self.font_size = 10
+        self.set_background (background)
+        self.border = border
+        self.borders = {}
+        self.line_color = (0.5, 0.5, 0.5)
+        self.line_width = 0.5
+        self.label_color = (0.0, 0.0, 0.0)
+        self.grid_color = (0.8, 0.8, 0.8)
+    
+    def create_surface(self, surface, width=None, height=None):
+        self.filename = None
+        if isinstance(surface, cairo.Surface):
+            self.surface = surface
+            return
+        if not type(surface) in (str, unicode): 
+            raise TypeError("Surface should be either a Cairo surface or a filename, not %s" % surface)
+        sufix = surface.rsplit(".")[-1].lower()
+        self.filename = surface
+        if sufix == "png":
+            self.surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
+        elif sufix == "ps":
+            self.surface = cairo.PSSurface(surface, width, height)
+        elif sufix == "pdf":
+            self.surface = cairo.PSSurface(surface, width, height)
+        else:
+            if sufix != "svg":
+                self.filename += ".svg"
+            self.surface = cairo.SVGSurface(self.filename, width, height)
+
+    def commit(self):
+        try:
+            self.context.show_page()
+            if self.filename and self.filename.endswith(".png"):
+                self.surface.write_to_png(self.filename)
+            else:
+                self.surface.finish()
+        except cairo.Error:
+            pass
+        
+    def load_series (self, data, x_labels=None, y_labels=None, series_colors=None):
+        self.series_labels = []
+        self.series = None
+        
+        #The pretty way
+        #if not isinstance(data, Series):
+        #    # Not an instance of Series
+        #    self.series = Series(data)
+        #else:
+        #    self.series = data
+        #    
+        #self.series_labels = self.series.get_names()
+        
+        #TODO: Remove on next version
+        # The ugly way, keeping retrocompatibility...
+        if callable(data) or type(data) is list and callable(data[0]): # Lambda or List of lambdas
+            self.series = data
+            self.series_labels = None
+        elif isinstance(data, Series): # Instance of Series
+            self.series = data
+            self.series_labels = data.get_names()
+        else: # Anything else
+            self.series = Series(data)
+            self.series_labels = self.series.get_names()
+            
+        #TODO: allow user passed series_widths
+        self.series_widths = [1.0 for group in self.series]
+
+        #TODO: Remove on next version
+        self.process_colors( series_colors )
+        
+    def process_colors( self, series_colors, length = None, mode = 'solid' ):
+        #series_colors might be None, a theme, a string of colors names or a list of color tuples
+        if length is None :
+            length = len( self.series.to_list() )
+            
+        #no colors passed
+        if not series_colors:
+            #Randomize colors
+            self.series_colors = [ [random.random() for i in range(3)] + [1.0, mode]  for series in range( length ) ]
+        else:
+            #Just theme pattern
+            if not hasattr( series_colors, "__iter__" ):
+                theme = series_colors
+                self.series_colors = colors_from_theme( theme.lower(), length )
+                
+            #Theme pattern and mode
+            elif not hasattr(series_colors, '__delitem__') and not hasattr( series_colors[0], "__iter__" ):
+                theme = series_colors[0]
+                mode = series_colors[1]
+                self.series_colors = colors_from_theme( theme.lower(), length, mode )
+                    
+            #List
+            else:
+                self.series_colors = series_colors
+                for index, color in enumerate( self.series_colors ):
+                    #element is a color name
+                    if not hasattr(color, "__iter__"):
+                        self.series_colors[index] = COLORS[color.lower()] + tuple([mode])
+                    #element is rgb tuple instead of rgba
+                    elif len( color ) == 3 :
+                        self.series_colors[index] += (1.0,mode)
+                    #element has 4 elements, might be rgba tuple or rgb tuple with mode
+                    elif len( color ) == 4 :
+                        #last element is mode
+                        if not hasattr(color[3], "__iter__"):
+                            self.series_colors[index] += tuple([color[3]])
+                            self.series_colors[index][3] = 1.0
+                        #last element is alpha
+                        else:
+                            self.series_colors[index] += tuple([mode])
+
+    def get_width(self):
+        return self.surface.get_width()
+    
+    def get_height(self):
+        return self.surface.get_height()
+
+    def set_background(self, background):
+        if background is None:
+            self.background = (0.0,0.0,0.0,0.0)
+        elif type(background) in (cairo.LinearGradient, tuple):
+            self.background = background
+        elif not hasattr(background,"__iter__"):
+            colors = background.split(" ")
+            if len(colors) == 1 and colors[0] in COLORS:
+                self.background = COLORS[background]
+            elif len(colors) > 1:
+                self.background = cairo.LinearGradient(self.dimensions[HORZ] / 2, 0, self.dimensions[HORZ] / 2, self.dimensions[VERT])
+                for index,color in enumerate(colors):
+                    self.background.add_color_stop_rgba(float(index)/(len(colors)-1),*COLORS[color])
+        else:
+            raise TypeError ("Background should be either cairo.LinearGradient or a 3/4-tuple, not %s" % type(background))
+        
+    def render_background(self):
+        if isinstance(self.background, cairo.LinearGradient):
+            self.context.set_source(self.background)
+        else:
+            self.context.set_source_rgba(*self.background)
+        self.context.rectangle(0,0, self.dimensions[HORZ], self.dimensions[VERT])
+        self.context.fill()
+        
+    def render_bounding_box(self):
+        self.context.set_source_rgba(*self.line_color)
+        self.context.set_line_width(self.line_width)
+        self.context.rectangle(self.border, self.border,
+                               self.dimensions[HORZ] - 2 * self.border,
+                               self.dimensions[VERT] - 2 * self.border)
+        self.context.stroke()
+
+    def render(self):
+        pass
+
+class ScatterPlot( Plot ):
+    def __init__(self, 
+                 surface=None,
+                 data=None,
+                 errorx=None,
+                 errory=None,
+                 width=640,
+                 height=480,
+                 background=None,
+                 border=0, 
+                 axis = False,
+                 dash = False,
+                 discrete = False,
+                 dots = 0,
+                 grid = False,
+                 series_legend = False,
+                 x_labels = None,
+                 y_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 z_bounds = None,
+                 x_title  = None,
+                 y_title  = None,
+                 series_colors = None,
+                 circle_colors = None ):
+        
+        self.bounds = {}
+        self.bounds[HORZ] = x_bounds
+        self.bounds[VERT] = y_bounds
+        self.bounds[NORM] = z_bounds
+        self.titles = {}
+        self.titles[HORZ] = x_title
+        self.titles[VERT] = y_title
+        self.max_value = {}
+        self.axis = axis
+        self.discrete = discrete
+        self.dots = dots
+        self.grid = grid
+        self.series_legend = series_legend
+        self.variable_radius = False
+        self.x_label_angle = math.pi / 2.5
+        self.circle_colors = circle_colors
+        
+        Plot.__init__(self, surface, data, width, height, background, border, x_labels, y_labels, series_colors)
+        
+        self.dash = None
+        if dash:
+            if hasattr(dash, "keys"):
+                self.dash = [dash[key] for key in self.series_labels]
+            elif max([hasattr(item,'__delitem__') for item in data]) :
+                self.dash = dash
+            else:
+                self.dash = [dash]
+                
+        self.load_errors(errorx, errory)
+    
+    def convert_list_to_tuple(self, data):
+        #Data must be converted from lists of coordinates to a single
+        # list of tuples
+        out_data = zip(*data)
+        if len(data) == 3:
+            self.variable_radius = True
+        return out_data
+    
+    def load_series(self, data, x_labels = None, y_labels = None, series_colors=None):
+        #TODO: In cairoplot 2.0 keep only the Series instances
+
+        # Convert Data and Group to Series
+        if isinstance(data, Data) or isinstance(data, Group):
+            data = Series(data)
+            
+        # Series
+        if  isinstance(data, Series):
+            for group in data:
+                for item in group:
+                    if len(item) is 3:
+                        self.variable_radius = True
+            
+        #Dictionary with lists  
+        if hasattr(data, "keys") :
+            if hasattr( data.values()[0][0], "__delitem__" ) :
+                for key in data.keys() :
+                    data[key] = self.convert_list_to_tuple(data[key])
+            elif len(data.values()[0][0]) == 3:
+                    self.variable_radius = True
+        #List
+        elif hasattr(data[0], "__delitem__") :
+            #List of lists 
+            if hasattr(data[0][0], "__delitem__") :
+                for index,value in enumerate(data) :
+                    data[index] = self.convert_list_to_tuple(value)
+            #List
+            elif type(data[0][0]) != type((0,0)):
+                data = self.convert_list_to_tuple(data)
+            #Three dimensional data
+            elif len(data[0][0]) == 3:
+                self.variable_radius = True
+
+        #List with three dimensional tuples
+        elif len(data[0]) == 3:
+            self.variable_radius = True
+        Plot.load_series(self, data, x_labels, y_labels, series_colors)
+        self.calc_boundaries()
+        self.calc_labels()
+    
+    def load_errors(self, errorx, errory):
+        self.errors = None
+        if errorx == None and errory == None:
+            return
+        self.errors = {}
+        self.errors[HORZ] = None
+        self.errors[VERT] = None
+        #asimetric errors
+        if errorx and hasattr(errorx[0], "__delitem__"):
+            self.errors[HORZ] = errorx
+        #simetric errors
+        elif errorx:
+            self.errors[HORZ] = [errorx]
+        #asimetric errors
+        if errory and hasattr(errory[0], "__delitem__"):
+            self.errors[VERT] = errory
+        #simetric errors
+        elif errory:
+            self.errors[VERT] = [errory]
+    
+    def calc_labels(self):
+        if not self.labels[HORZ]:
+            amplitude = self.bounds[HORZ][1] - self.bounds[HORZ][0]
+            if amplitude % 10: #if horizontal labels need floating points
+                self.labels[HORZ] = ["%.2lf" % (float(self.bounds[HORZ][0] + (amplitude * i / 10.0))) for i in range(11) ]
+            else:
+                self.labels[HORZ] = ["%d" % (int(self.bounds[HORZ][0] + (amplitude * i / 10.0))) for i in range(11) ]
+        if not self.labels[VERT]:
+            amplitude = self.bounds[VERT][1] - self.bounds[VERT][0]
+            if amplitude % 10: #if vertical labels need floating points
+                self.labels[VERT] = ["%.2lf" % (float(self.bounds[VERT][0] + (amplitude * i / 10.0))) for i in range(11) ]
+            else:
+                self.labels[VERT] = ["%d" % (int(self.bounds[VERT][0] + (amplitude * i / 10.0))) for i in range(11) ]
+
+    def calc_extents(self, direction):
+        self.context.set_font_size(self.font_size * 0.8)
+        self.max_value[direction] = max(self.context.text_extents(item)[2] for item in self.labels[direction])
+        self.borders[other_direction(direction)] = self.max_value[direction] + self.border + 20
+
+    def calc_boundaries(self):
+        #HORZ = 0, VERT = 1, NORM = 2
+        min_data_value = [0,0,0]
+        max_data_value = [0,0,0]
+        
+        for group in self.series:
+            if type(group[0].content) in (int, float, long):
+                group = [Data((index, item.content)) for index,item in enumerate(group)]
+            
+            for point in group:
+                for index, item in enumerate(point.content):
+                    if item > max_data_value[index]:
+                        max_data_value[index] = item
+                    elif item < min_data_value[index]:
+                        min_data_value[index] = item
+        
+        if not self.bounds[HORZ]:
+            self.bounds[HORZ] = (min_data_value[HORZ], max_data_value[HORZ])
+        if not self.bounds[VERT]:
+            self.bounds[VERT] = (min_data_value[VERT], max_data_value[VERT])
+        if not self.bounds[NORM]:
+            self.bounds[NORM] = (min_data_value[NORM], max_data_value[NORM])
+
+    def calc_all_extents(self):
+        self.calc_extents(HORZ)
+        self.calc_extents(VERT)
+
+        self.plot_height = self.dimensions[VERT] - 2 * self.borders[VERT]
+        self.plot_width = self.dimensions[HORZ] - 2* self.borders[HORZ]
+        
+        self.plot_top = self.dimensions[VERT] - self.borders[VERT]
+                
+    def calc_steps(self):
+        #Calculates all the x, y, z and color steps
+        series_amplitude = [self.bounds[index][1] - self.bounds[index][0] for index in range(3)]
+
+        if series_amplitude[HORZ]:
+            self.horizontal_step = float (self.plot_width) / series_amplitude[HORZ]
+        else:
+            self.horizontal_step = 0.00
+            
+        if series_amplitude[VERT]:
+            self.vertical_step = float (self.plot_height) / series_amplitude[VERT]
+        else:
+            self.vertical_step = 0.00
+
+        if series_amplitude[NORM]:
+            if self.variable_radius:
+                self.z_step = float (self.bounds[NORM][1]) / series_amplitude[NORM]
+            if self.circle_colors:
+                self.circle_color_step = tuple([float(self.circle_colors[1][i]-self.circle_colors[0][i])/series_amplitude[NORM] for i in range(4)])
+        else:
+            self.z_step = 0.00
+            self.circle_color_step = ( 0.0, 0.0, 0.0, 0.0 )
+    
+    def get_circle_color(self, value):
+        return tuple( [self.circle_colors[0][i] + value*self.circle_color_step[i] for i in range(4)] )
+    
+    def render(self):
+        self.calc_all_extents()
+        self.calc_steps()
+        self.render_background()
+        self.render_bounding_box()
+        if self.axis:
+            self.render_axis()
+        if self.grid:
+            self.render_grid()
+        self.render_labels()
+        self.render_plot()
+        if self.errors:
+            self.render_errors()
+        if self.series_legend and self.series_labels:
+            self.render_legend()
+            
+    def render_axis(self):
+        #Draws both the axis lines and their titles
+        cr = self.context
+        cr.set_source_rgba(*self.line_color)
+        cr.move_to(self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT])
+        cr.line_to(self.borders[HORZ], self.borders[VERT])
+        cr.stroke()
+
+        cr.move_to(self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT])
+        cr.line_to(self.dimensions[HORZ] - self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT])
+        cr.stroke()
+
+        cr.set_source_rgba(*self.label_color)
+        self.context.set_font_size( 1.2 * self.font_size )
+        if self.titles[HORZ]:
+            title_width,title_height = cr.text_extents(self.titles[HORZ])[2:4]
+            cr.move_to( self.dimensions[HORZ]/2 - title_width/2, self.borders[VERT] - title_height/2 )
+            cr.show_text( self.titles[HORZ] )
+
+        if self.titles[VERT]:
+            title_width,title_height = cr.text_extents(self.titles[VERT])[2:4]
+            cr.move_to( self.dimensions[HORZ] - self.borders[HORZ] + title_height/2, self.dimensions[VERT]/2 - title_width/2)
+            cr.save()
+            cr.rotate( math.pi/2 )
+            cr.show_text( self.titles[VERT] )
+            cr.restore()
+        
+    def render_grid(self):
+        cr = self.context
+        horizontal_step = float( self.plot_height ) / ( len( self.labels[VERT] ) - 1 )
+        vertical_step = float( self.plot_width ) / ( len( self.labels[HORZ] ) - 1 )
+        
+        x = self.borders[HORZ] + vertical_step
+        y = self.plot_top - horizontal_step
+        
+        for label in self.labels[HORZ][:-1]:
+            cr.set_source_rgba(*self.grid_color)
+            cr.move_to(x, self.dimensions[VERT] - self.borders[VERT])
+            cr.line_to(x, self.borders[VERT])
+            cr.stroke()
+            x += vertical_step
+        for label in self.labels[VERT][:-1]:
+            cr.set_source_rgba(*self.grid_color)
+            cr.move_to(self.borders[HORZ], y)
+            cr.line_to(self.dimensions[HORZ] - self.borders[HORZ], y)
+            cr.stroke()
+            y -= horizontal_step
+    
+    def render_labels(self):
+        self.context.set_font_size(self.font_size * 0.8)
+        self.render_horz_labels()
+        self.render_vert_labels()
+    
+    def render_horz_labels(self):
+        cr = self.context
+        step = float( self.plot_width ) / ( len( self.labels[HORZ] ) - 1 )
+        x = self.borders[HORZ]
+        y = self.dimensions[VERT] - self.borders[VERT] + 5
+        
+        # store rotation matrix from the initial state
+        rotation_matrix = cr.get_matrix()
+        rotation_matrix.rotate(self.x_label_angle)
+
+        cr.set_source_rgba(*self.label_color)
+
+        for item in self.labels[HORZ]:
+            width = cr.text_extents(item)[2]
+            cr.move_to(x, y)
+            cr.save()
+            cr.set_matrix(rotation_matrix)
+            cr.show_text(item)
+            cr.restore()
+            x += step
+    
+    def render_vert_labels(self):
+        cr = self.context
+        step = ( self.plot_height ) / ( len( self.labels[VERT] ) - 1 )
+        y = self.plot_top
+        cr.set_source_rgba(*self.label_color)
+        for item in self.labels[VERT]:
+            width = cr.text_extents(item)[2]
+            cr.move_to(self.borders[HORZ] - width - 5,y)
+            cr.show_text(item)
+            y -= step
+
+    def render_legend(self):
+        cr = self.context
+        cr.set_font_size(self.font_size)
+        cr.set_line_width(self.line_width)
+
+        widest_word = max(self.series_labels, key = lambda item: self.context.text_extents(item)[2])
+        tallest_word = max(self.series_labels, key = lambda item: self.context.text_extents(item)[3])
+        max_width = self.context.text_extents(widest_word)[2]
+        max_height = self.context.text_extents(tallest_word)[3] * 1.1
+        
+        color_box_height = max_height / 2
+        color_box_width = color_box_height * 2
+        
+        #Draw a bounding box
+        bounding_box_width = max_width + color_box_width + 15
+        bounding_box_height = (len(self.series_labels)+0.5) * max_height
+        cr.set_source_rgba(1,1,1)
+        cr.rectangle(self.dimensions[HORZ] - self.borders[HORZ] - bounding_box_width, self.borders[VERT],
+                            bounding_box_width, bounding_box_height)
+        cr.fill()
+        
+        cr.set_source_rgba(*self.line_color)
+        cr.set_line_width(self.line_width)
+        cr.rectangle(self.dimensions[HORZ] - self.borders[HORZ] - bounding_box_width, self.borders[VERT],
+                            bounding_box_width, bounding_box_height)
+        cr.stroke()
+
+        for idx,key in enumerate(self.series_labels):
+            #Draw color box
+            cr.set_source_rgba(*self.series_colors[idx][:4])
+            cr.rectangle(self.dimensions[HORZ] - self.borders[HORZ] - max_width - color_box_width - 10, 
+                                self.borders[VERT] + color_box_height + (idx*max_height) ,
+                                color_box_width, color_box_height)
+            cr.fill()
+            
+            cr.set_source_rgba(0, 0, 0)
+            cr.rectangle(self.dimensions[HORZ] - self.borders[HORZ] - max_width - color_box_width - 10, 
+                                self.borders[VERT] + color_box_height + (idx*max_height),
+                                color_box_width, color_box_height)
+            cr.stroke()
+            
+            #Draw series labels
+            cr.set_source_rgba(0, 0, 0)
+            cr.move_to(self.dimensions[HORZ] - self.borders[HORZ] - max_width - 5, self.borders[VERT] + ((idx+1)*max_height))
+            cr.show_text(key)
+
+    def render_errors(self):
+        cr = self.context
+        cr.rectangle(self.borders[HORZ], self.borders[VERT], self.plot_width, self.plot_height)
+        cr.clip()
+        radius = self.dots
+        x0 = self.borders[HORZ] - self.bounds[HORZ][0]*self.horizontal_step
+        y0 = self.borders[VERT] - self.bounds[VERT][0]*self.vertical_step
+        for index, group in enumerate(self.series):
+            cr.set_source_rgba(*self.series_colors[index][:4])
+            for number, data in enumerate(group):
+                x = x0 + self.horizontal_step * data.content[0]
+                y = self.dimensions[VERT] - y0 - self.vertical_step * data.content[1]
+                if self.errors[HORZ]:
+                    cr.move_to(x, y)
+                    x1 = x - self.horizontal_step * self.errors[HORZ][0][number]
+                    cr.line_to(x1, y)
+                    cr.line_to(x1, y - radius)
+                    cr.line_to(x1, y + radius)
+                    cr.stroke()
+                if self.errors[HORZ] and len(self.errors[HORZ]) == 2:
+                    cr.move_to(x, y)
+                    x1 = x + self.horizontal_step * self.errors[HORZ][1][number]
+                    cr.line_to(x1, y)
+                    cr.line_to(x1, y - radius)
+                    cr.line_to(x1, y + radius)
+                    cr.stroke()
+                if self.errors[VERT]:
+                    cr.move_to(x, y)
+                    y1 = y + self.vertical_step   * self.errors[VERT][0][number]
+                    cr.line_to(x, y1)
+                    cr.line_to(x - radius, y1)
+                    cr.line_to(x + radius, y1)
+                    cr.stroke()
+                if self.errors[VERT] and len(self.errors[VERT]) == 2:
+                    cr.move_to(x, y)
+                    y1 = y - self.vertical_step   * self.errors[VERT][1][number]
+                    cr.line_to(x, y1)
+                    cr.line_to(x - radius, y1)
+                    cr.line_to(x + radius, y1)
+                    cr.stroke()
+                
+                
+    def render_plot(self):
+        cr = self.context
+        if self.discrete:
+            cr.rectangle(self.borders[HORZ], self.borders[VERT], self.plot_width, self.plot_height)
+            cr.clip()
+            x0 = self.borders[HORZ] - self.bounds[HORZ][0]*self.horizontal_step
+            y0 = self.borders[VERT] - self.bounds[VERT][0]*self.vertical_step
+            radius = self.dots
+            for number, group in  enumerate (self.series):
+                cr.set_source_rgba(*self.series_colors[number][:4])
+                for data in group :
+                    if self.variable_radius:
+                        radius = data.content[2]*self.z_step
+                        if self.circle_colors:
+                            cr.set_source_rgba( *self.get_circle_color( data.content[2]) )
+                    x = x0 + self.horizontal_step*data.content[0]
+                    y = y0 + self.vertical_step*data.content[1]
+                    cr.arc(x, self.dimensions[VERT] - y, radius, 0, 2*math.pi)
+                    cr.fill()
+        else:
+            cr.rectangle(self.borders[HORZ], self.borders[VERT], self.plot_width, self.plot_height)
+            cr.clip()
+            x0 = self.borders[HORZ] - self.bounds[HORZ][0]*self.horizontal_step
+            y0 = self.borders[VERT] - self.bounds[VERT][0]*self.vertical_step
+            radius = self.dots
+            for number, group in  enumerate (self.series):
+                last_data = None
+                cr.set_source_rgba(*self.series_colors[number][:4])
+                for data in group :
+                    x = x0 + self.horizontal_step*data.content[0]
+                    y = y0 + self.vertical_step*data.content[1]
+                    if self.dots:
+                        if self.variable_radius:
+                            radius = data.content[2]*self.z_step
+                        cr.arc(x, self.dimensions[VERT] - y, radius, 0, 2*math.pi)
+                        cr.fill()
+                    if last_data :
+                        old_x = x0 + self.horizontal_step*last_data.content[0]
+                        old_y = y0 + self.vertical_step*last_data.content[1]
+                        cr.move_to( old_x, self.dimensions[VERT] - old_y )
+                        cr.line_to( x, self.dimensions[VERT] - y)
+                        cr.set_line_width(self.series_widths[number])
+
+                        # Display line as dash line 
+                        if self.dash and self.dash[number]:
+                            s = self.series_widths[number]
+                            cr.set_dash([s*3, s*3], 0)
+    
+                        cr.stroke()
+                        cr.set_dash([])
+                    last_data = data
+
+class DotLinePlot(ScatterPlot):
+    def __init__(self, 
+                 surface=None,
+                 data=None,
+                 width=640,
+                 height=480,
+                 background=None,
+                 border=0, 
+                 axis = False,
+                 dash = False,
+                 dots = 0,
+                 grid = False,
+                 series_legend = False,
+                 x_labels = None,
+                 y_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 x_title  = None,
+                 y_title  = None,
+                 series_colors = None):
+        
+        ScatterPlot.__init__(self, surface, data, None, None, width, height, background, border, 
+                             axis, dash, False, dots, grid, series_legend, x_labels, y_labels,
+                             x_bounds, y_bounds, None, x_title, y_title, series_colors, None )
+
+
+    def load_series(self, data, x_labels = None, y_labels = None, series_colors=None):
+        Plot.load_series(self, data, x_labels, y_labels, series_colors)
+        for group in self.series :
+            for index,data in enumerate(group):
+                group[index].content = (index, data.content)
+
+        self.calc_boundaries()
+        self.calc_labels()
+
+class FunctionPlot(ScatterPlot):
+    def __init__(self, 
+                 surface=None,
+                 data=None,
+                 width=640,
+                 height=480,
+                 background=None,
+                 border=0, 
+                 axis = False,
+                 discrete = False,
+                 dots = 0,
+                 grid = False,
+                 series_legend = False,
+                 x_labels = None,
+                 y_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 x_title  = None,
+                 y_title  = None,
+                 series_colors = None, 
+                 step = 1):
+
+        self.function = data
+        self.step = step
+        self.discrete = discrete
+        
+        data, x_bounds = self.load_series_from_function( self.function, x_bounds )
+
+        ScatterPlot.__init__(self, surface, data, None, None, width, height, background, border, 
+                             axis, False, discrete, dots, grid, series_legend, x_labels, y_labels,
+                             x_bounds, y_bounds, None, x_title, y_title, series_colors, None )
+    
+    def load_series(self, data, x_labels = None, y_labels = None, series_colors=None):
+        Plot.load_series(self, data, x_labels, y_labels, series_colors)
+        
+        if len(self.series[0][0]) is 1:          
+            for group_id, group in enumerate(self.series) :
+                for index,data in enumerate(group):
+                    group[index].content = (self.bounds[HORZ][0] + self.step*index, data.content)
+                
+        self.calc_boundaries()
+        self.calc_labels()
+    
+    def load_series_from_function( self, function, x_bounds ):
+        #TODO: Add the possibility for the user to define multiple functions with different discretization parameters
+        
+        #This function converts a function, a list of functions or a dictionary
+        #of functions into its corresponding array of data
+        series = Series()
+        
+        if isinstance(function, Group) or isinstance(function, Data):
+            function = Series(function)
+        
+        # If is instance of Series
+        if isinstance(function, Series):
+            # Overwrite any bounds passed by the function
+            x_bounds = (function.range[0],function.range[-1])
+        
+        #if no bounds are provided
+        if x_bounds == None:
+            x_bounds = (0,10)
+            
+                
+        #TODO: Finish the dict translation
+        if hasattr(function, "keys"): #dictionary:
+            for key in function.keys():
+                group = Group(name=key)
+                #data[ key ] = []
+                i = x_bounds[0]
+                while i <= x_bounds[1] :
+                    group.add_data(function[ key ](i))
+                    #data[ key ].append( function[ key ](i) )
+                    i += self.step
+                series.add_group(group)
+                    
+        elif hasattr(function, "__delitem__"): #list of functions
+            for index,f in enumerate( function ) :
+                group = Group()
+                #data.append( [] )
+                i = x_bounds[0]
+                while i <= x_bounds[1] :
+                    group.add_data(f(i))
+                    #data[ index ].append( f(i) )
+                    i += self.step
+                series.add_group(group)
+                
+        elif isinstance(function, Series): # instance of Series
+            series = function
+            
+        else: #function
+            group = Group()
+            i = x_bounds[0]
+            while i <= x_bounds[1] :
+                group.add_data(function(i))
+                i += self.step
+            series.add_group(group)
+            
+            
+        return series, x_bounds
+
+    def calc_labels(self):
+        if not self.labels[HORZ]:
+            self.labels[HORZ] = []
+            i = self.bounds[HORZ][0]
+            while i<=self.bounds[HORZ][1]:
+                self.labels[HORZ].append(str(i))
+                i += float(self.bounds[HORZ][1] - self.bounds[HORZ][0])/10
+        ScatterPlot.calc_labels(self)
+
+    def render_plot(self):
+        if not self.discrete:
+            ScatterPlot.render_plot(self)
+        else:
+            last = None
+            cr = self.context
+            for number, group in  enumerate (self.series):
+                cr.set_source_rgba(*self.series_colors[number][:4])
+                x0 = self.borders[HORZ] - self.bounds[HORZ][0]*self.horizontal_step
+                y0 = self.borders[VERT] - self.bounds[VERT][0]*self.vertical_step
+                for data in group:
+                    x = x0 + self.horizontal_step * data.content[0]
+                    y = y0 + self.vertical_step   * data.content[1]
+                    cr.move_to(x, self.dimensions[VERT] - y)
+                    cr.line_to(x, self.plot_top)
+                    cr.set_line_width(self.series_widths[number])
+                    cr.stroke()
+                    if self.dots:
+                        cr.new_path()
+                        cr.arc(x, self.dimensions[VERT] - y, 3, 0, 2.1 * math.pi)
+                        cr.close_path()
+                        cr.fill()
+
+class BarPlot(Plot):
+    def __init__(self, 
+                 surface = None,
+                 data = None,
+                 width = 640,
+                 height = 480,
+                 background = "white light_gray",
+                 border = 0,
+                 display_values = False,
+                 grid = False,
+                 rounded_corners = False,
+                 stack = False,
+                 three_dimension = False,
+                 x_labels = None,
+                 y_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 series_colors = None,
+                 main_dir = None):
+        
+        self.bounds = {}
+        self.bounds[HORZ] = x_bounds
+        self.bounds[VERT] = y_bounds
+        self.display_values = display_values
+        self.grid = grid
+        self.rounded_corners = rounded_corners
+        self.stack = stack
+        self.three_dimension = three_dimension
+        self.x_label_angle = math.pi / 2.5
+        self.main_dir = main_dir
+        self.max_value = {}
+        self.plot_dimensions = {}
+        self.steps = {}
+        self.value_label_color = (0.5,0.5,0.5,1.0)
+
+        Plot.__init__(self, surface, data, width, height, background, border, x_labels, y_labels, series_colors)
+
+    def load_series(self, data, x_labels = None, y_labels = None, series_colors = None):
+        Plot.load_series(self, data, x_labels, y_labels, series_colors)
+        self.calc_boundaries()
+        
+    def process_colors(self, series_colors):
+        #Data for a BarPlot might be a List or a List of Lists.
+        #On the first case, colors must be generated for all bars,
+        #On the second, colors must be generated for each of the inner lists.
+        
+        #TODO: Didn't get it...
+        #if hasattr(self.data[0], '__getitem__'):
+        #    length = max(len(series) for series in self.data)
+        #else:
+        #    length = len( self.data )
+        
+        length = max(len(group) for group in self.series)
+        
+        Plot.process_colors( self, series_colors, length, 'linear')
+    
+    def calc_boundaries(self):
+        if not self.bounds[self.main_dir]:
+            if self.stack:
+                max_data_value = max(sum(group.to_list()) for group in self.series)
+            else:
+                max_data_value = max(max(group.to_list()) for group in self.series)
+            self.bounds[self.main_dir] = (0, max_data_value)
+        if not self.bounds[other_direction(self.main_dir)]:
+            self.bounds[other_direction(self.main_dir)] = (0, len(self.series))
+    
+    def calc_extents(self, direction):
+        self.max_value[direction] = 0
+        if self.labels[direction]:
+            widest_word = max(self.labels[direction], key = lambda item: self.context.text_extents(item)[2])
+            self.max_value[direction] = self.context.text_extents(widest_word)[3 - direction]
+            self.borders[other_direction(direction)] = (2-direction)*self.max_value[direction] + self.border + direction*(5)
+        else:
+            self.borders[other_direction(direction)] = self.border
+
+    def calc_horz_extents(self):
+        self.calc_extents(HORZ)
+
+    def calc_vert_extents(self):
+        self.calc_extents(VERT)
+
+    def calc_all_extents(self):
+        self.calc_horz_extents()
+        self.calc_vert_extents()
+        other_dir = other_direction(self.main_dir)
+        self.value_label = 0
+        if self.display_values:
+            if self.stack:
+                self.value_label = self.context.text_extents(str(max(sum(group.to_list()) for group in self.series)))[2 + self.main_dir]
+            else:
+                self.value_label = self.context.text_extents(str(max(max(group.to_list()) for group in self.series)))[2 + self.main_dir]
+        if self.labels[self.main_dir]:
+            self.plot_dimensions[self.main_dir] = self.dimensions[self.main_dir] - 2*self.borders[self.main_dir] - self.value_label
+        else:
+            self.plot_dimensions[self.main_dir] = self.dimensions[self.main_dir] - self.borders[self.main_dir] - 1.2*self.border - self.value_label
+        self.plot_dimensions[other_dir] = self.dimensions[other_dir] - self.borders[other_dir] - self.border
+        self.plot_top = self.dimensions[VERT] - self.borders[VERT]
+
+    def calc_steps(self):
+        other_dir = other_direction(self.main_dir)
+        self.series_amplitude = self.bounds[self.main_dir][1] - self.bounds[self.main_dir][0]
+        if self.series_amplitude:
+            self.steps[self.main_dir] = float(self.plot_dimensions[self.main_dir])/self.series_amplitude
+        else:
+            self.steps[self.main_dir] = 0.00
+        series_length = len(self.series)
+        self.steps[other_dir] = float(self.plot_dimensions[other_dir])/(series_length + 0.1*(series_length + 1))
+        self.space = 0.1*self.steps[other_dir]
+        
+    def render(self):
+        self.calc_all_extents()
+        self.calc_steps()
+        self.render_background()
+        self.render_bounding_box()
+        if self.grid:
+            self.render_grid()
+        if self.three_dimension:
+            self.render_ground()
+        if self.display_values:
+            self.render_values()
+        self.render_labels()
+        self.render_plot()
+        if self.series_labels:
+            self.render_legend()
+    
+    def draw_3d_rectangle_front(self, x0, y0, x1, y1, shift):
+        self.context.rectangle(x0-shift, y0+shift, x1-x0, y1-y0)
+
+    def draw_3d_rectangle_side(self, x0, y0, x1, y1, shift):
+        self.context.move_to(x1-shift,y0+shift)
+        self.context.line_to(x1, y0)
+        self.context.line_to(x1, y1)
+        self.context.line_to(x1-shift, y1+shift)
+        self.context.line_to(x1-shift, y0+shift)
+        self.context.close_path()
+
+    def draw_3d_rectangle_top(self, x0, y0, x1, y1, shift):
+        self.context.move_to(x0-shift,y0+shift)
+        self.context.line_to(x0, y0)
+        self.context.line_to(x1, y0)
+        self.context.line_to(x1-shift, y0+shift)
+        self.context.line_to(x0-shift, y0+shift)
+        self.context.close_path()
+                
+    def draw_round_rectangle(self, x0, y0, x1, y1):
+        self.context.arc(x0+5, y0+5, 5, -math.pi, -math.pi/2)
+        self.context.line_to(x1-5, y0)
+        self.context.arc(x1-5, y0+5, 5, -math.pi/2, 0)
+        self.context.line_to(x1, y1-5)
+        self.context.arc(x1-5, y1-5, 5, 0, math.pi/2)
+        self.context.line_to(x0+5, y1)
+        self.context.arc(x0+5, y1-5, 5, math.pi/2, math.pi)
+        self.context.line_to(x0, y0+5)
+        self.context.close_path()
+
+    def render_ground(self):
+        self.draw_3d_rectangle_front(self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT], 
+                                     self.dimensions[HORZ] - self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT] + 5, 10)
+        self.context.fill()
+
+        self.draw_3d_rectangle_side (self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT], 
+                                     self.dimensions[HORZ] - self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT] + 5, 10)
+        self.context.fill()
+
+        self.draw_3d_rectangle_top  (self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT], 
+                                     self.dimensions[HORZ] - self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT] + 5, 10)
+        self.context.fill()
+
+    def render_labels(self):
+        self.context.set_font_size(self.font_size * 0.8)
+        if self.labels[HORZ]:
+            self.render_horz_labels()
+        if self.labels[VERT]:
+            self.render_vert_labels()
+            
+    def render_legend(self):
+        has_border = bool(getattr(self, "bar_borders", False))
+        cr = self.context
+        cr.set_font_size(self.font_size)
+        cr.set_line_width(self.line_width)
+
+        widest_word = max(self.series_labels, key = lambda item: self.context.text_extents(item)[2])
+        tallest_word = max(self.series_labels, key = lambda item: self.context.text_extents(item)[3])
+        max_width = self.context.text_extents(widest_word)[2]
+        max_height = self.context.text_extents(tallest_word)[3] * 1.1 + 5
+        
+        color_box_height = max_height / 2
+        color_box_width = color_box_height * 2
+        
+        #Draw a bounding box
+        bounding_box_width = max_width + color_box_width + 15
+        bounding_box_height = (len(self.series_labels) + int(has_border) +0.5) * max_height
+        cr.set_source_rgba(1,1,1)
+        cr.rectangle(self.dimensions[HORZ] - self.border - bounding_box_width, self.border,
+                            bounding_box_width, bounding_box_height)
+        cr.fill()
+        
+        cr.set_source_rgba(*self.line_color)
+        cr.set_line_width(self.line_width)
+        cr.rectangle(self.dimensions[HORZ] - self.border - bounding_box_width, self.border,
+                            bounding_box_width, bounding_box_height)
+        cr.stroke()
+
+        for idx,key in enumerate(self.series_labels):
+            #Draw color box
+            cr.set_source_rgba(*self.series_colors[idx][:4])
+            cr.rectangle(self.dimensions[HORZ] - self.border - max_width - color_box_width - 10, 
+                                self.border + color_box_height + (idx*max_height) ,
+                                color_box_width, color_box_height)
+            cr.fill()
+            
+            cr.set_source_rgba(0, 0, 0)
+            cr.rectangle(self.dimensions[HORZ] - self.border - max_width - color_box_width - 10, 
+                                self.border + color_box_height + (idx*max_height),
+                                color_box_width, color_box_height)
+            cr.stroke()
+            
+            #Draw series labels
+            cr.set_source_rgba(0, 0, 0)
+            cr.move_to(self.dimensions[HORZ] - self.border - max_width - 5, self.border + ((idx+1)*max_height))
+            cr.show_text(key)
+            
+        if has_border:
+            idx += 1
+            
+            cr.set_source_rgba(1, 0, 0)
+            cr.rectangle(self.dimensions[HORZ] - self.border - max_width - color_box_width - 10, 
+                                self.border + color_box_height + (idx*max_height),
+                                color_box_width, color_box_height)
+            cr.stroke()
+            
+            #Draw series labels
+            cr.set_source_rgba(0, 0, 0)
+            cr.move_to(self.dimensions[HORZ] - self.border - max_width - 5, self.border + ((idx+1)*max_height))
+            cr.show_text("is not using index")
+            
+
+
+class HorizontalBarPlot(BarPlot):
+    def __init__(self, 
+                 surface = None,
+                 data = None,
+                 width = 640,
+                 height = 480,
+                 background = "white light_gray",
+                 border = 0,
+                 display_values = False,
+                 grid = False,
+                 rounded_corners = False,
+                 stack = False,
+                 three_dimension = False,
+                 series_labels = None,
+                 x_labels = None,
+                 y_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 series_colors = None):
+
+        BarPlot.__init__(self, surface, data, width, height, background, border, 
+                         display_values, grid, rounded_corners, stack, three_dimension,
+                         x_labels, y_labels, x_bounds, y_bounds, series_colors, HORZ)
+        self.series_labels = series_labels
+
+    def calc_vert_extents(self):
+        self.calc_extents(VERT)
+        if self.labels[HORZ] and not self.labels[VERT]:
+            self.borders[HORZ] += 10
+
+    def draw_rectangle_bottom(self, x0, y0, x1, y1):
+        self.context.arc(x0+5, y1-5, 5, math.pi/2, math.pi)
+        self.context.line_to(x0, y0+5)
+        self.context.arc(x0+5, y0+5, 5, -math.pi, -math.pi/2)
+        self.context.line_to(x1, y0)
+        self.context.line_to(x1, y1)
+        self.context.line_to(x0+5, y1)
+        self.context.close_path()
+    
+    def draw_rectangle_top(self, x0, y0, x1, y1):
+        self.context.arc(x1-5, y0+5, 5, -math.pi/2, 0)
+        self.context.line_to(x1, y1-5)
+        self.context.arc(x1-5, y1-5, 5, 0, math.pi/2)
+        self.context.line_to(x0, y1)
+        self.context.line_to(x0, y0)
+        self.context.line_to(x1, y0)
+        self.context.close_path()
+        
+    def draw_rectangle(self, index, length, x0, y0, x1, y1):
+        if length == 1:
+            BarPlot.draw_rectangle(self, x0, y0, x1, y1)
+        elif index == 0:
+            self.draw_rectangle_bottom(x0, y0, x1, y1)
+        elif index == length-1:
+            self.draw_rectangle_top(x0, y0, x1, y1)
+        else:
+            self.context.rectangle(x0, y0, x1-x0, y1-y0)
+
+    #TODO: Review BarPlot.render_grid code
+    def render_grid(self):
+        self.context.set_source_rgba(0.8, 0.8, 0.8)
+        if self.labels[HORZ]:
+            self.context.set_font_size(self.font_size * 0.8)
+            step = (self.dimensions[HORZ] - 2*self.borders[HORZ] - self.value_label)/(len(self.labels[HORZ])-1)
+            x = self.borders[HORZ]
+            next_x = 0
+            for item in self.labels[HORZ]:
+                width = self.context.text_extents(item)[2]
+                if x - width/2 > next_x and x - width/2 > self.border:
+                    self.context.move_to(x, self.border)
+                    self.context.line_to(x, self.dimensions[VERT] - self.borders[VERT])
+                    self.context.stroke()
+                    next_x = x + width/2
+                x += step
+        else:
+            lines = 11
+            horizontal_step = float(self.plot_dimensions[HORZ])/(lines-1)
+            x = self.borders[HORZ]
+            for y in xrange(0, lines):
+                self.context.move_to(x, self.border)
+                self.context.line_to(x, self.dimensions[VERT] - self.borders[VERT])
+                self.context.stroke()
+                x += horizontal_step
+
+    def render_horz_labels(self):
+        step = (self.dimensions[HORZ] - 2*self.borders[HORZ])/(len(self.labels[HORZ])-1)
+        x = self.borders[HORZ]
+        next_x = 0
+
+        for item in self.labels[HORZ]:
+            self.context.set_source_rgba(*self.label_color)
+            width = self.context.text_extents(item)[2]
+            if x - width/2 > next_x and x - width/2 > self.border:
+                self.context.move_to(x - width/2, self.dimensions[VERT] - self.borders[VERT] + self.max_value[HORZ] + 3)
+                self.context.show_text(item)
+                next_x = x + width/2
+            x += step
+
+    def render_vert_labels(self):
+        series_length = len(self.labels[VERT])
+        step = (self.plot_dimensions[VERT] - (series_length + 1)*self.space)/(len(self.labels[VERT]))
+        y = self.border + step/2 + self.space
+
+        for item in self.labels[VERT]:
+            self.context.set_source_rgba(*self.label_color)
+            width, height = self.context.text_extents(item)[2:4]
+            self.context.move_to(self.borders[HORZ] - width - 5, y + height/2)
+            self.context.show_text(item)
+            y += step + self.space
+        self.labels[VERT].reverse()
+
+    def render_values(self):
+        self.context.set_source_rgba(*self.value_label_color)
+        self.context.set_font_size(self.font_size * 0.8)
+        if self.stack:
+            for i,group in enumerate(self.series):
+                value = sum(group.to_list())
+                height = self.context.text_extents(str(value))[3]
+                x = self.borders[HORZ] + value*self.steps[HORZ] + 2
+                y = self.borders[VERT] + (i+0.5)*self.steps[VERT] + (i+1)*self.space + height/2
+                self.context.move_to(x, y)
+                self.context.show_text(str(value))
+        else:
+            for i,group in enumerate(self.series):
+                inner_step = self.steps[VERT]/len(group)
+                y0 = self.border + i*self.steps[VERT] + (i+1)*self.space
+                for number,data in enumerate(group):
+                    height = self.context.text_extents(str(data.content))[3]
+                    self.context.move_to(self.borders[HORZ] + data.content*self.steps[HORZ] + 2, y0 + 0.5*inner_step + height/2, )
+                    self.context.show_text(str(data.content))
+                    y0 += inner_step
+
+    def render_plot(self):
+        if self.stack:
+            for i,group in enumerate(self.series):
+                x0 = self.borders[HORZ]
+                y0 = self.borders[VERT] + i*self.steps[VERT] + (i+1)*self.space
+                for number,data in enumerate(group):
+                    if self.series_colors[number][4] in ('radial','linear') :
+                        linear = cairo.LinearGradient( data.content*self.steps[HORZ]/2, y0, data.content*self.steps[HORZ]/2, y0 + self.steps[VERT] )
+                        color = self.series_colors[number]
+                        linear.add_color_stop_rgba(0.0, 3.5*color[0]/5.0, 3.5*color[1]/5.0, 3.5*color[2]/5.0,1.0)
+                        linear.add_color_stop_rgba(1.0, *color[:4])
+                        self.context.set_source(linear)
+                    elif self.series_colors[number][4] == 'solid':
+                        self.context.set_source_rgba(*self.series_colors[number][:4])
+                    if self.rounded_corners:
+                        self.draw_rectangle(number, len(group), x0, y0, x0+data.content*self.steps[HORZ], y0+self.steps[VERT])
+                        self.context.fill()
+                    else:
+                        self.context.rectangle(x0, y0, data.content*self.steps[HORZ], self.steps[VERT])
+                        self.context.fill()
+                    x0 += data.content*self.steps[HORZ]
+        else:
+            for i,group in enumerate(self.series):
+                inner_step = self.steps[VERT]/len(group)
+                x0 = self.borders[HORZ]
+                y0 = self.border + i*self.steps[VERT] + (i+1)*self.space
+                for number,data in enumerate(group):
+                    linear = cairo.LinearGradient(data.content*self.steps[HORZ]/2, y0, data.content*self.steps[HORZ]/2, y0 + inner_step)
+                    color = self.series_colors[number]
+                    linear.add_color_stop_rgba(0.0, 3.5*color[0]/5.0, 3.5*color[1]/5.0, 3.5*color[2]/5.0,1.0)
+                    linear.add_color_stop_rgba(1.0, *color[:4])
+                    self.context.set_source(linear)
+                    if self.rounded_corners and data.content != 0:
+                        BarPlot.draw_round_rectangle(self,x0, y0, x0 + data.content*self.steps[HORZ], y0 + inner_step)
+                        self.context.fill()
+                    else:
+                        self.context.rectangle(x0, y0, data.content*self.steps[HORZ], inner_step)
+                        self.context.fill()
+                    y0 += inner_step
+    
+class VerticalBarPlot(BarPlot):
+    def __init__(self, 
+                 surface = None,
+                 data = None,
+                 width = 640,
+                 height = 480,
+                 background = "white light_gray",
+                 border = 0,
+                 display_values = False,
+                 grid = False,
+                 rounded_corners = False,
+                 stack = False,
+                 three_dimension = False,
+                 series_labels = None,
+                 x_labels = None,
+                 y_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 series_colors = None):
+
+        BarPlot.__init__(self, surface, data, width, height, background, border, 
+                         display_values, grid, rounded_corners, stack, three_dimension,
+                         x_labels, y_labels, x_bounds, y_bounds, series_colors, VERT)
+        self.series_labels = series_labels
+
+    def calc_vert_extents(self):
+        self.calc_extents(VERT)
+        if self.labels[VERT] and not self.labels[HORZ]:
+            self.borders[VERT] += 10
+
+    def draw_rectangle_bottom(self, x0, y0, x1, y1):
+        self.context.move_to(x1,y1)
+        self.context.arc(x1-5, y1-5, 5, 0, math.pi/2)
+        self.context.line_to(x0+5, y1)
+        self.context.arc(x0+5, y1-5, 5, math.pi/2, math.pi)
+        self.context.line_to(x0, y0)
+        self.context.line_to(x1, y0)
+        self.context.line_to(x1, y1)
+        self.context.close_path()
+        
+    def draw_rectangle_top(self, x0, y0, x1, y1):
+        self.context.arc(x0+5, y0+5, 5, -math.pi, -math.pi/2)
+        self.context.line_to(x1-5, y0)
+        self.context.arc(x1-5, y0+5, 5, -math.pi/2, 0)
+        self.context.line_to(x1, y1)
+        self.context.line_to(x0, y1)
+        self.context.line_to(x0, y0)
+        self.context.close_path()
+        
+    def draw_rectangle(self, index, length, x0, y0, x1, y1):
+        if length == 1:
+            BarPlot.draw_rectangle(self, x0, y0, x1, y1)
+        elif index == 0:
+            self.draw_rectangle_bottom(x0, y0, x1, y1)
+        elif index == length-1:
+            self.draw_rectangle_top(x0, y0, x1, y1)
+        else:
+            self.context.rectangle(x0, y0, x1-x0, y1-y0)
+
+    def render_grid(self):
+        self.context.set_source_rgba(0.8, 0.8, 0.8)
+        if self.labels[VERT]:
+            lines = len(self.labels[VERT])
+            vertical_step = float(self.plot_dimensions[self.main_dir])/(lines-1)
+            y = self.borders[VERT] + self.value_label
+        else:
+            lines = 11
+            vertical_step = float(self.plot_dimensions[self.main_dir])/(lines-1)
+            y = 1.2*self.border + self.value_label
+        for x in xrange(0, lines):
+            self.context.move_to(self.borders[HORZ], y)
+            self.context.line_to(self.dimensions[HORZ] - self.border, y)
+            self.context.stroke()
+            y += vertical_step
+            
+    def render_ground(self):
+        self.draw_3d_rectangle_front(self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT], 
+                                     self.dimensions[HORZ] - self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT] + 5, 10)
+        self.context.fill()
+
+        self.draw_3d_rectangle_side (self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT], 
+                                     self.dimensions[HORZ] - self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT] + 5, 10)
+        self.context.fill()
+
+        self.draw_3d_rectangle_top  (self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT], 
+                                     self.dimensions[HORZ] - self.borders[HORZ], self.dimensions[VERT] - self.borders[VERT] + 5, 10)
+        self.context.fill()
+
+    def render_horz_labels(self):
+        series_length = len(self.labels[HORZ])
+        step = float (self.plot_dimensions[HORZ] - (series_length + 1)*self.space)/len(self.labels[HORZ])
+        x = self.borders[HORZ] + step/2 + self.space
+        next_x = 0
+
+        for item in self.labels[HORZ]:
+            self.context.set_source_rgba(*self.label_color)
+            width = self.context.text_extents(item)[2]
+            if not(x - width/2 > next_x and x - width/2 > self.borders[HORZ]):
+                items = [item[:len(item)/2], item[len(item)/2:],]
+            else:
+                items = [item,]
+            for i, item in enumerate(items):
+                width = self.context.text_extents(item)[2]
+                height = self.context.text_extents(item)[3]
+                v_space = (len(items) - i - 1) * height
+                
+                if x - width/2 > next_x and x - width/2 > self.borders[HORZ]:
+                    self.context.move_to(x - width/2, self.dimensions[VERT] - self.borders[VERT] + self.max_value[HORZ] + 3 - v_space + 3)
+                    self.context.show_text(item)
+            next_x = x + width/2
+            x += step + self.space
+            
+    def render_vert_labels(self):
+        self.context.set_source_rgba(*self.label_color)
+        y = self.borders[VERT] + self.value_label
+        step = (self.dimensions[VERT] - 2*self.borders[VERT] - self.value_label)/(len(self.labels[VERT]) - 1)
+        self.labels[VERT].reverse()
+        for item in self.labels[VERT]:
+            width, height = self.context.text_extents(item)[2:4]
+            self.context.move_to(self.borders[HORZ] - width - 5, y + height/2)
+            self.context.show_text(item)
+            y += step
+        self.labels[VERT].reverse()
+
+    def render_values(self):
+        self.context.set_source_rgba(*self.value_label_color)
+        self.context.set_font_size(self.font_size * 0.8)
+        if self.stack:
+            for i,group in enumerate(self.series):
+                value = sum(group.to_list())
+                width = self.context.text_extents(str(value))[2]
+                x = self.borders[HORZ] + (i+0.5)*self.steps[HORZ] + (i+1)*self.space - width/2
+                y = value*self.steps[VERT] + 2
+                self.context.move_to(x, self.plot_top-y)
+                self.context.show_text(str(value))
+        else:
+            for i,group in enumerate(self.series):
+                inner_step = self.steps[HORZ]/len(group)
+                x0 = self.borders[HORZ] + i*self.steps[HORZ] + (i+1)*self.space
+                for number,data in enumerate(group):
+                    width = self.context.text_extents(str(data.content))[2]
+                    self.context.move_to(x0 + 0.5*inner_step - width/2, self.plot_top - data.content*self.steps[VERT] - 2)
+                    self.context.show_text(str(data.content))
+                    x0 += inner_step
+
+    def render_plot(self):
+        if self.stack:
+            for i,group in enumerate(self.series):
+                x0 = self.borders[HORZ] + i*self.steps[HORZ] + (i+1)*self.space
+                y0 = 0
+                for number,data in enumerate(group):
+                    if self.series_colors[number][4] in ('linear','radial'):
+                        linear = cairo.LinearGradient( x0, data.content*self.steps[VERT]/2, x0 + self.steps[HORZ], data.content*self.steps[VERT]/2 )
+                        color = self.series_colors[number]
+                        linear.add_color_stop_rgba(0.0, 3.5*color[0]/5.0, 3.5*color[1]/5.0, 3.5*color[2]/5.0,1.0)
+                        linear.add_color_stop_rgba(1.0, *color[:4])
+                        self.context.set_source(linear)
+                    elif self.series_colors[number][4] == 'solid':
+                        self.context.set_source_rgba(*self.series_colors[number][:4])
+                    if self.rounded_corners:
+                        self.draw_rectangle(number, len(group), x0, self.plot_top - y0 - data.content*self.steps[VERT], x0 + self.steps[HORZ], self.plot_top - y0)
+                        self.context.fill()
+                    else:
+                        self.context.rectangle(x0, self.plot_top - y0 - data.content*self.steps[VERT], self.steps[HORZ], data.content*self.steps[VERT])
+                        self.context.fill()
+                    y0 += data.content*self.steps[VERT]
+        else:
+            for i,group in enumerate(self.series):
+                inner_step = self.steps[HORZ]/len(group)
+                y0 = self.borders[VERT]
+                x0 = self.borders[HORZ] + i*self.steps[HORZ] + (i+1)*self.space
+                for number,data in enumerate(group):
+                    if self.series_colors[number][4] == 'linear':
+                        linear = cairo.LinearGradient( x0, data.content*self.steps[VERT]/2, x0 + inner_step, data.content*self.steps[VERT]/2 )
+                        color = self.series_colors[number]
+                        linear.add_color_stop_rgba(0.0, 3.5*color[0]/5.0, 3.5*color[1]/5.0, 3.5*color[2]/5.0,1.0)
+                        linear.add_color_stop_rgba(1.0, *color[:4])
+                        self.context.set_source(linear)
+                    elif self.series_colors[number][4] == 'solid':
+                        self.context.set_source_rgba(*self.series_colors[number][:4])
+                    if self.rounded_corners and data.content != 0:
+                        BarPlot.draw_round_rectangle(self, x0, self.plot_top - data.content*self.steps[VERT], x0+inner_step, self.plot_top)
+                        self.context.fill()
+                    elif self.three_dimension:
+                        self.draw_3d_rectangle_front(x0, self.plot_top - data.content*self.steps[VERT], x0+inner_step, self.plot_top, 5)
+                        self.context.fill()
+                        self.draw_3d_rectangle_side(x0, self.plot_top - data.content*self.steps[VERT], x0+inner_step, self.plot_top, 5)
+                        self.context.fill()
+                        self.draw_3d_rectangle_top(x0, self.plot_top - data.content*self.steps[VERT], x0+inner_step, self.plot_top, 5)
+                        self.context.fill()
+                    else:
+                        self.context.rectangle(x0, self.plot_top - data.content*self.steps[VERT], inner_step, data.content*self.steps[VERT])
+                        if (i, number) in self.bar_borders:
+                            self.context.fill_preserve()
+                            self.context.set_source_rgb(1, 0, 0)
+                            self.context.stroke()
+                        else:
+                            self.context.fill()
+                    
+                    x0 += inner_step
+    
+class StreamChart(VerticalBarPlot):
+    def __init__(self, 
+                 surface = None,
+                 data = None,
+                 width = 640,
+                 height = 480,
+                 background = "white light_gray",
+                 border = 0,
+                 grid = False,
+                 series_legend = None,
+                 x_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 series_colors = None):
+
+        VerticalBarPlot.__init__(self, surface, data, width, height, background, border, 
+                                 False, grid, False, True, False,
+                                 None, x_labels, None, x_bounds, y_bounds, series_colors)
+    
+    def calc_steps(self):
+        other_dir = other_direction(self.main_dir)    
+        self.series_amplitude = self.bounds[self.main_dir][1] - self.bounds[self.main_dir][0]
+        if self.series_amplitude:
+            self.steps[self.main_dir] = float(self.plot_dimensions[self.main_dir])/self.series_amplitude
+        else:
+            self.steps[self.main_dir] = 0.00
+        series_length = len(self.data)
+        self.steps[other_dir] = float(self.plot_dimensions[other_dir])/series_length
+    
+    def render_legend(self):
+        pass
+    
+    def ground(self, index):
+        sum_values = sum(self.data[index])
+        return -0.5*sum_values
+    
+    def calc_angles(self):
+        middle = self.plot_top - self.plot_dimensions[VERT]/2.0
+        self.angles = [tuple([0.0 for x in range(len(self.data)+1)])]
+        for x_index in range(1, len(self.data)-1):
+            t = []
+            x0 = self.borders[HORZ] + (0.5 + x_index - 1)*self.steps[HORZ]
+            x2 = self.borders[HORZ] + (0.5 + x_index + 1)*self.steps[HORZ]
+            y0 = middle - self.ground(x_index-1)*self.steps[VERT]
+            y2 = middle - self.ground(x_index+1)*self.steps[VERT]
+            t.append(math.atan(float(y0-y2)/(x0-x2)))
+            for data_index in range(len(self.data[x_index])):
+                x0 = self.borders[HORZ] + (0.5 + x_index - 1)*self.steps[HORZ]
+                x2 = self.borders[HORZ] + (0.5 + x_index + 1)*self.steps[HORZ]
+                y0 = middle - self.ground(x_index-1)*self.steps[VERT] - self.data[x_index-1][data_index]*self.steps[VERT]
+                y2 = middle - self.ground(x_index+1)*self.steps[VERT] - self.data[x_index+1][data_index]*self.steps[VERT]
+                
+                for i in range(0,data_index):
+                    y0 -= self.data[x_index-1][i]*self.steps[VERT]
+                    y2 -= self.data[x_index+1][i]*self.steps[VERT]
+                
+                if data_index == len(self.data[0])-1 and False:
+                    self.context.set_source_rgba(0.0,0.0,0.0,0.3)
+                    self.context.move_to(x0,y0)
+                    self.context.line_to(x2,y2)
+                    self.context.stroke()
+                    self.context.arc(x0,y0,2,0,2*math.pi)
+                    self.context.fill()
+                t.append(math.atan(float(y0-y2)/(x0-x2)))
+            self.angles.append(tuple(t))
+        self.angles.append(tuple([0.0 for x in range(len(self.data)+1)]))
+    
+    def render_plot(self):
+        self.calc_angles()
+        middle = self.plot_top - self.plot_dimensions[VERT]/2.0
+        p = 0.4*self.steps[HORZ]
+        for data_index in range(len(self.data[0])-1,-1,-1):
+            self.context.set_source_rgba(*self.series_colors[data_index][:4])
+            
+            #draw the upper line
+            for x_index in range(len(self.data)-1) :
+                x1 = self.borders[HORZ] + (0.5 + x_index)*self.steps[HORZ]
+                y1 = middle - self.ground(x_index)*self.steps[VERT] - self.data[x_index][data_index]*self.steps[VERT]
+                x2 = self.borders[HORZ] + (0.5 + x_index + 1)*self.steps[HORZ]
+                y2 = middle - self.ground(x_index + 1)*self.steps[VERT] - self.data[x_index + 1][data_index]*self.steps[VERT]
+                
+                for i in range(0,data_index):
+                    y1 -= self.data[x_index][i]*self.steps[VERT]
+                    y2 -= self.data[x_index+1][i]*self.steps[VERT]
+                
+                if x_index == 0:
+                    self.context.move_to(x1,y1)
+                
+                ang1 = self.angles[x_index][data_index+1]
+                ang2 = self.angles[x_index+1][data_index+1] + math.pi
+                self.context.curve_to(x1+p*math.cos(ang1),y1+p*math.sin(ang1),
+                                      x2+p*math.cos(ang2),y2+p*math.sin(ang2),
+                                      x2,y2)
+
+            for x_index in range(len(self.data)-1,0,-1) :
+                x1 = self.borders[HORZ] + (0.5 + x_index)*self.steps[HORZ]
+                y1 = middle - self.ground(x_index)*self.steps[VERT]
+                x2 = self.borders[HORZ] + (0.5 + x_index - 1)*self.steps[HORZ]
+                y2 = middle - self.ground(x_index - 1)*self.steps[VERT]
+                
+                for i in range(0,data_index):
+                    y1 -= self.data[x_index][i]*self.steps[VERT]
+                    y2 -= self.data[x_index-1][i]*self.steps[VERT]
+                
+                if x_index == len(self.data)-1:
+                    self.context.line_to(x1,y1+2)
+                
+                #revert angles by pi degrees to take the turn back
+                ang1 = self.angles[x_index][data_index] + math.pi
+                ang2 = self.angles[x_index-1][data_index]
+                self.context.curve_to(x1+p*math.cos(ang1),y1+p*math.sin(ang1),
+                                      x2+p*math.cos(ang2),y2+p*math.sin(ang2),
+                                      x2,y2+2)
+
+            self.context.close_path()
+            self.context.fill()
+            
+            if False:
+                self.context.move_to(self.borders[HORZ] + 0.5*self.steps[HORZ], middle)
+                for x_index in range(len(self.data)-1) :
+                    x1 = self.borders[HORZ] + (0.5 + x_index)*self.steps[HORZ]
+                    y1 = middle - self.ground(x_index)*self.steps[VERT] - self.data[x_index][data_index]*self.steps[VERT]
+                    x2 = self.borders[HORZ] + (0.5 + x_index + 1)*self.steps[HORZ]
+                    y2 = middle - self.ground(x_index + 1)*self.steps[VERT] - self.data[x_index + 1][data_index]*self.steps[VERT]
+                    
+                    for i in range(0,data_index):
+                        y1 -= self.data[x_index][i]*self.steps[VERT]
+                        y2 -= self.data[x_index+1][i]*self.steps[VERT]
+                    
+                    ang1 = self.angles[x_index][data_index+1]
+                    ang2 = self.angles[x_index+1][data_index+1] + math.pi
+                    self.context.set_source_rgba(1.0,0.0,0.0)
+                    self.context.arc(x1+p*math.cos(ang1),y1+p*math.sin(ang1),2,0,2*math.pi)
+                    self.context.fill()
+                    self.context.set_source_rgba(0.0,0.0,0.0)
+                    self.context.arc(x2+p*math.cos(ang2),y2+p*math.sin(ang2),2,0,2*math.pi)
+                    self.context.fill()
+                    '''self.context.set_source_rgba(0.0,0.0,0.0,0.3)
+                    self.context.arc(x2,y2,2,0,2*math.pi)
+                    self.context.fill()'''
+                    self.context.move_to(x1,y1)
+                    self.context.line_to(x1+p*math.cos(ang1),y1+p*math.sin(ang1))
+                    self.context.stroke()
+                    self.context.move_to(x2,y2)
+                    self.context.line_to(x2+p*math.cos(ang2),y2+p*math.sin(ang2))
+                    self.context.stroke()
+            if False:
+                for x_index in range(len(self.data)-1,0,-1) :
+                    x1 = self.borders[HORZ] + (0.5 + x_index)*self.steps[HORZ]
+                    y1 = middle - self.ground(x_index)*self.steps[VERT]
+                    x2 = self.borders[HORZ] + (0.5 + x_index - 1)*self.steps[HORZ]
+                    y2 = middle - self.ground(x_index - 1)*self.steps[VERT]
+                    
+                    for i in range(0,data_index):
+                        y1 -= self.data[x_index][i]*self.steps[VERT]
+                        y2 -= self.data[x_index-1][i]*self.steps[VERT]
+                    
+                    #revert angles by pi degrees to take the turn back
+                    ang1 = self.angles[x_index][data_index] + math.pi
+                    ang2 = self.angles[x_index-1][data_index]
+                    self.context.set_source_rgba(0.0,1.0,0.0)
+                    self.context.arc(x1+p*math.cos(ang1),y1+p*math.sin(ang1),2,0,2*math.pi)
+                    self.context.fill()
+                    self.context.set_source_rgba(0.0,0.0,1.0)
+                    self.context.arc(x2+p*math.cos(ang2),y2+p*math.sin(ang2),2,0,2*math.pi)
+                    self.context.fill()
+                    '''self.context.set_source_rgba(0.0,0.0,0.0,0.3)
+                    self.context.arc(x2,y2,2,0,2*math.pi)
+                    self.context.fill()'''
+                    self.context.move_to(x1,y1)
+                    self.context.line_to(x1+p*math.cos(ang1),y1+p*math.sin(ang1))
+                    self.context.stroke()
+                    self.context.move_to(x2,y2)
+                    self.context.line_to(x2+p*math.cos(ang2),y2+p*math.sin(ang2))
+                    self.context.stroke()
+            #break
+            
+            #self.context.arc(self.dimensions[HORZ]/2, self.dimensions[VERT]/2,50,0,3*math.pi/2)
+            #self.context.fill()
+            
+
+class PiePlot(Plot):
+    #TODO: Check the old cairoplot, graphs aren't matching
+    def __init__ (self,
+            surface = None, 
+            data = None, 
+            width = 640, 
+            height = 480, 
+            background = "white light_gray",
+            gradient = False,
+            shadow = False,
+            colors = None):
+
+        Plot.__init__( self, surface, data, width, height, background, series_colors = colors )
+        self.center = (self.dimensions[HORZ]/2, self.dimensions[VERT]/2)
+        self.total = sum( self.series.to_list() )
+        self.radius = min(self.dimensions[HORZ]/3,self.dimensions[VERT]/3)
+        self.gradient = gradient
+        self.shadow = shadow
+    
+    def sort_function(x,y):
+        return x.content - y.content
+
+    def load_series(self, data, x_labels=None, y_labels=None, series_colors=None):
+        Plot.load_series(self, data, x_labels, y_labels, series_colors)
+        # Already done inside series
+        #self.data = sorted(self.data)
+
+    def draw_piece(self, angle, next_angle):
+        self.context.move_to(self.center[0],self.center[1])
+        self.context.line_to(self.center[0] + self.radius*math.cos(angle), self.center[1] + self.radius*math.sin(angle))
+        self.context.arc(self.center[0], self.center[1], self.radius, angle, next_angle)
+        self.context.line_to(self.center[0], self.center[1])
+        self.context.close_path()
+
+    def render(self):
+        self.render_background()
+        self.render_bounding_box()
+        if self.shadow:
+            self.render_shadow()
+        self.render_plot()
+        self.render_series_labels()
+
+    def render_shadow(self):
+        horizontal_shift = 3
+        vertical_shift = 3
+        self.context.set_source_rgba(0, 0, 0, 0.5)
+        self.context.arc(self.center[0] + horizontal_shift, self.center[1] + vertical_shift, self.radius, 0, 2*math.pi)
+        self.context.fill()
+
+    def render_series_labels(self):
+        angle = 0
+        next_angle = 0
+        x0,y0 = self.center
+        cr = self.context
+        for number,key in enumerate(self.series_labels):
+            # self.data[number] should be just a number
+            data = sum(self.series[number].to_list())
+            
+            next_angle = angle + 2.0*math.pi*data/self.total
+            cr.set_source_rgba(*self.series_colors[number][:4])
+            w = cr.text_extents(key)[2]
+            if (angle + next_angle)/2 < math.pi/2 or (angle + next_angle)/2 > 3*math.pi/2:
+                cr.move_to(x0 + (self.radius+10)*math.cos((angle+next_angle)/2), y0 + (self.radius+10)*math.sin((angle+next_angle)/2) )
+            else:
+                cr.move_to(x0 + (self.radius+10)*math.cos((angle+next_angle)/2) - w, y0 + (self.radius+10)*math.sin((angle+next_angle)/2) )
+            cr.show_text(key)
+            angle = next_angle
+
+    def render_plot(self):
+        angle = 0
+        next_angle = 0
+        x0,y0 = self.center
+        cr = self.context
+        for number,group in enumerate(self.series):
+            # Group should be just a number
+            data = sum(group.to_list())
+            next_angle = angle + 2.0*math.pi*data/self.total
+            if self.gradient or self.series_colors[number][4] in ('linear','radial'):
+                gradient_color = cairo.RadialGradient(self.center[0], self.center[1], 0, self.center[0], self.center[1], self.radius)
+                gradient_color.add_color_stop_rgba(0.3, *self.series_colors[number][:4])
+                gradient_color.add_color_stop_rgba(1, self.series_colors[number][0]*0.7,
+                                                      self.series_colors[number][1]*0.7,
+                                                      self.series_colors[number][2]*0.7,
+                                                      self.series_colors[number][3])
+                cr.set_source(gradient_color)
+            else:
+                cr.set_source_rgba(*self.series_colors[number][:4])
+
+            self.draw_piece(angle, next_angle)
+            cr.fill()
+
+            cr.set_source_rgba(1.0, 1.0, 1.0)
+            self.draw_piece(angle, next_angle)
+            cr.stroke()
+
+            angle = next_angle
+
+class DonutPlot(PiePlot):
+    def __init__ (self,
+            surface = None, 
+            data = None, 
+            width = 640, 
+            height = 480,
+            background = "white light_gray",
+            gradient = False,
+            shadow = False,
+            colors = None,
+            inner_radius=-1):
+
+        Plot.__init__( self, surface, data, width, height, background, series_colors = colors )
+        
+        self.center = ( self.dimensions[HORZ]/2, self.dimensions[VERT]/2 )
+        self.total = sum( self.series.to_list() )
+        self.radius = min( self.dimensions[HORZ]/3,self.dimensions[VERT]/3 )
+        self.inner_radius = inner_radius*self.radius
+        
+        if inner_radius == -1:
+            self.inner_radius = self.radius/3
+
+        self.gradient = gradient
+        self.shadow = shadow
+
+    def draw_piece(self, angle, next_angle):
+        self.context.move_to(self.center[0] + (self.inner_radius)*math.cos(angle), self.center[1] + (self.inner_radius)*math.sin(angle))
+        self.context.line_to(self.center[0] + self.radius*math.cos(angle), self.center[1] + self.radius*math.sin(angle))
+        self.context.arc(self.center[0], self.center[1], self.radius, angle, next_angle)
+        self.context.line_to(self.center[0] + (self.inner_radius)*math.cos(next_angle), self.center[1] + (self.inner_radius)*math.sin(next_angle))
+        self.context.arc_negative(self.center[0], self.center[1], self.inner_radius, next_angle, angle)
+        self.context.close_path()
+    
+    def render_shadow(self):
+        horizontal_shift = 3
+        vertical_shift = 3
+        self.context.set_source_rgba(0, 0, 0, 0.5)
+        self.context.arc(self.center[0] + horizontal_shift, self.center[1] + vertical_shift, self.inner_radius, 0, 2*math.pi)
+        self.context.arc_negative(self.center[0] + horizontal_shift, self.center[1] + vertical_shift, self.radius, 0, -2*math.pi)
+        self.context.fill()
+
+class GanttChart (Plot) :
+    def __init__(self,
+                 surface = None,
+                 data = None,
+                 width = 640,
+                 height = 480,
+                 x_labels = None,
+                 y_labels = None,
+                 colors = None):
+        self.bounds = {}
+        self.max_value = {}
+        Plot.__init__(self, surface, data, width, height,  x_labels = x_labels, y_labels = y_labels, series_colors = colors)
+
+    def load_series(self, data, x_labels=None, y_labels=None, series_colors=None):
+        Plot.load_series(self, data, x_labels, y_labels, series_colors)
+        self.calc_boundaries()
+
+    def calc_boundaries(self):
+        self.bounds[HORZ] = (0,len(self.series))
+        end_pos = max(self.series.to_list())
+        
+        #for group in self.series:
+        #    if hasattr(item, "__delitem__"):
+        #        for sub_item in item:
+        #            end_pos = max(sub_item)
+        #    else:
+        #        end_pos = max(item)
+        self.bounds[VERT] = (0,end_pos)
+
+    def calc_extents(self, direction):
+        self.max_value[direction] = 0
+        if self.labels[direction]:
+            self.max_value[direction] = max(self.context.text_extents(item)[2] for item in self.labels[direction])
+        else:
+            self.max_value[direction] = self.context.text_extents( str(self.bounds[direction][1] + 1) )[2]
+
+    def calc_horz_extents(self):
+        self.calc_extents(HORZ)
+        self.borders[HORZ] = 100 + self.max_value[HORZ]
+
+    def calc_vert_extents(self):
+        self.calc_extents(VERT)
+        self.borders[VERT] = self.dimensions[VERT]/(self.bounds[HORZ][1] + 1)
+
+    def calc_steps(self):
+        self.horizontal_step = (self.dimensions[HORZ] - self.borders[HORZ])/(len(self.labels[VERT]))
+        self.vertical_step = self.borders[VERT]
+
+    def render(self):
+        self.calc_horz_extents()
+        self.calc_vert_extents()
+        self.calc_steps()
+        self.render_background()
+
+        self.render_labels()
+        self.render_grid()
+        self.render_plot()
+
+    def render_background(self):
+        cr = self.context
+        cr.set_source_rgba(255,255,255)
+        cr.rectangle(0,0,self.dimensions[HORZ], self.dimensions[VERT])
+        cr.fill()
+        for number,group in enumerate(self.series):
+            linear = cairo.LinearGradient(self.dimensions[HORZ]/2, self.borders[VERT] + number*self.vertical_step, 
+                                          self.dimensions[HORZ]/2, self.borders[VERT] + (number+1)*self.vertical_step)
+            linear.add_color_stop_rgba(0,1.0,1.0,1.0,1.0)
+            linear.add_color_stop_rgba(1.0,0.9,0.9,0.9,1.0)
+            cr.set_source(linear)
+            cr.rectangle(0,self.borders[VERT] + number*self.vertical_step,self.dimensions[HORZ],self.vertical_step)
+            cr.fill()
+
+    def render_grid(self):
+        cr = self.context
+        cr.set_source_rgba(0.7, 0.7, 0.7)
+        cr.set_dash((1,0,0,0,0,0,1))
+        cr.set_line_width(0.5)
+        for number,label in enumerate(self.labels[VERT]):
+            h = cr.text_extents(label)[3]
+            cr.move_to(self.borders[HORZ] + number*self.horizontal_step, self.vertical_step/2 + h)
+            cr.line_to(self.borders[HORZ] + number*self.horizontal_step, self.dimensions[VERT])
+        cr.stroke()
+
+    def render_labels(self):
+        self.context.set_font_size(0.02 * self.dimensions[HORZ])
+
+        self.render_horz_labels()
+        self.render_vert_labels()
+
+    def render_horz_labels(self):
+        cr = self.context
+        labels = self.labels[HORZ]
+        if not labels:
+            labels = [str(i) for i in range(1, self.bounds[HORZ][1] + 1)  ]
+        for number,label in enumerate(labels):
+            if label != None:
+                cr.set_source_rgba(0.5, 0.5, 0.5)
+                w,h = cr.text_extents(label)[2], cr.text_extents(label)[3]
+                cr.move_to(40,self.borders[VERT] + number*self.vertical_step + self.vertical_step/2 + h/2)
+                cr.show_text(label)
+            
+    def render_vert_labels(self):
+        cr = self.context
+        labels = self.labels[VERT]
+        if not labels:
+            labels = [str(i) for i in range(1, self.bounds[VERT][1] + 1)  ]
+        for number,label in enumerate(labels):
+            w,h = cr.text_extents(label)[2], cr.text_extents(label)[3]
+            cr.move_to(self.borders[HORZ] + number*self.horizontal_step - w/2, self.vertical_step/2)
+            cr.show_text(label)
+
+    def render_rectangle(self, x0, y0, x1, y1, color):
+        self.draw_shadow(x0, y0, x1, y1)
+        self.draw_rectangle(x0, y0, x1, y1, color)
+
+    def draw_rectangular_shadow(self, gradient, x0, y0, w, h):
+        self.context.set_source(gradient)
+        self.context.rectangle(x0,y0,w,h)
+        self.context.fill()
+    
+    def draw_circular_shadow(self, x, y, radius, ang_start, ang_end, mult, shadow):
+        gradient = cairo.RadialGradient(x, y, 0, x, y, 2*radius)
+        gradient.add_color_stop_rgba(0, 0, 0, 0, shadow)
+        gradient.add_color_stop_rgba(1, 0, 0, 0, 0)
+        self.context.set_source(gradient)
+        self.context.move_to(x,y)
+        self.context.line_to(x + mult[0]*radius,y + mult[1]*radius)
+        self.context.arc(x, y, 8, ang_start, ang_end)
+        self.context.line_to(x,y)
+        self.context.close_path()
+        self.context.fill()
+
+    def draw_rectangle(self, x0, y0, x1, y1, color):
+        cr = self.context
+        middle = (x0+x1)/2
+        linear = cairo.LinearGradient(middle,y0,middle,y1)
+        linear.add_color_stop_rgba(0,3.5*color[0]/5.0, 3.5*color[1]/5.0, 3.5*color[2]/5.0,1.0)
+        linear.add_color_stop_rgba(1,*color[:4])
+        cr.set_source(linear)
+
+        cr.arc(x0+5, y0+5, 5, 0, 2*math.pi)
+        cr.arc(x1-5, y0+5, 5, 0, 2*math.pi)
+        cr.arc(x0+5, y1-5, 5, 0, 2*math.pi)
+        cr.arc(x1-5, y1-5, 5, 0, 2*math.pi)
+        cr.rectangle(x0+5,y0,x1-x0-10,y1-y0)
+        cr.rectangle(x0,y0+5,x1-x0,y1-y0-10)
+        cr.fill()
+
+    def draw_shadow(self, x0, y0, x1, y1):
+        shadow = 0.4
+        h_mid = (x0+x1)/2
+        v_mid = (y0+y1)/2
+        h_linear_1 = cairo.LinearGradient(h_mid,y0-4,h_mid,y0+4)
+        h_linear_2 = cairo.LinearGradient(h_mid,y1-4,h_mid,y1+4)
+        v_linear_1 = cairo.LinearGradient(x0-4,v_mid,x0+4,v_mid)
+        v_linear_2 = cairo.LinearGradient(x1-4,v_mid,x1+4,v_mid)
+
+        h_linear_1.add_color_stop_rgba( 0, 0, 0, 0, 0)
+        h_linear_1.add_color_stop_rgba( 1, 0, 0, 0, shadow)
+        h_linear_2.add_color_stop_rgba( 0, 0, 0, 0, shadow)
+        h_linear_2.add_color_stop_rgba( 1, 0, 0, 0, 0)
+        v_linear_1.add_color_stop_rgba( 0, 0, 0, 0, 0)
+        v_linear_1.add_color_stop_rgba( 1, 0, 0, 0, shadow)
+        v_linear_2.add_color_stop_rgba( 0, 0, 0, 0, shadow)
+        v_linear_2.add_color_stop_rgba( 1, 0, 0, 0, 0)
+
+        self.draw_rectangular_shadow(h_linear_1,x0+4,y0-4,x1-x0-8,8)
+        self.draw_rectangular_shadow(h_linear_2,x0+4,y1-4,x1-x0-8,8)
+        self.draw_rectangular_shadow(v_linear_1,x0-4,y0+4,8,y1-y0-8)
+        self.draw_rectangular_shadow(v_linear_2,x1-4,y0+4,8,y1-y0-8)
+
+        self.draw_circular_shadow(x0+4, y0+4, 4, math.pi, 3*math.pi/2, (-1,0), shadow)
+        self.draw_circular_shadow(x1-4, y0+4, 4, 3*math.pi/2, 2*math.pi, (0,-1), shadow)
+        self.draw_circular_shadow(x0+4, y1-4, 4, math.pi/2, math.pi, (0,1), shadow)
+        self.draw_circular_shadow(x1-4, y1-4, 4, 0, math.pi/2, (1,0), shadow)
+
+    def render_plot(self):
+        for index,group in enumerate(self.series):
+            for data in group:
+                self.render_rectangle(self.borders[HORZ] + data.content[0]*self.horizontal_step, 
+                                      self.borders[VERT] + index*self.vertical_step + self.vertical_step/4.0,
+                                      self.borders[HORZ] + data.content[1]*self.horizontal_step, 
+                                      self.borders[VERT] + index*self.vertical_step + 3.0*self.vertical_step/4.0, 
+                                      self.series_colors[index])
+
+# Function definition
+
+def scatter_plot(name,
+                 data   = None,
+                 errorx = None,
+                 errory = None,
+                 width  = 640,
+                 height = 480,
+                 background = "white light_gray",
+                 border = 0,
+                 axis = False,
+                 dash = False,
+                 discrete = False, 
+                 dots = False,
+                 grid = False,
+                 series_legend = False,
+                 x_labels = None,
+                 y_labels = None,
+                 x_bounds = None,
+                 y_bounds = None,
+                 z_bounds = None,
+                 x_title  = None,
+                 y_title  = None,
+                 series_colors = None,
+                 circle_colors = None):
+    
+    '''
+        - Function to plot scatter data.
+        
+        - Parameters
+        
+        data - The values to be ploted might be passed in a two basic:
+               list of points:       [(0,0), (0,1), (0,2)] or [(0,0,1), (0,1,4), (0,2,1)]
+               lists of coordinates: [ [0,0,0] , [0,1,2] ] or [ [0,0,0] , [0,1,2] , [1,4,1] ]
+               Notice that these kinds of that can be grouped in order to form more complex data 
+               using lists of lists or dictionaries;
+        series_colors - Define color values for each of the series
+        circle_colors - Define a lower and an upper bound for the circle colors for variable radius
+                        (3 dimensions) series
+    '''
+    
+    plot = ScatterPlot( name, data, errorx, errory, width, height, background, border,
+                        axis, dash, discrete, dots, grid, series_legend, x_labels, y_labels,
+                        x_bounds, y_bounds, z_bounds, x_title, y_title, series_colors, circle_colors )
+    plot.render()
+    plot.commit()
+
+def dot_line_plot(name,
+                  data,
+                  width,
+                  height,
+                  background = "white light_gray",
+                  border = 0,
+                  axis = False,
+                  dash = False,
+                  dots = False,
+                  grid = False,
+                  series_legend = False,
+                  x_labels = None,
+                  y_labels = None,
+                  x_bounds = None,
+                  y_bounds = None,
+                  x_title  = None,
+                  y_title  = None,
+                  series_colors = None):
+    '''
+        - Function to plot graphics using dots and lines.
+        
+        dot_line_plot (name, data, width, height, background = "white light_gray", border = 0, axis = False, grid = False, x_labels = None, y_labels = None, x_bounds = None, y_bounds = None)
+
+        - Parameters
+
+        name - Name of the desired output file, no need to input the .svg as it will be added at runtim;
+        data - The list, list of lists or dictionary holding the data to be plotted;
+        width, height - Dimensions of the output image;
+        background - A 3 element tuple representing the rgb color expected for the background or a new cairo linear gradient. 
+                     If left None, a gray to white gradient will be generated;
+        border - Distance in pixels of a square border into which the graphics will be drawn;
+        axis - Whether or not the axis are to be drawn;
+        dash - Boolean or a list or a dictionary of booleans indicating whether or not the associated series should be drawn in dashed mode;
+        dots - Whether or not dots should be drawn on each point;
+        grid - Whether or not the gris is to be drawn;
+        series_legend - Whether or not the legend is to be drawn;
+        x_labels, y_labels - lists of strings containing the horizontal and vertical labels for the axis;
+        x_bounds, y_bounds - tuples containing the lower and upper value bounds for the data to be plotted;
+        x_title - Whether or not to plot a title over the x axis.
+        y_title - Whether or not to plot a title over the y axis.
+
+        - Examples of use
+
+        data = [0, 1, 3, 8, 9, 0, 10, 10, 2, 1]
+        CairoPlot.dot_line_plot('teste', data, 400, 300)
+        
+        data = { "john" : [10, 10, 10, 10, 30], "mary" : [0, 0, 3, 5, 15], "philip" : [13, 32, 11, 25, 2] }
+        x_labels = ["jan/2008", "feb/2008", "mar/2008", "apr/2008", "may/2008" ]
+        CairoPlot.dot_line_plot( 'test', data, 400, 300, axis = True, grid = True, 
+                                  series_legend = True, x_labels = x_labels )
+    '''
+    plot = DotLinePlot( name, data, width, height, background, border,
+                        axis, dash, dots, grid, series_legend, x_labels, y_labels,
+                        x_bounds, y_bounds, x_title, y_title, series_colors )
+    plot.render()
+    plot.commit()
+
+def function_plot(name,
+                  data,
+                  width,
+                  height,
+                  background = "white light_gray",
+                  border = 0,
+                  axis = True,
+                  dots = False,
+                  discrete = False,
+                  grid = False,
+                  series_legend = False,
+                  x_labels = None,
+                  y_labels = None,
+                  x_bounds = None,
+                  y_bounds = None,
+                  x_title  = None,
+                  y_title  = None,
+                  series_colors = None,
+                  step = 1):
+
+    '''
+        - Function to plot functions.
+        
+        function_plot(name, data, width, height, background = "white light_gray", border = 0, axis = True, grid = False, dots = False, x_labels = None, y_labels = None, x_bounds = None, y_bounds = None, step = 1, discrete = False)
+
+        - Parameters
+        
+        name - Name of the desired output file, no need to input the .svg as it will be added at runtim;
+        data - The list, list of lists or dictionary holding the data to be plotted;
+        width, height - Dimensions of the output image;
+        background - A 3 element tuple representing the rgb color expected for the background or a new cairo linear gradient. 
+                     If left None, a gray to white gradient will be generated;
+        border - Distance in pixels of a square border into which the graphics will be drawn;
+        axis - Whether or not the axis are to be drawn;
+        grid - Whether or not the gris is to be drawn;
+        dots - Whether or not dots should be shown at each point;
+        x_labels, y_labels - lists of strings containing the horizontal and vertical labels for the axis;
+        x_bounds, y_bounds - tuples containing the lower and upper value bounds for the data to be plotted;
+        step - the horizontal distance from one point to the other. The smaller, the smoother the curve will be;
+        discrete - whether or not the function should be plotted in discrete format.
+       
+        - Example of use
+
+        data = lambda x : x**2
+        CairoPlot.function_plot('function4', data, 400, 300, grid = True, x_bounds=(-10,10), step = 0.1)
+    '''
+    
+    plot = FunctionPlot( name, data, width, height, background, border,
+                         axis, discrete, dots, grid, series_legend, x_labels, y_labels,
+                         x_bounds, y_bounds, x_title, y_title, series_colors, step )
+    plot.render()
+    plot.commit()
+
+def pie_plot( name, data, width, height, background = "white light_gray", gradient = False, shadow = False, colors = None ):
+
+    '''
+        - Function to plot pie graphics.
+        
+        pie_plot(name, data, width, height, background = "white light_gray", gradient = False, colors = None)
+
+        - Parameters
+        
+        name - Name of the desired output file, no need to input the .svg as it will be added at runtim;
+        data - The list, list of lists or dictionary holding the data to be plotted;
+        width, height - Dimensions of the output image;
+        background - A 3 element tuple representing the rgb color expected for the background or a new cairo linear gradient. 
+                     If left None, a gray to white gradient will be generated;
+        gradient - Whether or not the pie color will be painted with a gradient;
+        shadow - Whether or not there will be a shadow behind the pie;
+        colors - List of slices colors.
+
+        - Example of use
+        
+        teste_data = {"john" : 123, "mary" : 489, "philip" : 890 , "suzy" : 235}
+        CairoPlot.pie_plot("pie_teste", teste_data, 500, 500)
+    '''
+
+    plot = PiePlot( name, data, width, height, background, gradient, shadow, colors )
+    plot.render()
+    plot.commit()
+
+def donut_plot(name, data, width, height, background = "white light_gray", gradient = False, shadow = False, colors = None, inner_radius = -1):
+
+    '''
+        - Function to plot donut graphics.
+        
+        donut_plot(name, data, width, height, background = "white light_gray", gradient = False, inner_radius = -1)
+
+        - Parameters
+        
+        name - Name of the desired output file, no need to input the .svg as it will be added at runtim;
+        data - The list, list of lists or dictionary holding the data to be plotted;
+        width, height - Dimensions of the output image;
+        background - A 3 element tuple representing the rgb color expected for the background or a new cairo linear gradient. 
+                     If left None, a gray to white gradient will be generated;
+        shadow - Whether or not there will be a shadow behind the donut;
+        gradient - Whether or not the donut color will be painted with a gradient;
+        colors - List of slices colors;
+        inner_radius - The radius of the donut's inner circle.
+
+        - Example of use
+        
+        teste_data = {"john" : 123, "mary" : 489, "philip" : 890 , "suzy" : 235}
+        CairoPlot.donut_plot("donut_teste", teste_data, 500, 500)
+    '''
+
+    plot = DonutPlot(name, data, width, height, background, gradient, shadow, colors, inner_radius)
+    plot.render()
+    plot.commit()
+
+def gantt_chart(name, pieces, width, height, x_labels, y_labels, colors):
+
+    '''
+        - Function to generate Gantt Charts.
+        
+        gantt_chart(name, pieces, width, height, x_labels, y_labels, colors):
+
+        - Parameters
+        
+        name - Name of the desired output file, no need to input the .svg as it will be added at runtim;
+        pieces - A list defining the spaces to be drawn. The user must pass, for each line, the index of its start and the index of its end. If a line must have two or more spaces, they must be passed inside a list;
+        width, height - Dimensions of the output image;
+        x_labels - A list of names for each of the vertical lines;
+        y_labels - A list of names for each of the horizontal spaces;
+        colors - List containing the colors expected for each of the horizontal spaces
+
+        - Example of use
+
+        pieces = [ (0.5,5.5) , [(0,4),(6,8)] , (5.5,7) , (7,8)]
+        x_labels = [ 'teste01', 'teste02', 'teste03', 'teste04']
+        y_labels = [ '0001', '0002', '0003', '0004', '0005', '0006', '0007', '0008', '0009', '0010' ]
+        colors = [ (1.0, 0.0, 0.0), (1.0, 0.7, 0.0), (1.0, 1.0, 0.0), (0.0, 1.0, 0.0) ]
+        CairoPlot.gantt_chart('gantt_teste', pieces, 600, 300, x_labels, y_labels, colors)
+    '''
+
+    plot = GanttChart(name, pieces, width, height, x_labels, y_labels, colors)
+    plot.render()
+    plot.commit()
+
+def vertical_bar_plot(name, 
+                      data, 
+                      width, 
+                      height, 
+                      background = "white light_gray", 
+                      border = 0, 
+                      display_values = False,
+                      grid = False,
+                      rounded_corners = False,
+                      stack = False,
+                      three_dimension = False,
+                      series_labels = None,
+                      x_labels = None, 
+                      y_labels = None, 
+                      x_bounds = None, 
+                      y_bounds = None,
+                      colors = None,
+                      bar_borders=None):
+    #TODO: Fix docstring for vertical_bar_plot
+    '''
+        - Function to generate vertical Bar Plot Charts.
+
+        bar_plot(name, data, width, height, background, border, grid, rounded_corners, three_dimension, 
+                 x_labels, y_labels, x_bounds, y_bounds, colors):
+
+        - Parameters
+        
+        name - Name of the desired output file, no need to input the .svg as it will be added at runtime;
+        data - The list, list of lists or dictionary holding the data to be plotted;
+        width, height - Dimensions of the output image;
+        background - A 3 element tuple representing the rgb color expected for the background or a new cairo linear gradient. 
+                     If left None, a gray to white gradient will be generated;
+        border - Distance in pixels of a square border into which the graphics will be drawn;
+        grid - Whether or not the gris is to be drawn;
+        rounded_corners - Whether or not the bars should have rounded corners;
+        three_dimension - Whether or not the bars should be drawn in pseudo 3D;
+        x_labels, y_labels - lists of strings containing the horizontal and vertical labels for the axis;
+        x_bounds, y_bounds - tuples containing the lower and upper value bounds for the data to be plotted;
+        colors - List containing the colors expected for each of the bars.
+
+        - Example of use
+
+        data = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        CairoPlot.vertical_bar_plot ('bar2', data, 400, 300, border = 20, grid = True, rounded_corners = False)
+    '''
+    
+    plot = VerticalBarPlot(name, data, width, height, background, border, 
+                           display_values, grid, rounded_corners, stack, three_dimension, 
+                           series_labels, x_labels, y_labels, x_bounds, y_bounds, colors)
+    plot.bar_borders = bar_borders or list()
+    plot.render()
+    plot.commit()
+
+def horizontal_bar_plot(name, 
+                       data, 
+                       width, 
+                       height, 
+                       background = "white light_gray", 
+                       border = 0,
+                       display_values = False,
+                       grid = False,
+                       rounded_corners = False,
+                       stack = False,
+                       three_dimension = False,
+                       series_labels = None,
+                       x_labels = None, 
+                       y_labels = None, 
+                       x_bounds = None, 
+                       y_bounds = None,
+                       colors = None):
+
+    #TODO: Fix docstring for horizontal_bar_plot
+    '''
+        - Function to generate Horizontal Bar Plot Charts.
+
+        bar_plot(name, data, width, height, background, border, grid, rounded_corners, three_dimension, 
+                 x_labels, y_labels, x_bounds, y_bounds, colors):
+
+        - Parameters
+        
+        name - Name of the desired output file, no need to input the .svg as it will be added at runtime;
+        data - The list, list of lists or dictionary holding the data to be plotted;
+        width, height - Dimensions of the output image;
+        background - A 3 element tuple representing the rgb color expected for the background or a new cairo linear gradient. 
+                     If left None, a gray to white gradient will be generated;
+        border - Distance in pixels of a square border into which the graphics will be drawn;
+        grid - Whether or not the gris is to be drawn;
+        rounded_corners - Whether or not the bars should have rounded corners;
+        three_dimension - Whether or not the bars should be drawn in pseudo 3D;
+        x_labels, y_labels - lists of strings containing the horizontal and vertical labels for the axis;
+        x_bounds, y_bounds - tuples containing the lower and upper value bounds for the data to be plotted;
+        colors - List containing the colors expected for each of the bars.
+
+        - Example of use
+
+        data = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        CairoPlot.bar_plot ('bar2', data, 400, 300, border = 20, grid = True, rounded_corners = False)
+    '''
+    
+    plot = HorizontalBarPlot(name, data, width, height, background, border, 
+                             display_values, grid, rounded_corners, stack, three_dimension, 
+                             series_labels, x_labels, y_labels, x_bounds, y_bounds, colors)
+    plot.render()
+    plot.commit()
+
+def stream_chart(name, 
+                 data, 
+                 width, 
+                 height, 
+                 background = "white light_gray", 
+                 border = 0,
+                 grid = False,
+                 series_legend = None,
+                 x_labels = None, 
+                 x_bounds = None, 
+                 y_bounds = None,
+                 colors = None):
+
+    #TODO: Fix docstring for horizontal_bar_plot
+    plot = StreamChart(name, data, width, height, background, border, 
+                       grid, series_legend, x_labels, x_bounds, y_bounds, colors)
+    plot.render()
+    plot.commit()
+
+
+if __name__ == "__main__":
+    import tests
+    import seriestests

=== added file 'tools/development/mem.json'
--- tools/development/mem.json	1970-01-01 00:00:00 +0000
+++ tools/development/mem.json	2011-12-25 16:30:29 +0000
@@ -0,0 +1,68 @@
+{
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularActor": {
+        "find_events": 0.1846622200000001, 
+        "get_events_time": 0.0038136999999999997, 
+        "find_ids_time": 0.20167999267578124, 
+        "overall": 0.18847592, 
+        "marsh_time": 0.00286044
+    }, 
+    "__metadata__": {
+        "name": "lp:zeitgeist-memory"
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentMimeType": {
+        "find_events": 0.18125415999999997, 
+        "get_events_time": 0.0037675800000000004, 
+        "find_ids_time": 0.19801628112792968, 
+        "overall": 0.18502174, 
+        "marsh_time": 0.0028360200000000003
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentEvents": {
+        "find_events": 0.22450478000000004, 
+        "get_events_time": 0.003636660000000001, 
+        "find_ids_time": 0.24092146396636963, 
+        "overall": 0.22814144, 
+        "marsh_time": 0.0028534200000000006
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularMimeType": {
+        "find_events": 0.18577652, 
+        "get_events_time": 0.0038717200000000004, 
+        "find_ids_time": 0.20267923831939696, 
+        "overall": 0.18964824000000002, 
+        "marsh_time": 0.00290134
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularSubjects": {
+        "find_events": 0.31522891999999997, 
+        "get_events_time": 0.004730179999999998, 
+        "find_ids_time": 0.33615870475769044, 
+        "overall": 0.31995909999999994, 
+        "marsh_time": 0.0036437199999999996
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularSubjectInterpretation": {
+        "find_events": 0.19031057999999998, 
+        "get_events_time": 0.0011861600000000001, 
+        "find_ids_time": 0.1958630323410034, 
+        "overall": 0.19149674, 
+        "marsh_time": 0.0007032400000000003
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentSubjects": {
+        "find_events": 0.30441516, 
+        "get_events_time": 0.004497760000000001, 
+        "find_ids_time": 0.3248697566986084, 
+        "overall": 0.30891292, 
+        "marsh_time": 0.0035954999999999993
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentActor": {
+        "find_events": 0.17844293999999997, 
+        "get_events_time": 0.0037379200000000005, 
+        "find_ids_time": 0.1951742935180664, 
+        "overall": 0.18218086, 
+        "marsh_time": 0.00282154
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentSubjectInterpretation": {
+        "find_events": 0.22029188000000008, 
+        "get_events_time": 0.0013980600000000002, 
+        "find_ids_time": 0.2268238639831543, 
+        "overall": 0.22168994, 
+        "marsh_time": 0.0008562600000000004
+    }
+}
\ No newline at end of file

=== added directory 'tools/development/query_sets'
=== added file 'tools/development/query_sets/timerange_always.txt'
--- tools/development/query_sets/timerange_always.txt	1970-01-01 00:00:00 +0000
+++ tools/development/query_sets/timerange_always.txt	2011-12-25 16:30:29 +0000
@@ -0,0 +1,9 @@
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentEvents
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentSubjects
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularSubjects
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularActor
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentActor
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentSubjectInterpretation
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularSubjectInterpretation
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentMimeType
+TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularMimeType

=== added file 'tools/development/query_sets/timerange_interval.txt'
--- tools/development/query_sets/timerange_interval.txt	1970-01-01 00:00:00 +0000
+++ tools/development/query_sets/timerange_interval.txt	2011-12-25 16:30:29 +0000
@@ -0,0 +1,9 @@
+(1, 60000), [], StorageState.Any, 6, ResultType.MostRecentEvents
+(1, 60000), [], StorageState.Any, 6, ResultType.MostRecentSubjects
+(1, 60000), [], StorageState.Any, 6, ResultType.MostPopularSubjects
+(1, 60000), [], StorageState.Any, 6, ResultType.MostPopularActor
+(1, 60000), [], StorageState.Any, 6, ResultType.MostRecentActor
+(1, 60000), [], StorageState.Any, 6, ResultType.MostRecentSubjectInterpretation
+(1, 60000), [], StorageState.Any, 6, ResultType.MostPopularSubjectInterpretation
+(1, 60000), [], StorageState.Any, 6, ResultType.MostRecentMimeType
+(1, 60000), [], StorageState.Any, 6, ResultType.MostPopularMimeType

=== added file 'tools/development/query_timings.py'
--- tools/development/query_timings.py	1970-01-01 00:00:00 +0000
+++ tools/development/query_timings.py	2011-12-25 16:30:29 +0000
@@ -0,0 +1,238 @@
+#! /usr/bin/env python
+# -.- coding: utf-8 -.-
+
+# Zeitgeist
+#
+# Copyright © 2010 Markus Korn <thekorn@xxxxxxx>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# USAGE
+#
+# To run the benchmarks on a certain branch of zeitgeist make sure this
+# branch is in PYTHONPATH.
+# To benchmark and output overall to 'output.json' run
+#  ./query_overalls.py -o output.json
+# If you already have data in the output file and want to merge both
+# data sets (build avg.) run
+#  ./query_overalls.py -m -o output.json
+# To plot the data use the '--plot' argument, multible '--plot' arguments
+# will define multible series.
+#  ./query_overalls.py --plot output.json --plot output1.json -o plot.svg
+# In short, a run always looks like:
+#  PYTHONPATH=../trunk tools/development/query_overalls.py --name "lp:zeitgeist" -o trunk.json \
+#       --queries tools/development/query_sets/timerange_always.txt
+#  PYTHONPATH=. tools/development/query_overalls.py --name "lp:some-branch" -o somebranch.json
+#  PYTHONPATH=. tools/development/query_overalls.py --plot somebranch.json --plot trunk.json -o benchmark.svg
+
+import os
+import random
+import time
+import json
+import sys
+import logging
+
+from optparse import OptionParser
+from logging import handlers
+from collections import defaultdict
+
+from zeitgeist.datamodel import TimeRange, StorageState, ResultType
+from zeitgeist.datamodel import Event
+import benchmark as engine
+
+from cairoplot import vertical_bar_plot
+
+
+class QueryPlanHandler(handlers.MemoryHandler):
+    
+    @staticmethod
+    def get_plan(msg):
+        if "SELECT id FROM event_view" not in msg:
+            return None
+        msg = msg.splitlines()
+        if not "PLAN:" in msg:
+            return None
+        for plan in msg[msg.index("PLAN:")+1:]:
+            if "INDEX" not in plan and "PRIMARY KEY" not in plan:
+                return False
+        return True
+        
+    def __init__(self):
+        handlers.MemoryHandler.__init__(self, 200000, logging.DEBUG)
+        self.uses_index = None
+        
+    def emit(self, record):
+        x = self.get_plan(record.msg)
+        if x is not None:
+            if not x or self.uses_index is None:
+                self.uses_index = x
+        return handlers.MemoryHandler.emit(self, record)
+
+def get_reference_engine():
+    return engine
+    
+def get_query_set(source):
+    for line in open(source):
+        yield line.strip()
+
+def get_cmdline():
+    parser = OptionParser()
+    parser.add_option("-o", dest="output", help="write output to FILE", metavar="FILE")
+    parser.add_option("--queries", dest="queryset", help="run all queries in FILE", metavar="FILE")
+    parser.add_option("--name", dest="name", help="name of the data series", metavar="NAME")
+    parser.add_option("-i", dest="isolated", action="store_true",
+        default=False, help="run each query isolated")
+    parser.add_option("-m", dest="merge", action="store_true",
+        default=False, help="if the datafile already contains data the new data gets merged")
+    parser.add_option("--plot", dest="plot_files", metavar="DATA_FILE",
+        action="append", type="str")
+    parser.add_option("--type", dest="type", help="type of plot")
+    (options, args) = parser.parse_args()
+    assert not args
+    return options
+    
+def get_name(data, alternative_name):
+    try:
+        return data["__metadata__"]["name"]
+    except:
+        return alternative_name
+        
+def get_data(dataset, query, key):
+    try:
+        return float(dataset[query][key])
+    except:
+        return 0.0
+        
+def compare_queries(a, b):
+    result = cmp(a.strip().split()[-1], b.strip().split()[-1])
+    if result != 0:
+        return result
+    return cmp(a[0], b[0])
+    
+def plot(output_filename, plot_type, *data_files):
+    raw_data = map(lambda x: json.load(open(x)), data_files)
+    series_labels = map(lambda x: get_name(x[1], data_files[x[0]]), enumerate(raw_data))
+    queries = sorted(
+        filter(lambda x: x != "__metadata__", set(sum([d.keys() for d in raw_data], []))),
+        cmp=compare_queries
+    )
+    data = []
+    max_value = 0
+    no_index = list()
+    style = plot_type
+    for n, query in enumerate(queries):
+        x = [get_data(d, query, style) for d in raw_data]
+        print x
+        y = max(x)
+        idx_border = [not d.get(query, {}).get("uses_index", True) for d in raw_data]
+        for i, b in enumerate(idx_border):
+            if b:
+                no_index.append((n, i))
+        if y > max_value:
+            max_value = y
+        data.append(x)
+    y_parts = max_value / float(4)
+    y_labels = ["%.5fs" %(i*y_parts) for i in range(5)]
+    vertical_bar_plot(
+        output_filename, data, len(queries)*400, 600,
+        x_labels=queries, y_labels=y_labels,
+        grid=True, series_labels=series_labels, bar_borders=no_index)
+    
+
+if __name__ == "__main__":
+    options = get_cmdline()
+    if options.plot_files:
+        if options.type in ("marsh_time", "get_events_time", "find_ids_time", "find_events", "overall"):
+            assert options.output
+            plot(options.output, options.type, *options.plot_files)
+        else:
+            print "please specify plot type (marsh_time, get_events_time, find_ids_time, find_events, overall)"
+    else:
+        engine = get_reference_engine()
+        result = {}
+        if options.name:
+            result["__metadata__"] = {
+                "name": options.name,
+            }
+        if options.output and os.path.exists(options.output):
+            existing_data = json.load(open(options.output))
+        else:
+            existing_data = {}
+        logging.basicConfig(level=logging.DEBUG)
+        for query in get_query_set(options.queryset):
+            args = eval(query)
+            start_time = time.time()
+            logging.getLogger("").removeHandler(logging.getLogger("").handlers[0])
+            handler = QueryPlanHandler()
+            logging.getLogger("").addHandler(handler)
+            results = {}
+            for i in xrange (50):
+                t1 = time.time()
+                temp = engine.find_events(*args)
+                temp["overall"] = time.time() - t1
+                if len(results.keys()) == 0:
+                    for key in results.keys():
+                        temp[key] = temp[key]
+                    results = temp
+                else:
+                    for key in temp.keys():
+                        if key != "events":
+                            results[key] += temp[key]
+                            print results[key]
+            
+            for key in temp.keys():
+                if key != "events":
+                    results[key] = results[key]/50
+            
+            print (results.keys())
+            
+            events = results["events"]
+            run_time = results["find_events"]
+            find_ids_time = results["overall"]
+            find_events_time = results["find_event_ids"]
+            get_events_time = results["get_events"]
+            marsh_time = results["marsh_events"]
+            
+            print "===>", find_ids_time
+            
+            if query in existing_data and options.merge:
+                print "=================================="
+                counter = existing_data[query].get("counter", 1)
+                old_time = existing_data[query]["overall"]
+                run_time = (old_time * counter + run_time)/(counter + 1)
+                
+                result[query] = {
+                    "overall": run_time,
+                    "counter": counter + 1,
+                    "find_ids_time": find_ids_time,
+                    "get_events_time": get_events_time,
+                    "find_events": find_events_time,
+                    "marsh_time": marsh_time,
+                }
+            else:
+                result[query] = {
+                    "overall": run_time,
+                    "find_ids_time": find_ids_time,
+                    "get_events_time": get_events_time,
+                    "find_events": find_events_time,
+                    "marsh_time": marsh_time,
+                }
+        if options.output:
+            f = open(options.output, "w")
+        else:
+            f = sys.stdout
+        try:
+            json.dump(result, f, indent=4)
+        finally:
+            f.close()

=== added file 'tools/development/series.py'
--- tools/development/series.py	1970-01-01 00:00:00 +0000
+++ tools/development/series.py	2011-12-25 16:30:29 +0000
@@ -0,0 +1,1140 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Serie.py
+#
+# Copyright (c) 2008 Magnun Leno da Silva
+#
+# Author: Magnun Leno da Silva <magnun.leno@xxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+# Contributor: Rodrigo Moreiro Araujo <alf.rodrigo@xxxxxxxxx>
+
+#import cairoplot
+import doctest
+
+NUMTYPES = (int, float, long)
+LISTTYPES = (list, tuple)
+STRTYPES = (str, unicode)
+FILLING_TYPES = ['linear', 'solid', 'gradient']
+DEFAULT_COLOR_FILLING = 'solid'
+#TODO: Define default color list
+DEFAULT_COLOR_LIST = None
+
+class Data(object):
+    '''
+        Class that models the main data structure.
+        It can hold:
+         - a number type (int, float or long)
+         - a tuple, witch represents a point and can have 2 or 3 items (x,y,z)
+         - if a list is passed it will be converted to a tuple.
+         
+        obs: In case a tuple is passed it will convert to tuple
+    '''
+    def __init__(self, data=None, name=None, parent=None):
+        '''
+            Starts main atributes from the Data class
+            @name    - Name for each point;
+            @content - The real data, can be an int, float, long or tuple, which
+                       represents a point (x,y) or (x,y,z);
+            @parent  - A pointer that give the data access to it's parent.
+            
+            Usage:
+            >>> d = Data(name='empty'); print d
+            empty: ()
+            >>> d = Data((1,1),'point a'); print d
+            point a: (1, 1)
+            >>> d = Data((1,2,3),'point b'); print d
+            point b: (1, 2, 3)
+            >>> d = Data([2,3],'point c'); print d
+            point c: (2, 3)
+            >>> d = Data(12, 'simple value'); print d
+            simple value: 12
+        '''
+        # Initial values
+        self.__content = None
+        self.__name = None
+        
+        # Setting passed values
+        self.parent = parent
+        self.name = name
+        self.content = data
+        
+    # Name property
+    @apply
+    def name():
+        doc = '''
+            Name is a read/write property that controls the input of name.
+             - If passed an invalid value it cleans the name with None
+             
+            Usage:
+            >>> d = Data(13); d.name = 'name_test'; print d
+            name_test: 13
+            >>> d.name = 11; print d
+            13
+            >>> d.name = 'other_name'; print d
+            other_name: 13
+            >>> d.name = None; print d
+            13
+            >>> d.name = 'last_name'; print d
+            last_name: 13
+            >>> d.name = ''; print d
+            13
+        '''
+        def fget(self):
+            '''
+                returns the name as a string
+            '''
+            return self.__name
+        
+        def fset(self, name):
+            '''
+                Sets the name of the Data
+            '''
+            if type(name) in STRTYPES and len(name) > 0:
+                self.__name = name
+            else:
+                self.__name = None
+                
+        
+        
+        return property(**locals())
+
+    # Content property
+    @apply
+    def content():
+        doc = '''
+            Content is a read/write property that validate the data passed
+            and return it.
+            
+            Usage:
+            >>> d = Data(); d.content = 13; d.content
+            13
+            >>> d = Data(); d.content = (1,2); d.content
+            (1, 2)
+            >>> d = Data(); d.content = (1,2,3); d.content
+            (1, 2, 3)
+            >>> d = Data(); d.content = [1,2,3]; d.content
+            (1, 2, 3)
+            >>> d = Data(); d.content = [1.5,.2,3.3]; d.content
+            (1.5, 0.20000000000000001, 3.2999999999999998)
+        '''
+        def fget(self):
+            '''
+                Return the content of Data
+            '''
+            return self.__content
+
+        def fset(self, data):
+            '''
+                Ensures that data is a valid tuple/list or a number (int, float
+                or long)
+            '''
+            # Type: None
+            if data is None:
+                self.__content = None
+                return
+            
+            # Type: Int or Float
+            elif type(data) in NUMTYPES:
+                self.__content = data
+            
+            # Type: List or Tuple
+            elif type(data) in LISTTYPES:
+                # Ensures the correct size
+                if len(data) not in (2, 3):
+                    raise TypeError, "Data (as list/tuple) must have 2 or 3 items"
+                    return
+                    
+                # Ensures that all items in list/tuple is a number
+                isnum = lambda x : type(x) not in NUMTYPES
+                    
+                if max(map(isnum, data)):
+                    # An item in data isn't an int or a float
+                    raise TypeError, "All content of data must be a number (int or float)"
+                    
+                # Convert the tuple to list
+                if type(data) is list:
+                    data = tuple(data)
+                    
+                # Append a copy and sets the type
+                self.__content = data[:]
+            
+            # Unknown type!
+            else:
+                self.__content = None
+                raise TypeError, "Data must be an int, float or a tuple with two or three items"
+                return
+            
+        return property(**locals())
+
+    
+    def clear(self):
+        '''
+            Clear the all Data (content, name and parent)
+        '''
+        self.content = None
+        self.name = None
+        self.parent = None
+        
+    def copy(self):
+        '''
+            Returns a copy of the Data structure
+        '''
+        # The copy
+        new_data = Data()
+        if self.content is not None:
+            # If content is a point
+            if type(self.content) is tuple:
+                new_data.__content = self.content[:]
+                
+            # If content is a number
+            else:
+                new_data.__content = self.content
+                
+        # If it has a name
+        if self.name is not None:
+            new_data.__name = self.name
+            
+        return new_data
+    
+    def __str__(self):
+        '''
+            Return a string representation of the Data structure
+        '''
+        if self.name is None:
+            if self.content is None:
+                return ''
+            return str(self.content)
+        else:
+            if self.content is None:
+                return self.name+": ()"
+            return self.name+": "+str(self.content)
+
+    def __len__(self):
+        '''
+            Return the length of the Data.
+             - If it's a number return 1;
+             - If it's a list return it's length;
+             - If its None return 0.
+        '''
+        if self.content is None:
+            return 0
+        elif type(self.content) in NUMTYPES:
+            return 1
+        return len(self.content)
+    
+    
+    
+
+class Group(object):
+    '''
+        Class that models a group of data. Every value (int, float, long, tuple
+        or list) passed is converted to a list of Data.
+        It can receive:
+         - A single number (int, float, long);
+         - A list of numbers;
+         - A tuple of numbers;
+         - An instance of Data;
+         - A list of Data;
+         
+         Obs: If a tuple with 2 or 3 items is passed it is converted to a point.
+              If a tuple with only 1 item is passed it's converted to a number;
+              If a tuple with more than 2 items is passed it's converted to a
+               list of numbers
+    '''
+    def __init__(self, group=None, name=None, parent=None):
+        '''
+            Starts main atributes in Group instance.
+            @data_list  - a list of data which forms the group;
+            @range      - a range that represent the x axis of possible functions;
+            @name       - name of the data group;
+            @parent     - the Serie parent of this group.
+            
+            Usage:
+            >>> g = Group(13, 'simple number'); print g
+            simple number ['13']
+            >>> g = Group((1,2), 'simple point'); print g
+            simple point ['(1, 2)']
+            >>> g = Group([1,2,3,4], 'list of numbers'); print g
+            list of numbers ['1', '2', '3', '4']
+            >>> g = Group((1,2,3,4),'int in tuple'); print g
+            int in tuple ['1', '2', '3', '4']
+            >>> g = Group([(1,2),(2,3),(3,4)], 'list of points'); print g
+            list of points ['(1, 2)', '(2, 3)', '(3, 4)']
+            >>> g = Group([[1,2,3],[1,2,3]], '2D coordinate lists'); print g
+            2D coordinated lists ['(1, 1)', '(2, 2)', '(3, 3)']
+            >>> g = Group([[1,2],[1,2],[1,2]], '3D coordinate lists'); print g
+            3D coordinated lists ['(1, 1, 1)', '(2, 2, 2)']
+        '''
+        # Initial values
+        self.__data_list = []
+        self.__range = []
+        self.__name = None
+        
+        
+        self.parent = parent
+        self.name = name
+        self.data_list = group
+        
+    # Name property
+    @apply
+    def name():
+        doc = '''
+            Name is a read/write property that controls the input of name.
+             - If passed an invalid value it cleans the name with None
+             
+            Usage:
+            >>> g = Group(13); g.name = 'name_test'; print g
+            name_test ['13']
+            >>> g.name = 11; print g
+            ['13']
+            >>> g.name = 'other_name'; print g
+            other_name ['13']
+            >>> g.name = None; print g
+            ['13']
+            >>> g.name = 'last_name'; print g
+            last_name ['13']
+            >>> g.name = ''; print g
+            ['13']
+        '''
+        def fget(self):
+            '''
+                Returns the name as a string
+            '''
+            return self.__name
+        
+        def fset(self, name):
+            '''
+                Sets the name of the Group
+            '''
+            if type(name) in STRTYPES and len(name) > 0:
+                self.__name = name
+            else:
+                self.__name = None
+        
+        return property(**locals())
+
+    # data_list property
+    @apply
+    def data_list():
+        doc = '''
+            The data_list is a read/write property that can be a list of
+            numbers, a list of points or a list of 2 or 3 coordinate lists. This
+            property uses mainly the self.add_data method.
+            
+            Usage:
+            >>> g = Group(); g.data_list = 13; print g
+            ['13']
+            >>> g.data_list = (1,2); print g
+            ['(1, 2)']
+            >>> g.data_list = Data((1,2),'point a'); print g
+            ['point a: (1, 2)']
+            >>> g.data_list = [1,2,3]; print g
+            ['1', '2', '3']
+            >>> g.data_list = (1,2,3,4); print g
+            ['1', '2', '3', '4']
+            >>> g.data_list = [(1,2),(2,3),(3,4)]; print g
+            ['(1, 2)', '(2, 3)', '(3, 4)']
+            >>> g.data_list = [[1,2],[1,2]]; print g
+            ['(1, 1)', '(2, 2)']
+            >>> g.data_list = [[1,2],[1,2],[1,2]]; print g
+            ['(1, 1, 1)', '(2, 2, 2)']
+            >>> g.range = (10); g.data_list = lambda x:x**2; print g
+            ['(0.0, 0.0)', '(1.0, 1.0)', '(2.0, 4.0)', '(3.0, 9.0)', '(4.0, 16.0)', '(5.0, 25.0)', '(6.0, 36.0)', '(7.0, 49.0)', '(8.0, 64.0)', '(9.0, 81.0)']
+        '''
+        def fget(self):
+            '''
+                Returns the value of data_list
+            '''
+            return self.__data_list
+
+        def fset(self, group):
+            '''
+                Ensures that group is valid.
+            '''
+            # None
+            if group is None:
+                self.__data_list = []
+            
+            # Int/float/long or Instance of Data
+            elif type(group) in NUMTYPES or isinstance(group, Data):
+                # Clean data_list
+                self.__data_list = []
+                self.add_data(group)
+            
+            # One point
+            elif type(group) is tuple and len(group) in (2,3):
+                self.__data_list = []
+                self.add_data(group)
+            
+            # list of items
+            elif type(group) in LISTTYPES and type(group[0]) is not list:
+                # Clean data_list
+                self.__data_list = []
+                for item in group:
+                    # try to append and catch an exception
+                    self.add_data(item)
+            
+            # function lambda
+            elif callable(group):
+                # Explicit is better than implicit
+                function = group
+                # Has range
+                if len(self.range) is not 0:
+                    # Clean data_list
+                    self.__data_list = []
+                    # Generate values for the lambda function
+                    for x in self.range:
+                        #self.add_data((x,round(group(x),2)))
+                        self.add_data((x,function(x)))
+                        
+                # Only have range in parent
+                elif self.parent is not None and len(self.parent.range) is not 0:
+                    # Copy parent range
+                    self.__range = self.parent.range[:]
+                    # Clean data_list
+                    self.__data_list = []
+                    # Generate values for the lambda function
+                    for x in self.range:
+                        #self.add_data((x,round(group(x),2)))
+                        self.add_data((x,function(x)))
+                        
+                # Don't have range anywhere
+                else:
+                    # x_data don't exist
+                    raise Exception, "Data argument is valid but to use function type please set x_range first"
+                
+            # Coordinate Lists
+            elif type(group) in LISTTYPES and type(group[0]) is list:
+                # Clean data_list
+                self.__data_list = []
+                data = []
+                if len(group) == 3:
+                    data = zip(group[0], group[1], group[2])
+                elif len(group) == 2:
+                    data = zip(group[0], group[1])
+                else:
+                    raise TypeError, "Only one list of coordinates was received."
+                
+                for item in data:
+                    self.add_data(item)
+                
+            else:
+                raise TypeError, "Group type not supported"
+
+        return property(**locals())
+
+    @apply
+    def range():
+        doc = '''
+            The range is a read/write property that generates a range of values
+            for the x axis of the functions. When passed a tuple it almost works
+            like the built-in range funtion:
+             - 1 item, represent the end of the range started from 0;
+             - 2 items, represents the start and the end, respectively;
+             - 3 items, the last one represents the step;
+             
+            When passed a list the range function understands as a valid range.
+            
+            Usage:
+            >>> g = Group(); g.range = 10; print g.range
+            [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0]
+            >>> g = Group(); g.range = (5); print g.range
+            [0.0, 1.0, 2.0, 3.0, 4.0]
+            >>> g = Group(); g.range = (1,7); print g.range
+            [1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
+            >>> g = Group(); g.range = (0,10,2); print g.range
+            [0.0, 2.0, 4.0, 6.0, 8.0]
+            >>>
+            >>> g = Group(); g.range = [0]; print g.range
+            [0.0]
+            >>> g = Group(); g.range = [0,10,20]; print g.range
+            [0.0, 10.0, 20.0]
+        '''
+        def fget(self):
+            '''
+                Returns the range
+            '''
+            return self.__range
+        
+        def fset(self, x_range):
+            '''
+                Controls the input of a valid type and generate the range
+            '''
+            # if passed a simple number convert to tuple
+            if type(x_range) in NUMTYPES:
+                x_range = (x_range,)
+            
+            # A list, just convert to float
+            if type(x_range) is list and len(x_range) > 0:
+                # Convert all to float
+                x_range = map(float, x_range)
+                # Prevents repeated values and convert back to list
+                self.__range = list(set(x_range[:]))
+                # Sort the list to ascending order
+                self.__range.sort()
+            
+            # A tuple, must check the lengths and generate the values
+            elif type(x_range) is tuple and len(x_range) in (1,2,3):
+                # Convert all to float
+                x_range = map(float, x_range)
+                
+                # Inital values
+                start = 0.0
+                step = 1.0
+                end = 0.0
+                
+                # Only the end and it can't be less or iqual to 0
+                if len(x_range) is 1 and x_range > 0:
+                        end = x_range[0]
+                
+                # The start and the end but the start must be less then the end
+                elif len(x_range) is 2 and x_range[0] < x_range[1]:
+                        start = x_range[0]
+                        end = x_range[1]
+                
+                # All 3, but the start must be less then the end
+                elif x_range[0] <= x_range[1]:
+                        start = x_range[0]
+                        end = x_range[1]
+                        step = x_range[2]
+                
+                # Starts the range
+                self.__range = []
+                # Generate the range
+                # Can't use the range function because it doesn't support float values
+                while start < end:
+                    self.__range.append(start)
+                    start += step
+                
+            # Incorrect type
+            else:
+                raise Exception, "x_range must be a list with one or more items or a tuple with 2 or 3 items"
+        
+        return property(**locals())
+
+    def add_data(self, data, name=None):
+        '''
+            Append a new data to the data_list.
+             - If data is an instance of Data, append it
+             - If it's an int, float, tuple or list create an instance of Data and append it
+            
+            Usage:
+            >>> g = Group()
+            >>> g.add_data(12); print g
+            ['12']
+            >>> g.add_data(7,'other'); print g
+            ['12', 'other: 7']
+            >>>
+            >>> g = Group()
+            >>> g.add_data((1,1),'a'); print g
+            ['a: (1, 1)']
+            >>> g.add_data((2,2),'b'); print g
+            ['a: (1, 1)', 'b: (2, 2)']
+            >>> 
+            >>> g.add_data(Data((1,2),'c')); print g
+            ['a: (1, 1)', 'b: (2, 2)', 'c: (1, 2)']
+        '''
+        if not isinstance(data, Data):
+            # Try to convert
+            data = Data(data,name,self)
+        
+        if data.content is not None:
+            self.__data_list.append(data.copy())
+            self.__data_list[-1].parent = self
+        
+
+    def to_list(self):
+        '''
+            Returns the group as a list of numbers (int, float or long) or a
+            list of tuples (points 2D or 3D).
+            
+            Usage:
+            >>> g = Group([1,2,3,4],'g1'); g.to_list()
+            [1, 2, 3, 4]
+            >>> g = Group([(1,2),(2,3),(3,4)],'g2'); g.to_list()
+            [(1, 2), (2, 3), (3, 4)]
+            >>> g = Group([(1,2,3),(3,4,5)],'g2'); g.to_list()
+            [(1, 2, 3), (3, 4, 5)]
+        '''
+        return [data.content for data in self]
+    
+    def copy(self):
+        '''
+            Returns a copy of this group
+        '''
+        new_group = Group()
+        new_group.__name = self.__name
+        if self.__range is not None:
+            new_group.__range = self.__range[:]
+        for data in self:
+            new_group.add_data(data.copy())
+        return new_group
+    
+    def get_names(self):
+        '''
+            Return a list with the names of all data in this group
+        '''
+        names = []
+        for data in self:
+            if data.name is None:
+                names.append('Data '+str(data.index()+1))
+            else:
+                names.append(data.name)
+        return names
+        
+    
+    def __str__ (self):
+        '''
+            Returns a string representing the Group
+        '''
+        ret = ""
+        if self.name is not None:
+            ret += self.name + " "
+        if len(self) > 0:
+            list_str = [str(item) for item in self]
+            ret += str(list_str)
+        else:
+            ret += "[]"
+        return ret
+    
+    def __getitem__(self, key):
+        '''
+            Makes a Group iterable, based in the data_list property
+        '''
+        return self.data_list[key]
+    
+    def __len__(self):
+        '''
+            Returns the length of the Group, based in the data_list property
+        '''
+        return len(self.data_list)
+
+
+class Colors(object):
+    '''
+        Class that models the colors its labels (names) and its properties, RGB
+        and filling type.
+        
+        It can receive:
+        - A list where each item is a list with 3 or 4 items. The
+          first 3 items represent the RGB values and the last argument
+          defines the filling type. The list will be converted to a dict
+          and each color will receve a name based in its position in the
+          list.
+        - A dictionary where each key will be the color name and its item
+          can be a list with 3 or 4 items. The first 3 items represent
+          the RGB colors and the last argument defines the filling type.
+    '''
+    def __init__(self, color_list=None):
+        '''
+            Start the color_list property
+            @ color_list - the list or dict contaning the colors properties.
+        '''
+        self.__color_list = None
+        
+        self.color_list = color_list
+    
+    @apply
+    def color_list():
+        doc = '''
+        >>> c = Colors([[1,1,1],[2,2,2,'linear'],[3,3,3,'gradient']])
+        >>> print c.color_list
+        {'Color 2': [2, 2, 2, 'linear'], 'Color 3': [3, 3, 3, 'gradient'], 'Color 1': [1, 1, 1, 'solid']}
+        >>> c.color_list = [[1,1,1],(2,2,2,'solid'),(3,3,3,'linear')]
+        >>> print c.color_list
+        {'Color 2': [2, 2, 2, 'solid'], 'Color 3': [3, 3, 3, 'linear'], 'Color 1': [1, 1, 1, 'solid']}
+        >>> c.color_list = {'a':[1,1,1],'b':(2,2,2,'solid'),'c':(3,3,3,'linear'), 'd':(4,4,4)}
+        >>> print c.color_list
+        {'a': [1, 1, 1, 'solid'], 'c': [3, 3, 3, 'linear'], 'b': [2, 2, 2, 'solid'], 'd': [4, 4, 4, 'solid']}
+        '''
+        def fget(self):
+            '''
+                Return the color list
+            '''
+            return self.__color_list
+        
+        def fset(self, color_list):
+            '''
+                Format the color list to a dictionary
+            '''
+            if color_list is None:
+                self.__color_list = None
+                return
+            
+            if type(color_list) in LISTTYPES and type(color_list[0]) in LISTTYPES:
+                old_color_list = color_list[:]
+                color_list = {}
+                for index, color in enumerate(old_color_list):
+                    if len(color) is 3 and max(map(type, color)) in NUMTYPES:
+                        color_list['Color '+str(index+1)] = list(color)+[DEFAULT_COLOR_FILLING]
+                    elif len(color) is 4 and max(map(type, color[:-1])) in NUMTYPES and color[-1] in FILLING_TYPES:
+                        color_list['Color '+str(index+1)] = list(color)
+                    else:
+                        raise TypeError, "Unsuported color format"
+            elif type(color_list) is not dict:
+                raise TypeError, "Unsuported color format"
+            
+            for name, color in color_list.items():
+                if len(color) is 3:
+                    if max(map(type, color)) in NUMTYPES:
+                        color_list[name] = list(color)+[DEFAULT_COLOR_FILLING]
+                    else:
+                        raise TypeError, "Unsuported color format"
+                elif len(color) is 4:
+                    if max(map(type, color[:-1])) in NUMTYPES and color[-1] in FILLING_TYPES:
+                        color_list[name] = list(color)
+                    else:
+                        raise TypeError, "Unsuported color format"
+            self.__color_list = color_list.copy()
+        
+        return property(**locals())
+        
+    
+class Series(object):
+    '''
+        Class that models a Series (group of groups). Every value (int, float,
+        long, tuple or list) passed is converted to a list of Group or Data.
+        It can receive:
+         - a single number or point, will be converted to a Group of one Data;
+         - a list of numbers, will be converted to a group of numbers;
+         - a list of tuples, will converted to a single Group of points;
+         - a list of lists of numbers, each 'sublist' will be converted to a
+           group of numbers;
+         - a list of lists of tuples, each 'sublist' will be converted to a
+           group of points;
+         - a list of lists of lists, the content of the 'sublist' will be
+           processed as coordinated lists and the result will be converted to
+           a group of points;
+         - a Dictionary where each item can be the same of the list: number,
+           point, list of numbers, list of points or list of lists (coordinated
+           lists);
+         - an instance of Data;
+         - an instance of group.
+    '''
+    def __init__(self, series=None, name=None, property=[], colors=None):
+        '''
+            Starts main atributes in Group instance.
+            @series     - a list, dict of data of which the series is composed;
+            @name       - name of the series;
+            @property   - a list/dict of properties to be used in the plots of
+                          this Series
+            
+            Usage:
+            >>> print Series([1,2,3,4])
+            ["Group 1 ['1', '2', '3', '4']"]
+            >>> print Series([[1,2,3],[4,5,6]])
+            ["Group 1 ['1', '2', '3']", "Group 2 ['4', '5', '6']"]
+            >>> print Series((1,2))
+            ["Group 1 ['(1, 2)']"]
+            >>> print Series([(1,2),(2,3)])
+            ["Group 1 ['(1, 2)', '(2, 3)']"]
+            >>> print Series([[(1,2),(2,3)],[(4,5),(5,6)]])
+            ["Group 1 ['(1, 2)', '(2, 3)']", "Group 2 ['(4, 5)', '(5, 6)']"]
+            >>> print Series([[[1,2,3],[1,2,3],[1,2,3]]])
+            ["Group 1 ['(1, 1, 1)', '(2, 2, 2)', '(3, 3, 3)']"]
+            >>> print Series({'g1':[1,2,3], 'g2':[4,5,6]})
+            ["g1 ['1', '2', '3']", "g2 ['4', '5', '6']"]
+            >>> print Series({'g1':[(1,2),(2,3)], 'g2':[(4,5),(5,6)]})
+            ["g1 ['(1, 2)', '(2, 3)']", "g2 ['(4, 5)', '(5, 6)']"]
+            >>> print Series({'g1':[[1,2],[1,2]], 'g2':[[4,5],[4,5]]})
+            ["g1 ['(1, 1)', '(2, 2)']", "g2 ['(4, 4)', '(5, 5)']"]
+            >>> print Series(Data(1,'d1'))
+            ["Group 1 ['d1: 1']"]
+            >>> print Series(Group([(1,2),(2,3)],'g1'))
+            ["g1 ['(1, 2)', '(2, 3)']"]
+        '''
+        # Intial values
+        self.__group_list = []
+        self.__name = None
+        self.__range = None
+        
+        # TODO: Implement colors with filling
+        self.__colors = None
+        
+        self.name = name
+        self.group_list = series
+        self.colors = colors
+        
+    # Name property
+    @apply
+    def name():
+        doc = '''
+            Name is a read/write property that controls the input of name.
+             - If passed an invalid value it cleans the name with None
+             
+            Usage:
+            >>> s = Series(13); s.name = 'name_test'; print s
+            name_test ["Group 1 ['13']"]
+            >>> s.name = 11; print s
+            ["Group 1 ['13']"]
+            >>> s.name = 'other_name'; print s
+            other_name ["Group 1 ['13']"]
+            >>> s.name = None; print s
+            ["Group 1 ['13']"]
+            >>> s.name = 'last_name'; print s
+            last_name ["Group 1 ['13']"]
+            >>> s.name = ''; print s
+            ["Group 1 ['13']"]
+        '''
+        def fget(self):
+            '''
+                Returns the name as a string
+            '''
+            return self.__name
+        
+        def fset(self, name):
+            '''
+                Sets the name of the Group
+            '''
+            if type(name) in STRTYPES and len(name) > 0:
+                self.__name = name
+            else:
+                self.__name = None
+        
+        return property(**locals())
+        
+        
+        
+    # Colors property
+    @apply
+    def colors():
+        doc = '''
+        >>> s = Series()
+        >>> s.colors = [[1,1,1],[2,2,2,'linear'],[3,3,3,'gradient']]
+        >>> print s.colors
+        {'Color 2': [2, 2, 2, 'linear'], 'Color 3': [3, 3, 3, 'gradient'], 'Color 1': [1, 1, 1, 'solid']}
+        >>> s.colors = [[1,1,1],(2,2,2,'solid'),(3,3,3,'linear')]
+        >>> print s.colors
+        {'Color 2': [2, 2, 2, 'solid'], 'Color 3': [3, 3, 3, 'linear'], 'Color 1': [1, 1, 1, 'solid']}
+        >>> s.colors = {'a':[1,1,1],'b':(2,2,2,'solid'),'c':(3,3,3,'linear'), 'd':(4,4,4)}
+        >>> print s.colors
+        {'a': [1, 1, 1, 'solid'], 'c': [3, 3, 3, 'linear'], 'b': [2, 2, 2, 'solid'], 'd': [4, 4, 4, 'solid']}
+        '''
+        def fget(self):
+            '''
+                Return the color list
+            '''
+            return self.__colors.color_list
+        
+        def fset(self, colors):
+            '''
+                Format the color list to a dictionary
+            '''
+            self.__colors = Colors(colors)
+        
+        return property(**locals())
+        
+    @apply
+    def range():
+        doc = '''
+            The range is a read/write property that generates a range of values
+            for the x axis of the functions. When passed a tuple it almost works
+            like the built-in range funtion:
+             - 1 item, represent the end of the range started from 0;
+             - 2 items, represents the start and the end, respectively;
+             - 3 items, the last one represents the step;
+             
+            When passed a list the range function understands as a valid range.
+            
+            Usage:
+            >>> s = Series(); s.range = 10; print s.range
+            [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0]
+            >>> s = Series(); s.range = (5); print s.range
+            [0.0, 1.0, 2.0, 3.0, 4.0, 5.0]
+            >>> s = Series(); s.range = (1,7); print s.range
+            [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0]
+            >>> s = Series(); s.range = (0,10,2); print s.range
+            [0.0, 2.0, 4.0, 6.0, 8.0, 10.0]
+            >>>
+            >>> s = Series(); s.range = [0]; print s.range
+            [0.0]
+            >>> s = Series(); s.range = [0,10,20]; print s.range
+            [0.0, 10.0, 20.0]
+        '''
+        def fget(self):
+            '''
+                Returns the range
+            '''
+            return self.__range
+        
+        def fset(self, x_range):
+            '''
+                Controls the input of a valid type and generate the range
+            '''
+            # if passed a simple number convert to tuple
+            if type(x_range) in NUMTYPES:
+                x_range = (x_range,)
+            
+            # A list, just convert to float
+            if type(x_range) is list and len(x_range) > 0:
+                # Convert all to float
+                x_range = map(float, x_range)
+                # Prevents repeated values and convert back to list
+                self.__range = list(set(x_range[:]))
+                # Sort the list to ascending order
+                self.__range.sort()
+            
+            # A tuple, must check the lengths and generate the values
+            elif type(x_range) is tuple and len(x_range) in (1,2,3):
+                # Convert all to float
+                x_range = map(float, x_range)
+                
+                # Inital values
+                start = 0.0
+                step = 1.0
+                end = 0.0
+                
+                # Only the end and it can't be less or iqual to 0
+                if len(x_range) is 1 and x_range > 0:
+                        end = x_range[0]
+                
+                # The start and the end but the start must be lesser then the end
+                elif len(x_range) is 2 and x_range[0] < x_range[1]:
+                        start = x_range[0]
+                        end = x_range[1]
+                
+                # All 3, but the start must be lesser then the end
+                elif x_range[0] < x_range[1]:
+                        start = x_range[0]
+                        end = x_range[1]
+                        step = x_range[2]
+                
+                # Starts the range
+                self.__range = []
+                # Generate the range
+                # Cnat use the range function becouse it don't suport float values
+                while start <= end:
+                    self.__range.append(start)
+                    start += step
+                
+            # Incorrect type
+            else:
+                raise Exception, "x_range must be a list with one or more item or a tuple with 2 or 3 items"
+            
+        return property(**locals())
+    
+    @apply
+    def group_list():
+        doc = '''
+            The group_list is a read/write property used to pre-process the list
+            of Groups.
+            It can be:
+             - a single number, point or lambda, will be converted to a single
+               Group of one Data;
+             - a list of numbers, will be converted to a group of numbers;
+             - a list of tuples, will converted to a single Group of points;
+             - a list of lists of numbers, each 'sublist' will be converted to
+               a group of numbers;
+             - a list of lists of tuples, each 'sublist' will be converted to a
+               group of points;
+             - a list of lists of lists, the content of the 'sublist' will be
+               processed as coordinated lists and the result will be converted
+               to a group of points;
+             - a list of lambdas, each lambda represents a Group;
+             - a Dictionary where each item can be the same of the list: number,
+               point, list of numbers, list of points, list of lists
+               (coordinated lists) or lambdas
+             - an instance of Data;
+             - an instance of group.
+             
+            Usage:
+            >>> s = Series()
+            >>> s.group_list = [1,2,3,4]; print s
+            ["Group 1 ['1', '2', '3', '4']"]
+            >>> s.group_list = [[1,2,3],[4,5,6]]; print s
+            ["Group 1 ['1', '2', '3']", "Group 2 ['4', '5', '6']"]
+            >>> s.group_list = (1,2); print s
+            ["Group 1 ['(1, 2)']"]
+            >>> s.group_list = [(1,2),(2,3)]; print s
+            ["Group 1 ['(1, 2)', '(2, 3)']"]
+            >>> s.group_list = [[(1,2),(2,3)],[(4,5),(5,6)]]; print s
+            ["Group 1 ['(1, 2)', '(2, 3)']", "Group 2 ['(4, 5)', '(5, 6)']"]
+            >>> s.group_list = [[[1,2,3],[1,2,3],[1,2,3]]]; print s
+            ["Group 1 ['(1, 1, 1)', '(2, 2, 2)', '(3, 3, 3)']"]
+            >>> s.group_list = [(0.5,5.5) , [(0,4),(6,8)] , (5.5,7) , (7,9)]; print s
+            ["Group 1 ['(0.5, 5.5)']", "Group 2 ['(0, 4)', '(6, 8)']", "Group 3 ['(5.5, 7)']", "Group 4 ['(7, 9)']"]
+            >>> s.group_list = {'g1':[1,2,3], 'g2':[4,5,6]}; print s
+            ["g1 ['1', '2', '3']", "g2 ['4', '5', '6']"]
+            >>> s.group_list = {'g1':[(1,2),(2,3)], 'g2':[(4,5),(5,6)]}; print s
+            ["g1 ['(1, 2)', '(2, 3)']", "g2 ['(4, 5)', '(5, 6)']"]
+            >>> s.group_list = {'g1':[[1,2],[1,2]], 'g2':[[4,5],[4,5]]}; print s
+            ["g1 ['(1, 1)', '(2, 2)']", "g2 ['(4, 4)', '(5, 5)']"]
+            >>> s.range = 10
+            >>> s.group_list = lambda x:x*2
+            >>> s.group_list = [lambda x:x*2, lambda x:x**2, lambda x:x**3]; print s
+            ["Group 1 ['(0.0, 0.0)', '(1.0, 2.0)', '(2.0, 4.0)', '(3.0, 6.0)', '(4.0, 8.0)', '(5.0, 10.0)', '(6.0, 12.0)', '(7.0, 14.0)', '(8.0, 16.0)', '(9.0, 18.0)', '(10.0, 20.0)']", "Group 2 ['(0.0, 0.0)', '(1.0, 1.0)', '(2.0, 4.0)', '(3.0, 9.0)', '(4.0, 16.0)', '(5.0, 25.0)', '(6.0, 36.0)', '(7.0, 49.0)', '(8.0, 64.0)', '(9.0, 81.0)', '(10.0, 100.0)']", "Group 3 ['(0.0, 0.0)', '(1.0, 1.0)', '(2.0, 8.0)', '(3.0, 27.0)', '(4.0, 64.0)', '(5.0, 125.0)', '(6.0, 216.0)', '(7.0, 343.0)', '(8.0, 512.0)', '(9.0, 729.0)', '(10.0, 1000.0)']"]
+            >>> s.group_list = {'linear':lambda x:x*2, 'square':lambda x:x**2, 'cubic':lambda x:x**3}; print s
+            ["cubic ['(0.0, 0.0)', '(1.0, 1.0)', '(2.0, 8.0)', '(3.0, 27.0)', '(4.0, 64.0)', '(5.0, 125.0)', '(6.0, 216.0)', '(7.0, 343.0)', '(8.0, 512.0)', '(9.0, 729.0)', '(10.0, 1000.0)']", "linear ['(0.0, 0.0)', '(1.0, 2.0)', '(2.0, 4.0)', '(3.0, 6.0)', '(4.0, 8.0)', '(5.0, 10.0)', '(6.0, 12.0)', '(7.0, 14.0)', '(8.0, 16.0)', '(9.0, 18.0)', '(10.0, 20.0)']", "square ['(0.0, 0.0)', '(1.0, 1.0)', '(2.0, 4.0)', '(3.0, 9.0)', '(4.0, 16.0)', '(5.0, 25.0)', '(6.0, 36.0)', '(7.0, 49.0)', '(8.0, 64.0)', '(9.0, 81.0)', '(10.0, 100.0)']"]
+            >>> s.group_list = Data(1,'d1'); print s
+            ["Group 1 ['d1: 1']"]
+            >>> s.group_list = Group([(1,2),(2,3)],'g1'); print s
+            ["g1 ['(1, 2)', '(2, 3)']"]
+        '''
+        def fget(self):
+            '''
+                Return the group list.
+            '''
+            return self.__group_list
+        
+        def fset(self, series):
+            '''
+                Controls the input of a valid group list.
+            '''
+            #TODO: Add support to the following strem of data: [ (0.5,5.5) , [(0,4),(6,8)] , (5.5,7) , (7,9)]
+            
+            # Type: None
+            if series is None:
+                self.__group_list = []
+            
+            # List or Tuple
+            elif type(series) in LISTTYPES:
+                self.__group_list = []
+                
+                is_function = lambda x: callable(x)
+                # Groups
+                if list in map(type, series) or max(map(is_function, series)):
+                    for group in series:
+                        self.add_group(group)
+                        
+                # single group
+                else:
+                    self.add_group(series)
+                
+                #old code
+                ## List of numbers
+                #if type(series[0]) in NUMTYPES or type(series[0]) is tuple:
+                #    print series
+                #    self.add_group(series)
+                #    
+                ## List of anything else
+                #else:
+                #    for group in series:
+                #        self.add_group(group)
+            
+            # Dict representing series of groups
+            elif type(series) is dict:
+                self.__group_list = []
+                names = series.keys()
+                names.sort()
+                for name in names:
+                    self.add_group(Group(series[name],name,self))
+                    
+            # A single lambda
+            elif callable(series):
+                self.__group_list = []
+                self.add_group(series)
+                
+            # Int/float, instance of Group or Data
+            elif type(series) in NUMTYPES or isinstance(series, Group) or isinstance(series, Data):
+                self.__group_list = []
+                self.add_group(series)
+                
+            # Default
+            else:
+                raise TypeError, "Serie type not supported"
+
+        return property(**locals())
+    
+    def add_group(self, group, name=None):
+        '''
+            Append a new group in group_list
+        '''
+        if not isinstance(group, Group):
+            #Try to convert
+            group = Group(group, name, self)
+            
+        if len(group.data_list) is not 0:
+            # Auto naming groups
+            if group.name is None:
+                group.name = "Group "+str(len(self.__group_list)+1)
+            
+            self.__group_list.append(group)
+            self.__group_list[-1].parent = self
+            
+    def copy(self):
+        '''
+            Returns a copy of the Series
+        '''
+        new_series = Series()
+        new_series.__name = self.__name
+        if self.__range is not None:
+            new_series.__range = self.__range[:]
+        #Add color property in the copy method
+        #self.__colors = None
+        
+        for group in self:
+            new_series.add_group(group.copy())
+            
+        return new_series
+    
+    def get_names(self):
+        '''
+            Returns a list of the names of all groups in the Serie
+        '''
+        names = []
+        for group in self:
+            if group.name is None:
+                names.append('Group '+str(group.index()+1))
+            else:
+                names.append(group.name)
+                
+        return names
+        
+    def to_list(self):
+        '''
+            Returns a list with the content of all groups and data
+        '''
+        big_list = []
+        for group in self:
+            for data in group:
+                if type(data.content) in NUMTYPES:
+                    big_list.append(data.content)
+                else:
+                    big_list = big_list + list(data.content)
+        return big_list
+
+    def __getitem__(self, key):
+        '''
+            Makes the Series iterable, based in the group_list property
+        '''
+        return self.__group_list[key]
+        
+    def __str__(self):
+        '''
+            Returns a string that represents the Series
+        '''
+        ret = ""
+        if self.name is not None:
+            ret += self.name + " "
+        if len(self) > 0:
+            list_str = [str(item) for item in self]
+            ret += str(list_str)
+        else:
+            ret += "[]"
+        return ret
+    
+    def __len__(self):
+        '''
+            Returns the length of the Series, based in the group_lsit property
+        '''
+        return len(self.group_list)
+    
+
+if __name__ == '__main__':
+    doctest.testmod()

=== added file 'tools/development/trunk.json'
--- tools/development/trunk.json	1970-01-01 00:00:00 +0000
+++ tools/development/trunk.json	2011-12-25 16:30:29 +0000
@@ -0,0 +1,68 @@
+{
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularActor": {
+        "find_events": 0.18468548, 
+        "get_events_time": 0.0036406999999999993, 
+        "find_ids_time": 0.1999027967453003, 
+        "overall": 0.19031572, 
+        "marsh_time": 0.00198954
+    }, 
+    "__metadata__": {
+        "name": "lp:zeitgeist"
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentMimeType": {
+        "find_events": 0.24061812000000007, 
+        "get_events_time": 0.004851439999999999, 
+        "find_ids_time": 0.26048434734344483, 
+        "overall": 0.24815498000000008, 
+        "marsh_time": 0.00268542
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentEvents": {
+        "find_events": 0.22520402, 
+        "get_events_time": 0.0035227599999999998, 
+        "find_ids_time": 0.24481987476348877, 
+        "overall": 0.23074491999999996, 
+        "marsh_time": 0.00201814
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularMimeType": {
+        "find_events": 0.18227677999999994, 
+        "get_events_time": 0.00370286, 
+        "find_ids_time": 0.19794647693634032, 
+        "overall": 0.18799147999999996, 
+        "marsh_time": 0.00201184
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularSubjects": {
+        "find_events": 0.25038046, 
+        "get_events_time": 0.00368694, 
+        "find_ids_time": 0.2657345771789551, 
+        "overall": 0.25607208000000004, 
+        "marsh_time": 0.00200468
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostPopularSubjectInterpretation": {
+        "find_events": 0.1669545, 
+        "get_events_time": 0.0010883600000000002, 
+        "find_ids_time": 0.17183988571166992, 
+        "overall": 0.16851842000000006, 
+        "marsh_time": 0.00047555999999999987
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentSubjects": {
+        "find_events": 0.2365201399999999, 
+        "get_events_time": 0.003541620000000001, 
+        "find_ids_time": 0.25139119625091555, 
+        "overall": 0.24203851999999998, 
+        "marsh_time": 0.0019767599999999997
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentActor": {
+        "find_events": 0.18014862000000004, 
+        "get_events_time": 0.00369312, 
+        "find_ids_time": 0.19580111026763916, 
+        "overall": 0.18583920000000007, 
+        "marsh_time": 0.0019974599999999995
+    }, 
+    "TimeRange.always(), [], StorageState.Any, 100, ResultType.MostRecentSubjectInterpretation": {
+        "find_events": 0.16435113999999998, 
+        "get_events_time": 0.0010964800000000006, 
+        "find_ids_time": 0.16919457912445068, 
+        "overall": 0.16591594, 
+        "marsh_time": 0.00046832
+    }
+}
\ No newline at end of file


Follow ups