Re-render test files as SVG images.

test/test_files/UNTESTED

@@ -1,3 +0,0 @@
-Missing tests (=TODO):
-
- - order of small steps semantic aspect

test/test_files/day_atlee/statechart_fig20_invar.svg

@@ -4,11 +4,11 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: state transitions Pages: 1 -->
-<svg width="295pt" height="578pt"
- viewBox="0.00 0.00 295.44 578.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="307pt" height="578pt"
+ viewBox="0.00 0.00 306.56 578.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 574)">
 <title>state transitions</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-574 291.444,-574 291.444,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-574 302.561,-574 302.561,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster__Invar</title>
 <path fill="none" stroke="#000000" stroke-width="2" d="M20,-74C20,-74 221,-74 221,-74 227,-74 233,-80 233,-86 233,-86 233,-519 233,-519 233,-525 227,-531 221,-531 221,-531 20,-531 20,-531 14,-531 8,-525 8,-519 8,-519 8,-86 8,-86 8,-80 14,-74 20,-74"/>
@@ -78,7 +78,7 @@
 <title>_Invar_I2_S6&#45;&gt;_Done</title>
 <path fill="none" stroke="#000000" d="M172,-89.9737C172,-80.1983 172,-67.8024 172,-56.3399"/>
 <polygon fill="#000000" stroke="#000000" points="175.5001,-56.1774 172,-46.1775 168.5001,-56.1775 175.5001,-56.1774"/>
-<text text-anchor="start" x="172" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[INSTATE([&quot;/Invar/S3&quot;])] &#160;&#160;</text>
+<text text-anchor="start" x="172" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[INSTATE([&quot;/Invar/I1/S3&quot;])] &#160;&#160;</text>
 </g>
 <!-- _Invar_I2_S5 -->
 <g id="node7" class="node">

test/test_files/day_atlee/statechart_fig9_trafficlight.svg

@@ -48,7 +48,7 @@
 <title>_TrafficLight_EastWest_EW_Red</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="370,-326 258,-326 258,-280 370,-280 370,-326"/>
 <text text-anchor="start" x="289.9976" y="-309.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">EW_Red</text>
-<text text-anchor="start" x="263.8388" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.set_light</text>
+<text text-anchor="start" x="263.5034" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.set_light</text>
 <polygon fill="#000000" stroke="#000000" points="258,-303 258,-303 370,-303 370,-303 258,-303"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M271,-281C271,-281 357,-281 357,-281 363,-281 369,-287 369,-293 369,-293 369,-313 369,-313 369,-319 363,-325 357,-325 357,-325 271,-325 271,-325 265,-325 259,-319 259,-313 259,-313 259,-293 259,-293 259,-287 265,-281 271,-281"/>
 </g>
@@ -64,7 +64,7 @@
 <title>_TrafficLight_EastWest_EW_Yellow</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="389,-70 277,-70 277,-24 389,-24 389,-70"/>
 <text text-anchor="start" x="302.3334" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">EW_Yellow</text>
-<text text-anchor="start" x="282.8388" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.set_light</text>
+<text text-anchor="start" x="282.5034" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.set_light</text>
 <polygon fill="#000000" stroke="#000000" points="277,-47 277,-47 389,-47 389,-47 277,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M290,-25C290,-25 376,-25 376,-25 382,-25 388,-31 388,-37 388,-37 388,-57 388,-57 388,-63 382,-69 376,-69 376,-69 290,-69 290,-69 284,-69 278,-63 278,-57 278,-57 278,-37 278,-37 278,-31 284,-25 290,-25"/>
 </g>
@@ -80,7 +80,7 @@
 <title>_TrafficLight_EastWest_EW_Green</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="450,-198 338,-198 338,-152 450,-152 450,-198"/>
 <text text-anchor="start" x="364.3288" y="-181.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">EW_Green</text>
-<text text-anchor="start" x="343.8388" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.set_light</text>
+<text text-anchor="start" x="343.5034" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.set_light</text>
 <polygon fill="#000000" stroke="#000000" points="338,-175 338,-175 450,-175 450,-175 338,-175"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M351,-153C351,-153 437,-153 437,-153 443,-153 449,-159 449,-165 449,-165 449,-185 449,-185 449,-191 443,-197 437,-197 437,-197 351,-197 351,-197 345,-197 339,-191 339,-185 339,-185 339,-165 339,-165 339,-159 345,-153 351,-153"/>
 </g>
@@ -109,7 +109,7 @@
 <title>_TrafficLight_NorthSouth_NS_Green</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="149,-326 37,-326 37,-280 149,-280 149,-326"/>
 <text text-anchor="start" x="64.6608" y="-309.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">NS_Green</text>
-<text text-anchor="start" x="42.8388" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.set_light</text>
+<text text-anchor="start" x="42.5034" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.set_light</text>
 <polygon fill="#000000" stroke="#000000" points="37,-303 37,-303 149,-303 149,-303 37,-303"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M50,-281C50,-281 136,-281 136,-281 142,-281 148,-287 148,-293 148,-293 148,-313 148,-313 148,-319 142,-325 136,-325 136,-325 50,-325 50,-325 44,-325 38,-319 38,-313 38,-313 38,-293 38,-293 38,-287 44,-281 50,-281"/>
 </g>
@@ -125,7 +125,7 @@
 <title>_TrafficLight_NorthSouth_NS_Red</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="168,-70 56,-70 56,-24 168,-24 168,-70"/>
 <text text-anchor="start" x="89.3296" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">NS_Red</text>
-<text text-anchor="start" x="61.8388" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.set_light</text>
+<text text-anchor="start" x="61.5034" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.set_light</text>
 <polygon fill="#000000" stroke="#000000" points="56,-47 56,-47 168,-47 168,-47 56,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M69,-25C69,-25 155,-25 155,-25 161,-25 167,-31 167,-37 167,-37 167,-57 167,-57 167,-63 161,-69 155,-69 155,-69 69,-69 69,-69 63,-69 57,-63 57,-57 57,-57 57,-37 57,-37 57,-31 63,-25 69,-25"/>
 </g>
@@ -141,7 +141,7 @@
 <title>_TrafficLight_NorthSouth_NS_Yellow</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="229,-198 117,-198 117,-152 229,-152 229,-198"/>
 <text text-anchor="start" x="143.6654" y="-181.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">NS_Yellow</text>
-<text text-anchor="start" x="122.8388" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.set_light</text>
+<text text-anchor="start" x="122.5034" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.set_light</text>
 <polygon fill="#000000" stroke="#000000" points="117,-175 117,-175 229,-175 229,-175 117,-175"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M130,-153C130,-153 216,-153 216,-153 222,-153 228,-159 228,-165 228,-165 228,-185 228,-185 228,-191 222,-197 216,-197 216,-197 130,-197 130,-197 124,-197 118,-191 118,-185 118,-185 118,-165 118,-165 118,-159 124,-153 130,-153"/>
 </g>

test/test_files/features/action_lang/test_closure.svg

@@ -4,63 +4,63 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: state transitions Pages: 1 -->
-<svg width="133pt" height="241pt"
- viewBox="0.00 0.00 133.00 241.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="134pt" height="241pt"
+ viewBox="0.00 0.00 134.00 241.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 237)">
 <title>state transitions</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-237 129,-237 129,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-237 130,-237 130,4 -4,4"/>
 <!-- __initial -->
 <g id="node1" class="node">
 <title>__initial</title>
-<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="62.5" cy="-227.5" rx="5.5" ry="5.5"/>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="63" cy="-227.5" rx="5.5" ry="5.5"/>
 </g>
 <!-- _s1 -->
 <g id="node4" class="node">
 <title>_s1</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="125,-194 0,-194 0,-148 125,-148 125,-194"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="126,-194 0,-194 0,-148 126,-148 126,-194"/>
 <text text-anchor="start" x="56.6646" y="-177.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s1</text>
-<text text-anchor="start" x="6.1614" y="-157.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry/ x = increment()</text>
-<polygon fill="#000000" stroke="#000000" points=".5,-171 .5,-171 125.5,-171 125.5,-171 .5,-171"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M13,-149C13,-149 112,-149 112,-149 118,-149 124,-155 124,-161 124,-161 124,-181 124,-181 124,-187 118,-193 112,-193 112,-193 13,-193 13,-193 7,-193 1,-187 1,-181 1,-181 1,-161 1,-161 1,-155 7,-149 13,-149"/>
+<text text-anchor="start" x="5.826" y="-157.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter /x = increment()</text>
+<polygon fill="#000000" stroke="#000000" points="0,-171 0,-171 126,-171 126,-171 0,-171"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M13,-149C13,-149 113,-149 113,-149 119,-149 125,-155 125,-161 125,-161 125,-181 125,-181 125,-187 119,-193 113,-193 113,-193 13,-193 13,-193 7,-193 1,-187 1,-181 1,-181 1,-161 1,-161 1,-155 7,-149 13,-149"/>
 </g>
 <!-- __initial&#45;&gt;_s1 -->
 <g id="edge1" class="edge">
 <title>__initial&#45;&gt;_s1</title>
-<path fill="none" stroke="#000000" d="M62.5,-221.876C62.5,-217.5252 62.5,-211.1081 62.5,-204.286"/>
-<polygon fill="#000000" stroke="#000000" points="66.0001,-204.1947 62.5,-194.1947 59.0001,-204.1947 66.0001,-204.1947"/>
-<text text-anchor="middle" x="63.8895" y="-205" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M63,-221.876C63,-217.5252 63,-211.1081 63,-204.286"/>
+<polygon fill="#000000" stroke="#000000" points="66.5001,-204.1947 63,-194.1947 59.5001,-204.1947 66.5001,-204.1947"/>
+<text text-anchor="middle" x="64.3895" y="-205" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _s3 -->
 <g id="node2" class="node">
 <title>_s3</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="109.5,-46 15.5,-46 15.5,0 109.5,0 109.5,-46"/>
-<text text-anchor="start" x="56.1646" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
-<text text-anchor="start" x="21.3364" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.done</text>
-<polygon fill="#000000" stroke="#000000" points="15.5,-23 15.5,-23 109.5,-23 109.5,-23 15.5,-23"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M28.5,-1C28.5,-1 96.5,-1 96.5,-1 102.5,-1 108.5,-7 108.5,-13 108.5,-13 108.5,-33 108.5,-33 108.5,-39 102.5,-45 96.5,-45 96.5,-45 28.5,-45 28.5,-45 22.5,-45 16.5,-39 16.5,-33 16.5,-33 16.5,-13 16.5,-13 16.5,-7 22.5,-1 28.5,-1"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="110,-46 16,-46 16,0 110,0 110,-46"/>
+<text text-anchor="start" x="56.6646" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
+<text text-anchor="start" x="21.501" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.done</text>
+<polygon fill="#000000" stroke="#000000" points="16,-23 16,-23 110,-23 110,-23 16,-23"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M29,-1C29,-1 97,-1 97,-1 103,-1 109,-7 109,-13 109,-13 109,-33 109,-33 109,-39 103,-45 97,-45 97,-45 29,-45 29,-45 23,-45 17,-39 17,-33 17,-33 17,-13 17,-13 17,-7 23,-1 29,-1"/>
 </g>
 <!-- _s2 -->
 <g id="node3" class="node">
 <title>_s2</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="125,-120 0,-120 0,-74 125,-74 125,-120"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="126,-120 0,-120 0,-74 126,-74 126,-120"/>
 <text text-anchor="start" x="56.6646" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
-<text text-anchor="start" x="6.1614" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry/ x = increment()</text>
-<polygon fill="#000000" stroke="#000000" points=".5,-97 .5,-97 125.5,-97 125.5,-97 .5,-97"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M13,-75C13,-75 112,-75 112,-75 118,-75 124,-81 124,-87 124,-87 124,-107 124,-107 124,-113 118,-119 112,-119 112,-119 13,-119 13,-119 7,-119 1,-113 1,-107 1,-107 1,-87 1,-87 1,-81 7,-75 13,-75"/>
+<text text-anchor="start" x="5.826" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter /x = increment()</text>
+<polygon fill="#000000" stroke="#000000" points="0,-97 0,-97 126,-97 126,-97 0,-97"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M13,-75C13,-75 113,-75 113,-75 119,-75 125,-81 125,-87 125,-87 125,-107 125,-107 125,-113 119,-119 113,-119 113,-119 13,-119 13,-119 7,-119 1,-113 1,-107 1,-107 1,-87 1,-87 1,-81 7,-75 13,-75"/>
 </g>
 <!-- _s2&#45;&gt;_s3 -->
 <g id="edge2" class="edge">
 <title>_s2&#45;&gt;_s3</title>
-<path fill="none" stroke="#000000" d="M62.5,-73.9916C62.5,-68.476 62.5,-62.474 62.5,-56.5881"/>
-<polygon fill="#000000" stroke="#000000" points="66.0001,-56.249 62.5,-46.2491 59.0001,-56.2491 66.0001,-56.249"/>
-<text text-anchor="start" x="62.5" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[x == 2] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M63,-73.9916C63,-68.476 63,-62.474 63,-56.5881"/>
+<polygon fill="#000000" stroke="#000000" points="66.5001,-56.249 63,-46.2491 59.5001,-56.2491 66.5001,-56.249"/>
+<text text-anchor="start" x="63" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[x == 2] &#160;&#160;</text>
 </g>
 <!-- _s1&#45;&gt;_s2 -->
 <g id="edge3" class="edge">
 <title>_s1&#45;&gt;_s2</title>
