From 427a477645103079d00c5c608591abe6369d2e03 Mon Sep 17 00:00:00 2001
From: ducky
Date: Tue, 6 Oct 2015 17:10:22 -0700
Subject: Type hierarchy diagram attempt

---
 doc/images/type_hierarchy.svg | 921 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 921 insertions(+)
 create mode 100644 doc/images/type_hierarchy.svg

diff --git a/doc/images/type_hierarchy.svg b/doc/images/type_hierarchy.svg
new file mode 100644
index 00000000..a8087653
--- /dev/null
+++ b/doc/images/type_hierarchy.svg
@@ -0,0 +1,921 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 744.09448819 1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="type_hierarchy.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient8044"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8046" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8038"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8040" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8032"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8034" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8026"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8028" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8020"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8022" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8014"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8016" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8008"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8010" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8002"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8004" />
+    </linearGradient>
+    <linearGradient
+       id="AbstractType"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#a0a0a0;stop-opacity:1;"
+         offset="0"
+         id="stop7998" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7984"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#c0c0c0;stop-opacity:1;"
+         offset="0"
+         id="stop7986" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4528"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4504"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker4777"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4779"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4501"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4148"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:1;"
+         offset="0"
+         id="stop4150" />
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:0;"
+         offset="1"
+         id="stop4152" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(106.2992,-212.59839)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-1"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4967096,0,0,0.99341894,-17.483362,-135.38956)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-1-4"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4967095,0,0,0.99341895,159.68199,-135.38954)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-5"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-35.433077,-70.866113)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-5-1"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(70.866124,-70.866113)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-5-1-4"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(141.73227,3.2966827e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-5-1-4-2"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(248.03148,3.0966827e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-5-1-4-6"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(194.88187,-70.866113)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4148"
+       id="linearGradient4154-5-1-4-3"
+       x1="70.866142"
+       y1="981.49603"
+       x2="70.866142"
+       y2="946.06299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(137.97403,70.866171)" />
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7-3"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9-3-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7-3-4"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7-1"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9-3-2-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7-3-4-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9-3-1"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7-3-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient7988"
+       x1="70.334641"
+       y1="822.04718"
+       x2="177.69685"
+       y2="822.04718"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-35.433076,2.8354915e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8000"
+       x1="176.63386"
+       y1="751.18107"
+       x2="248.563"
+       y2="751.18107"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-35.433076,2.8354915e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8006"
+       x1="143.57263"
+       y1="958.04987"
+       x2="184.80798"
+       y2="958.04987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8012"
+       x1="141.87891"
+       y1="959.86719"
+       x2="238.51282"
+       y2="959.86719"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8018"
+       x1="247.5"
+       y1="822.04718"
+       x2="354.86221"
+       y2="822.04718"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-35.433076,2.8354915e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8024"
+       x1="143.57263"
+       y1="957.76147"
+       x2="218.948"
+       y2="957.76147"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8030"
+       x1="143.57263"
+       y1="957.76147"
+       x2="206.02991"
+       y2="957.76147"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8036"
+       x1="34.901588"
+       y1="892.91339"
+       x2="106.83072"
+       y2="892.91339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-35.433076,2.8354915e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8042"
+       x1="265.21652"
+       y1="892.91339"
+       x2="337.14566"
+       y2="892.91339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-35.433076,2.8354915e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8048"
+       x1="143.57263"
+       y1="957.76147"
+       x2="176.00061"
+       y2="957.76147"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8074"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="176.00061"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8076"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="176.00061"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8078"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="176.00061"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8080"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="176.00061"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8082"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="206.02991"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8084"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="206.02991"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8086"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="206.02991"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8088"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="206.02991"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8090"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="218.948"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8092"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="218.948"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8094"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="218.948"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8096"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="218.948"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8098"
+       gradientUnits="userSpaceOnUse"
+       x1="141.87891"
+       y1="959.86719"
+       x2="238.51282"
+       y2="959.86719" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8100"
+       gradientUnits="userSpaceOnUse"
+       x1="141.87891"
+       y1="959.86719"
+       x2="238.51282"
+       y2="959.86719" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8102"
+       gradientUnits="userSpaceOnUse"
+       x1="141.87891"
+       y1="959.86719"
+       x2="238.51282"
+       y2="959.86719" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8104"
+       gradientUnits="userSpaceOnUse"
+       x1="141.87891"
+       y1="959.86719"
+       x2="238.51282"
+       y2="959.86719" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8106"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="958.04987"
+       x2="184.80798"
+       y2="958.04987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8108"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="958.04987"
+       x2="184.80798"
+       y2="958.04987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8110"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="958.04987"
+       x2="184.80798"
+       y2="958.04987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient8112"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="958.04987"
+       x2="184.80798"
+       y2="958.04987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="200.68486"
+     inkscape:cy="278.22886"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1551"
+     inkscape:window-x="1200"
+     inkscape:window-y="185"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient4154);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8000);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338"
+       width="70.866142"
+       height="35.433071"
+       x="141.73228"
+       y="733.46454" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8112);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(12.975041,-206.86875)"><flowRegion
+         id="flowRegion4193"
+         style="fill:url(#linearGradient8108);fill-opacity:1"><rect
+           id="rect4195"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="946.06299"
+           style="fill:url(#linearGradient8106);fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4197"
+         style="fill:url(#linearGradient8110);fill-opacity:1">Data</flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-1);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7988);stroke-width:1.29617918;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-1"
+       width="106.06603"
+       height="35.199883"
+       x="35.549652"
+       y="804.44727" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-3"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8104);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(-101.61319,-137.81993)"><flowRegion
+         id="flowRegion4193-0"
+         style="fill:url(#linearGradient8100);fill-opacity:1"><rect
+           id="rect4195-8"
+           width="102.18243"
+           height="29.703432"
+           x="141.73228"
+           y="946.06299"
+           style="fill:url(#linearGradient8098);fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4197-7"
+         style="fill:url(#linearGradient8102);fill-opacity:1">Aggregate</flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-1-4);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8018);stroke-width:1.29617906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-1-7"
+       width="106.06603"
+       height="35.199886"
+       x="212.71501"
+       y="804.44727" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-3-7"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8096);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(84.487714,-135.71422)"><flowRegion
+         id="flowRegion4193-0-5"
+         style="fill:url(#linearGradient8092);fill-opacity:1"><rect
+           id="rect4195-8-5"
+           width="102.18243"
+           height="29.703432"
+           x="141.73228"
+           y="946.06299"
+           style="fill:url(#linearGradient8090);fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4197-7-8"
+         style="fill:url(#linearGradient8094);fill-opacity:1">Element</flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-5);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8036);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-6"
+       width="70.866142"
+       height="35.433071"
+       x="1.036276e-05"
+       y="875.19684" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-31"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8088);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(-139.36821,-64.848082)"><flowRegion
+         id="flowRegion4193-6"
+         style="fill:url(#linearGradient8084);fill-opacity:1"><rect
+           id="rect4195-80"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="946.06299"
+           style="fill:url(#linearGradient8082);fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4197-4"
+         style="fill:url(#linearGradient8086);fill-opacity:1">Bundle</flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-5-1);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-6-9"
+       width="70.866142"
+       height="35.433071"
+       x="106.29921"
+       y="875.19684" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-31-0"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(-16.090537,-65.136473)"><flowRegion
+         id="flowRegion4193-6-3"><rect
+           id="rect4195-80-0"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="946.06299" /></flowRegion><flowPara
+         id="flowPara4197-4-8">Vec</flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-5-1-4);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-6-9-2"
+       width="70.866142"
+       height="35.433071"
+       x="177.16534"
+       y="946.06299" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-31-0-3"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(51.017365,5.7296693)"><flowRegion
+         id="flowRegion4193-6-3-4"><rect
+           id="rect4195-80-0-4"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="946.06299" /></flowRegion><flowPara
+         id="flowPara4197-4-8-5">UInt</flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-5-1-4-2);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-6-9-2-9"
+       width="70.866142"
+       height="35.433071"
+       x="283.46457"
+       y="946.06299" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-31-0-3-1"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(158.42894,5.8532655)"><flowRegion
+         id="flowRegion4193-6-3-4-0"><rect
+           id="rect4195-80-0-4-5"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="946.06299" /></flowRegion><flowPara
+         id="flowPara4197-4-8-5-5">SInt</flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-5-1-4-6);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8042);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-6-9-2-2"
+       width="70.866142"
+       height="35.433071"
+       x="230.31494"
+       y="875.19684" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-31-0-3-8"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8080);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(107.92521,-65.136473)"><flowRegion
+         id="flowRegion4193-6-3-4-8"
+         style="fill:url(#linearGradient8076);fill-opacity:1"><rect
+           id="rect4195-80-0-4-6"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="946.06299"
+           style="fill:url(#linearGradient8074);fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4197-4-8-5-9"
+         style="fill:url(#linearGradient8078);fill-opacity:1">Bits</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4451"
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;letter-spacing:0px;word-spacing:0px"><flowRegion
+         id="flowRegion4453"><rect
+           id="rect4455"
+           width="124.01575"
+           height="97.440948"
+           x="186.02362"
+           y="928.34644" /></flowRegion><flowPara
+         id="flowPara4457"></flowPara></flowRoot>    <rect
+       style="fill:url(#linearGradient4154-5-1-4-3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3338-6-9-2-4"
+       width="70.866142"
+       height="35.433071"
+       x="173.4071"
+       y="1016.9291" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4191-31-0-3-3"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(50.33072,76.884202)"><flowRegion
+         id="flowRegion4193-6-3-4-3"><rect
+           id="rect4195-80-0-4-4"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="946.06299" /></flowRegion><flowPara
+         id="flowPara4197-4-8-5-99">Bool</flowPara></flowRoot>    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
+       d="M 159.44881,768.89767 88.582674,804.33074"
+       id="path4495"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4)"
+       d="m 194.88188,768.89767 70.86614,35.43307"
+       id="path4495-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9)"
+       d="m 265.74802,839.76381 0,35.43307"
+       id="path4495-2-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3)"
+       d="M 248.03149,910.62995 212.5882,945.25949"
+       id="path4495-2-7-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2)"
+       d="m 283.46456,910.62995 35.43307,35.43307"
+       id="path4495-2-7-2-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-0)"
+       d="m 212.5882,980.69256 0,35.43304"
+       id="path4495-2-7-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2-0)"
+       d="m 105.88613,839.35796 35.43307,35.43307"
+       id="path4495-2-7-2-2-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-1)"
+       d="M 71.285084,839.76044 35.841793,874.38998"
+       id="path4495-2-7-2-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
-- 
cgit v1.2.3


