regenerated

4 files changed, 14544 insertions, 3449 deletions

diff --git a/Cargo.lock b/Cargo.lock
index d4e68fe..3d49b88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,7 +11,7 @@ name = "atty"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -28,7 +28,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -63,7 +63,7 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.42"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -79,7 +79,7 @@ name = "log"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -171,7 +171,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -179,7 +179,7 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -226,11 +226,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
 "checksum cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "2119ea4867bd2b8ed3aecab467709720b2d55b1bcfe09f772fd68066eaf15275"
-"checksum cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efe5c877e17a9c717a0bf3613b2709f723202c4e4675cc8f12926ded29bcb17e"
+"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
 "checksum handlebars 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)" = "937e9d49d65ffb5f70e95710a6c8539addf40200275ad8b6cdba0f0a59d5814d"
-"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1"
+"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2"
 "checksum pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8"
diff --git a/svgbob/examples/demo.svg b/svgbob/examples/demo.svg
index dbd4906..c6a3062 100644
--- a/svgbob/examples/demo.svg
+++ b/svgbob/examples/demo.svg
@@ -54,2575 +54,4508 @@
     
 </style>
 <rect fill="white" height="4736" width="688" x="0" y="0"/>
+<g>
 <line x1="0" x2="184" y1="3670" y2="3670"/>
+</g>
+<g>
 <line x1="0" x2="184" y1="3674" y2="3674"/>
-<line x1="4" x2="4" y1="912" y2="928"/>
+</g>
+<g>
+<line x1="4" x2="4" y1="912" y2="920"/>
 <line x1="4" x2="16" y1="920" y2="896"/>
-<line x1="4" x2="4" y1="1032" y2="1048"/>
-<line x1="4" x2="16" y1="1032" y2="1008"/>
-<line x1="4" x2="16" y1="1048" y2="1072"/>
+<line x1="4" x2="16" y1="920" y2="944"/>
+<line x1="4" x2="4" y1="928" y2="920"/>
+</g>
+<g>
 <line x1="4" x2="4" y1="3896" y2="3928"/>
 <line x1="4" x2="92" y1="3896" y2="3896"/>
 <line x1="4" x2="92" y1="3928" y2="3928"/>
-<line x1="8" x2="16" y1="928" y2="944"/>
+<line x1="92" x2="92" y1="3896" y2="3928"/>
+</g>
+<g>
 <line x1="8" x2="112" y1="3512" y2="3512"/>
+<path d="M 6 3508 A 4 4 0 0 0 8 3512" fill="none"/>
+<path d="M 112 3512 A 8 8 0 0 0 118 3508" fill="none"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="8" x2="20" y1="3528" y2="3528"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="8" x2="20" y1="3560" y2="3560"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="8" x2="20" y1="3608" y2="3608"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="8" x2="20" y1="3704" y2="3704"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="8" x2="20" y1="3752" y2="3752"/>
+</g>
+<g>
 <line x1="8" x2="10" y1="3856" y2="3860"/>
+<path d="M 8 3840 A 16 16 0 0 0 8 3856" fill="none"/>
+<path d="M 10 3860 A 8 8 0 0 0 16 3864" fill="none"/>
+</g>
+<g>
 <line x1="10" x2="8" y1="3836" y2="3840"/>
+<path d="M 16 3832 A 8 8 0 0 0 10 3836" fill="none"/>
+</g>
+<g>
 <line x1="16" x2="256" y1="3832" y2="3832"/>
+<path d="M 262 3836 A 8 8 0 0 0 256 3832" fill="none"/>
+</g>
+<g>
 <line x1="16" x2="256" y1="3864" y2="3864"/>
+<path d="M 256 3864 A 8 8 0 0 0 262 3860" fill="none"/>
+</g>
+<g>
 <line x1="18" x2="6" y1="3484" y2="3508"/>
+<path d="M 24 3480 A 8 8 0 0 0 18 3484" fill="none"/>
+</g>
+<g>
 <line x1="20" x2="28" y1="944" y2="952"/>
-<line x1="20" x2="28" y1="1072" y2="1080"/>
+</g>
+<g>
 <line x1="24" x2="26" y1="208" y2="212"/>
+<path d="M 24 192 A 16 16 0 0 0 24 208" fill="none"/>
+<path d="M 26 212 A 8 8 0 0 0 32 216" fill="none"/>
+</g>
+<g>
 <line x1="24" x2="128" y1="3480" y2="3480"/>
+<path d="M 130 3484 A 4 4 0 0 0 128 3480" fill="none"/>
+</g>
+<g>
 <line x1="26" x2="24" y1="188" y2="192"/>
+<path d="M 32 184 A 8 8 0 0 0 26 188" fill="none"/>
+</g>
+<g>
 <line x1="28" x2="20" y1="880" y2="888"/>
-<line x1="28" x2="20" y1="992" y2="1000"/>
+</g>
+<g>
 <line x1="32" x2="44" y1="184" y2="184"/>
+</g>
+<g>
 <line x1="32" x2="40" y1="216" y2="216"/>
+<path d="M 46 220 A 8 8 0 0 0 40 216" fill="none"/>
+</g>
+<g>
 <line x1="32" x2="56" y1="880" y2="880"/>
+</g>
+<g>
 <line x1="32" x2="56" y1="960" y2="960"/>
-<line x1="32" x2="80" y1="992" y2="992"/>
-<line x1="32" x2="80" y1="1088" y2="1088"/>
+</g>
+<g>
 <line x1="32" x2="34" y1="1184" y2="1188"/>