-<path fill="none" stroke="#000000" d="M62.5,-147.9916C62.5,-142.476 62.5,-136.474 62.5,-130.5881"/>
-<polygon fill="#000000" stroke="#000000" points="66.0001,-130.249 62.5,-120.2491 59.0001,-130.2491 66.0001,-130.249"/>
-<text text-anchor="start" x="62.5" y="-131" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[x == 1] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M63,-147.9916C63,-142.476 63,-136.474 63,-130.5881"/>
+<polygon fill="#000000" stroke="#000000" points="66.5001,-130.249 63,-120.2491 59.5001,-130.2491 66.5001,-130.249"/>
+<text text-anchor="start" x="63" y="-131" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[x == 1] &#160;&#160;</text>
 </g>
 </g>
 </svg>

test/test_files/features/action_lang/test_expressions.svg

@@ -4,337 +4,337 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: state transitions Pages: 1 -->
-<svg width="207pt" height="1824pt"
- viewBox="0.00 0.00 207.00 1824.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="208pt" height="1824pt"
+ viewBox="0.00 0.00 207.50 1824.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1820)">
 <title>state transitions</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1820 203,-1820 203,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1820 203.5,-1820 203.5,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster__boolean_logic</title>
-<path fill="none" stroke="#000000" stroke-width="2" d="M32,-74C32,-74 179,-74 179,-74 185,-74 191,-80 191,-86 191,-86 191,-611 191,-611 191,-617 185,-623 179,-623 179,-623 32,-623 32,-623 26,-623 20,-617 20,-611 20,-611 20,-86 20,-86 20,-80 26,-74 32,-74"/>
-<text text-anchor="start" x="68.4872" y="-604.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">boolean_logic</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M32.5,-74C32.5,-74 179.5,-74 179.5,-74 185.5,-74 191.5,-80 191.5,-86 191.5,-86 191.5,-611 191.5,-611 191.5,-617 185.5,-623 179.5,-623 179.5,-623 32.5,-623 32.5,-623 26.5,-623 20.5,-617 20.5,-611 20.5,-611 20.5,-86 20.5,-86 20.5,-80 26.5,-74 32.5,-74"/>
+<text text-anchor="start" x="68.9872" y="-604.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">boolean_logic</text>
 </g>
 <g id="clust2" class="cluster">
 <title>cluster__arithmetic</title>
-<path fill="none" stroke="#000000" stroke-width="2" d="M67,-651C67,-651 172,-651 172,-651 178,-651 184,-657 184,-663 184,-663 184,-1270 184,-1270 184,-1276 178,-1282 172,-1282 172,-1282 67,-1282 67,-1282 61,-1282 55,-1276 55,-1270 55,-1270 55,-663 55,-663 55,-657 61,-651 67,-651"/>
-<text text-anchor="start" x="94.0014" y="-1263.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">arithmetic</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M67.5,-651C67.5,-651 172.5,-651 172.5,-651 178.5,-651 184.5,-657 184.5,-663 184.5,-663 184.5,-1270 184.5,-1270 184.5,-1276 178.5,-1282 172.5,-1282 172.5,-1282 67.5,-1282 67.5,-1282 61.5,-1282 55.5,-1276 55.5,-1270 55.5,-1270 55.5,-663 55.5,-663 55.5,-657 61.5,-651 67.5,-651"/>
+<text text-anchor="start" x="94.5014" y="-1263.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">arithmetic</text>
 </g>
 <g id="clust3" class="cluster">
 <title>cluster__comparisons</title>
-<path fill="none" stroke="#000000" stroke-width="2" d="M103,-1310C103,-1310 171,-1310 171,-1310 177,-1310 183,-1316 183,-1322 183,-1322 183,-1765 183,-1765 183,-1771 177,-1777 171,-1777 171,-1777 103,-1777 103,-1777 97,-1777 91,-1771 91,-1765 91,-1765 91,-1322 91,-1322 91,-1316 97,-1310 103,-1310"/>
-<text text-anchor="start" x="102.9968" y="-1758.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">comparisons</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M103.5,-1310C103.5,-1310 171.5,-1310 171.5,-1310 177.5,-1310 183.5,-1316 183.5,-1322 183.5,-1322 183.5,-1765 183.5,-1765 183.5,-1771 177.5,-1777 171.5,-1777 171.5,-1777 103.5,-1777 103.5,-1777 97.5,-1777 91.5,-1771 91.5,-1765 91.5,-1765 91.5,-1322 91.5,-1322 91.5,-1316 97.5,-1310 103.5,-1310"/>
+<text text-anchor="start" x="103.4968" y="-1758.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">comparisons</text>
 </g>
 <!-- __initial -->
 <g id="node1" class="node">
 <title>__initial</title>
-<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="168" cy="-1810.5" rx="5.5" ry="5.5"/>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="168.5" cy="-1810.5" rx="5.5" ry="5.5"/>
 </g>
 <!-- _comparisons -->
 <!-- __initial&#45;&gt;_comparisons -->
 <g id="edge1" class="edge">
 <title>__initial&#45;&gt;_comparisons</title>
-<path fill="none" stroke="#000000" d="M168,-1804.9623C168,-1800.7143 168,-1794.3733 168,-1787.1925"/>
-<polygon fill="#000000" stroke="#000000" points="171.5001,-1786.9976 168,-1776.9976 164.5001,-1786.9976 171.5001,-1786.9976"/>
-<text text-anchor="middle" x="169.3895" y="-1788" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M168.5,-1804.9623C168.5,-1800.7143 168.5,-1794.3733 168.5,-1787.1925"/>
+<polygon fill="#000000" stroke="#000000" points="172.0001,-1786.9976 168.5,-1776.9976 165.0001,-1786.9976 172.0001,-1786.9976"/>
+<text text-anchor="middle" x="169.8895" y="-1788" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _final -->
 <g id="node2" class="node">
 <title>_final</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="112,-46 0,-46 0,0 112,0 112,-46"/>
-<text text-anchor="start" x="44.999" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">final</text>
-<text text-anchor="start" x="5.5028" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.all_good</text>
-<polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 112,-23 112,-23 0,-23"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 99,-1 99,-1 105,-1 111,-7 111,-13 111,-13 111,-33 111,-33 111,-39 105,-45 99,-45 99,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="113,-46 0,-46 0,0 113,0 113,-46"/>
+<text text-anchor="start" x="45.999" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">final</text>
+<text text-anchor="start" x="6.1674" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.all_good</text>
+<polygon fill="#000000" stroke="#000000" points=".5,-23 .5,-23 113.5,-23 113.5,-23 .5,-23"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 100,-1 100,-1 106,-1 112,-7 112,-13 112,-13 112,-33 112,-33 112,-39 106,-45 100,-45 100,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>
 <!-- _boolean_logic -->
 <!-- _boolean_logic_initial -->
 <g id="node4" class="node">
 <title>_boolean_logic_initial</title>
-<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="56" cy="-579.5" rx="5.5" ry="5.5"/>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="56.5" cy="-579.5" rx="5.5" ry="5.5"/>
 </g>
 <!-- _boolean_logic_s1 -->
 <g id="node10" class="node">
 <title>_boolean_logic_s1</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84,-528 28,-528 28,-492 84,-492 84,-528"/>
-<text text-anchor="start" x="49.6646" y="-506.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s1</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M40.3333,-493C40.3333,-493 71.6667,-493 71.6667,-493 77.3333,-493 83,-498.6667 83,-504.3333 83,-504.3333 83,-515.6667 83,-515.6667 83,-521.3333 77.3333,-527 71.6667,-527 71.6667,-527 40.3333,-527 40.3333,-527 34.6667,-527 29,-521.3333 29,-515.6667 29,-515.6667 29,-504.3333 29,-504.3333 29,-498.6667 34.6667,-493 40.3333,-493"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84.5,-528 28.5,-528 28.5,-492 84.5,-492 84.5,-528"/>
+<text text-anchor="start" x="50.1646" y="-506.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s1</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M40.8333,-493C40.8333,-493 72.1667,-493 72.1667,-493 77.8333,-493 83.5,-498.6667 83.5,-504.3333 83.5,-504.3333 83.5,-515.6667 83.5,-515.6667 83.5,-521.3333 77.8333,-527 72.1667,-527 72.1667,-527 40.8333,-527 40.8333,-527 35.1667,-527 29.5,-521.3333 29.5,-515.6667 29.5,-515.6667 29.5,-504.3333 29.5,-504.3333 29.5,-498.6667 35.1667,-493 40.8333,-493"/>
 </g>
 <!-- _boolean_logic_initial&#45;&gt;_boolean_logic_s1 -->
 <g id="edge2" class="edge">
 <title>_boolean_logic_initial&#45;&gt;_boolean_logic_s1</title>
-<path fill="none" stroke="#000000" d="M56,-573.5745C56,-565.7003 56,-551.2498 56,-538.1135"/>
-<polygon fill="#000000" stroke="#000000" points="59.5001,-538.0109 56,-528.011 52.5001,-538.011 59.5001,-538.0109"/>
-<text text-anchor="middle" x="57.3895" y="-548" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M56.5,-573.5745C56.5,-565.7003 56.5,-551.2498 56.5,-538.1135"/>
+<polygon fill="#000000" stroke="#000000" points="60.0001,-538.0109 56.5,-528.011 53.0001,-538.011 60.0001,-538.0109"/>
+<text text-anchor="middle" x="57.8895" y="-548" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _boolean_logic_s6 -->
 <g id="node5" class="node">
 <title>_boolean_logic_s6</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84,-118 28,-118 28,-82 84,-82 84,-118"/>
-<text text-anchor="start" x="49.6646" y="-96.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s6</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M40.3333,-83C40.3333,-83 71.6667,-83 71.6667,-83 77.3333,-83 83,-88.6667 83,-94.3333 83,-94.3333 83,-105.6667 83,-105.6667 83,-111.3333 77.3333,-117 71.6667,-117 71.6667,-117 40.3333,-117 40.3333,-117 34.6667,-117 29,-111.3333 29,-105.6667 29,-105.6667 29,-94.3333 29,-94.3333 29,-88.6667 34.6667,-83 40.3333,-83"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84.5,-118 28.5,-118 28.5,-82 84.5,-82 84.5,-118"/>
+<text text-anchor="start" x="50.1646" y="-96.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s6</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M40.8333,-83C40.8333,-83 72.1667,-83 72.1667,-83 77.8333,-83 83.5,-88.6667 83.5,-94.3333 83.5,-94.3333 83.5,-105.6667 83.5,-105.6667 83.5,-111.3333 77.8333,-117 72.1667,-117 72.1667,-117 40.8333,-117 40.8333,-117 35.1667,-117 29.5,-111.3333 29.5,-105.6667 29.5,-105.6667 29.5,-94.3333 29.5,-94.3333 29.5,-88.6667 35.1667,-83 40.8333,-83"/>
 </g>
 <!-- _boolean_logic_s6&#45;&gt;_final -->
 <g id="edge3" class="edge">
 <title>_boolean_logic_s6&#45;&gt;_final</title>
-<path fill="none" stroke="#000000" d="M56,-81.7521C56,-74.0806 56,-64.9093 56,-56.1197"/>
-<polygon fill="#000000" stroke="#000000" points="59.5001,-56.0895 56,-46.0895 52.5001,-56.0895 59.5001,-56.0895"/>
-<text text-anchor="middle" x="57.3895" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M56.5,-81.7521C56.5,-74.0806 56.5,-64.9093 56.5,-56.1197"/>
+<polygon fill="#000000" stroke="#000000" points="60.0001,-56.0895 56.5,-46.0895 53.0001,-56.0895 60.0001,-56.0895"/>
+<text text-anchor="middle" x="57.8895" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _boolean_logic_s5 -->
 <g id="node6" class="node">
 <title>_boolean_logic_s5</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84,-200 28,-200 28,-164 84,-164 84,-200"/>
-<text text-anchor="start" x="49.6646" y="-178.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s5</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M40.3333,-165C40.3333,-165 71.6667,-165 71.6667,-165 77.3333,-165 83,-170.6667 83,-176.3333 83,-176.3333 83,-187.6667 83,-187.6667 83,-193.3333 77.3333,-199 71.6667,-199 71.6667,-199 40.3333,-199 40.3333,-199 34.6667,-199 29,-193.3333 29,-187.6667 29,-187.6667 29,-176.3333 29,-176.3333 29,-170.6667 34.6667,-165 40.3333,-165"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84.5,-200 28.5,-200 28.5,-164 84.5,-164 84.5,-200"/>
+<text text-anchor="start" x="50.1646" y="-178.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s5</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M40.8333,-165C40.8333,-165 72.1667,-165 72.1667,-165 77.8333,-165 83.5,-170.6667 83.5,-176.3333 83.5,-176.3333 83.5,-187.6667 83.5,-187.6667 83.5,-193.3333 77.8333,-199 72.1667,-199 72.1667,-199 40.8333,-199 40.8333,-199 35.1667,-199 29.5,-193.3333 29.5,-187.6667 29.5,-187.6667 29.5,-176.3333 29.5,-176.3333 29.5,-170.6667 35.1667,-165 40.8333,-165"/>
 </g>
 <!-- _boolean_logic_s5&#45;&gt;_boolean_logic_s6 -->
 <g id="edge4" class="edge">
 <title>_boolean_logic_s5&#45;&gt;_boolean_logic_s6</title>