From 1abf1a59f363a73840dc0540ca1ae37816dc2323 Mon Sep 17 00:00:00 2001
From: ducky
Date: Wed, 7 Oct 2015 12:38:05 -0700
Subject: Diagram improvements

---
 doc/images/type_hierarchy.svg | 215 ++++++++++++++++++++++++++----------------
 1 file changed, 132 insertions(+), 83 deletions(-)

diff --git a/doc/images/type_hierarchy.svg b/doc/images/type_hierarchy.svg
index a8087653..301017a5 100644
--- a/doc/images/type_hierarchy.svg
+++ b/doc/images/type_hierarchy.svg
@@ -11,9 +11,9 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
+   width="105.3mm"
+   height="95.299995mm"
+   viewBox="0 0 373.11022 337.67715"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -103,61 +103,64 @@
     <marker
        inkscape:stockid="Arrow2Mend"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="Arrow2Mend"
-       style="overflow:visible;"
+       style="overflow:visible"
        inkscape:isstock="true">
       <path
          id="path4528"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="Arrow1Lend"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="Arrow1Lend"
-       style="overflow:visible;"
+       style="overflow:visible"
        inkscape:isstock="true">
       <path
          id="path4504"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="Arrow1Lstart"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="marker4777"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
          id="path4779"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.8) translate(12.5,0)" />
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="Arrow1Lstart"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="Arrow1Lstart"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
          id="path4501"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.8) translate(12.5,0)" />
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
     </marker>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4148"
        osb:paint="gradient">
       <stop