+<path d="M 32 1168 A 16 16 0 0 0 32 1184" fill="none"/>
+<path d="M 34 1188 A 8 8 0 0 0 40 1192" fill="none"/>
+</g>
+<g>
 <line x1="34" x2="32" y1="1164" y2="1168"/>
+<path d="M 40 1160 A 8 8 0 0 0 34 1164" fill="none"/>
+</g>
+<g>
 <line x1="40" x2="52" y1="1160" y2="1160"/>
+</g>
+<g>
 <line x1="40" x2="48" y1="1192" y2="1192"/>
+<path d="M 54 1196 A 8 8 0 0 0 48 1192" fill="none"/>
+</g>
+<g>
 <line x1="46" x2="60" y1="220" y2="248"/>
+<line x1="60" x2="72" y1="248" y2="224"/>
+</g>
+<g>
 <line x1="52" x2="52" y1="1560" y2="1624"/>
 <line marker-end="url(#circle)" x1="52" x2="260" y1="1560" y2="1560"/>
+<line marker-end="url(#circle)" x1="52" x2="68" y1="1624" y2="1624"/>
+<line marker-end="url(#circle)" marker-start="url(#circle)" x1="68" x2="92" y1="1624" y2="1624"/>
+<line marker-start="url(#circle)" x1="92" x2="116" y1="1624" y2="1624"/>
+<line x1="116" x2="116" y1="1624" y2="1616"/>
+<line x1="116" x2="140" y1="1624" y2="1624"/>
+<line x1="140" x2="140" y1="1624" y2="1616"/>
+<line x1="140" x2="164" y1="1624" y2="1624"/>
+<line marker-start="url(#circle)" x1="164" x2="164" y1="1592" y2="1624"/>
+<line marker-end="url(#circle)" marker-start="url(#circle)" x1="164" x2="188" y1="1592" y2="1592"/>
+<line x1="164" x2="188" y1="1624" y2="1624"/>
+<line marker-start="url(#circle)" x1="188" x2="188" y1="1592" y2="1624"/>
+<line x1="188" x2="212" y1="1624" y2="1624"/>
+<line marker-start="url(#circle)" x1="212" x2="212" y1="1576" y2="1624"/>
+<line marker-end="url(#circle)" marker-start="url(#circle)" x1="212" x2="236" y1="1576" y2="1576"/>
+<line x1="212" x2="236" y1="1624" y2="1624"/>
+<line marker-start="url(#circle)" x1="236" x2="236" y1="1576" y2="1624"/>
+<line marker-start="url(#circle)" x1="236" x2="260" y1="1576" y2="1576"/>
+<line x1="236" x2="260" y1="1624" y2="1624"/>
+<line marker-start="url(#circle)" x1="260" x2="260" y1="1560" y2="1624"/>
+<line marker-start="url(#circle)" x1="260" x2="284" y1="1560" y2="1560"/>
+<line marker-end="url(#circle)" x1="260" x2="284" y1="1576" y2="1576"/>
+<line x1="260" x2="284" y1="1624" y2="1624"/>
+<line x1="284" x2="284" y1="1560" y2="1568"/>
+<line marker-start="url(#circle)" x1="284" x2="284" y1="1576" y2="1624"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="52" x2="212" y1="1576" y2="1576"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="52" x2="164" y1="1592" y2="1592"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="52" x2="116" y1="1608" y2="1608"/>
-<line marker-end="url(#circle)" x1="52" x2="68" y1="1624" y2="1624"/>
+<line marker-end="url(#circle)" marker-start="url(#circle)" x1="116" x2="140" y1="1608" y2="1608"/>
+</g>
+<g>
 <line x1="54" x2="68" y1="1196" y2="1224"/>
+<line x1="68" x2="80" y1="1224" y2="1200"/>
+</g>
+<g>
 <line x1="56" x2="72" y1="192" y2="224"/>
+<line marker-start="url(#open_circle)" x1="68" x2="56" y1="168" y2="192"/>
+<line marker-start="url(#open_circle)" x1="68" x2="84" y1="168" y2="168"/>
+</g>
+<g>
 <line x1="56" x2="72" y1="464" y2="432"/>
 <line x1="56" x2="72" y1="464" y2="496"/>
+<line x1="72" x2="128" y1="432" y2="432"/>
+<line x1="72" x2="128" y1="496" y2="496"/>
+<line x1="128" x2="144" y1="432" y2="464"/>
+<line x1="128" x2="144" y1="496" y2="464"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="58" x2="36" y1="156" y2="200"/>
-<line x1="60" x2="72" y1="248" y2="224"/>
+<path d="M 64 152 A 8 8 0 0 0 58 156" fill="none"/>
+</g>
+<g>
 <line x1="60" x2="60" y1="376" y2="408"/>
 <line x1="60" x2="116" y1="376" y2="376"/>
 <line x1="60" x2="116" y1="408" y2="408"/>
+<line x1="116" x2="116" y1="376" y2="408"/>
+</g>
+<g>
 <line x1="60" x2="68" y1="880" y2="888"/>
+</g>
+<g>
 <line x1="64" x2="88" y1="152" y2="152"/>
+<path d="M 90 156 A 4 4 0 0 0 88 152" fill="none"/>
+</g>
+<g>
 <line x1="64" x2="90" y1="208" y2="156"/>
+</g>
+<g>
 <line x1="64" x2="66" y1="544" y2="548"/>
