Merge branch 'orthogonal-edges'

Author: codedstructure

CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Changed: `<line>` based connectors are now axis-aligned by default where
+  there is overlap in one dimension between the start and end elements. The new
+  behaviour is equivalent to the previous `edge-type="h"` (or `="v"` as
+  appropriate) in cases where the connector will meet both elements, and
+  `edge-type` is now ignored and deprecated (it is currently removed from the
+  rendered output to preserve output, but this special-casing will be removed
+  in the future). If the elements do not 'overlap' in either dimension, the
+  connection will be a straight line between the closest corners; in the event
+  that the two elements overlap in _both_ dimensions (i.e. intersect) then no
+  connecting line is rendered. This new behaviour applies only if a bare elref
+  is provided (e.g. `start="#ref"` or `="^"`); if a locspec is also given then
+  the previous behaviour remains, and no change is made to the elbow connectors
+  generated from `<polyline>` elements.
+
 - Added: new config option 'error-mode' with values 'strict' (default, as
   previous behaviour), 'ignore' (leaves erroneous elements as provided in the
   input) and 'warn' (inserting a comment prior to the errored element with the

docs/mdbook/src/reference/attribute-ref.md

@@ -171,10 +171,6 @@ Example:
 <line start="#abc" end="#pqr" />
 ```
 
-### `edge-type`
-
-TODO
-
 ### `corner-offset`
 
 TODO

examples/containment.xml

@@ -23,6 +23,6 @@
   <rect id="yproc2" xy="#group|v 2" text="process 2" wh="^"/>
   <rect id="yout" xy="#yproc2|v 2" text="out" wh="^"/>
 
-  <polyline start="#o3@r" end="#o4" edge-type="h"/>
+  <line start="#o3" end="#o4"/>
   <polyline start="#out@r" end="#yinp@t"/>
 </svg>

examples/edges.xml

@@ -44,11 +44,11 @@
     <rect xy="5 40" wh="20 5" text="d" id="d"/>
     <rect xy="-5 15" xy-loc="tr" wh="10 30" text="e" id="e"/>
     <rect xy="-5 10" xy-loc="r" wh="10 5" text="f" id="f"/>
-    <line end="#a" start="#base" edge-type="h" marker-end="url(#arrow)"/>
-    <line end="#b" start="#base" edge-type="h" marker-end="url(#arrow)"/>
-    <line end="#c" start="#base" edge-type="h" marker-end="url(#arrow)"/>
-    <line end="#d" start="#base" edge-type="v" marker-end="url(#arrow)"/>
-    <line end="#e" start="#base" edge-type="h" marker-end="url(#arrow)"/>
-    <line end="#f" start="#base" edge-type="h" marker-end="url(#arrow)"/>
+    <line end="#a" start="#base" marker-end="url(#arrow)"/>
+    <line end="#b" start="#base" marker-end="url(#arrow)"/>
+    <line end="#c" start="#base" marker-end="url(#arrow)"/>
+    <line end="#d" start="#base" marker-end="url(#arrow)"/>
+    <line end="#e" start="#base" marker-end="url(#arrow)"/>
+    <line end="#f" start="#base" marker-end="url(#arrow)"/>
     <use href="#zero-marker" x="0" y="0"/>
 </svg>

examples/flow.xml

@@ -8,8 +8,8 @@
 
   <rect id="effect" xy="#base|V 20" wh="20 8" text="effect" class="d-fill-darkmagenta"/>
 
-  <line start="#send" end="#effect" edge-type="v" class="d-arrow d-dash"/>
-  <line start="#effect" end="#return" edge-type="v" class="d-arrow d-dash"/>
+  <line start="#send" end="#effect" class="d-arrow d-dash"/>
+  <line start="#effect" end="#return" class="d-arrow d-dash"/>
 
   <polyline points="#in@l, #in@r, #send@b, #send@t, #effect@c, #return@t, #return@b, #out@l, #out@r"
             dxy="1 3" class="d-arrow d-hardshadow d-blue d-thin"/>

examples/functional_block_diagram.xml

@@ -17,7 +17,7 @@
 
   <polyline start="#prgp@l" end="#ace@l:75%" corner-offset="8" text="p,q,r" text-loc="br" class="d-arrow"/>
   <polyline start="#srgp@l" end="#ace@l:50%" corner-offset="14" text="p,q,r" text-loc="br" class="d-arrow"/>
-  <line start="#as" end="#ace" edge-type="h" class="d-arrow"/>
+  <line start="#as" end="#ace" class="d-arrow"/>
 
   <polyline start="#ppi@t" end="#ace@b" corner-offset="70%" class="d-arrow"/>
   <polyline start="#ppi" end="#srgp@r" class="d-arrow"/>