@@ -258,7 +261,7 @@
        x2="70.866142"
        y2="946.06299"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(137.97403,70.866171)" />
+       gradientTransform="translate(141.73226,70.866206)" />
     <marker
        inkscape:stockid="Arrow2Mend"
        orient="auto"
@@ -378,10 +381,10 @@
        inkscape:collect="always"
        xlink:href="#AbstractType"
        id="linearGradient8000"
-       x1="176.63386"
-       y1="751.18107"
+       x1="176.63387"
+       y1="751.18109"
        x2="248.563"
-       y2="751.18107"
+       y2="751.18109"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-35.433076,2.8354915e-5)" />
     <linearGradient
@@ -477,15 +480,6 @@
        y1="957.76147"
        x2="176.00061"
        y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8078"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="176.00061"
-       y2="957.76147" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
@@ -513,15 +507,6 @@
        y1="957.76147"
        x2="206.02991"
        y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8086"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="206.02991"
-       y2="957.76147" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
@@ -549,15 +534,6 @@
        y1="957.76147"
        x2="218.948"
        y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8094"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="218.948"
-       y2="957.76147" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
@@ -585,15 +561,6 @@
        y1="959.86719"
        x2="238.51282"
        y2="959.86719" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8102"
-       gradientUnits="userSpaceOnUse"
-       x1="141.87891"
-       y1="959.86719"
-       x2="238.51282"
-       y2="959.86719" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
@@ -624,7 +591,7 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
-       id="linearGradient8110"
+       id="linearGradient8112"
        gradientUnits="userSpaceOnUse"
        x1="143.57263"
        y1="958.04987"
@@ -633,12 +600,63 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
-       id="linearGradient8112"
+       id="linearGradient4283"
        gradientUnits="userSpaceOnUse"
        x1="143.57263"
        y1="958.04987"
        x2="184.80798"
        y2="958.04987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient4285"
+       gradientUnits="userSpaceOnUse"
+       x1="141.87891"
+       y1="959.86719"
+       x2="238.51282"
+       y2="959.86719" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient4287"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="218.948"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient4289"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="206.02991"
+       y2="957.76147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#AbstractType"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="143.57263"
+       y1="957.76147"
+       x2="176.00061"
+       y2="957.76147" />
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9-3-2-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7-3-4-6"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -647,9 +665,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="200.68486"
-     inkscape:cy="278.22886"
+     inkscape:zoom="4.0719368"
+     inkscape:cx="186.55512"
+     inkscape:cy="168.83857"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -661,10 +679,16 @@
      inkscape:snap-bbox="true"
      inkscape:snap-bbox-midpoints="true"
      inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true">
+     inkscape:object-nodes="true"
+     fit-margin-top="2.5"
+     fit-margin-left="2.5"
+     fit-margin-right="2.5"
+     fit-margin-bottom="2.5">
     <inkscape:grid
        type="xygrid"
-       id="grid3336" />
+       id="grid3336"
+       originx="9.3897524"
+       originy="9.3897072" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -681,7 +705,8 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(9.3897534,-724.07477)">
     <rect
        style="fill:url(#linearGradient4154);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8000);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338"
@@ -703,7 +728,7 @@
            y="946.06299"
            style="fill:url(#linearGradient8106);fill-opacity:1" /></flowRegion><flowPara
          id="flowPara4197"