+<path d="M 64 528 A 16 16 0 0 0 64 544" fill="none"/>
+<path d="M 66 548 A 8 8 0 0 0 72 552" fill="none"/>
+</g>
+<g>
 <line x1="64" x2="80" y1="1168" y2="1200"/>
+<line marker-start="url(#open_circle)" x1="76" x2="64" y1="1144" y2="1168"/>
+<line marker-start="url(#open_circle)" x1="76" x2="92" y1="1144" y2="1144"/>
+</g>
+<g>
 <line x1="66" x2="64" y1="524" y2="528"/>
+<path d="M 72 520 A 8 8 0 0 0 66 524" fill="none"/>
+</g>
+<g>
 <line marker-end="url(#circle)" x1="66" x2="44" y1="1132" y2="1176"/>
+<path d="M 72 1128 A 8 8 0 0 0 66 1132" fill="none"/>
+</g>
+<g>
 <line x1="68" x2="60" y1="944" y2="952"/>
-<line x1="68" x2="80" y1="1224" y2="1200"/>
-<line marker-end="url(#circle)" marker-start="url(#circle)" x1="68" x2="92" y1="1624" y2="1624"/>
-<line x1="72" x2="128" y1="432" y2="432"/>
-<line x1="72" x2="128" y1="496" y2="496"/>
+</g>
+<g>
 <line x1="72" x2="160" y1="520" y2="520"/>
+<path d="M 166 524 A 8 8 0 0 0 160 520" fill="none"/>
+</g>
+<g>
 <line x1="72" x2="116" y1="552" y2="552"/>
+<line x1="116" x2="116" y1="552" y2="576"/>
+</g>
+<g>
 <line x1="72" x2="84" y1="896" y2="920"/>
-<line x1="72" x2="80" y1="944" y2="928"/>
+<line x1="84" x2="84" y1="912" y2="920"/>
+<line x1="84" x2="72" y1="920" y2="944"/>
+<line x1="84" x2="84" y1="928" y2="920"/>
+</g>
+<g>
 <line x1="72" x2="96" y1="1128" y2="1128"/>
+<path d="M 98 1132 A 4 4 0 0 0 96 1128" fill="none"/>
+</g>
+<g>
 <line x1="72" x2="98" y1="1184" y2="1132"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="76" x2="92" y1="184" y2="184"/>
+</g>
+<g>
 <line x1="76" x2="76" y1="1900" y2="1952"/>
-<line x1="80" x2="104" y1="168" y2="168"/>
+<line x1="88" x2="76" y1="1952" y2="1952"/>
+<path d="M 80 1896 A 4 4 0 0 0 76 1900" fill="none"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="80" x2="100" y1="1896" y2="1896"/>
+</g>
+<g>
 <line x1="80" x2="136" y1="1952" y2="1952"/>
+<line x1="136" x2="146" y1="1952" y2="1932"/>
+<line x1="136" x2="148" y1="1952" y2="1976"/>
+<line x1="148" x2="136" y1="1928" y2="1952"/>
+<line x1="148" x2="160" y1="1928" y2="1952"/>
+<line x1="148" x2="160" y1="1976" y2="1952"/>
+<line x1="148" x2="148" y1="1988" y2="1976"/>
+<line x1="150" x2="160" y1="1932" y2="1952"/>
+<line x1="160" x2="200" y1="1952" y2="1952"/>
+<path d="M 146 1932 A 16 16 0 0 0 148 1924" fill="none"/>
+<path d="M 148 1924 A 16 16 0 0 0 150 1932" fill="none"/>
+<path d="M 148 1988 A 4 4 0 0 0 152 1992" fill="none"/>
+</g>
+<g>
 <line x1="80" x2="88" y1="2224" y2="2208"/>
-<line x1="84" x2="84" y1="912" y2="928"/>
-<line x1="84" x2="92" y1="992" y2="1000"/>
+</g>
+<g>
+<line x1="84" x2="104" y1="168" y2="168"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="84" x2="100" y1="1160" y2="1160"/>
+</g>
+<g>
 <line marker-end="url(#circle)" marker-start="url(#circle)" x1="84" x2="148" y1="1416" y2="1416"/>
+<line marker-end="url(#triangle)" marker-start="url(#circle)" x1="148" x2="166" y1="1416" y2="1452"/>
+<line marker-end="url(#circle)" marker-start="url(#circle)" x1="148" x2="196" y1="1416" y2="1416"/>
+<line marker-end="url(#circle)" marker-start="url(#circle)" x1="196" x2="228" y1="1416" y2="1416"/>
+<line marker-end="url(#circle)" marker-start="url(#circle)" x1="228" x2="268" y1="1416" y2="1416"/>
+<line marker-start="url(#circle)" x1="268" x2="282" y1="1416" y2="1444"/>
+<line marker-end="url(#triangle)" marker-start="url(#circle)" x1="268" x2="316" y1="1416" y2="1416"/>
+<line marker-end="url(#circle)" x1="282" x2="268" y1="1388" y2="1416"/>
+<path d="M 282 1444 A 8 8 0 0 0 288 1448" fill="none"/>
+<path d="M 288 1384 A 8 8 0 0 0 282 1388" fill="none"/>
+</g>
+<g>
 <line x1="84" x2="84" y1="2192" y2="2208"/>
 <line x1="84" x2="116" y1="2208" y2="2208"/>
-<line x1="88" x2="112" y1="1144" y2="1144"/>
-<line x1="88" x2="76" y1="1952" y2="1952"/>
 <line x1="88" x2="84" y1="2192" y2="2192"/>
 <line x1="88" x2="116" y1="2192" y2="2192"/>