-<path fill="none" stroke="#000000" d="M56,-163.8015C56,-153.3976 56,-140.1215 56,-128.3768"/>
-<polygon fill="#000000" stroke="#000000" points="59.5001,-128.1476 56,-118.1476 52.5001,-128.1476 59.5001,-128.1476"/>
-<text text-anchor="start" x="56" y="-138" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[not (false or false and true)] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M56.5,-163.8015C56.5,-153.3976 56.5,-140.1215 56.5,-128.3768"/>
+<polygon fill="#000000" stroke="#000000" points="60.0001,-128.1476 56.5,-118.1476 53.0001,-128.1476 60.0001,-128.1476"/>
+<text text-anchor="start" x="56.5" y="-138" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[not (false or false and true)] &#160;&#160;</text>
 </g>
 <!-- _boolean_logic_s4 -->
 <g id="node7" class="node">
 <title>_boolean_logic_s4</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84,-282 28,-282 28,-246 84,-246 84,-282"/>
-<text text-anchor="start" x="49.6646" y="-260.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s4</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M40.3333,-247C40.3333,-247 71.6667,-247 71.6667,-247 77.3333,-247 83,-252.6667 83,-258.3333 83,-258.3333 83,-269.6667 83,-269.6667 83,-275.3333 77.3333,-281 71.6667,-281 71.6667,-281 40.3333,-281 40.3333,-281 34.6667,-281 29,-275.3333 29,-269.6667 29,-269.6667 29,-258.3333 29,-258.3333 29,-252.6667 34.6667,-247 40.3333,-247"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84.5,-282 28.5,-282 28.5,-246 84.5,-246 84.5,-282"/>
+<text text-anchor="start" x="50.1646" y="-260.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s4</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M40.8333,-247C40.8333,-247 72.1667,-247 72.1667,-247 77.8333,-247 83.5,-252.6667 83.5,-258.3333 83.5,-258.3333 83.5,-269.6667 83.5,-269.6667 83.5,-275.3333 77.8333,-281 72.1667,-281 72.1667,-281 40.8333,-281 40.8333,-281 35.1667,-281 29.5,-275.3333 29.5,-269.6667 29.5,-269.6667 29.5,-258.3333 29.5,-258.3333 29.5,-252.6667 35.1667,-247 40.8333,-247"/>
 </g>
 <!-- _boolean_logic_s4&#45;&gt;_boolean_logic_s5 -->
 <g id="edge5" class="edge">
 <title>_boolean_logic_s4&#45;&gt;_boolean_logic_s5</title>
-<path fill="none" stroke="#000000" d="M56,-245.8015C56,-235.3976 56,-222.1215 56,-210.3768"/>
-<polygon fill="#000000" stroke="#000000" points="59.5001,-210.1476 56,-200.1476 52.5001,-210.1476 59.5001,-210.1476"/>
-<text text-anchor="start" x="56" y="-220" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[not (true and false or false)] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M56.5,-245.8015C56.5,-235.3976 56.5,-222.1215 56.5,-210.3768"/>
+<polygon fill="#000000" stroke="#000000" points="60.0001,-210.1476 56.5,-200.1476 53.0001,-210.1476 60.0001,-210.1476"/>
+<text text-anchor="start" x="56.5" y="-220" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[not (true and false or false)] &#160;&#160;</text>
 </g>
 <!-- _boolean_logic_s3 -->
 <g id="node8" class="node">
 <title>_boolean_logic_s3</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84,-364 28,-364 28,-328 84,-328 84,-364"/>
-<text text-anchor="start" x="49.6646" y="-342.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M40.3333,-329C40.3333,-329 71.6667,-329 71.6667,-329 77.3333,-329 83,-334.6667 83,-340.3333 83,-340.3333 83,-351.6667 83,-351.6667 83,-357.3333 77.3333,-363 71.6667,-363 71.6667,-363 40.3333,-363 40.3333,-363 34.6667,-363 29,-357.3333 29,-351.6667 29,-351.6667 29,-340.3333 29,-340.3333 29,-334.6667 34.6667,-329 40.3333,-329"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84.5,-364 28.5,-364 28.5,-328 84.5,-328 84.5,-364"/>
+<text text-anchor="start" x="50.1646" y="-342.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M40.8333,-329C40.8333,-329 72.1667,-329 72.1667,-329 77.8333,-329 83.5,-334.6667 83.5,-340.3333 83.5,-340.3333 83.5,-351.6667 83.5,-351.6667 83.5,-357.3333 77.8333,-363 72.1667,-363 72.1667,-363 40.8333,-363 40.8333,-363 35.1667,-363 29.5,-357.3333 29.5,-351.6667 29.5,-351.6667 29.5,-340.3333 29.5,-340.3333 29.5,-334.6667 35.1667,-329 40.8333,-329"/>
 </g>
 <!-- _boolean_logic_s3&#45;&gt;_boolean_logic_s4 -->
 <g id="edge6" class="edge">
 <title>_boolean_logic_s3&#45;&gt;_boolean_logic_s4</title>
-<path fill="none" stroke="#000000" d="M56,-327.8015C56,-317.3976 56,-304.1215 56,-292.3768"/>
-<polygon fill="#000000" stroke="#000000" points="59.5001,-292.1476 56,-282.1476 52.5001,-292.1476 59.5001,-292.1476"/>
-<text text-anchor="start" x="56" y="-302" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[true and not false] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M56.5,-327.8015C56.5,-317.3976 56.5,-304.1215 56.5,-292.3768"/>
+<polygon fill="#000000" stroke="#000000" points="60.0001,-292.1476 56.5,-282.1476 53.0001,-292.1476 60.0001,-292.1476"/>
+<text text-anchor="start" x="56.5" y="-302" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[true and not false] &#160;&#160;</text>
 </g>
 <!-- _boolean_logic_s2 -->
 <g id="node9" class="node">
 <title>_boolean_logic_s2</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84,-446 28,-446 28,-410 84,-410 84,-446"/>
-<text text-anchor="start" x="49.6646" y="-424.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M40.3333,-411C40.3333,-411 71.6667,-411 71.6667,-411 77.3333,-411 83,-416.6667 83,-422.3333 83,-422.3333 83,-433.6667 83,-433.6667 83,-439.3333 77.3333,-445 71.6667,-445 71.6667,-445 40.3333,-445 40.3333,-445 34.6667,-445 29,-439.3333 29,-433.6667 29,-433.6667 29,-422.3333 29,-422.3333 29,-416.6667 34.6667,-411 40.3333,-411"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="84.5,-446 28.5,-446 28.5,-410 84.5,-410 84.5,-446"/>
+<text text-anchor="start" x="50.1646" y="-424.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M40.8333,-411C40.8333,-411 72.1667,-411 72.1667,-411 77.8333,-411 83.5,-416.6667 83.5,-422.3333 83.5,-422.3333 83.5,-433.6667 83.5,-433.6667 83.5,-439.3333 77.8333,-445 72.1667,-445 72.1667,-445 40.8333,-445 40.8333,-445 35.1667,-445 29.5,-439.3333 29.5,-433.6667 29.5,-433.6667 29.5,-422.3333 29.5,-422.3333 29.5,-416.6667 35.1667,-411 40.8333,-411"/>
 </g>
 <!-- _boolean_logic_s2&#45;&gt;_boolean_logic_s3 -->
 <g id="edge7" class="edge">
 <title>_boolean_logic_s2&#45;&gt;_boolean_logic_s3</title>
-<path fill="none" stroke="#000000" d="M56,-409.8015C56,-399.3976 56,-386.1215 56,-374.3768"/>
-<polygon fill="#000000" stroke="#000000" points="59.5001,-374.1476 56,-364.1476 52.5001,-374.1476 59.5001,-374.1476"/>
-<text text-anchor="start" x="56" y="-384" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[false or true] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M56.5,-409.8015C56.5,-399.3976 56.5,-386.1215 56.5,-374.3768"/>
+<polygon fill="#000000" stroke="#000000" points="60.0001,-374.1476 56.5,-364.1476 53.0001,-374.1476 60.0001,-374.1476"/>
+<text text-anchor="start" x="56.5" y="-384" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[false or true] &#160;&#160;</text>
 </g>
 <!-- _boolean_logic_s1&#45;&gt;_boolean_logic_s2 -->
 <g id="edge8" class="edge">
 <title>_boolean_logic_s1&#45;&gt;_boolean_logic_s2</title>
-<path fill="none" stroke="#000000" d="M56,-491.8015C56,-481.3976 56,-468.1215 56,-456.3768"/>
-<polygon fill="#000000" stroke="#000000" points="59.5001,-456.1476 56,-446.1476 52.5001,-456.1476 59.5001,-456.1476"/>
-<text text-anchor="start" x="56" y="-466" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[true] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M56.5,-491.8015C56.5,-481.3976 56.5,-468.1215 56.5,-456.3768"/>
+<polygon fill="#000000" stroke="#000000" points="60.0001,-456.1476 56.5,-446.1476 53.0001,-456.1476 60.0001,-456.1476"/>
+<text text-anchor="start" x="56.5" y="-466" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[true] &#160;&#160;</text>
 </g>
 <!-- _arithmetic -->
 <!-- _arithmetic_initial -->
 <g id="node12" class="node">
 <title>_arithmetic_initial</title>
-<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="91" cy="-1238.5" rx="5.5" ry="5.5"/>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="91.5" cy="-1238.5" rx="5.5" ry="5.5"/>
 </g>
 <!-- _arithmetic_s1 -->
 <g id="node19" class="node">
 <title>_arithmetic_s1</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119,-1187 63,-1187 63,-1151 119,-1151 119,-1187"/>
-<text text-anchor="start" x="84.6646" y="-1165.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s1</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M75.3333,-1152C75.3333,-1152 106.6667,-1152 106.6667,-1152 112.3333,-1152 118,-1157.6667 118,-1163.3333 118,-1163.3333 118,-1174.6667 118,-1174.6667 118,-1180.3333 112.3333,-1186 106.6667,-1186 106.6667,-1186 75.3333,-1186 75.3333,-1186 69.6667,-1186 64,-1180.3333 64,-1174.6667 64,-1174.6667 64,-1163.3333 64,-1163.3333 64,-1157.6667 69.6667,-1152 75.3333,-1152"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119.5,-1187 63.5,-1187 63.5,-1151 119.5,-1151 119.5,-1187"/>
+<text text-anchor="start" x="85.1646" y="-1165.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s1</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M75.8333,-1152C75.8333,-1152 107.1667,-1152 107.1667,-1152 112.8333,-1152 118.5,-1157.6667 118.5,-1163.3333 118.5,-1163.3333 118.5,-1174.6667 118.5,-1174.6667 118.5,-1180.3333 112.8333,-1186 107.1667,-1186 107.1667,-1186 75.8333,-1186 75.8333,-1186 70.1667,-1186 64.5,-1180.3333 64.5,-1174.6667 64.5,-1174.6667 64.5,-1163.3333 64.5,-1163.3333 64.5,-1157.6667 70.1667,-1152 75.8333,-1152"/>
 </g>
 <!-- _arithmetic_initial&#45;&gt;_arithmetic_s1 -->
 <g id="edge9" class="edge">
 <title>_arithmetic_initial&#45;&gt;_arithmetic_s1</title>
-<path fill="none" stroke="#000000" d="M91,-1232.5745C91,-1224.7003 91,-1210.2498 91,-1197.1135"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-1197.0109 91,-1187.011 87.5001,-1197.011 94.5001,-1197.0109"/>
-<text text-anchor="middle" x="92.3895" y="-1207" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M91.5,-1232.5745C91.5,-1224.7003 91.5,-1210.2498 91.5,-1197.1135"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-1197.0109 91.5,-1187.011 88.0001,-1197.011 95.0001,-1197.0109"/>
+<text text-anchor="middle" x="92.8895" y="-1207" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _arithmetic_s7 -->
 <g id="node13" class="node">
 <title>_arithmetic_s7</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119,-695 63,-695 63,-659 119,-659 119,-695"/>
-<text text-anchor="start" x="84.6646" y="-673.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s7</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M75.3333,-660C75.3333,-660 106.6667,-660 106.6667,-660 112.3333,-660 118,-665.6667 118,-671.3333 118,-671.3333 118,-682.6667 118,-682.6667 118,-688.3333 112.3333,-694 106.6667,-694 106.6667,-694 75.3333,-694 75.3333,-694 69.6667,-694 64,-688.3333 64,-682.6667 64,-682.6667 64,-671.3333 64,-671.3333 64,-665.6667 69.6667,-660 75.3333,-660"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119.5,-695 63.5,-695 63.5,-659 119.5,-659 119.5,-695"/>
+<text text-anchor="start" x="85.1646" y="-673.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s7</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M75.8333,-660C75.8333,-660 107.1667,-660 107.1667,-660 112.8333,-660 118.5,-665.6667 118.5,-671.3333 118.5,-671.3333 118.5,-682.6667 118.5,-682.6667 118.5,-688.3333 112.8333,-694 107.1667,-694 107.1667,-694 75.8333,-694 75.8333,-694 70.1667,-694 64.5,-688.3333 64.5,-682.6667 64.5,-682.6667 64.5,-671.3333 64.5,-671.3333 64.5,-665.6667 70.1667,-660 75.8333,-660"/>
 </g>
 <!-- _arithmetic_s7&#45;&gt;_boolean_logic -->
 <g id="edge10" class="edge">
 <title>_arithmetic_s7&#45;&gt;_boolean_logic</title>