-         style="fill:url(#linearGradient8110);fill-opacity:1">Data</flowPara></flowRoot>    <rect
+         style="fill:url(#linearGradient4283);fill-opacity:1">Data</flowPara></flowRoot>    <rect
        style="fill:url(#linearGradient4154-1);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7988);stroke-width:1.29617918;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-1"
        width="106.06603"
@@ -724,7 +749,7 @@
            y="946.06299"
            style="fill:url(#linearGradient8098);fill-opacity:1" /></flowRegion><flowPara
          id="flowPara4197-7"
-         style="fill:url(#linearGradient8102);fill-opacity:1">Aggregate</flowPara></flowRoot>    <rect
+         style="fill:url(#linearGradient4285);fill-opacity:1">Aggregate</flowPara></flowRoot>    <rect
        style="fill:url(#linearGradient4154-1-4);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8018);stroke-width:1.29617906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-1-7"
        width="106.06603"
@@ -745,7 +770,7 @@
            y="946.06299"
            style="fill:url(#linearGradient8090);fill-opacity:1" /></flowRegion><flowPara
          id="flowPara4197-7-8"
-         style="fill:url(#linearGradient8094);fill-opacity:1">Element</flowPara></flowRoot>    <rect
+         style="fill:url(#linearGradient4287);fill-opacity:1">Element</flowPara></flowRoot>    <rect
        style="fill:url(#linearGradient4154-5);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8036);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6"
        width="70.866142"
@@ -766,7 +791,7 @@
            y="946.06299"
            style="fill:url(#linearGradient8082);fill-opacity:1" /></flowRegion><flowPara
          id="flowPara4197-4"
-         style="fill:url(#linearGradient8086);fill-opacity:1">Bundle</flowPara></flowRoot>    <rect
+         style="fill:url(#linearGradient4289);fill-opacity:1">Bundle</flowPara></flowRoot>    <rect
        style="fill:url(#linearGradient4154-5-1);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6-9"
        width="70.866142"
@@ -841,28 +866,28 @@
            y="946.06299"
            style="fill:url(#linearGradient8074);fill-opacity:1" /></flowRegion><flowPara
          id="flowPara4197-4-8-5-9"
-         style="fill:url(#linearGradient8078);fill-opacity:1">Bits</flowPara></flowRoot>    <flowRoot
+         style="fill:url(#linearGradient4291);fill-opacity:1">Bits</flowPara></flowRoot>    <flowRoot
        xml:space="preserve"
        id="flowRoot4451"
-       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;letter-spacing:0px;word-spacing:0px"><flowRegion
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
          id="flowRegion4453"><rect
            id="rect4455"
            width="124.01575"
            height="97.440948"
            x="186.02362"
            y="928.34644" /></flowRegion><flowPara
-         id="flowPara4457"></flowPara></flowRoot>    <rect
+         id="flowPara4457" /></flowRoot>    <rect
        style="fill:url(#linearGradient4154-5-1-4-3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6-9-2-4"
        width="70.866142"
        height="35.433071"
-       x="173.4071"
+       x="177.16533"
        y="1016.9291" />
     <flowRoot
        xml:space="preserve"
        id="flowRoot4191-31-0-3-3"
        style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(50.33072,76.884202)"><flowRegion
+       transform="translate(50.33071,76.884181)"><flowRegion
          id="flowRegion4193-6-3-4-3"><rect
            id="rect4195-80-0-4-4"
            width="70.866142"
@@ -917,5 +942,29 @@
        id="path4495-2-7-2-9"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2-6)"
+       d="m 35.433056,910.62993 0,35.43307"
+       id="path4495-2-7-2-2-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.0629921;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4498"
+       cx="26.574787"
+       cy="963.77954"
+       r="2.2145669" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.0629921;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4498-2"
+       cx="35.433056"
+       cy="963.77954"
+       r="2.2145669" />
+    <circle
+       r="2.2145669"
+       cy="963.77954"
+       cx="44.291325"
+       id="circle4515"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.0629921;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
-- 
cgit v1.2.3


From 99a0490828d92f69d57f258ffdb335dddc7d9771 Mon Sep 17 00:00:00 2001
From: ducky
Date: Wed, 7 Oct 2015 12:45:00 -0700
Subject: Link picture to README

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index c6d5f2b1..8fd52158 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,11 @@ like:
  - Optionally, Verilog to C++ (for simulation and testing).  
  *TODO: Verilator support*
 
+### Data Types Overview
+These are the base data types for defining circuit wires: 
+
+![Image](../master/docs/images/type_hierarchy.svg?raw=true)
+
 ### Chisel Tutorial
 *TODO: quick howto for running chisel-tutorial*
 
-- 
cgit v1.2.3


From a1561f4751361e4de7afd9a071dbec86d309455b Mon Sep 17 00:00:00 2001
From: ducky
Date: Wed, 7 Oct 2015 13:05:28 -0700
Subject: Remove flowed text

---
 README.md                     |   5 +-
 doc/images/type_hierarchy.png | Bin 0 -> 16698 bytes
 doc/images/type_hierarchy.svg | 779 ++++++++++++++----------------------------
 3 files changed, 252 insertions(+), 532 deletions(-)
 create mode 100644 doc/images/type_hierarchy.png