-<line x1="92" x2="84" y1="1072" y2="1080"/>
-<line marker-start="url(#circle)" x1="92" x2="116" y1="1624" y2="1624"/>
-<line x1="92" x2="92" y1="3896" y2="3928"/>
+<line x1="116" x2="116" y1="2192" y2="2208"/>
+</g>
+<g>
+<line x1="92" x2="112" y1="1144" y2="1144"/>
+</g>
+<g>
 <line x1="92" x2="92" y1="4444" y2="4468"/>
-<line x1="96" x2="108" y1="1008" y2="1032"/>
+<path d="M 92 4468 A 4 4 0 0 0 96 4472" fill="none"/>
+<path d="M 96 4440 A 4 4 0 0 0 92 4444" fill="none"/>
+</g>
+<g>
 <line x1="96" x2="120" y1="2936" y2="2936"/>
+</g>
+<g>
 <line x1="96" x2="192" y1="4440" y2="4440"/>
+<path d="M 196 4444 A 4 4 0 0 0 192 4440" fill="none"/>
+</g>
+<g>
 <line x1="96" x2="192" y1="4472" y2="4472"/>
+<path d="M 192 4472 A 4 4 0 0 0 196 4468" fill="none"/>
+</g>
+<g>
 <line x1="100" x2="100" y1="1272" y2="1288"/>
 <line x1="100" x2="116" y1="1272" y2="1272"/>
-<line x1="100" x2="100" y1="1304" y2="1280"/>
+<line x1="100" x2="100" y1="1288" y2="1304"/>
+<line x1="100" x2="116" y1="1288" y2="1288"/>
 <line x1="100" x2="116" y1="1304" y2="1304"/>
+<line x1="116" x2="116" y1="1272" y2="1288"/>
+<line x1="116" x2="124" y1="1272" y2="1272"/>
+<line x1="116" x2="116" y1="1288" y2="1304"/>
+<line x1="116" x2="124" y1="1288" y2="1288"/>
+<line x1="116" x2="124" y1="1304" y2="1304"/>
+<line x1="124" x2="124" y1="1272" y2="1288"/>
+<line x1="124" x2="124" y1="1288" y2="1304"/>
+</g>
+<g>
 <line marker-end="url(#square)" marker-start="url(#square)" x1="100" x2="108" y1="2952" y2="2952"/>
-<line x1="104" x2="116" y1="1288" y2="1288"/>
+<line marker-end="url(#square)" marker-start="url(#square)" x1="108" x2="116" y1="2952" y2="2952"/>
+<line marker-end="url(#open_circle)" marker-start="url(#square)" x1="108" x2="108" y1="2952" y2="2984"/>
+<line marker-start="url(#open_circle)" x1="108" x2="108" y1="2984" y2="3008"/>
+</g>
+<g>
 <line x1="104" x2="112" y1="2224" y2="2208"/>
-<line x1="108" x2="108" y1="1032" y2="1048"/>
-<line x1="108" x2="96" y1="1048" y2="1072"/>
+</g>
+<g>
 <line x1="108" x2="108" y1="1884" y2="1892"/>
-<line marker-end="url(#square)" marker-start="url(#square)" x1="108" x2="116" y1="2952" y2="2952"/>
-<line x1="112" x2="140" y1="1624" y2="1624"/>
+<path d="M 108 1892 A 4 4 0 0 0 112 1896" fill="none"/>
+<path d="M 112 1880 A 4 4 0 0 0 108 1884" fill="none"/>
+</g>
+<g>
 <line x1="112" x2="120" y1="1880" y2="1880"/>
+<path d="M 124 1884 A 4 4 0 0 0 120 1880" fill="none"/>
+</g>
+<g>
 <line x1="112" x2="120" y1="1896" y2="1896"/>
-<line x1="116" x2="116" y1="376" y2="408"/>
-<line x1="116" x2="116" y1="552" y2="576"/>
-<line x1="116" x2="116" y1="1280" y2="1304"/>
-<line x1="116" x2="116" y1="1304" y2="1280"/>
-<line marker-end="url(#circle)" marker-start="url(#circle)" x1="116" x2="140" y1="1608" y2="1608"/>
-<line x1="116" x2="116" y1="2192" y2="2208"/>
+<path d="M 120 1896 A 4 4 0 0 0 124 1892" fill="none"/>
+</g>
+<g>
 <line x1="118" x2="130" y1="3508" y2="3484"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="120" x2="134" y1="1904" y2="1932"/>
-<line x1="124" x2="112" y1="1272" y2="1272"/>
-<line x1="124" x2="124" y1="1272" y2="1288"/>
-<line x1="124" x2="112" y1="1288" y2="1288"/>
-<line x1="124" x2="120" y1="1304" y2="1304"/>
-<line x1="124" x2="124" y1="1304" y2="1296"/>
+</g>
+<g>
 <line x1="124" x2="124" y1="1884" y2="1892"/>
+</g>
+<g>
 <line x1="124" x2="124" y1="2192" y2="2208"/>
 <line x1="124" x2="128" y1="2192" y2="2192"/>
 <line x1="124" x2="124" y1="2208" y2="2224"/>
-<line x1="128" x2="144" y1="432" y2="464"/>
-<line x1="128" x2="144" y1="496" y2="464"/>
 <line x1="128" x2="136" y1="2192" y2="2192"/>