-<path fill="none" stroke="#000000" d="M91,-658.661C91,-651.2376 91,-642.2479 91,-633.0279"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-632.9962 91,-622.9962 87.5001,-632.9963 94.5001,-632.9962"/>
-<text text-anchor="middle" x="92.3895" y="-634" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M91.5,-658.661C91.5,-651.2376 91.5,-642.2479 91.5,-633.0279"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-632.9962 91.5,-622.9962 88.0001,-632.9963 95.0001,-632.9962"/>
+<text text-anchor="middle" x="92.8895" y="-634" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _arithmetic_s6 -->
 <g id="node14" class="node">
 <title>_arithmetic_s6</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119,-777 63,-777 63,-741 119,-741 119,-777"/>
-<text text-anchor="start" x="84.6646" y="-755.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s6</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M75.3333,-742C75.3333,-742 106.6667,-742 106.6667,-742 112.3333,-742 118,-747.6667 118,-753.3333 118,-753.3333 118,-764.6667 118,-764.6667 118,-770.3333 112.3333,-776 106.6667,-776 106.6667,-776 75.3333,-776 75.3333,-776 69.6667,-776 64,-770.3333 64,-764.6667 64,-764.6667 64,-753.3333 64,-753.3333 64,-747.6667 69.6667,-742 75.3333,-742"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119.5,-777 63.5,-777 63.5,-741 119.5,-741 119.5,-777"/>
+<text text-anchor="start" x="85.1646" y="-755.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s6</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M75.8333,-742C75.8333,-742 107.1667,-742 107.1667,-742 112.8333,-742 118.5,-747.6667 118.5,-753.3333 118.5,-753.3333 118.5,-764.6667 118.5,-764.6667 118.5,-770.3333 112.8333,-776 107.1667,-776 107.1667,-776 75.8333,-776 75.8333,-776 70.1667,-776 64.5,-770.3333 64.5,-764.6667 64.5,-764.6667 64.5,-753.3333 64.5,-753.3333 64.5,-747.6667 70.1667,-742 75.8333,-742"/>
 </g>
 <!-- _arithmetic_s6&#45;&gt;_arithmetic_s7 -->
 <g id="edge11" class="edge">
 <title>_arithmetic_s6&#45;&gt;_arithmetic_s7</title>
-<path fill="none" stroke="#000000" d="M91,-740.8015C91,-730.3976 91,-717.1215 91,-705.3768"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-705.1476 91,-695.1476 87.5001,-705.1476 94.5001,-705.1476"/>
-<text text-anchor="start" x="91" y="-715" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[5 % 2 == 1] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M91.5,-740.8015C91.5,-730.3976 91.5,-717.1215 91.5,-705.3768"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-705.1476 91.5,-695.1476 88.0001,-705.1476 95.0001,-705.1476"/>
+<text text-anchor="start" x="91.5" y="-715" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[5 % 2 == 1] &#160;&#160;</text>
 </g>
 <!-- _arithmetic_s5 -->
 <g id="node15" class="node">
 <title>_arithmetic_s5</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119,-859 63,-859 63,-823 119,-823 119,-859"/>
-<text text-anchor="start" x="84.6646" y="-837.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s5</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M75.3333,-824C75.3333,-824 106.6667,-824 106.6667,-824 112.3333,-824 118,-829.6667 118,-835.3333 118,-835.3333 118,-846.6667 118,-846.6667 118,-852.3333 112.3333,-858 106.6667,-858 106.6667,-858 75.3333,-858 75.3333,-858 69.6667,-858 64,-852.3333 64,-846.6667 64,-846.6667 64,-835.3333 64,-835.3333 64,-829.6667 69.6667,-824 75.3333,-824"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119.5,-859 63.5,-859 63.5,-823 119.5,-823 119.5,-859"/>
+<text text-anchor="start" x="85.1646" y="-837.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s5</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M75.8333,-824C75.8333,-824 107.1667,-824 107.1667,-824 112.8333,-824 118.5,-829.6667 118.5,-835.3333 118.5,-835.3333 118.5,-846.6667 118.5,-846.6667 118.5,-852.3333 112.8333,-858 107.1667,-858 107.1667,-858 75.8333,-858 75.8333,-858 70.1667,-858 64.5,-852.3333 64.5,-846.6667 64.5,-846.6667 64.5,-835.3333 64.5,-835.3333 64.5,-829.6667 70.1667,-824 75.8333,-824"/>
 </g>
 <!-- _arithmetic_s5&#45;&gt;_arithmetic_s6 -->
 <g id="edge12" class="edge">
 <title>_arithmetic_s5&#45;&gt;_arithmetic_s6</title>
-<path fill="none" stroke="#000000" d="M91,-822.8015C91,-812.3976 91,-799.1215 91,-787.3768"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-787.1476 91,-777.1476 87.5001,-787.1476 94.5001,-787.1476"/>
-<text text-anchor="start" x="91" y="-797" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[256 == 2 ** 2 ** 3] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M91.5,-822.8015C91.5,-812.3976 91.5,-799.1215 91.5,-787.3768"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-787.1476 91.5,-777.1476 88.0001,-787.1476 95.0001,-787.1476"/>
+<text text-anchor="start" x="91.5" y="-797" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[256 == 2 ** 2 ** 3] &#160;&#160;</text>
 </g>
 <!-- _arithmetic_s4 -->
 <g id="node16" class="node">
 <title>_arithmetic_s4</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119,-941 63,-941 63,-905 119,-905 119,-941"/>
-<text text-anchor="start" x="84.6646" y="-919.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s4</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M75.3333,-906C75.3333,-906 106.6667,-906 106.6667,-906 112.3333,-906 118,-911.6667 118,-917.3333 118,-917.3333 118,-928.6667 118,-928.6667 118,-934.3333 112.3333,-940 106.6667,-940 106.6667,-940 75.3333,-940 75.3333,-940 69.6667,-940 64,-934.3333 64,-928.6667 64,-928.6667 64,-917.3333 64,-917.3333 64,-911.6667 69.6667,-906 75.3333,-906"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119.5,-941 63.5,-941 63.5,-905 119.5,-905 119.5,-941"/>
+<text text-anchor="start" x="85.1646" y="-919.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s4</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M75.8333,-906C75.8333,-906 107.1667,-906 107.1667,-906 112.8333,-906 118.5,-911.6667 118.5,-917.3333 118.5,-917.3333 118.5,-928.6667 118.5,-928.6667 118.5,-934.3333 112.8333,-940 107.1667,-940 107.1667,-940 75.8333,-940 75.8333,-940 70.1667,-940 64.5,-934.3333 64.5,-928.6667 64.5,-928.6667 64.5,-917.3333 64.5,-917.3333 64.5,-911.6667 70.1667,-906 75.8333,-906"/>
 </g>
 <!-- _arithmetic_s4&#45;&gt;_arithmetic_s5 -->
 <g id="edge13" class="edge">
 <title>_arithmetic_s4&#45;&gt;_arithmetic_s5</title>