diff --git a/README.md b/README.md
index 8fd52158..12423672 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,10 @@ like:
  *TODO: Verilator support*
 
 ### Data Types Overview
-These are the base data types for defining circuit wires: 
+These are the base data types for defining circuit wires (abstract types which
+may not be instantiated are greyed out):
 
-![Image](../master/docs/images/type_hierarchy.svg?raw=true)
+![Image](doc/images/type_hierarchy.png?raw=true)
 
 ### Chisel Tutorial
 *TODO: quick howto for running chisel-tutorial*
diff --git a/doc/images/type_hierarchy.png b/doc/images/type_hierarchy.png
new file mode 100644
index 00000000..c808fa9d
Binary files /dev/null and b/doc/images/type_hierarchy.png differ
diff --git a/doc/images/type_hierarchy.svg b/doc/images/type_hierarchy.svg
index 301017a5..d150cf74 100644
--- a/doc/images/type_hierarchy.svg
+++ b/doc/images/type_hierarchy.svg
@@ -17,72 +17,23 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="type_hierarchy.svg">
+   sodipodi:docname="type_hierarchy.svg"
+   inkscape:export-filename="/home/ducky/git/chisel3/doc/images/type_hierarchy.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient8044"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8046" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8038"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8040" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8032"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8034" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8026"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8028" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8020"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8022" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8014"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8016" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8008"
-       osb:paint="solid">
+       id="Gradient"
+       osb:paint="gradient">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#e0e0e0;stop-opacity:1"
          offset="0"
-         id="stop8010" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8002"
-       osb:paint="solid">
+         id="stop4275" />
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8004" />
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4277" />
     </linearGradient>
     <linearGradient
        id="AbstractType"
@@ -92,14 +43,6 @@
          offset="0"
          id="stop7998" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient7984"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop7986" />
-    </linearGradient>
     <marker
        inkscape:stockid="Arrow2Mend"
        orient="auto"
@@ -115,66 +58,9 @@
          transform="scale(-0.6,-0.6)"
          inkscape:connector-curvature="0" />
     </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4504"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker4777"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4779"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4501"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient4148"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#f2f2f2;stop-opacity:1;"
-         offset="0"
-         id="stop4150" />
-      <stop
-         style="stop-color:#f2f2f2;stop-opacity:0;"
-         offset="1"
-         id="stop4152" />
-    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154"
        x1="70.866142"
        y1="981.49603"
@@ -184,7 +70,7 @@
        gradientTransform="translate(106.2992,-212.59839)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-1"
        x1="70.866142"
        y1="981.49603"
@@ -194,7 +80,7 @@
        gradientTransform="matrix(1.4967096,0,0,0.99341894,-17.483362,-135.38956)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-1-4"
        x1="70.866142"
        y1="981.49603"
@@ -204,7 +90,7 @@
        gradientTransform="matrix(1.4967095,0,0,0.99341895,159.68199,-135.38954)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-5"
        x1="70.866142"
        y1="981.49603"
@@ -214,7 +100,7 @@
        gradientTransform="translate(-35.433077,-70.866113)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-5-1"
        x1="70.866142"
        y1="981.49603"
@@ -224,17 +110,17 @@
        gradientTransform="translate(70.866124,-70.866113)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-5-1-4"
        x1="70.866142"
        y1="981.49603"
        x2="70.866142"
        y2="946.06299"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(141.73227,3.2966827e-5)" />
+       gradientTransform="translate(141.73226,4.3895239e-5)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-5-1-4-2"
        x1="70.866142"
        y1="981.49603"
@@ -244,7 +130,7 @@
        gradientTransform="translate(248.03148,3.0966827e-5)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-5-1-4-6"
        x1="70.866142"
        y1="981.49603"
@@ -254,7 +140,7 @@
        gradientTransform="translate(194.88187,-70.866113)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4148"
+       xlink:href="#Gradient"
        id="linearGradient4154-5-1-4-3"
        x1="70.866142"
        y1="981.49603"
@@ -387,24 +273,6 @@
        y2="751.18109"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-35.433076,2.8354915e-5)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8006"
-       x1="143.57263"
-       y1="958.04987"
-       x2="184.80798"
-       y2="958.04987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8012"
-       x1="141.87891"
-       y1="959.86719"
-       x2="238.51282"
-       y2="959.86719"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
@@ -415,24 +283,6 @@
        y2="822.04718"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-35.433076,2.8354915e-5)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8024"