+<line x1="136" x2="140" y1="2192" y2="2192"/>
+<line x1="136" x2="124" y1="2224" y2="2224"/>
+<line x1="140" x2="140" y1="2192" y2="2208"/>
+<line x1="140" x2="140" y1="2208" y2="2224"/>
+</g>
+<g>
 <line x1="128" x2="136" y1="2198" y2="2198"/>
+</g>
+<g>
 <line x1="128" x2="136" y1="2202" y2="2202"/>
+</g>
+<g>
 <line x1="128" x2="136" y1="2224" y2="2224"/>
 <line x1="128" x2="140" y1="2224" y2="2224"/>
+</g>
+<g>
 <line x1="130" x2="120" y1="556" y2="576"/>
+<path d="M 136 552 A 8 8 0 0 0 130 556" fill="none"/>
+</g>
+<g>
 <line marker-start="url(#circle)" x1="132" x2="170" y1="2456" y2="2532"/>
+<path d="M 170 2532 A 8 8 0 0 0 176 2536" fill="none"/>
+</g>
+<g>
 <line x1="136" x2="160" y1="552" y2="552"/>
-<line x1="136" x2="164" y1="1624" y2="1624"/>
-<line x1="136" x2="144" y1="1952" y2="1936"/>
-<line x1="136" x2="148" y1="1952" y2="1976"/>
-<line x1="136" x2="140" y1="2192" y2="2192"/>
-<line x1="136" x2="124" y1="2224" y2="2224"/>
+<path d="M 160 552 A 8 8 0 0 0 166 548" fill="none"/>
+</g>
+<g>
 <line x1="140" x2="140" y1="1884" y2="1892"/>
-<line x1="140" x2="140" y1="2192" y2="2208"/>
-<line x1="140" x2="140" y1="2208" y2="2224"/>
+<path d="M 140 1892 A 4 4 0 0 0 144 1896" fill="none"/>
+<path d="M 144 1880 A 4 4 0 0 0 140 1884" fill="none"/>
+</g>
+<g>
 <line x1="144" x2="154" y1="1200" y2="1220"/>
+<line x1="170" x2="144" y1="1148" y2="1200"/>
+<path d="M 154 1220 A 8 8 0 0 0 160 1224" fill="none"/>
+<path d="M 176 1144 A 8 8 0 0 0 170 1148" fill="none"/>
+</g>
+<g>
 <line x1="144" x2="152" y1="1880" y2="1880"/>
+<path d="M 156 1884 A 4 4 0 0 0 152 1880" fill="none"/>
+</g>
+<g>
 <line x1="144" x2="152" y1="1896" y2="1896"/>
+<path d="M 152 1896 A 4 4 0 0 0 156 1892" fill="none"/>
+</g>
+<g>
 <line x1="146" x2="146" y1="1272" y2="1308"/>
 <line x1="146" x2="174" y1="1272" y2="1272"/>
 <line x1="146" x2="174" y1="1308" y2="1308"/>
+<line x1="174" x2="174" y1="1272" y2="1308"/>
+</g>
+<g>
 <line x1="148" x2="148" y1="380" y2="404"/>
-<line marker-end="url(#triangle)" marker-start="url(#circle)" x1="148" x2="166" y1="1416" y2="1452"/>
-<line marker-end="url(#circle)" marker-start="url(#circle)" x1="148" x2="196" y1="1416" y2="1416"/>
+<path d="M 148 404 A 4 4 0 0 0 152 408" fill="none"/>
+<path d="M 152 376 A 4 4 0 0 0 148 380" fill="none"/>
+</g>
+<g>
 <line x1="148" x2="148" y1="1904" y2="1924"/>
-<line x1="148" x2="148" y1="1924" y2="1924"/>
-<line x1="148" x2="146" y1="1928" y2="1932"/>
-<line x1="148" x2="150" y1="1928" y2="1932"/>
-<line x1="148" x2="160" y1="1976" y2="1952"/>
-<line x1="148" x2="148" y1="1988" y2="1976"/>
+<line x1="148" x2="148" y1="1924" y2="1920"/>
+</g>
+<g>
 <line x1="150" x2="150" y1="1276" y2="1288"/>
 <line x1="150" x2="162" y1="1276" y2="1276"/>
 <line x1="150" x2="162" y1="1288" y2="1288"/>
+<line x1="162" x2="162" y1="1276" y2="1288"/>
+</g>
+<g>
 <line x1="150" x2="150" y1="1292" y2="1304"/>
 <line x1="150" x2="162" y1="1292" y2="1292"/>
 <line x1="150" x2="162" y1="1304" y2="1304"/>
-<line x1="150" x2="148" y1="1932" y2="1928"/>
+<line x1="162" x2="162" y1="1292" y2="1304"/>
+</g>
+<g>
 <line x1="152" x2="200" y1="376" y2="376"/>
+<path d="M 204 380 A 4 4 0 0 0 200 376" fill="none"/>
+</g>
+<g>
 <line x1="152" x2="200" y1="408" y2="408"/>
+<path d="M 200 408 A 4 4 0 0 0 204 404" fill="none"/>
+</g>
+<g>
 <line x1="152" x2="162" y1="1184" y2="1204"/>
-<line x1="152" x2="160" y1="1936" y2="1952"/>
+<path d="M 162 1204 A 8 8 0 0 0 168 1208" fill="none"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="152" x2="172" y1="1992" y2="1992"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="152" x2="172" y1="2200" y2="2200"/>
+</g>
+<g>
 <line x1="156" x2="156" y1="1884" y2="1892"/>