-<path fill="none" stroke="#000000" d="M91,-904.8015C91,-894.3976 91,-881.1215 91,-869.3768"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-869.1476 91,-859.1476 87.5001,-869.1476 94.5001,-869.1476"/>
-<text text-anchor="start" x="91" y="-879" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[21 // 3 == 7] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M91.5,-904.8015C91.5,-894.3976 91.5,-881.1215 91.5,-869.3768"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-869.1476 91.5,-859.1476 88.0001,-869.1476 95.0001,-869.1476"/>
+<text text-anchor="start" x="91.5" y="-879" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[21 // 3 == 7] &#160;&#160;</text>
 </g>
 <!-- _arithmetic_s3 -->
 <g id="node17" class="node">
 <title>_arithmetic_s3</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119,-1023 63,-1023 63,-987 119,-987 119,-1023"/>
-<text text-anchor="start" x="84.6646" y="-1001.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M75.3333,-988C75.3333,-988 106.6667,-988 106.6667,-988 112.3333,-988 118,-993.6667 118,-999.3333 118,-999.3333 118,-1010.6667 118,-1010.6667 118,-1016.3333 112.3333,-1022 106.6667,-1022 106.6667,-1022 75.3333,-1022 75.3333,-1022 69.6667,-1022 64,-1016.3333 64,-1010.6667 64,-1010.6667 64,-999.3333 64,-999.3333 64,-993.6667 69.6667,-988 75.3333,-988"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119.5,-1023 63.5,-1023 63.5,-987 119.5,-987 119.5,-1023"/>
+<text text-anchor="start" x="85.1646" y="-1001.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M75.8333,-988C75.8333,-988 107.1667,-988 107.1667,-988 112.8333,-988 118.5,-993.6667 118.5,-999.3333 118.5,-999.3333 118.5,-1010.6667 118.5,-1010.6667 118.5,-1016.3333 112.8333,-1022 107.1667,-1022 107.1667,-1022 75.8333,-1022 75.8333,-1022 70.1667,-1022 64.5,-1016.3333 64.5,-1010.6667 64.5,-1010.6667 64.5,-999.3333 64.5,-999.3333 64.5,-993.6667 70.1667,-988 75.8333,-988"/>
 </g>
 <!-- _arithmetic_s3&#45;&gt;_arithmetic_s4 -->
 <g id="edge14" class="edge">
 <title>_arithmetic_s3&#45;&gt;_arithmetic_s4</title>
-<path fill="none" stroke="#000000" d="M91,-986.8015C91,-976.3976 91,-963.1215 91,-951.3768"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-951.1476 91,-941.1476 87.5001,-951.1476 94.5001,-951.1476"/>
-<text text-anchor="start" x="91" y="-961" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[2 * 3 == 6] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M91.5,-986.8015C91.5,-976.3976 91.5,-963.1215 91.5,-951.3768"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-951.1476 91.5,-941.1476 88.0001,-951.1476 95.0001,-951.1476"/>
+<text text-anchor="start" x="91.5" y="-961" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[2 * 3 == 6] &#160;&#160;</text>
 </g>
 <!-- _arithmetic_s2 -->
 <g id="node18" class="node">
 <title>_arithmetic_s2</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119,-1105 63,-1105 63,-1069 119,-1069 119,-1105"/>
-<text text-anchor="start" x="84.6646" y="-1083.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M75.3333,-1070C75.3333,-1070 106.6667,-1070 106.6667,-1070 112.3333,-1070 118,-1075.6667 118,-1081.3333 118,-1081.3333 118,-1092.6667 118,-1092.6667 118,-1098.3333 112.3333,-1104 106.6667,-1104 106.6667,-1104 75.3333,-1104 75.3333,-1104 69.6667,-1104 64,-1098.3333 64,-1092.6667 64,-1092.6667 64,-1081.3333 64,-1081.3333 64,-1075.6667 69.6667,-1070 75.3333,-1070"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="119.5,-1105 63.5,-1105 63.5,-1069 119.5,-1069 119.5,-1105"/>
+<text text-anchor="start" x="85.1646" y="-1083.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M75.8333,-1070C75.8333,-1070 107.1667,-1070 107.1667,-1070 112.8333,-1070 118.5,-1075.6667 118.5,-1081.3333 118.5,-1081.3333 118.5,-1092.6667 118.5,-1092.6667 118.5,-1098.3333 112.8333,-1104 107.1667,-1104 107.1667,-1104 75.8333,-1104 75.8333,-1104 70.1667,-1104 64.5,-1098.3333 64.5,-1092.6667 64.5,-1092.6667 64.5,-1081.3333 64.5,-1081.3333 64.5,-1075.6667 70.1667,-1070 75.8333,-1070"/>
 </g>
 <!-- _arithmetic_s2&#45;&gt;_arithmetic_s3 -->
 <g id="edge15" class="edge">
 <title>_arithmetic_s2&#45;&gt;_arithmetic_s3</title>
-<path fill="none" stroke="#000000" d="M91,-1068.8015C91,-1058.3976 91,-1045.1215 91,-1033.3768"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-1033.1476 91,-1023.1476 87.5001,-1033.1476 94.5001,-1033.1476"/>
-<text text-anchor="start" x="91" y="-1043" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[42 == 52 &#45; 11 + 1] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M91.5,-1068.8015C91.5,-1058.3976 91.5,-1045.1215 91.5,-1033.3768"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-1033.1476 91.5,-1023.1476 88.0001,-1033.1476 95.0001,-1033.1476"/>
+<text text-anchor="start" x="91.5" y="-1043" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[42 == 52 &#45; 11 + 1] &#160;&#160;</text>
 </g>
 <!-- _arithmetic_s1&#45;&gt;_arithmetic_s2 -->
 <g id="edge16" class="edge">
 <title>_arithmetic_s1&#45;&gt;_arithmetic_s2</title>
-<path fill="none" stroke="#000000" d="M91,-1150.8015C91,-1140.3976 91,-1127.1215 91,-1115.3768"/>
-<polygon fill="#000000" stroke="#000000" points="94.5001,-1115.1476 91,-1105.1476 87.5001,-1115.1476 94.5001,-1115.1476"/>
-<text text-anchor="start" x="91" y="-1125" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 + 1 == 2] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M91.5,-1150.8015C91.5,-1140.3976 91.5,-1127.1215 91.5,-1115.3768"/>
+<polygon fill="#000000" stroke="#000000" points="95.0001,-1115.1476 91.5,-1105.1476 88.0001,-1115.1476 95.0001,-1115.1476"/>
+<text text-anchor="start" x="91.5" y="-1125" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 + 1 == 2] &#160;&#160;</text>
 </g>
 <!-- _comparisons_initial -->
 <g id="node21" class="node">
 <title>_comparisons_initial</title>
-<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="130" cy="-1733.5" rx="5.5" ry="5.5"/>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="130.5" cy="-1733.5" rx="5.5" ry="5.5"/>
 </g>
 <!-- _comparisons_s1 -->
 <g id="node26" class="node">
 <title>_comparisons_s1</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158,-1682 102,-1682 102,-1646 158,-1646 158,-1682"/>
-<text text-anchor="start" x="123.6646" y="-1660.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s1</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M114.3333,-1647C114.3333,-1647 145.6667,-1647 145.6667,-1647 151.3333,-1647 157,-1652.6667 157,-1658.3333 157,-1658.3333 157,-1669.6667 157,-1669.6667 157,-1675.3333 151.3333,-1681 145.6667,-1681 145.6667,-1681 114.3333,-1681 114.3333,-1681 108.6667,-1681 103,-1675.3333 103,-1669.6667 103,-1669.6667 103,-1658.3333 103,-1658.3333 103,-1652.6667 108.6667,-1647 114.3333,-1647"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158.5,-1682 102.5,-1682 102.5,-1646 158.5,-1646 158.5,-1682"/>
+<text text-anchor="start" x="124.1646" y="-1660.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s1</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M114.8333,-1647C114.8333,-1647 146.1667,-1647 146.1667,-1647 151.8333,-1647 157.5,-1652.6667 157.5,-1658.3333 157.5,-1658.3333 157.5,-1669.6667 157.5,-1669.6667 157.5,-1675.3333 151.8333,-1681 146.1667,-1681 146.1667,-1681 114.8333,-1681 114.8333,-1681 109.1667,-1681 103.5,-1675.3333 103.5,-1669.6667 103.5,-1669.6667 103.5,-1658.3333 103.5,-1658.3333 103.5,-1652.6667 109.1667,-1647 114.8333,-1647"/>
 </g>
 <!-- _comparisons_initial&#45;&gt;_comparisons_s1 -->
 <g id="edge17" class="edge">
 <title>_comparisons_initial&#45;&gt;_comparisons_s1</title>
-<path fill="none" stroke="#000000" d="M130,-1727.5745C130,-1719.7003 130,-1705.2498 130,-1692.1135"/>
-<polygon fill="#000000" stroke="#000000" points="133.5001,-1692.0109 130,-1682.011 126.5001,-1692.011 133.5001,-1692.0109"/>
-<text text-anchor="middle" x="131.3895" y="-1702" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M130.5,-1727.5745C130.5,-1719.7003 130.5,-1705.2498 130.5,-1692.1135"/>
+<polygon fill="#000000" stroke="#000000" points="134.0001,-1692.0109 130.5,-1682.011 127.0001,-1692.011 134.0001,-1692.0109"/>
+<text text-anchor="middle" x="131.8895" y="-1702" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _comparisons_s5 -->
 <g id="node22" class="node">
 <title>_comparisons_s5</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158,-1354 102,-1354 102,-1318 158,-1318 158,-1354"/>
-<text text-anchor="start" x="123.6646" y="-1332.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s5</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M114.3333,-1319C114.3333,-1319 145.6667,-1319 145.6667,-1319 151.3333,-1319 157,-1324.6667 157,-1330.3333 157,-1330.3333 157,-1341.6667 157,-1341.6667 157,-1347.3333 151.3333,-1353 145.6667,-1353 145.6667,-1353 114.3333,-1353 114.3333,-1353 108.6667,-1353 103,-1347.3333 103,-1341.6667 103,-1341.6667 103,-1330.3333 103,-1330.3333 103,-1324.6667 108.6667,-1319 114.3333,-1319"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158.5,-1354 102.5,-1354 102.5,-1318 158.5,-1318 158.5,-1354"/>
+<text text-anchor="start" x="124.1646" y="-1332.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s5</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M114.8333,-1319C114.8333,-1319 146.1667,-1319 146.1667,-1319 151.8333,-1319 157.5,-1324.6667 157.5,-1330.3333 157.5,-1330.3333 157.5,-1341.6667 157.5,-1341.6667 157.5,-1347.3333 151.8333,-1353 146.1667,-1353 146.1667,-1353 114.8333,-1353 114.8333,-1353 109.1667,-1353 103.5,-1347.3333 103.5,-1341.6667 103.5,-1341.6667 103.5,-1330.3333 103.5,-1330.3333 103.5,-1324.6667 109.1667,-1319 114.8333,-1319"/>
 </g>
 <!-- _comparisons_s5&#45;&gt;_arithmetic -->
 <g id="edge18" class="edge">
 <title>_comparisons_s5&#45;&gt;_arithmetic</title>
-<path fill="none" stroke="#000000" d="M130,-1317.661C130,-1310.2376 130,-1301.2479 130,-1292.0279"/>
-<polygon fill="#000000" stroke="#000000" points="133.5001,-1291.9962 130,-1281.9962 126.5001,-1291.9963 133.5001,-1291.9962"/>
-<text text-anchor="middle" x="131.3895" y="-1293" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M130.5,-1317.661C130.5,-1310.2376 130.5,-1301.2479 130.5,-1292.0279"/>
+<polygon fill="#000000" stroke="#000000" points="134.0001,-1291.9962 130.5,-1281.9962 127.0001,-1291.9963 134.0001,-1291.9962"/>
+<text text-anchor="middle" x="131.8895" y="-1293" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
 <!-- _comparisons_s4 -->
 <g id="node23" class="node">
 <title>_comparisons_s4</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158,-1436 102,-1436 102,-1400 158,-1400 158,-1436"/>
-<text text-anchor="start" x="123.6646" y="-1414.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s4</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M114.3333,-1401C114.3333,-1401 145.6667,-1401 145.6667,-1401 151.3333,-1401 157,-1406.6667 157,-1412.3333 157,-1412.3333 157,-1423.6667 157,-1423.6667 157,-1429.3333 151.3333,-1435 145.6667,-1435 145.6667,-1435 114.3333,-1435 114.3333,-1435 108.6667,-1435 103,-1429.3333 103,-1423.6667 103,-1423.6667 103,-1412.3333 103,-1412.3333 103,-1406.6667 108.6667,-1401 114.3333,-1401"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158.5,-1436 102.5,-1436 102.5,-1400 158.5,-1400 158.5,-1436"/>
+<text text-anchor="start" x="124.1646" y="-1414.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s4</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M114.8333,-1401C114.8333,-1401 146.1667,-1401 146.1667,-1401 151.8333,-1401 157.5,-1406.6667 157.5,-1412.3333 157.5,-1412.3333 157.5,-1423.6667 157.5,-1423.6667 157.5,-1429.3333 151.8333,-1435 146.1667,-1435 146.1667,-1435 114.8333,-1435 114.8333,-1435 109.1667,-1435 103.5,-1429.3333 103.5,-1423.6667 103.5,-1423.6667 103.5,-1412.3333 103.5,-1412.3333 103.5,-1406.6667 109.1667,-1401 114.8333,-1401"/>
 </g>
 <!-- _comparisons_s4&#45;&gt;_comparisons_s5 -->
 <g id="edge19" class="edge">
 <title>_comparisons_s4&#45;&gt;_comparisons_s5</title>
-<path fill="none" stroke="#000000" d="M130,-1399.8015C130,-1389.3976 130,-1376.1215 130,-1364.3768"/>
-<polygon fill="#000000" stroke="#000000" points="133.5001,-1364.1476 130,-1354.1476 126.5001,-1364.1476 133.5001,-1364.1476"/>
-<text text-anchor="start" x="130" y="-1374" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[2 &gt; 1] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M130.5,-1399.8015C130.5,-1389.3976 130.5,-1376.1215 130.5,-1364.3768"/>
+<polygon fill="#000000" stroke="#000000" points="134.0001,-1364.1476 130.5,-1354.1476 127.0001,-1364.1476 134.0001,-1364.1476"/>
+<text text-anchor="start" x="130.5" y="-1374" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[2 &gt; 1] &#160;&#160;</text>
 </g>
 <!-- _comparisons_s3 -->
 <g id="node24" class="node">
 <title>_comparisons_s3</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158,-1518 102,-1518 102,-1482 158,-1482 158,-1518"/>
-<text text-anchor="start" x="123.6646" y="-1496.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M114.3333,-1483C114.3333,-1483 145.6667,-1483 145.6667,-1483 151.3333,-1483 157,-1488.6667 157,-1494.3333 157,-1494.3333 157,-1505.6667 157,-1505.6667 157,-1511.3333 151.3333,-1517 145.6667,-1517 145.6667,-1517 114.3333,-1517 114.3333,-1517 108.6667,-1517 103,-1511.3333 103,-1505.6667 103,-1505.6667 103,-1494.3333 103,-1494.3333 103,-1488.6667 108.6667,-1483 114.3333,-1483"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158.5,-1518 102.5,-1518 102.5,-1482 158.5,-1482 158.5,-1518"/>
+<text text-anchor="start" x="124.1646" y="-1496.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M114.8333,-1483C114.8333,-1483 146.1667,-1483 146.1667,-1483 151.8333,-1483 157.5,-1488.6667 157.5,-1494.3333 157.5,-1494.3333 157.5,-1505.6667 157.5,-1505.6667 157.5,-1511.3333 151.8333,-1517 146.1667,-1517 146.1667,-1517 114.8333,-1517 114.8333,-1517 109.1667,-1517 103.5,-1511.3333 103.5,-1505.6667 103.5,-1505.6667 103.5,-1494.3333 103.5,-1494.3333 103.5,-1488.6667 109.1667,-1483 114.8333,-1483"/>
 </g>
 <!-- _comparisons_s3&#45;&gt;_comparisons_s4 -->
 <g id="edge20" class="edge">
 <title>_comparisons_s3&#45;&gt;_comparisons_s4</title>
-<path fill="none" stroke="#000000" d="M130,-1481.8015C130,-1471.3976 130,-1458.1215 130,-1446.3768"/>
-<polygon fill="#000000" stroke="#000000" points="133.5001,-1446.1476 130,-1436.1476 126.5001,-1446.1476 133.5001,-1446.1476"/>
-<text text-anchor="start" x="130" y="-1456" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 &lt; 2] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M130.5,-1481.8015C130.5,-1471.3976 130.5,-1458.1215 130.5,-1446.3768"/>
+<polygon fill="#000000" stroke="#000000" points="134.0001,-1446.1476 130.5,-1436.1476 127.0001,-1446.1476 134.0001,-1446.1476"/>
+<text text-anchor="start" x="130.5" y="-1456" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 &lt; 2] &#160;&#160;</text>
 </g>
 <!-- _comparisons_s2 -->
 <g id="node25" class="node">
 <title>_comparisons_s2</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158,-1600 102,-1600 102,-1564 158,-1564 158,-1600"/>
-<text text-anchor="start" x="123.6646" y="-1578.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M114.3333,-1565C114.3333,-1565 145.6667,-1565 145.6667,-1565 151.3333,-1565 157,-1570.6667 157,-1576.3333 157,-1576.3333 157,-1587.6667 157,-1587.6667 157,-1593.3333 151.3333,-1599 145.6667,-1599 145.6667,-1599 114.3333,-1599 114.3333,-1599 108.6667,-1599 103,-1593.3333 103,-1587.6667 103,-1587.6667 103,-1576.3333 103,-1576.3333 103,-1570.6667 108.6667,-1565 114.3333,-1565"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="158.5,-1600 102.5,-1600 102.5,-1564 158.5,-1564 158.5,-1600"/>
+<text text-anchor="start" x="124.1646" y="-1578.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M114.8333,-1565C114.8333,-1565 146.1667,-1565 146.1667,-1565 151.8333,-1565 157.5,-1570.6667 157.5,-1576.3333 157.5,-1576.3333 157.5,-1587.6667 157.5,-1587.6667 157.5,-1593.3333 151.8333,-1599 146.1667,-1599 146.1667,-1599 114.8333,-1599 114.8333,-1599 109.1667,-1599 103.5,-1593.3333 103.5,-1587.6667 103.5,-1587.6667 103.5,-1576.3333 103.5,-1576.3333 103.5,-1570.6667 109.1667,-1565 114.8333,-1565"/>
 </g>
 <!-- _comparisons_s2&#45;&gt;_comparisons_s3 -->
 <g id="edge21" class="edge">
 <title>_comparisons_s2&#45;&gt;_comparisons_s3</title>
-<path fill="none" stroke="#000000" d="M130,-1563.8015C130,-1553.3976 130,-1540.1215 130,-1528.3768"/>
-<polygon fill="#000000" stroke="#000000" points="133.5001,-1528.1476 130,-1518.1476 126.5001,-1528.1476 133.5001,-1528.1476"/>
-<text text-anchor="start" x="130" y="-1538" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 != 2] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M130.5,-1563.8015C130.5,-1553.3976 130.5,-1540.1215 130.5,-1528.3768"/>
+<polygon fill="#000000" stroke="#000000" points="134.0001,-1528.1476 130.5,-1518.1476 127.0001,-1528.1476 134.0001,-1528.1476"/>
+<text text-anchor="start" x="130.5" y="-1538" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 != 2] &#160;&#160;</text>
 </g>
 <!-- _comparisons_s1&#45;&gt;_comparisons_s2 -->
 <g id="edge22" class="edge">
 <title>_comparisons_s1&#45;&gt;_comparisons_s2</title>