-       x1="143.57263"
-       y1="957.76147"
-       x2="218.948"
-       y2="957.76147"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8030"
-       x1="143.57263"
-       y1="957.76147"
-       x2="206.02991"
-       y2="957.76147"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
@@ -453,210 +303,71 @@
        y2="892.91339"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-35.433076,2.8354915e-5)" />
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-4-9-3-2-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528-3-7-3-4-6"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
-       id="linearGradient8048"
-       x1="143.57263"
-       y1="957.76147"
-       x2="176.00061"
-       y2="957.76147"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8074"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="176.00061"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8076"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="176.00061"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8080"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="176.00061"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8082"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="206.02991"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8084"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="206.02991"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8088"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="206.02991"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8090"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="218.948"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8092"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="218.948"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8096"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="957.76147"
-       x2="218.948"
-       y2="957.76147" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8098"
-       gradientUnits="userSpaceOnUse"
-       x1="141.87891"
-       y1="959.86719"
-       x2="238.51282"
-       y2="959.86719" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8100"
-       gradientUnits="userSpaceOnUse"
-       x1="141.87891"
-       y1="959.86719"
-       x2="238.51282"
-       y2="959.86719" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8104"
-       gradientUnits="userSpaceOnUse"
-       x1="141.87891"
-       y1="959.86719"
-       x2="238.51282"
-       y2="959.86719" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8106"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="958.04987"
-       x2="184.80798"
-       y2="958.04987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8108"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="958.04987"
-       x2="184.80798"
-       y2="958.04987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient8112"
-       gradientUnits="userSpaceOnUse"
-       x1="143.57263"
-       y1="958.04987"
-       x2="184.80798"
-       y2="958.04987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#AbstractType"
-       id="linearGradient4283"
+       id="linearGradient5787"
        gradientUnits="userSpaceOnUse"
        x1="143.57263"
        y1="958.04987"
        x2="184.80798"
-       y2="958.04987" />
+       y2="958.04987"
+       gradientTransform="translate(-11.229986,737.74357)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
-       id="linearGradient4285"
+       id="linearGradient5797"
        gradientUnits="userSpaceOnUse"
        x1="141.87891"
        y1="959.86719"
        x2="238.51282"
-       y2="959.86719" />
+       y2="959.86719"
+       gradientTransform="translate(-101.61319,-137.81993)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
-       id="linearGradient4287"
+       id="linearGradient5807"
        gradientUnits="userSpaceOnUse"
        x1="143.57263"
        y1="957.76147"
        x2="218.948"
-       y2="957.76147" />
+       y2="957.76147"
+       gradientTransform="translate(84.487714,-135.71422)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
-       id="linearGradient4289"
+       id="linearGradient5817"
        gradientUnits="userSpaceOnUse"
        x1="143.57263"
        y1="957.76147"
        x2="206.02991"
-       y2="957.76147" />
+       y2="957.76147"
+       gradientTransform="translate(-139.36821,-64.848082)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#AbstractType"
-       id="linearGradient4291"
+       id="linearGradient5833"
        gradientUnits="userSpaceOnUse"
        x1="143.57263"
        y1="957.76147"
        x2="176.00061"
-       y2="957.76147" />
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mend-4-9-3-2-6"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4528-3-7-3-4-6"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(-0.6,-0.6)" />
-    </marker>
+       y2="957.76147"
+       gradientTransform="translate(107.92521,-65.136473)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -665,17 +376,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4.0719368"
-     inkscape:cx="186.55512"
-     inkscape:cy="168.83857"
-     inkscape:document-units="px"
+     inkscape:zoom="2.8792942"
+     inkscape:cx="208.14795"
+     inkscape:cy="131.02553"
+     inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1551"
+     inkscape:window-width="1278"
+     inkscape:window-height="1550"
      inkscape:window-x="1200"
      inkscape:window-y="185"
-     inkscape:window-maximized="1"
+     inkscape:window-maximized="0"
      inkscape:snap-bbox="true"
      inkscape:snap-bbox-midpoints="true"
      inkscape:snap-smooth-nodes="true"
@@ -707,247 +418,243 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(9.3897534,-724.07477)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.06299996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4)"
+       d="m 194.88187,768.89764 70.86615,35.43308"
+       id="path4495-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9)"
+       d="m 265.74802,839.76381 0,35.43307"
+       id="path4495-2-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2)"
+       d="M 283.46456,910.62995 318.89762,946.063"
+       id="path4495-2-7-2-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-0)"
+       d="m 212.58819,980.69257 0,35.43303"
+       id="path4495-2-7-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.063;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3)"
+       d="M 248.03148,910.62993 212.59841,946.063"
+       id="path4495-2-7-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2-6)"
+       d="m 35.433056,910.62993 0,35.43307"
+       id="path4495-2-7-2-2-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2-0)"
+       d="m 106.2992,839.76379 35.84614,35.83889"
+       id="path4495-2-7-2-2-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-1)"
+       d="M 70.866126,839.76379 35.014098,875.2002"
+       id="path4495-2-7-2-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
+       d="M 159.4488,768.89764 88.582662,804.33072"
+       id="path4495"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
     <rect
-       style="fill:url(#linearGradient4154);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8000);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient4154);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient8000);stroke-width:1.063;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338"
        width="70.866142"
        height="35.433071"
        x="141.73228"
        y="733.46454" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot4191"
-       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8112);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(12.975041,-206.86875)"><flowRegion
-         id="flowRegion4193"
-         style="fill:url(#linearGradient8108);fill-opacity:1"><rect
-           id="rect4195"
-           width="70.866142"
-           height="35.433071"
-           x="141.73228"
-           y="946.06299"
-           style="fill:url(#linearGradient8106);fill-opacity:1" /></flowRegion><flowPara
-         id="flowPara4197"
-         style="fill:url(#linearGradient4283);fill-opacity:1">Data</flowPara></flowRoot>    <rect
-       style="fill:url(#linearGradient4154-1);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7988);stroke-width:1.29617918;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+    <rect
+       style="fill:url(#linearGradient4154-1);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient7988);stroke-width:1.29617918;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-1"
        width="106.06603"
        height="35.199883"
        x="35.549652"
        y="804.44727" />