+</g>
+<g>
 <line marker-start="url(#circle)" x1="156" x2="216" y1="2408" y2="2408"/>
+<path d="M 222 2412 A 8 8 0 0 0 216 2408" fill="none"/>
+<line marker-end="url(#open_circle)" x1="222" x2="268" y1="2412" y2="2504"/>
+</g>
+<g>
 <line x1="160" x2="176" y1="1224" y2="1224"/>
-<line x1="160" x2="200" y1="1952" y2="1952"/>
+<path d="M 176 1224 A 8 8 0 0 0 182 1220" fill="none"/>
+</g>
+<g>
 <line x1="160" x2="168" y1="3744" y2="3728"/>
-<line x1="162" x2="162" y1="1276" y2="1288"/>
-<line x1="162" x2="162" y1="1292" y2="1304"/>
+</g>
+<g>
 <line x1="164" x2="184" y1="1160" y2="1160"/>
-<line marker-start="url(#circle)" x1="164" x2="164" y1="1592" y2="1624"/>
-<line marker-end="url(#circle)" marker-start="url(#circle)" x1="164" x2="188" y1="1592" y2="1592"/>
+<path d="M 190 1164 A 8 8 0 0 0 184 1160" fill="none"/>
+</g>
+<g>
 <line x1="166" x2="168" y1="524" y2="528"/>
+<path d="M 168 544 A 16 16 0 0 0 168 528" fill="none"/>
+</g>
+<g>
 <line x1="166" x2="168" y1="548" y2="544"/>
+</g>
+<g>
 <line x1="166" x2="166" y1="1276" y2="1288"/>
 <line x1="166" x2="170" y1="1276" y2="1276"/>
 <line x1="166" x2="170" y1="1288" y2="1288"/>
+<line x1="170" x2="170" y1="1276" y2="1288"/>
+</g>
+<g>
 <line x1="166" x2="166" y1="1292" y2="1304"/>
 <line x1="166" x2="170" y1="1292" y2="1292"/>
 <line x1="166" x2="170" y1="1304" y2="1304"/>
-<line x1="168" x2="188" y1="1624" y2="1624"/>
-<line x1="168" x2="184" y1="2984" y2="2984"/>
-<line x1="170" x2="144" y1="1148" y2="1200"/>
-<line x1="170" x2="170" y1="1276" y2="1288"/>
 <line x1="170" x2="170" y1="1292" y2="1304"/>
+</g>
+<g>
+<line x1="168" x2="184" y1="2984" y2="2984"/>
+<path d="M 164 2980 A 4 4 0 0 0 168 2984" fill="none"/>
+<path d="M 188 2988 A 4 4 0 0 0 184 2984" fill="none"/>
+<line marker-start="url(#open_circle)" x1="164" x2="164" y1="2904" y2="2980"/>
+<line marker-start="url(#open_circle)" x1="164" x2="176" y1="2904" y2="2904"/>
+</g>
+<g>
 <line x1="172" x2="188" y1="1192" y2="1192"/>
+</g>
+<g>
+<line x1="172" x2="168" y1="1208" y2="1208"/>
+<line x1="172" x2="176" y1="1208" y2="1208"/>
+<path d="M 176 1208 A 8 8 0 0 0 182 1204" fill="none"/>
+<line marker-start="url(#big_open_circle)" x1="172" x2="172" y1="1176" y2="1208"/>
+</g>
+<g>
 <line x1="172" x2="172" y1="1884" y2="1892"/>
+<path d="M 172 1892 A 4 4 0 0 0 176 1896" fill="none"/>
+<path d="M 176 1880 A 4 4 0 0 0 172 1884" fill="none"/>
+</g>
+<g>
 <line x1="172" x2="172" y1="3020" y2="3268"/>
-<line x1="174" x2="174" y1="1272" y2="1308"/>
+<path d="M 172 3268 A 4 4 0 0 0 176 3272" fill="none"/>
+<path d="M 176 3016 A 4 4 0 0 0 172 3020" fill="none"/>
+</g>
+<g>
 <line x1="176" x2="192" y1="464" y2="432"/>
 <line x1="176" x2="192" y1="464" y2="496"/>
+<line x1="192" x2="208" y1="432" y2="464"/>
+<line x1="192" x2="208" y1="496" y2="464"/>
+</g>
+<g>
 <line x1="176" x2="192" y1="1144" y2="1144"/>
-<line x1="176" x2="168" y1="1208" y2="1208"/>
+<path d="M 198 1148 A 8 8 0 0 0 192 1144" fill="none"/>
+</g>
+<g>
 <line x1="176" x2="184" y1="1880" y2="1880"/>
+<path d="M 188 1884 A 4 4 0 0 0 184 1880" fill="none"/>
+</g>
+<g>
 <line x1="176" x2="184" y1="1896" y2="1896"/>
+<path d="M 184 1896 A 4 4 0 0 0 188 1892" fill="none"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="176" x2="162" y1="1904" y2="1932"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="176" x2="228" y1="2536" y2="2536"/>
+</g>
+<g>
 <line x1="176" x2="188" y1="3016" y2="3016"/>