-<path fill="none" stroke="#000000" d="M130,-1645.8015C130,-1635.3976 130,-1622.1215 130,-1610.3768"/>
-<polygon fill="#000000" stroke="#000000" points="133.5001,-1610.1476 130,-1600.1476 126.5001,-1610.1476 133.5001,-1610.1476"/>
-<text text-anchor="start" x="130" y="-1620" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 == 1] &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M130.5,-1645.8015C130.5,-1635.3976 130.5,-1622.1215 130.5,-1610.3768"/>
+<polygon fill="#000000" stroke="#000000" points="134.0001,-1610.1476 130.5,-1600.1476 127.0001,-1610.1476 134.0001,-1610.1476"/>
+<text text-anchor="start" x="130.5" y="-1620" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">[1 == 1] &#160;&#160;</text>
 </g>
 </g>
 </svg>

test/test_files/features/action_lang/test_expressions_ortho.svg

@@ -67,7 +67,7 @@
 <title>_p_boolean_logic_ok</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="353,-206 273,-206 273,-160 353,-160 353,-206"/>
 <text text-anchor="start" x="306.6646" y="-189.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">ok</text>
-<text text-anchor="start" x="278.8426" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.ok</text>
+<text text-anchor="start" x="278.5072" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.ok</text>
 <polygon fill="#000000" stroke="#000000" points="273,-183 273,-183 353,-183 353,-183 273,-183"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M286,-161C286,-161 340,-161 340,-161 346,-161 352,-167 352,-173 352,-173 352,-193 352,-193 352,-199 346,-205 340,-205 340,-205 286,-205 286,-205 280,-205 274,-199 274,-193 274,-193 274,-173 274,-173 274,-167 280,-161 286,-161"/>
 </g>
@@ -159,7 +159,7 @@
 <title>_p_arithmetic_ok</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="216,-70 136,-70 136,-24 216,-24 216,-70"/>
 <text text-anchor="start" x="169.6646" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">ok</text>
-<text text-anchor="start" x="141.8426" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.ok</text>
+<text text-anchor="start" x="141.5072" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.ok</text>
 <polygon fill="#000000" stroke="#000000" points="136,-47 136,-47 216,-47 216,-47 136,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M149,-25C149,-25 203,-25 203,-25 209,-25 215,-31 215,-37 215,-37 215,-57 215,-57 215,-63 209,-69 203,-69 203,-69 149,-69 149,-69 143,-69 137,-63 137,-57 137,-57 137,-37 137,-37 137,-31 143,-25 149,-25"/>
 </g>
@@ -265,7 +265,7 @@
 <title>_p_comparisons_ok</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="112,-342 32,-342 32,-296 112,-296 112,-342"/>
 <text text-anchor="start" x="65.6646" y="-325.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">ok</text>
-<text text-anchor="start" x="37.8426" y="-305.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.ok</text>
+<text text-anchor="start" x="37.5072" y="-305.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.ok</text>
 <polygon fill="#000000" stroke="#000000" points="32,-319 32,-319 112,-319 112,-319 32,-319"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M45,-297C45,-297 99,-297 99,-297 105,-297 111,-303 111,-309 111,-309 111,-329 111,-329 111,-335 105,-341 99,-341 99,-341 45,-341 45,-341 39,-341 33,-335 33,-329 33,-329 33,-309 33,-309 33,-303 39,-297 45,-297"/>
 </g>

test/test_files/features/action_lang/test_guard_action.svg

@@ -33,7 +33,7 @@
 <title>_done</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="94,-46 0,-46 0,0 94,0 94,-46"/>
 <text text-anchor="start" x="33.6584" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">done</text>
-<text text-anchor="start" x="5.8364" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.done</text>
+<text text-anchor="start" x="5.501" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.done</text>
 <polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 94,-23 94,-23 0,-23"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 81,-1 81,-1 87,-1 93,-7 93,-13 93,-13 93,-33 93,-33 93,-39 87,-45 81,-45 81,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>

test/test_files/features/after/test_after.svg

@@ -33,7 +33,7 @@
 <title>_s4</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-46 0,-46 0,0 90,0 90,-46"/>
 <text text-anchor="start" x="38.6646" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s4</text>
-<text text-anchor="start" x="5.8404" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_4</text>
+<text text-anchor="start" x="5.505" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_4</text>
 <polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 90,-23 90,-23 0,-23"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 77,-1 77,-1 83,-1 89,-7 89,-13 89,-13 89,-33 89,-33 89,-39 83,-45 77,-45 77,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>
@@ -42,7 +42,7 @@
 <title>_s3</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="202,-120 112,-120 112,-74 202,-74 202,-120"/>
 <text text-anchor="start" x="150.6646" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s3</text>
-<text text-anchor="start" x="117.8404" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_3</text>
+<text text-anchor="start" x="117.505" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_3</text>
 <polygon fill="#000000" stroke="#000000" points="112,-97 112,-97 202,-97 202,-97 112,-97"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M125,-75C125,-75 189,-75 189,-75 195,-75 201,-81 201,-87 201,-87 201,-107 201,-107 201,-113 195,-119 189,-119 189,-119 125,-119 125,-119 119,-119 113,-113 113,-107 113,-107 113,-87 113,-87 113,-81 119,-75 125,-75"/>
 </g>
@@ -51,7 +51,7 @@
 <title>_s2</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-120 0,-120 0,-74 90,-74 90,-120"/>
 <text text-anchor="start" x="38.6646" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">s2</text>
-<text text-anchor="start" x="5.8404" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_2</text>
+<text text-anchor="start" x="5.505" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_2</text>
 <polygon fill="#000000" stroke="#000000" points="0,-97 0,-97 90,-97 90,-97 0,-97"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-75C13,-75 77,-75 77,-75 83,-75 89,-81 89,-87 89,-87 89,-107 89,-107 89,-113 83,-119 77,-119 77,-119 13,-119 13,-119 7,-119 1,-113 1,-107 1,-107 1,-87 1,-87 1,-81 7,-75 13,-75"/>
 </g>

test/test_files/features/after/test_after_reentry.svg

@@ -94,18 +94,18 @@
 <!-- _p_o0_c -->
 <g id="node9" class="node">
 <title>_p_o0_c</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="357.5,-70 268.5,-70 268.5,-24 357.5,-24 357.5,-70"/>
-<text text-anchor="start" x="310.5" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
-<text text-anchor="start" x="274.6758" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_c</text>
-<polygon fill="#000000" stroke="#000000" points="269,-47 269,-47 358,-47 358,-47 269,-47"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M281.5,-25C281.5,-25 344.5,-25 344.5,-25 350.5,-25 356.5,-31 356.5,-37 356.5,-37 356.5,-57 356.5,-57 356.5,-63 350.5,-69 344.5,-69 344.5,-69 281.5,-69 281.5,-69 275.5,-69 269.5,-63 269.5,-57 269.5,-57 269.5,-37 269.5,-37 269.5,-31 275.5,-25 281.5,-25"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="358,-70 268,-70 268,-24 358,-24 358,-70"/>
+<text text-anchor="start" x="310" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="273.8404" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_c</text>
+<polygon fill="#000000" stroke="#000000" points="268,-47 268,-47 358,-47 358,-47 268,-47"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M281,-25C281,-25 345,-25 345,-25 351,-25 357,-31 357,-37 357,-37 357,-57 357,-57 357,-63 351,-69 345,-69 345,-69 281,-69 281,-69 275,-69 269,-63 269,-57 269,-57 269,-37 269,-37 269,-31 275,-25 281,-25"/>
 </g>
 <!-- _p_o0_b -->
 <g id="node10" class="node">
 <title>_p_o0_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="134,-70 44,-70 44,-24 134,-24 134,-70"/>
 <text text-anchor="start" x="85.6646" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
-<text text-anchor="start" x="49.8404" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_b</text>
+<text text-anchor="start" x="49.505" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_b</text>
 <polygon fill="#000000" stroke="#000000" points="44,-47 44,-47 134,-47 134,-47 44,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M57,-25C57,-25 121,-25 121,-25 127,-25 133,-31 133,-37 133,-37 133,-57 133,-57 133,-63 127,-69 121,-69 121,-69 57,-69 57,-69 51,-69 45,-63 45,-57 45,-57 45,-37 45,-37 45,-31 51,-25 57,-25"/>
 </g>

test/test_files/semantics/big_step_maximality/statechart_flat.svg

@@ -31,18 +31,18 @@
 <!-- _c -->
 <g id="node2" class="node">
 <title>_c</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="89.5,-46 .5,-46 .5,0 89.5,0 89.5,-46"/>
-<text text-anchor="start" x="42.5" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
-<text text-anchor="start" x="6.6758" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_c</text>
-<polygon fill="#000000" stroke="#000000" points="1,-23 1,-23 90,-23 90,-23 1,-23"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M13.5,-1C13.5,-1 76.5,-1 76.5,-1 82.5,-1 88.5,-7 88.5,-13 88.5,-13 88.5,-33 88.5,-33 88.5,-39 82.5,-45 76.5,-45 76.5,-45 13.5,-45 13.5,-45 7.5,-45 1.5,-39 1.5,-33 1.5,-33 1.5,-13 1.5,-13 1.5,-7 7.5,-1 13.5,-1"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-46 0,-46 0,0 90,0 90,-46"/>
+<text text-anchor="start" x="42" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="5.8404" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_c</text>
+<polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 90,-23 90,-23 0,-23"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 77,-1 77,-1 83,-1 89,-7 89,-13 89,-13 89,-33 89,-33 89,-39 83,-45 77,-45 77,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>
 <!-- _b -->
 <g id="node3" class="node">
 <title>_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-120 0,-120 0,-74 90,-74 90,-120"/>
 <text text-anchor="start" x="41.6646" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
-<text text-anchor="start" x="5.8404" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_b</text>
+<text text-anchor="start" x="5.505" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_b</text>
 <polygon fill="#000000" stroke="#000000" points="0,-97 0,-97 90,-97 90,-97 0,-97"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-75C13,-75 77,-75 77,-75 83,-75 89,-81 89,-87 89,-87 89,-107 89,-107 89,-113 83,-119 77,-119 77,-119 13,-119 13,-119 7,-119 1,-113 1,-107 1,-107 1,-87 1,-87 1,-81 7,-75 13,-75"/>
 </g>

test/test_files/semantics/big_step_maximality/statechart_ortho.svg

@@ -60,18 +60,18 @@
 <!-- _p_o1_f -->
 <g id="node5" class="node">
 <title>_p_o1_f</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="234,-70 148,-70 148,-24 234,-24 234,-70"/>
-<text text-anchor="start" x="189.3326" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">f</text>
-<text text-anchor="start" x="153.5084" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_f</text>
-<polygon fill="#000000" stroke="#000000" points="148,-47 148,-47 234,-47 234,-47 148,-47"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M161,-25C161,-25 221,-25 221,-25 227,-25 233,-31 233,-37 233,-37 233,-57 233,-57 233,-63 227,-69 221,-69 221,-69 161,-69 161,-69 155,-69 149,-63 149,-57 149,-57 149,-37 149,-37 149,-31 155,-25 161,-25"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="234.5,-70 147.5,-70 147.5,-24 234.5,-24 234.5,-70"/>
+<text text-anchor="start" x="189.8326" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">f</text>
+<text text-anchor="start" x="153.673" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_f</text>
+<polygon fill="#000000" stroke="#000000" points="148,-47 148,-47 235,-47 235,-47 148,-47"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M160.5,-25C160.5,-25 221.5,-25 221.5,-25 227.5,-25 233.5,-31 233.5,-37 233.5,-37 233.5,-57 233.5,-57 233.5,-63 227.5,-69 221.5,-69 221.5,-69 160.5,-69 160.5,-69 154.5,-69 148.5,-63 148.5,-57 148.5,-57 148.5,-37 148.5,-37 148.5,-31 154.5,-25 160.5,-25"/>
 </g>
 <!-- _p_o1_e -->
 <g id="node6" class="node">
 <title>_p_o1_e</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="236,-198 146,-198 146,-152 236,-152 236,-198"/>
 <text text-anchor="start" x="187.6646" y="-181.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">e</text>
-<text text-anchor="start" x="151.8404" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_e</text>
+<text text-anchor="start" x="151.505" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_e</text>
 <polygon fill="#000000" stroke="#000000" points="146,-175 146,-175 236,-175 236,-175 146,-175"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M159,-153C159,-153 223,-153 223,-153 229,-153 235,-159 235,-165 235,-165 235,-185 235,-185 235,-191 229,-197 223,-197 223,-197 159,-197 159,-197 153,-197 147,-191 147,-185 147,-185 147,-165 147,-165 147,-159 153,-153 159,-153"/>
 </g>
@@ -112,18 +112,18 @@
 <!-- _p_o0_c -->
 <g id="node10" class="node">
 <title>_p_o0_c</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="121.5,-70 32.5,-70 32.5,-24 121.5,-24 121.5,-70"/>