-    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4191-3"
-       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8104);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-101.61319,-137.81993)"><flowRegion
-         id="flowRegion4193-0"
-         style="fill:url(#linearGradient8100);fill-opacity:1"><rect
-           id="rect4195-8"
-           width="102.18243"
-           height="29.703432"
-           x="141.73228"
-           y="946.06299"
-           style="fill:url(#linearGradient8098);fill-opacity:1" /></flowRegion><flowPara
-         id="flowPara4197-7"
-         style="fill:url(#linearGradient4285);fill-opacity:1">Aggregate</flowPara></flowRoot>    <rect
-       style="fill:url(#linearGradient4154-1-4);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8018);stroke-width:1.29617906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient5797);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="40.119232"
+       y="826.93158"
+       id="text5789"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="40.119232"
+         y="826.93158"
+         id="tspan5791"
+         style="fill:url(#linearGradient5797)"><tspan
+           x="40.119232"
+           y="826.93158"
+           style="fill:url(#linearGradient5797);fill-opacity:1"
+           id="tspan5793">Aggregate</tspan></tspan></text>
+    <rect
+       style="fill:url(#linearGradient4154-1-4);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient8018);stroke-width:1.29617906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-1-7"
        width="106.06603"
        height="35.199886"
        x="212.71501"
        y="804.44727" />
-    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4191-3-7"
-       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8096);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(84.487714,-135.71422)"><flowRegion
-         id="flowRegion4193-0-5"
-         style="fill:url(#linearGradient8092);fill-opacity:1"><rect
-           id="rect4195-8-5"
-           width="102.18243"
-           height="29.703432"
-           x="141.73228"
-           y="946.06299"
-           style="fill:url(#linearGradient8090);fill-opacity:1" /></flowRegion><flowPara
-         id="flowPara4197-7-8"
-         style="fill:url(#linearGradient4287);fill-opacity:1">Element</flowPara></flowRoot>    <rect
-       style="fill:url(#linearGradient4154-5);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8036);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient5807);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="226.22014"
+       y="829.03729"
+       id="text5799"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="226.22014"
+         y="829.03729"
+         id="tspan5801"
+         style="fill:url(#linearGradient5807)"><tspan
+           x="226.22014"
+           y="829.03729"
+           style="fill:url(#linearGradient5807);fill-opacity:1"
+           id="tspan5803">Element</tspan></tspan></text>
+    <rect
+       style="fill:url(#linearGradient4154-5);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient8036);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6"
        width="70.866142"
        height="35.433071"
        x="1.036276e-05"
        y="875.19684" />
-    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4191-31"
-       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8088);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-139.36821,-64.848082)"><flowRegion
-         id="flowRegion4193-6"
-         style="fill:url(#linearGradient8084);fill-opacity:1"><rect
-           id="rect4195-80"
-           width="70.866142"
-           height="35.433071"
-           x="141.73228"
-           y="946.06299"
-           style="fill:url(#linearGradient8082);fill-opacity:1" /></flowRegion><flowPara
-         id="flowPara4197-4"
-         style="fill:url(#linearGradient4289);fill-opacity:1">Bundle</flowPara></flowRoot>    <rect
-       style="fill:url(#linearGradient4154-5-1);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient5817);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.3642118"
+       y="899.90344"
+       id="text5809"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="2.3642118"
+         y="899.90344"
+         id="tspan5811"
+         style="fill:url(#linearGradient5817)"><tspan
+           x="2.3642118"
+           y="899.90344"
+           style="fill:url(#linearGradient5817);fill-opacity:1"
+           id="tspan5813">Bundle</tspan></tspan></text>
+    <rect
+       style="fill:url(#linearGradient4154-5-1);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6-9"
        width="70.866142"
        height="35.433071"
        x="106.29921"
        y="875.19684" />
-    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4191-31-0"
        style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-16.090537,-65.136473)"><flowRegion
-         id="flowRegion4193-6-3"><rect
-           id="rect4195-80-0"
-           width="70.866142"
-           height="35.433071"
-           x="141.73228"
-           y="946.06299" /></flowRegion><flowPara
-         id="flowPara4197-4-8">Vec</flowPara></flowRoot>    <rect
+       x="125.64188"
+       y="899.61505"
+       id="text5819"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="125.64188"
+         y="899.61505"
+         id="tspan5821"><tspan
+           x="125.64188"
+           y="899.61505"
+           id="tspan5823">Vec</tspan></tspan></text>
+    <rect
        style="fill:url(#linearGradient4154-5-1-4);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6-9-2"
        width="70.866142"
        height="35.433071"
-       x="177.16534"
+       x="177.16533"
        y="946.06299" />
-    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4191-31-0-3"
        style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(51.017365,5.7296693)"><flowRegion