+<line x1="188" x2="188" y1="2988" y2="3016"/>
+<line x1="188" x2="228" y1="3016" y2="3016"/>
+<line x1="228" x2="228" y1="2912" y2="3016"/>
+<line x1="228" x2="252" y1="3016" y2="3016"/>
+<line x1="252" x2="252" y1="2984" y2="3016"/>
+<line x1="252" x2="256" y1="2984" y2="2984"/>
+<line x1="252" x2="272" y1="3016" y2="3016"/>
+<path d="M 256 2984 A 4 4 0 0 0 260 2980" fill="none"/>
+<path d="M 276 3020 A 4 4 0 0 0 272 3016" fill="none"/>
+<line marker-start="url(#open_circle)" x1="228" x2="228" y1="2904" y2="2912"/>
+<line marker-end="url(#open_circle)" marker-start="url(#open_circle)" x1="228" x2="252" y1="2904" y2="2904"/>
+<line marker-start="url(#open_circle)" x1="252" x2="252" y1="2904" y2="2912"/>
+<line marker-end="url(#open_circle)" marker-start="url(#open_circle)" x1="252" x2="332" y1="2904" y2="2904"/>
+<line marker-start="url(#open_circle)" x1="332" x2="332" y1="2904" y2="2912"/>
+<line marker-end="url(#open_circle)" marker-start="url(#open_circle)" x1="332" x2="372" y1="2904" y2="2904"/>
+<line marker-start="url(#open_circle)" x1="372" x2="372" y1="2904" y2="2912"/>
+<line marker-start="url(#open_circle)" x1="372" x2="432" y1="2904" y2="2904"/>
+</g>
+<g>
 <line x1="176" x2="220" y1="3272" y2="3272"/>
+<line x1="220" x2="220" y1="3272" y2="3332"/>
+<line x1="220" x2="260" y1="3272" y2="3272"/>
+<line x1="260" x2="260" y1="3272" y2="3300"/>
+<line x1="260" x2="272" y1="3272" y2="3272"/>
+<path d="M 220 3332 A 4 4 0 0 0 224 3336" fill="none"/>
+<path d="M 260 3300 A 4 4 0 0 0 264 3304" fill="none"/>
+<path d="M 272 3272 A 4 4 0 0 0 276 3268" fill="none"/>
+<line marker-end="url(#open_circle)" x1="264" x2="372" y1="3304" y2="3304"/>
+<line marker-end="url(#open_circle)" x1="372" x2="372" y1="3260" y2="3304"/>
+<line marker-end="url(#open_circle)" marker-start="url(#open_circle)" x1="372" x2="484" y1="3304" y2="3304"/>
+<line marker-end="url(#open_circle)" marker-start="url(#open_circle)" x1="484" x2="484" y1="3176" y2="3304"/>
+<line marker-end="url(#open_circle)" marker-start="url(#open_circle)" x1="484" x2="524" y1="3176" y2="3176"/>
+<line marker-start="url(#open_circle)" x1="484" x2="484" y1="3304" y2="3328"/>
+<line marker-start="url(#open_circle)" x1="524" x2="524" y1="3176" y2="3216"/>
+<line marker-start="url(#open_circle)" x1="524" x2="544" y1="3176" y2="3176"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="180" x2="180" y1="1836" y2="1868"/>
+<path d="M 184 1832 A 4 4 0 0 0 180 1836" fill="none"/>
+</g>
+<g>
 <line x1="180" x2="180" y1="2896" y2="2912"/>
 <line x1="180" x2="184" y1="2896" y2="2896"/>
+<line x1="184" x2="208" y1="2896" y2="2896"/>
+<line x1="192" x2="180" y1="2912" y2="2912"/>
+<line x1="208" x2="212" y1="2896" y2="2896"/>
+<line x1="212" x2="212" y1="2896" y2="2912"/>
+</g>
+<g>
 <line x1="182" x2="192" y1="1204" y2="1184"/>
+<path d="M 192 1184 A 16 16 0 0 0 192 1168" fill="none"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="184" x2="204" y1="1464" y2="1464"/>
+</g>
+<g>
 <line x1="184" x2="200" y1="1832" y2="1832"/>
+<path d="M 204 1836 A 4 4 0 0 0 200 1832" fill="none"/>
+</g>
+<g>
 <line x1="184" x2="192" y1="2000" y2="1984"/>
 <line x1="184" x2="216" y1="2000" y2="2000"/>
+<line x1="192" x2="224" y1="1984" y2="1984"/>
+<line x1="216" x2="224" y1="2000" y2="1984"/>
+</g>
+<g>
 <line x1="184" x2="186" y1="2208" y2="2212"/>
-<line x1="184" x2="208" y1="2896" y2="2896"/>
+<path d="M 184 2192 A 16 16 0 0 0 184 2208" fill="none"/>
+<path d="M 186 2212 A 8 8 0 0 0 192 2216" fill="none"/>
+</g>
+<g>
 <line x1="184" x2="208" y1="2912" y2="2912"/>
+</g>
+<g>
 <line x1="186" x2="184" y1="2188" y2="2192"/>
-<line marker-start="url(#circle)" x1="188" x2="188" y1="1592" y2="1624"/>
+<path d="M 192 2184 A 8 8 0 0 0 186 2188" fill="none"/>
+</g>
+<g>
 <line x1="188" x2="188" y1="1884" y2="1892"/>
-<line x1="188" x2="188" y1="2988" y2="3016"/>
+</g>
+<g>
 <line x1="190" x2="192" y1="1164" y2="1168"/>
-<line x1="192" x2="208" y1="432" y2="464"/>
-<line x1="192" x2="208" y1="496" y2="464"/>
-<line x1="192" x2="212" y1="1624" y2="1624"/>
+</g>
+<g>
 <line x1="192" x2="204" y1="1952" y2="1952"/>