-<text text-anchor="start" x="74.5" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
-<text text-anchor="start" x="38.6758" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_c</text>
-<polygon fill="#000000" stroke="#000000" points="33,-47 33,-47 122,-47 122,-47 33,-47"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M45.5,-25C45.5,-25 108.5,-25 108.5,-25 114.5,-25 120.5,-31 120.5,-37 120.5,-37 120.5,-57 120.5,-57 120.5,-63 114.5,-69 108.5,-69 108.5,-69 45.5,-69 45.5,-69 39.5,-69 33.5,-63 33.5,-57 33.5,-57 33.5,-37 33.5,-37 33.5,-31 39.5,-25 45.5,-25"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="122,-70 32,-70 32,-24 122,-24 122,-70"/>
+<text text-anchor="start" x="74" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="37.8404" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_c</text>
+<polygon fill="#000000" stroke="#000000" points="32,-47 32,-47 122,-47 122,-47 32,-47"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M45,-25C45,-25 109,-25 109,-25 115,-25 121,-31 121,-37 121,-37 121,-57 121,-57 121,-63 115,-69 109,-69 109,-69 45,-69 45,-69 39,-69 33,-63 33,-57 33,-57 33,-37 33,-37 33,-31 39,-25 45,-25"/>
 </g>
 <!-- _p_o0_b -->
 <g id="node11" class="node">
 <title>_p_o0_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="122,-198 32,-198 32,-152 122,-152 122,-198"/>
 <text text-anchor="start" x="73.6646" y="-181.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
-<text text-anchor="start" x="37.8404" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_b</text>
+<text text-anchor="start" x="37.505" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_b</text>
 <polygon fill="#000000" stroke="#000000" points="32,-175 32,-175 122,-175 122,-175 32,-175"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M45,-153C45,-153 109,-153 109,-153 115,-153 121,-159 121,-165 121,-165 121,-185 121,-185 121,-191 115,-197 109,-197 109,-197 45,-197 45,-197 39,-197 33,-191 33,-185 33,-185 33,-165 33,-165 33,-159 39,-153 45,-153"/>
 </g>

test/test_files/semantics/big_step_maximality/test_flat_syntactic.svg

@@ -33,18 +33,18 @@
 <title>_d</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-46 0,-46 0,0 90,0 90,-46"/>
 <text text-anchor="start" x="34.995" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">d ✓</text>
-<text text-anchor="start" x="5.8404" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_d</text>
+<text text-anchor="start" x="5.505" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_d</text>
 <polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 90,-23 90,-23 0,-23"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 77,-1 77,-1 83,-1 89,-7 89,-13 89,-13 89,-33 89,-33 89,-39 83,-45 77,-45 77,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>
 <!-- _c -->
 <g id="node3" class="node">
 <title>_c</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="89.5,-120 .5,-120 .5,-74 89.5,-74 89.5,-120"/>
-<text text-anchor="start" x="42.5" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
-<text text-anchor="start" x="6.6758" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_c</text>
-<polygon fill="#000000" stroke="#000000" points="1,-97 1,-97 90,-97 90,-97 1,-97"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M13.5,-75C13.5,-75 76.5,-75 76.5,-75 82.5,-75 88.5,-81 88.5,-87 88.5,-87 88.5,-107 88.5,-107 88.5,-113 82.5,-119 76.5,-119 76.5,-119 13.5,-119 13.5,-119 7.5,-119 1.5,-113 1.5,-107 1.5,-107 1.5,-87 1.5,-87 1.5,-81 7.5,-75 13.5,-75"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-120 0,-120 0,-74 90,-74 90,-120"/>
+<text text-anchor="start" x="42" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="5.8404" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_c</text>
+<polygon fill="#000000" stroke="#000000" points="0,-97 0,-97 90,-97 90,-97 0,-97"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M13,-75C13,-75 77,-75 77,-75 83,-75 89,-81 89,-87 89,-87 89,-107 89,-107 89,-113 83,-119 77,-119 77,-119 13,-119 13,-119 7,-119 1,-113 1,-107 1,-107 1,-87 1,-87 1,-81 7,-75 13,-75"/>
 </g>
 <!-- _c&#45;&gt;_d -->
 <g id="edge2" class="edge">
@@ -58,7 +58,7 @@
 <title>_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-194 0,-194 0,-148 90,-148 90,-194"/>
 <text text-anchor="start" x="34.995" y="-177.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b ✓</text>
-<text text-anchor="start" x="5.8404" y="-157.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_b</text>
+<text text-anchor="start" x="5.505" y="-157.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_b</text>
 <polygon fill="#000000" stroke="#000000" points="0,-171 0,-171 90,-171 90,-171 0,-171"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-149C13,-149 77,-149 77,-149 83,-149 89,-155 89,-161 89,-161 89,-181 89,-181 89,-187 83,-193 77,-193 77,-193 13,-193 13,-193 7,-193 1,-187 1,-181 1,-181 1,-161 1,-161 1,-155 7,-149 13,-149"/>
 </g>

test/test_files/semantics/big_step_maximality/test_ortho_syntactic.svg

@@ -62,7 +62,7 @@
 <title>_p_ortho1_h</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="236,-70 146,-70 146,-24 236,-24 236,-70"/>
 <text text-anchor="start" x="180.995" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">h ✓</text>
-<text text-anchor="start" x="151.8404" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_h</text>
+<text text-anchor="start" x="151.505" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_h</text>
 <polygon fill="#000000" stroke="#000000" points="146,-47 146,-47 236,-47 236,-47 146,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M159,-25C159,-25 223,-25 223,-25 229,-25 235,-31 235,-37 235,-37 235,-57 235,-57 235,-63 229,-69 223,-69 223,-69 159,-69 159,-69 153,-69 147,-63 147,-57 147,-57 147,-37 147,-37 147,-31 153,-25 159,-25"/>
 </g>
@@ -71,7 +71,7 @@
 <title>_p_ortho1_g</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="236,-198 146,-198 146,-152 236,-152 236,-198"/>
 <text text-anchor="start" x="180.995" y="-181.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">g ✓</text>
-<text text-anchor="start" x="151.8404" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_g</text>
+<text text-anchor="start" x="151.505" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_g</text>
 <polygon fill="#000000" stroke="#000000" points="146,-175 146,-175 236,-175 236,-175 146,-175"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M159,-153C159,-153 223,-153 223,-153 229,-153 235,-159 235,-165 235,-165 235,-185 235,-185 235,-191 229,-197 223,-197 223,-197 159,-197 159,-197 153,-197 147,-191 147,-185 147,-185 147,-165 147,-165 147,-159 153,-153 159,-153"/>
 </g>
@@ -85,11 +85,11 @@
 <!-- _p_ortho1_f -->
 <g id="node7" class="node">
 <title>_p_ortho1_f</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="234,-326 148,-326 148,-280 234,-280 234,-326"/>
-<text text-anchor="start" x="189.3326" y="-309.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">f</text>
-<text text-anchor="start" x="153.5084" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_f</text>
-<polygon fill="#000000" stroke="#000000" points="148,-303 148,-303 234,-303 234,-303 148,-303"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M161,-281C161,-281 221,-281 221,-281 227,-281 233,-287 233,-293 233,-293 233,-313 233,-313 233,-319 227,-325 221,-325 221,-325 161,-325 161,-325 155,-325 149,-319 149,-313 149,-313 149,-293 149,-293 149,-287 155,-281 161,-281"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="234.5,-326 147.5,-326 147.5,-280 234.5,-280 234.5,-326"/>
+<text text-anchor="start" x="189.8326" y="-309.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">f</text>
+<text text-anchor="start" x="153.673" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_f</text>
+<polygon fill="#000000" stroke="#000000" points="148,-303 148,-303 235,-303 235,-303 148,-303"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M160.5,-281C160.5,-281 221.5,-281 221.5,-281 227.5,-281 233.5,-287 233.5,-293 233.5,-293 233.5,-313 233.5,-313 233.5,-319 227.5,-325 221.5,-325 221.5,-325 160.5,-325 160.5,-325 154.5,-325 148.5,-319 148.5,-313 148.5,-313 148.5,-293 148.5,-293 148.5,-287 154.5,-281 160.5,-281"/>
 </g>
 <!-- _p_ortho1_f&#45;&gt;_p_ortho1_g -->
 <g id="edge4" class="edge">
@@ -130,18 +130,18 @@
 <title>_p_ortho0_d</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="122,-70 32,-70 32,-24 122,-24 122,-70"/>
 <text text-anchor="start" x="66.995" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">d ✓</text>
-<text text-anchor="start" x="37.8404" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_d</text>
+<text text-anchor="start" x="37.505" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_d</text>
 <polygon fill="#000000" stroke="#000000" points="32,-47 32,-47 122,-47 122,-47 32,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M45,-25C45,-25 109,-25 109,-25 115,-25 121,-31 121,-37 121,-37 121,-57 121,-57 121,-63 115,-69 109,-69 109,-69 45,-69 45,-69 39,-69 33,-63 33,-57 33,-57 33,-37 33,-37 33,-31 39,-25 45,-25"/>
 </g>
 <!-- _p_ortho0_c -->
 <g id="node12" class="node">
 <title>_p_ortho0_c</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="121.5,-198 32.5,-198 32.5,-152 121.5,-152 121.5,-198"/>
-<text text-anchor="start" x="74.5" y="-181.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
-<text text-anchor="start" x="38.6758" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_c</text>
-<polygon fill="#000000" stroke="#000000" points="33,-175 33,-175 122,-175 122,-175 33,-175"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M45.5,-153C45.5,-153 108.5,-153 108.5,-153 114.5,-153 120.5,-159 120.5,-165 120.5,-165 120.5,-185 120.5,-185 120.5,-191 114.5,-197 108.5,-197 108.5,-197 45.5,-197 45.5,-197 39.5,-197 33.5,-191 33.5,-185 33.5,-185 33.5,-165 33.5,-165 33.5,-159 39.5,-153 45.5,-153"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="122,-198 32,-198 32,-152 122,-152 122,-198"/>
+<text text-anchor="start" x="74" y="-181.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="37.8404" y="-161.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_c</text>
+<polygon fill="#000000" stroke="#000000" points="32,-175 32,-175 122,-175 122,-175 32,-175"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M45,-153C45,-153 109,-153 109,-153 115,-153 121,-159 121,-165 121,-165 121,-185 121,-185 121,-191 115,-197 109,-197 109,-197 45,-197 45,-197 39,-197 33,-191 33,-185 33,-185 33,-165 33,-165 33,-159 39,-153 45,-153"/>
 </g>
 <!-- _p_ortho0_c&#45;&gt;_p_ortho0_d -->
 <g id="edge7" class="edge">
@@ -155,7 +155,7 @@
 <title>_p_ortho0_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="122,-326 32,-326 32,-280 122,-280 122,-326"/>
 <text text-anchor="start" x="66.995" y="-309.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b ✓</text>
-<text text-anchor="start" x="37.8404" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_b</text>
+<text text-anchor="start" x="37.505" y="-289.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_b</text>
 <polygon fill="#000000" stroke="#000000" points="32,-303 32,-303 122,-303 122,-303 32,-303"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M45,-281C45,-281 109,-281 109,-281 115,-281 121,-287 121,-293 121,-293 121,-313 121,-313 121,-319 115,-325 109,-325 109,-325 45,-325 45,-325 39,-325 33,-319 33,-313 33,-313 33,-293 33,-293 33,-287 39,-281 45,-281"/>
 </g>

test/test_files/semantics/event_lifeline/statechart_flat.svg

@@ -4,61 +4,77 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: state transitions Pages: 1 -->
-<svg width="98pt" height="231pt"
- viewBox="0.00 0.00 98.00 231.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 227)">
+<svg width="98pt" height="305pt"
+ viewBox="0.00 0.00 98.00 305.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 301)">
 <title>state transitions</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-227 94,-227 94,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-301 94,-301 94,4 -4,4"/>
 <!-- __initial -->
 <g id="node1" class="node">
 <title>__initial</title>
-<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="45" cy="-217.5" rx="5.5" ry="5.5"/>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="45" cy="-291.5" rx="5.5" ry="5.5"/>
 </g>
 <!-- _a -->
-<g id="node4" class="node">
+<g id="node5" class="node">
 <title>_a</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="73,-184 17,-184 17,-148 73,-148 73,-184"/>
-<text text-anchor="start" x="41.6646" y="-162.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">a</text>
-<path fill="none" stroke="#000000" stroke-width="2" d="M29.3333,-149C29.3333,-149 60.6667,-149 60.6667,-149 66.3333,-149 72,-154.6667 72,-160.3333 72,-160.3333 72,-171.6667 72,-171.6667 72,-177.3333 66.3333,-183 60.6667,-183 60.6667,-183 29.3333,-183 29.3333,-183 23.6667,-183 18,-177.3333 18,-171.6667 18,-171.6667 18,-160.3333 18,-160.3333 18,-154.6667 23.6667,-149 29.3333,-149"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="73,-258 17,-258 17,-222 73,-222 73,-258"/>
+<text text-anchor="start" x="41.6646" y="-236.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">a</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M29.3333,-223C29.3333,-223 60.6667,-223 60.6667,-223 66.3333,-223 72,-228.6667 72,-234.3333 72,-234.3333 72,-245.6667 72,-245.6667 72,-251.3333 66.3333,-257 60.6667,-257 60.6667,-257 29.3333,-257 29.3333,-257 23.6667,-257 18,-251.3333 18,-245.6667 18,-245.6667 18,-234.3333 18,-234.3333 18,-228.6667 23.6667,-223 29.3333,-223"/>
 </g>
 <!-- __initial&#45;&gt;_a -->
 <g id="edge1" class="edge">
 <title>__initial&#45;&gt;_a</title>