-         id="flowRegion4193-6-3-4"><rect
-           id="rect4195-80-0-4"
-           width="70.866142"
-           height="35.433071"
-           x="141.73228"
-           y="946.06299" /></flowRegion><flowPara
-         id="flowPara4197-4-8-5">UInt</flowPara></flowRoot>    <rect
-       style="fill:url(#linearGradient4154-5-1-4-2);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="192.74977"
+       y="970.4812"
+       id="text5835"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="192.74977"
+         y="970.4812"
+         id="tspan5837"><tspan
+           x="192.74977"
+           y="970.4812"
+           id="tspan5839">UInt</tspan></tspan></text>
+    <rect
+       style="fill:url(#linearGradient4154-5-1-4-2);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6-9-2-9"
        width="70.866142"
        height="35.433071"
        x="283.46457"
        y="946.06299" />
-    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4191-31-0-3-1"
        style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(158.42894,5.8532655)"><flowRegion
-         id="flowRegion4193-6-3-4-0"><rect
-           id="rect4195-80-0-4-5"
-           width="70.866142"
-           height="35.433071"
-           x="141.73228"
-           y="946.06299" /></flowRegion><flowPara
-         id="flowPara4197-4-8-5-5">SInt</flowPara></flowRoot>    <rect
-       style="fill:url(#linearGradient4154-5-1-4-6);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8042);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="300.16138"
+       y="970.6048"
+       id="text5841"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="300.16138"
+         y="970.6048"
+         id="tspan5843"><tspan
+           x="300.16138"
+           y="970.6048"
+           id="tspan5845">SInt</tspan></tspan></text>
+    <rect
+       style="fill:url(#linearGradient4154-5-1-4-6);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient8042);stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6-9-2-2"
        width="70.866142"
        height="35.433071"
        x="230.31494"
        y="875.19684" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot4191-31-0-3-8"
-       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient8080);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(107.92521,-65.136473)"><flowRegion
-         id="flowRegion4193-6-3-4-8"
-         style="fill:url(#linearGradient8076);fill-opacity:1"><rect
-           id="rect4195-80-0-4-6"
-           width="70.866142"
-           height="35.433071"
-           x="141.73228"
-           y="946.06299"
-           style="fill:url(#linearGradient8074);fill-opacity:1" /></flowRegion><flowPara
-         id="flowPara4197-4-8-5-9"
-         style="fill:url(#linearGradient4291);fill-opacity:1">Bits</flowPara></flowRoot>    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4451"
-       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
-         id="flowRegion4453"><rect
-           id="rect4455"
-           width="124.01575"
-           height="97.440948"
-           x="186.02362"
-           y="928.34644" /></flowRegion><flowPara
-         id="flowPara4457" /></flowRoot>    <rect
-       style="fill:url(#linearGradient4154-5-1-4-3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient5833);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="249.65764"
+       y="899.61505"
+       id="text5825"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="249.65764"
+         y="899.61505"
+         id="tspan5827"
+         style="fill:url(#linearGradient5833)"><tspan
+           x="249.65764"
+           y="899.61505"
+           style="fill:url(#linearGradient5833);fill-opacity:1"
+           id="tspan5829">Bits</tspan></tspan></text>
+    <rect
+       style="fill:url(#linearGradient4154-5-1-4-3);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3338-6-9-2-4"
        width="70.866142"
        height="35.433071"
        x="177.16533"
        y="1016.9291" />
-    <flowRoot
+    <text
        xml:space="preserve"
-       id="flowRoot4191-31-0-3-3"
        style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(50.33071,76.884181)"><flowRegion
-         id="flowRegion4193-6-3-4-3"><rect
-           id="rect4195-80-0-4-4"
-           width="70.866142"
-           height="35.433071"
-           x="141.73228"
-           y="946.06299" /></flowRegion><flowPara
-         id="flowPara4197-4-8-5-99">Bool</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
-       d="M 159.44881,768.89767 88.582674,804.33074"
-       id="path4495"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4)"
-       d="m 194.88188,768.89767 70.86614,35.43307"
-       id="path4495-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9)"
-       d="m 265.74802,839.76381 0,35.43307"
-       id="path4495-2-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3)"
-       d="M 248.03149,910.62995 212.5882,945.25949"
-       id="path4495-2-7-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2)"
-       d="m 283.46456,910.62995 35.43307,35.43307"
-       id="path4495-2-7-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-0)"
-       d="m 212.5882,980.69256 0,35.43304"
-       id="path4495-2-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2-0)"
-       d="m 105.88613,839.35796 35.43307,35.43307"
-       id="path4495-2-7-2-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-1)"
-       d="M 71.285084,839.76044 35.841793,874.38998"
-       id="path4495-2-7-2-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-4-9-3-2-6)"
-       d="m 35.433056,910.62993 0,35.43307"
-       id="path4495-2-7-2-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       x="192.06311"
+       y="1041.6357"
+       id="text5847"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="192.06311"
+         y="1041.6357"
+         id="tspan5849"><tspan
+           x="192.06311"
+           y="1041.6357"
+           id="tspan5851">Bool</tspan></tspan></text>
     <circle
        style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.0629921;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path4498"
@@ -966,5 +673,17 @@
        cx="44.291325"
        id="circle4515"
        style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.0629921;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:18.75px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient5787);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="154.70746"
+       y="757.88275"
+       id="text5781"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5783"
+         style="fill:url(#linearGradient5787)"
+         x="154.70746"
+         y="757.88275">Data</tspan></text>
   </g>
 </svg>
-- 
cgit v1.2.3