-<line x1="192" x2="224" y1="1984" y2="1984"/>
+<line x1="204" x2="204" y1="1836" y2="1952"/>
+</g>
+<g>
 <line x1="192" x2="200" y1="2184" y2="2184"/>
+</g>
+<g>
 <line x1="192" x2="200" y1="2216" y2="2216"/>
-<line marker-end="url(#triangle)" x1="192" x2="170" y1="2672" y2="2716"/>
-<line marker-end="url(#triangle)" x1="192" x2="170" y1="2704" y2="2748"/>
-<line x1="192" x2="180" y1="2912" y2="2912"/>
-<line x1="192" x2="228" y1="3016" y2="3016"/>
+</g>
+<g>
 <line x1="194" x2="194" y1="1272" y2="1304"/>
 <line x1="194" x2="222" y1="1272" y2="1272"/>
 <line x1="194" x2="222" y1="1304" y2="1304"/>
+<line x1="222" x2="222" y1="1272" y2="1304"/>
+</g>
+<g>
+<line marker-end="url(#triangle)" x1="194" x2="170" y1="2668" y2="2716"/>
+<path d="M 194 2668 A 16 16 0 0 0 196 2660" fill="none"/>
+</g>
+<g>
+<line marker-end="url(#triangle)" x1="194" x2="170" y1="2700" y2="2748"/>
+<path d="M 194 2700 A 16 16 0 0 0 196 2692" fill="none"/>
+</g>
+<g>
 <line marker-end="url(#triangle)" x1="194" x2="170" y1="2732" y2="2780"/>
-<line marker-end="url(#circle)" marker-start="url(#circle)" x1="196" x2="228" y1="1416" y2="1416"/>
-<line x1="196" x2="196" y1="2640" y2="2724"/>
-<line x1="196" x2="196" y1="2660" y2="2724"/>
-<line x1="196" x2="196" y1="2692" y2="2724"/>
+<path d="M 194 2732 A 16 16 0 0 0 196 2724" fill="none"/>
+</g>
+<g>
+<line x1="196" x2="196" y1="2636" y2="2724"/>
+<path d="M 198 2628 A 16 16 0 0 0 196 2636" fill="none"/>
+</g>
+<g>
+<line x1="196" x2="196" y1="2660" y2="2656"/>
+</g>
+<g>
+<line x1="196" x2="196" y1="2692" y2="2688"/>
+</g>
+<g>
 <line x1="196" x2="196" y1="4444" y2="4468"/>
+</g>
+<g>
 <line x1="198" x2="204" y1="1148" y2="1160"/>
+<line x1="204" x2="204" y1="1160" y2="1176"/>
+<line x1="204" x2="182" y1="1176" y2="1220"/>
+</g>
+<g>
 <line x1="198" x2="198" y1="1272" y2="1304"/>
+</g>
+<g>
 <line x1="198" x2="218" y1="1288" y2="1288"/>
-<line marker-end="url(#triangle)" x1="198" x2="170" y1="2628" y2="2684"/>
+</g>
+<g>
+<line marker-end="url(#triangle)" x1="200" x2="170" y1="2624" y2="2684"/>
+</g>
+<g>
 <line x1="200" x2="212" y1="2912" y2="2912"/>
+</g>
+<g>
 <line x1="204" x2="204" y1="380" y2="404"/>
-<line x1="204" x2="204" y1="1160" y2="1176"/>
-<line x1="204" x2="182" y1="1176" y2="1220"/>
-<line x1="204" x2="204" y1="1836" y2="1952"/>
+</g>
+<g>
 <line x1="208" x2="210" y1="2224" y2="2228"/>
-<line x1="208" x2="212" y1="2896" y2="2896"/>
+<path d="M 208 2208 A 16 16 0 0 0 208 2224" fill="none"/>
+<path d="M 210 2228 A 8 8 0 0 0 216 2232" fill="none"/>
+</g>
+<g>
 <line x1="210" x2="210" y1="1272" y2="1304"/>
+</g>
+<g>
 <line x1="210" x2="208" y1="2172" y2="2176"/>
+<path d="M 208 2176 A 16 16 0 0 0 208 2192" fill="none"/>
+<path d="M 216 2168 A 8 8 0 0 0 210 2172" fill="none"/>
+</g>
+<g>
 <line x1="210" x2="198" y1="2604" y2="2628"/>
-<line marker-start="url(#circle)" x1="212" x2="212" y1="1576" y2="1624"/>
-<line marker-end="url(#circle)" marker-start="url(#circle)" x1="212" x2="236" y1="1576" y2="1576"/>
-<line x1="212" x2="212" y1="2896" y2="2912"/>
+<path d="M 216 2600 A 8 8 0 0 0 210 2604" fill="none"/>
+</g>
+<g>
 <line x1="212" x2="212" y1="4432" y2="4480"/>
+</g>
+<g>
 <line x1="214" x2="214" y1="1272" y2="1304"/>
-<line x1="216" x2="236" y1="1624" y2="1624"/>
-<line x1="216" x2="224" y1="2000" y2="1984"/>
+</g>
+<g>
 <line x1="216" x2="224" y1="2168" y2="2168"/>
+<path d="M 228 2172 A 4 4 0 0 0 224 2168" fill="none"/>
+</g>
+<g>
 <line x1="216" x2="224" y1="2232" y2="2232"/>
+<path d="M 228 2236 A 4 4 0 0 0 224 2232" fill="none"/>
+</g>
+<g>
 <line x1="216" x2="232"