-<path fill="none" stroke="#000000" d="M45,-211.9886C45,-207.6293 45,-201.1793 45,-194.4801"/>
-<polygon fill="#000000" stroke="#000000" points="48.5001,-194.0122 45,-184.0122 41.5001,-194.0122 48.5001,-194.0122"/>
-<text text-anchor="middle" x="46.3895" y="-195" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+<path fill="none" stroke="#000000" d="M45,-285.9886C45,-281.6293 45,-275.1793 45,-268.4801"/>
+<polygon fill="#000000" stroke="#000000" points="48.5001,-268.0122 45,-258.0122 41.5001,-268.0122 48.5001,-268.0122"/>
+<text text-anchor="middle" x="46.3895" y="-269" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
 </g>
-<!-- _c -->
+<!-- _d -->
 <g id="node2" class="node">
-<title>_c</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="89.5,-46 .5,-46 .5,0 89.5,0 89.5,-46"/>
-<text text-anchor="start" x="42.5" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
-<text text-anchor="start" x="6.6758" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_c</text>
-<polygon fill="#000000" stroke="#000000" points="1,-23 1,-23 90,-23 90,-23 1,-23"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M13.5,-1C13.5,-1 76.5,-1 76.5,-1 82.5,-1 88.5,-7 88.5,-13 88.5,-13 88.5,-33 88.5,-33 88.5,-39 82.5,-45 76.5,-45 76.5,-45 13.5,-45 13.5,-45 7.5,-45 1.5,-39 1.5,-33 1.5,-33 1.5,-13 1.5,-13 1.5,-7 7.5,-1 13.5,-1"/>
+<title>_d</title>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-46 0,-46 0,0 90,0 90,-46"/>
+<text text-anchor="start" x="41.6646" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">d</text>
+<text text-anchor="start" x="5.505" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_d</text>
+<polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 90,-23 90,-23 0,-23"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 77,-1 77,-1 83,-1 89,-7 89,-13 89,-13 89,-33 89,-33 89,-39 83,-45 77,-45 77,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>
-<!-- _b -->
+<!-- _c -->
 <g id="node3" class="node">
-<title>_b</title>
+<title>_c</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-120 0,-120 0,-74 90,-74 90,-120"/>
-<text text-anchor="start" x="41.6646" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
-<text text-anchor="start" x="5.8404" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_b</text>
+<text text-anchor="start" x="42" y="-103.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="5.8404" y="-83.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_c</text>
 <polygon fill="#000000" stroke="#000000" points="0,-97 0,-97 90,-97 90,-97 0,-97"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-75C13,-75 77,-75 77,-75 83,-75 89,-81 89,-87 89,-87 89,-107 89,-107 89,-113 83,-119 77,-119 77,-119 13,-119 13,-119 7,-119 1,-113 1,-107 1,-107 1,-87 1,-87 1,-81 7,-75 13,-75"/>
 </g>
-<!-- _b&#45;&gt;_c -->
+<!-- _c&#45;&gt;_d -->
 <g id="edge2" class="edge">
-<title>_b&#45;&gt;_c</title>
+<title>_c&#45;&gt;_d</title>
 <path fill="none" stroke="#000000" d="M45,-73.9916C45,-68.476 45,-62.474 45,-56.5881"/>
 <polygon fill="#000000" stroke="#000000" points="48.5001,-56.249 45,-46.2491 41.5001,-56.2491 48.5001,-56.249"/>
 <text text-anchor="start" x="45" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">f &#160;&#160;</text>
 </g>
-<!-- _a&#45;&gt;_b -->
+<!-- _b -->
+<g id="node4" class="node">
+<title>_b</title>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="90,-194 0,-194 0,-148 90,-148 90,-194"/>
+<text text-anchor="start" x="41.6646" y="-177.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
+<text text-anchor="start" x="5.505" y="-157.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_b</text>
+<polygon fill="#000000" stroke="#000000" points="0,-171 0,-171 90,-171 90,-171 0,-171"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M13,-149C13,-149 77,-149 77,-149 83,-149 89,-155 89,-161 89,-161 89,-181 89,-181 89,-187 83,-193 77,-193 77,-193 13,-193 13,-193 7,-193 1,-187 1,-181 1,-181 1,-161 1,-161 1,-155 7,-149 13,-149"/>
+</g>
+<!-- _b&#45;&gt;_c -->
 <g id="edge3" class="edge">
+<title>_b&#45;&gt;_c</title>
+<path fill="none" stroke="#000000" d="M45,-147.9916C45,-142.476 45,-136.474 45,-130.5881"/>
+<polygon fill="#000000" stroke="#000000" points="48.5001,-130.249 45,-120.2491 41.5001,-130.2491 48.5001,-130.249"/>
+<text text-anchor="start" x="45" y="-131" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">f &#160;&#160;</text>
+</g>
+<!-- _a&#45;&gt;_b -->
+<g id="edge4" class="edge">
 <title>_a&#45;&gt;_b</title>
-<path fill="none" stroke="#000000" d="M45,-147.8711C45,-142.4482 45,-136.3229 45,-130.2494"/>
-<polygon fill="#000000" stroke="#000000" points="48.5001,-130.21 45,-120.21 41.5001,-130.21 48.5001,-130.21"/>
-<text text-anchor="start" x="45" y="-131" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">e^f &#160;&#160;</text>
+<path fill="none" stroke="#000000" d="M45,-221.8711C45,-216.4482 45,-210.3229 45,-204.2494"/>
+<polygon fill="#000000" stroke="#000000" points="48.5001,-204.21 45,-194.21 41.5001,-204.21 48.5001,-204.21"/>
+<text text-anchor="start" x="45" y="-205" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">e^f &#160;&#160;</text>
 </g>
 </g>
 </svg>

test/test_files/semantics/event_lifeline/statechart_ortho.svg

@@ -62,7 +62,7 @@
 <title>_p_o1_e</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="236,-206 146,-206 146,-160 236,-160 236,-206"/>
 <text text-anchor="start" x="187.6646" y="-189.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">e</text>
-<text text-anchor="start" x="151.8404" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_e</text>
+<text text-anchor="start" x="151.505" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_e</text>
 <polygon fill="#000000" stroke="#000000" points="146,-183 146,-183 236,-183 236,-183 146,-183"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M159,-161C159,-161 223,-161 223,-161 229,-161 235,-167 235,-173 235,-173 235,-193 235,-193 235,-199 229,-205 223,-205 223,-205 159,-205 159,-205 153,-205 147,-199 147,-193 147,-193 147,-173 147,-173 147,-167 153,-161 159,-161"/>
 </g>
@@ -96,18 +96,18 @@
 <!-- _p_o0_c -->
 <g id="node9" class="node">
 <title>_p_o0_c</title>
-<polygon fill="transparent" stroke="transparent" stroke-width="2" points="121.5,-70 32.5,-70 32.5,-24 121.5,-24 121.5,-70"/>
-<text text-anchor="start" x="74.5" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
-<text text-anchor="start" x="38.6758" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_c</text>
-<polygon fill="#000000" stroke="#000000" points="33,-47 33,-47 122,-47 122,-47 33,-47"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M45.5,-25C45.5,-25 108.5,-25 108.5,-25 114.5,-25 120.5,-31 120.5,-37 120.5,-37 120.5,-57 120.5,-57 120.5,-63 114.5,-69 108.5,-69 108.5,-69 45.5,-69 45.5,-69 39.5,-69 33.5,-63 33.5,-57 33.5,-57 33.5,-37 33.5,-37 33.5,-31 39.5,-25 45.5,-25"/>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="122,-70 32,-70 32,-24 122,-24 122,-70"/>
+<text text-anchor="start" x="74" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="37.8404" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_c</text>
+<polygon fill="#000000" stroke="#000000" points="32,-47 32,-47 122,-47 122,-47 32,-47"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M45,-25C45,-25 109,-25 109,-25 115,-25 121,-31 121,-37 121,-37 121,-57 121,-57 121,-63 115,-69 109,-69 109,-69 45,-69 45,-69 39,-69 33,-63 33,-57 33,-57 33,-37 33,-37 33,-31 39,-25 45,-25"/>
 </g>
 <!-- _p_o0_b -->
 <g id="node10" class="node">
 <title>_p_o0_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="122,-206 32,-206 32,-160 122,-160 122,-206"/>
 <text text-anchor="start" x="73.6646" y="-189.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
-<text text-anchor="start" x="37.8404" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.in_b</text>
+<text text-anchor="start" x="37.505" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.in_b</text>
 <polygon fill="#000000" stroke="#000000" points="32,-183 32,-183 122,-183 122,-183 32,-183"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M45,-161C45,-161 109,-161 109,-161 115,-161 121,-167 121,-173 121,-173 121,-193 121,-193 121,-199 115,-205 109,-205 109,-205 45,-205 45,-205 39,-205 33,-199 33,-193 33,-193 33,-173 33,-173 33,-167 39,-161 45,-161"/>
 </g>

test/test_files/semantics/memory_protocol/statechart_enabledness.svg

@@ -62,7 +62,7 @@
 <title>_p_status_done</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="459,-70 365,-70 365,-24 459,-24 459,-70"/>
 <text text-anchor="start" x="398.6584" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">done</text>
-<text text-anchor="start" x="370.8364" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.done</text>
+<text text-anchor="start" x="370.501" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.done</text>
 <polygon fill="#000000" stroke="#000000" points="365,-47 365,-47 459,-47 459,-47 365,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M378,-25C378,-25 446,-25 446,-25 452,-25 458,-31 458,-37 458,-37 458,-57 458,-57 458,-63 452,-69 446,-69 446,-69 378,-69 378,-69 372,-69 366,-63 366,-57 366,-57 366,-37 366,-37 366,-31 372,-25 378,-25"/>
 </g>

test/test_files/xml_syntax/stateref/test_flat_absolute.svg

@@ -33,7 +33,7 @@
 <title>_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="94,-46 0,-46 0,0 94,0 94,-46"/>
 <text text-anchor="start" x="43.6646" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
-<text text-anchor="start" x="5.8364" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.done</text>
+<text text-anchor="start" x="5.501" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.done</text>
 <polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 94,-23 94,-23 0,-23"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 81,-1 81,-1 87,-1 93,-7 93,-13 93,-13 93,-33 93,-33 93,-39 87,-45 81,-45 81,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>

test/test_files/xml_syntax/stateref/test_flat_relative.svg

@@ -33,7 +33,7 @@
 <title>_b</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="94,-46 0,-46 0,0 94,0 94,-46"/>
 <text text-anchor="start" x="43.6646" y="-29.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
-<text text-anchor="start" x="5.8364" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.done</text>
+<text text-anchor="start" x="5.501" y="-9.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.done</text>
 <polygon fill="#000000" stroke="#000000" points="0,-23 0,-23 94,-23 94,-23 0,-23"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M13,-1C13,-1 81,-1 81,-1 87,-1 93,-7 93,-13 93,-13 93,-33 93,-33 93,-39 87,-45 81,-45 81,-45 13,-45 13,-45 7,-45 1,-39 1,-33 1,-33 1,-13 1,-13 1,-7 7,-1 13,-1"/>
 </g>

test/test_files/xml_syntax/stateref/test_nested_absolute.svg

@@ -66,7 +66,7 @@
 <title>_d_e_f</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="214,-70 120,-70 120,-24 214,-24 214,-70"/>
 <text text-anchor="start" x="165.3326" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">f</text>
-<text text-anchor="start" x="125.8364" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.done</text>
+<text text-anchor="start" x="125.501" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.done</text>
 <polygon fill="#000000" stroke="#000000" points="120,-47 120,-47 214,-47 214,-47 120,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M133,-25C133,-25 201,-25 201,-25 207,-25 213,-31 213,-37 213,-37 213,-57 213,-57 213,-63 207,-69 201,-69 201,-69 133,-69 133,-69 127,-69 121,-63 121,-57 121,-57 121,-37 121,-37 121,-31 127,-25 133,-25"/>
 </g>

test/test_files/xml_syntax/stateref/test_nested_relative.svg

@@ -66,7 +66,7 @@
 <title>_d_e_f</title>
 <polygon fill="transparent" stroke="transparent" stroke-width="2" points="214,-70 120,-70 120,-24 214,-24 214,-70"/>
 <text text-anchor="start" x="165.3326" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">f</text>
-<text text-anchor="start" x="125.8364" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">entry ^out.done</text>
+<text text-anchor="start" x="125.501" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">enter ^out.done</text>
 <polygon fill="#000000" stroke="#000000" points="120,-47 120,-47 214,-47 214,-47 120,-47"/>
 <path fill="none" stroke="#000000" stroke-width="2" d="M133,-25C133,-25 201,-25 201,-25 207,-25 213,-31 213,-37 213,-37 213,-57 213,-57 213,-63 207,-69 201,-69 201,-69 133,-69 133,-69 127,-69 121,-63 121,-57 121,-57 121,-37 121,-37 121,-31 127,-25 133,-25"/>
 </g>