diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 2a6e579d6..60e1ebc6f 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -9,3 +9,4 @@ - Fix importing files that override an existing value with an array. [#1762](https://github.com/terrastruct/d2/pull/1762) - Fixes missing unfilled triangle arrowheads when sketch flag is on. [#1763](https://github.com/terrastruct/d2/pull/1763) - Fixes a bug where the render target could be incorrect if the target path contains "index". [#1764](https://github.com/terrastruct/d2/pull/1764) +- Fixes ELK layout with outside labels/icons. [#1776](https://github.com/terrastruct/d2/pull/1776) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 8b01bc964..9fece76c1 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -565,6 +565,10 @@ func (obj *Object) HasLabel() bool { } } +func (obj *Object) HasIcon() bool { + return obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage +} + func (obj *Object) AbsID() string { if obj.Parent != nil && obj.Parent.ID != "" { return obj.Parent.AbsID() + "." + obj.ID @@ -1951,6 +1955,10 @@ func (obj *Object) Is3D() bool { } func (obj *Object) Spacing() (margin, padding geo.Spacing) { + return obj.SpacingOpt(2*label.PADDING, 2*label.PADDING, true) +} + +func (obj *Object) SpacingOpt(labelPadding, iconPadding float64, maxIconSize bool) (margin, padding geo.Spacing) { if obj.HasLabel() { var position label.Position if obj.LabelPosition != nil { @@ -1959,10 +1967,10 @@ func (obj *Object) Spacing() (margin, padding geo.Spacing) { var labelWidth, labelHeight float64 if obj.LabelDimensions.Width > 0 { - labelWidth = float64(obj.LabelDimensions.Width) + 2*label.PADDING + labelWidth = float64(obj.LabelDimensions.Width) + labelPadding } if obj.LabelDimensions.Height > 0 { - labelHeight = float64(obj.LabelDimensions.Height) + 2*label.PADDING + labelHeight = float64(obj.LabelDimensions.Height) + labelPadding } switch position { @@ -1985,13 +1993,16 @@ func (obj *Object) Spacing() (margin, padding geo.Spacing) { } } - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + if obj.HasIcon() { var position label.Position if obj.IconPosition != nil { position = label.FromString(*obj.IconPosition) } - iconSize := float64(d2target.MAX_ICON_SIZE + 2*label.PADDING) + iconSize := float64(d2target.MAX_ICON_SIZE + iconPadding) + if !maxIconSize { + iconSize = float64(d2target.GetIconSize(obj.Box, position.String())) + iconPadding + } switch position { case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: margin.Top = math.Max(margin.Top, iconSize) diff --git a/d2graph/layout.go b/d2graph/layout.go index 7567dfbdc..d0f5a53da 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -334,7 +334,7 @@ func (obj *Object) GetMargin() geo.Spacing { } } - if obj.Icon != nil && obj.IconPosition != nil && obj.Shape.Value != d2target.ShapeImage { + if obj.HasIcon() && obj.IconPosition != nil { position := label.FromString(*obj.IconPosition) iconSize := float64(d2target.MAX_ICON_SIZE + label.PADDING) @@ -417,7 +417,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n startingSegment := geo.Segment{Start: points[startIndex+1], End: points[startIndex]} // if an edge runs into an outside label, stop the edge at the label instead - overlapsOutsideLabel := false + var overlapsOutsideLabel, overlapsOutsideIcon bool if edge.Src.HasLabel() { // assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label labelPosition := label.FromString(*edge.Src.LabelPosition) @@ -453,7 +453,38 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } } } - if !overlapsOutsideLabel { + if !overlapsOutsideLabel && edge.Src.HasIcon() { + // assumes IconPosition is set if there is an Icon + iconPosition := label.FromString(*edge.Src.IconPosition) + if iconPosition.IsOutside() { + iconWidth := float64(d2target.MAX_ICON_SIZE) + iconHeight := float64(d2target.MAX_ICON_SIZE) + iconTL := iconPosition.GetPointOnBox(edge.Src.Box, label.PADDING, iconWidth, iconHeight) + + iconBox := geo.NewBox(iconTL, iconWidth, iconHeight) + for iconBox.Contains(startingSegment.End) && startIndex+1 > endIndex { + startingSegment.Start = startingSegment.End + startingSegment.End = points[startIndex+2] + startIndex++ + } + if intersections := iconBox.Intersections(startingSegment); len(intersections) > 0 { + overlapsOutsideIcon = true + p := intersections[0] + if len(intersections) > 1 { + p = findOuterIntersection(iconPosition, intersections) + } + // move starting segment to icon intersection point + points[startIndex] = p + startingSegment.End = p + // if the segment becomes too short, just merge it with the next segment + if startIndex+1 < endIndex && startingSegment.Length() < MIN_SEGMENT_LEN { + points[startIndex+1] = points[startIndex] + startIndex++ + } + } + } + } + if !overlapsOutsideLabel && !overlapsOutsideIcon { if intersections := edge.Src.Intersections(startingSegment); len(intersections) > 0 { // move starting segment to intersection point points[startIndex] = intersections[0] @@ -469,6 +500,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } endingSegment := geo.Segment{Start: points[endIndex-1], End: points[endIndex]} overlapsOutsideLabel = false + overlapsOutsideIcon = false if edge.Dst.HasLabel() { // assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label labelPosition := label.FromString(*edge.Dst.LabelPosition) @@ -503,7 +535,39 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } } } - if !overlapsOutsideLabel { + if !overlapsOutsideLabel && edge.Dst.HasIcon() { + // assumes IconPosition is set if there is an Icon + iconPosition := label.FromString(*edge.Dst.IconPosition) + if iconPosition.IsOutside() { + iconSize := d2target.GetIconSize(edge.Dst.Box, iconPosition.String()) + iconWidth := float64(iconSize) + iconHeight := float64(iconSize) + labelTL := iconPosition.GetPointOnBox(edge.Dst.Box, label.PADDING, iconWidth, iconHeight) + + iconBox := geo.NewBox(labelTL, iconWidth, iconHeight) + for iconBox.Contains(endingSegment.Start) && endIndex-1 > startIndex { + endingSegment.End = endingSegment.Start + endingSegment.Start = points[endIndex-2] + endIndex-- + } + if intersections := iconBox.Intersections(endingSegment); len(intersections) > 0 { + overlapsOutsideIcon = true + p := intersections[0] + if len(intersections) > 1 { + p = findOuterIntersection(iconPosition, intersections) + } + // move ending segment to icon intersection point + points[endIndex] = p + endingSegment.End = p + // if the segment becomes too short, just merge it with the previous segment + if endIndex-1 > startIndex && endingSegment.Length() < MIN_SEGMENT_LEN { + points[endIndex-1] = points[endIndex] + endIndex-- + } + } + } + } + if !overlapsOutsideLabel && !overlapsOutsideIcon { if intersections := edge.Dst.Intersections(endingSegment); len(intersections) > 0 { // move ending segment to intersection point points[endIndex] = intersections[0] diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 55e00e6fb..fbf618ed7 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1351,7 +1351,7 @@ func fitPadding(obj *d2graph.Object) { } } } - if obj.Icon != nil && shapeType != shape.IMAGE_TYPE && obj.IconPosition != nil { + if obj.HasIcon() && obj.IconPosition != nil { iconPosition = label.FromString(*obj.IconPosition) switch iconPosition { case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight, @@ -1386,7 +1386,7 @@ func fitPadding(obj *d2graph.Object) { innerBoxes = append(innerBoxes, *childLabelBox) } } - if child.Icon != nil && child.Shape.Value != d2target.ShapeImage && child.IconPosition != nil { + if child.HasIcon() && child.IconPosition != nil { childIconPosition = label.FromString(*child.IconPosition) if childIconPosition.IsOutside() { childIconTL := child.GetIconTopLeft() diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 47dee829f..2c0b45a9f 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -218,6 +218,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err positionLabelsIcons(obj) } + adjustments := make(map[*d2graph.Object]geo.Spacing) elkNodes := make(map[*d2graph.Object]*ELKNode) elkEdges := make(map[*d2graph.Edge]*ELKEdge) @@ -256,7 +257,15 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - width, height := adjustDimensions(obj) + if obj.HasLabel() && obj.HasIcon() { + // this gives shapes extra height for their label if they also have an icon + obj.Height += float64(obj.LabelDimensions.Height + label.PADDING) + } + + margin, _ := obj.SpacingOpt(label.PADDING, label.PADDING, false) + width := margin.Left + obj.Width + margin.Right + height := margin.Top + obj.Height + margin.Bottom + adjustments[obj] = margin n := &ELKNode{ ID: obj.AbsID(), @@ -348,42 +357,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err elkNodes[obj] = n }) - // adjust parent padding for children with outside positioned icons - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - - var hasTop, hasBottom bool - for _, child := range obj.ChildrenArray { - if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { - continue - } - - switch label.FromString(*child.IconPosition) { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: - hasTop = true - case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - hasBottom = true - } - if hasTop && hasBottom { - break - } - } - - if hasTop || hasBottom { - padding := parsePadding(elkNodes[obj].LayoutOptions.Padding) - if hasTop { - // TODO I think this fails to account for a potential inner label of container - padding.top = go2.Max(padding.top, d2target.MAX_ICON_SIZE+2*label.PADDING) - } - if hasBottom { - padding.bottom = go2.Max(padding.bottom, d2target.MAX_ICON_SIZE+2*label.PADDING) - } - elkNodes[obj].LayoutOptions.Padding = padding.String() - } - } - var srcSide, dstSide PortSide switch elkGraph.LayoutOptions.Direction { case Up: @@ -572,8 +545,73 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } + objEdges := make(map[*d2graph.Object][]*d2graph.Edge) + for _, e := range g.Edges { + objEdges[e.Src] = append(objEdges[e.Src], e) + if e.Dst != e.Src { + objEdges[e.Dst] = append(objEdges[e.Dst], e) + } + } + for _, obj := range g.Objects { - cleanupAdjustment(obj) + if margin, has := adjustments[obj]; has { + edges := objEdges[obj] + // also move edges with the shrinking sides + if margin.Left > 0 { + for _, e := range edges { + l := len(e.Route) + if e.Src == obj && e.Route[0].X == obj.TopLeft.X { + e.Route[0].X += margin.Left + } + if e.Dst == obj && e.Route[l-1].X == obj.TopLeft.X { + e.Route[l-1].X += margin.Left + } + } + obj.TopLeft.X += margin.Left + obj.ShiftDescendants(margin.Left/2, 0) + obj.Width -= margin.Left + } + if margin.Right > 0 { + for _, e := range edges { + l := len(e.Route) + if e.Src == obj && e.Route[0].X == obj.TopLeft.X+obj.Width { + e.Route[0].X -= margin.Right + } + if e.Dst == obj && e.Route[l-1].X == obj.TopLeft.X+obj.Width { + e.Route[l-1].X -= margin.Right + } + } + obj.ShiftDescendants(-margin.Right/2, 0) + obj.Width -= margin.Right + } + if margin.Top > 0 { + for _, e := range edges { + l := len(e.Route) + if e.Src == obj && e.Route[0].Y == obj.TopLeft.Y { + e.Route[0].Y += margin.Top + } + if e.Dst == obj && e.Route[l-1].Y == obj.TopLeft.Y { + e.Route[l-1].Y += margin.Top + } + } + obj.TopLeft.Y += margin.Top + obj.ShiftDescendants(0, margin.Top/2) + obj.Height -= margin.Top + } + if margin.Bottom > 0 { + for _, e := range edges { + l := len(e.Route) + if e.Src == obj && e.Route[0].Y == obj.TopLeft.Y+obj.Height { + e.Route[0].Y -= margin.Bottom + } + if e.Dst == obj && e.Route[l-1].Y == obj.TopLeft.Y+obj.Height { + e.Route[l-1].Y -= margin.Bottom + } + } + obj.ShiftDescendants(0, -margin.Bottom/2) + obj.Height -= margin.Bottom + } + } } for _, edge := range g.Edges { @@ -1016,7 +1054,7 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd extraRight = labelWidth } } - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage && obj.IconPosition != nil { + if obj.HasIcon() && obj.IconPosition != nil { iconSize := d2target.MAX_ICON_SIZE + 2*label.PADDING switch label.FromString(*obj.IconPosition) { case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: @@ -1086,120 +1124,6 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd return padding } -func adjustDimensions(obj *d2graph.Object) (width, height float64) { - width = obj.Width - height = obj.Height - - // reserve spacing for labels - if obj.HasLabel() { - var position label.Position - if obj.LabelPosition != nil { - position = label.FromString(*obj.LabelPosition) - } else if len(obj.ChildrenArray) == 0 && obj.HasOutsideBottomLabel() { - position = label.OutsideBottomCenter - } - - if position.IsShapePosition() { - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - width += float64(obj.LabelDimensions.Width) + label.PADDING - default: - // TODO labelWidth+2*label.PADDING - width = go2.Max(width, float64(obj.LabelDimensions.Width)) - } - } - - // special handling - if obj.HasOutsideBottomLabel() || obj.Icon != nil { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } - } - - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - var position label.Position - if obj.IconPosition != nil { - position = label.FromString(*obj.IconPosition) - } - - if position.IsShapePosition() { - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - width += d2target.MAX_ICON_SIZE + label.PADDING - default: - width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) - } - } - } - - // reserve extra space for 3d/multiple by providing elk the larger dimensions - dx, dy := obj.GetModifierElementAdjustments() - width += dx - height += dy - - return -} - -func cleanupAdjustment(obj *d2graph.Object) { - // adjust size and position to account for space reserved for labels - if obj.HasLabel() { - position := label.FromString(*obj.LabelPosition) - if position.IsShapePosition() { - var labelWidth float64 - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - labelWidth = float64(obj.LabelDimensions.Width) + label.PADDING - obj.Width -= labelWidth - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += labelWidth - obj.ShiftDescendants(labelWidth/2, 0) - case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.ShiftDescendants(-labelWidth/2, 0) - } - } - } - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - position := label.FromString(*obj.IconPosition) - if position.IsShapePosition() { - var iconWidth float64 - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - iconWidth = d2target.MAX_ICON_SIZE + label.PADDING - obj.Width -= iconWidth - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += iconWidth - obj.ShiftDescendants(iconWidth/2, 0) - case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.ShiftDescendants(-iconWidth/2, 0) - } - } - } - - // special handling to start/end connections below label - if obj.HasOutsideBottomLabel() { - obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING - } - - // remove the extra width/height we added for 3d/multiple after all objects/connections are placed - // and shift the shapes down accordingly - dx, dy := obj.GetModifierElementAdjustments() - if dx != 0 || dy != 0 { - obj.TopLeft.Y += dy - obj.ShiftDescendants(0, dy) - if !obj.IsContainer() { - obj.Width -= dx - obj.Height -= dy - } - } -} - func positionLabelsIcons(obj *d2graph.Object) { if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json index 4630de718..0573103e7 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json @@ -7,8 +7,8 @@ "id": "x", "type": "rectangle", "pos": { - "x": 40, - "y": 12 + "x": 37, + "y": 76 }, "width": 131, "height": 118, @@ -60,8 +60,8 @@ "id": "y", "type": "rectangle", "pos": { - "x": 81, - "y": 200 + "x": 76, + "y": 264 }, "width": 118, "height": 118, @@ -136,12 +136,12 @@ "labelPercentage": 0, "route": [ { - "x": 105.5, - "y": 130 + "x": 103, + "y": 194 }, { - "x": 105.5, - "y": 200 + "x": 103, + "y": 264 } ], "animated": false, diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg index 0357c3a3d..aaf0d429f 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -programprofits - - - + .d2-1296623166 .fill-N1{fill:#0A0F25;} + .d2-1296623166 .fill-N2{fill:#676C7E;} + .d2-1296623166 .fill-N3{fill:#9499AB;} + .d2-1296623166 .fill-N4{fill:#CFD2DD;} + .d2-1296623166 .fill-N5{fill:#DEE1EB;} + .d2-1296623166 .fill-N6{fill:#EEF1F8;} + .d2-1296623166 .fill-N7{fill:#FFFFFF;} + .d2-1296623166 .fill-B1{fill:#0D32B2;} + .d2-1296623166 .fill-B2{fill:#0D32B2;} + .d2-1296623166 .fill-B3{fill:#E3E9FD;} + .d2-1296623166 .fill-B4{fill:#E3E9FD;} + .d2-1296623166 .fill-B5{fill:#EDF0FD;} + .d2-1296623166 .fill-B6{fill:#F7F8FE;} + .d2-1296623166 .fill-AA2{fill:#4A6FF3;} + .d2-1296623166 .fill-AA4{fill:#EDF0FD;} + .d2-1296623166 .fill-AA5{fill:#F7F8FE;} + .d2-1296623166 .fill-AB4{fill:#EDF0FD;} + .d2-1296623166 .fill-AB5{fill:#F7F8FE;} + .d2-1296623166 .stroke-N1{stroke:#0A0F25;} + .d2-1296623166 .stroke-N2{stroke:#676C7E;} + .d2-1296623166 .stroke-N3{stroke:#9499AB;} + .d2-1296623166 .stroke-N4{stroke:#CFD2DD;} + .d2-1296623166 .stroke-N5{stroke:#DEE1EB;} + .d2-1296623166 .stroke-N6{stroke:#EEF1F8;} + .d2-1296623166 .stroke-N7{stroke:#FFFFFF;} + .d2-1296623166 .stroke-B1{stroke:#0D32B2;} + .d2-1296623166 .stroke-B2{stroke:#0D32B2;} + .d2-1296623166 .stroke-B3{stroke:#E3E9FD;} + .d2-1296623166 .stroke-B4{stroke:#E3E9FD;} + .d2-1296623166 .stroke-B5{stroke:#EDF0FD;} + .d2-1296623166 .stroke-B6{stroke:#F7F8FE;} + .d2-1296623166 .stroke-AA2{stroke:#4A6FF3;} + .d2-1296623166 .stroke-AA4{stroke:#EDF0FD;} + .d2-1296623166 .stroke-AA5{stroke:#F7F8FE;} + .d2-1296623166 .stroke-AB4{stroke:#EDF0FD;} + .d2-1296623166 .stroke-AB5{stroke:#F7F8FE;} + .d2-1296623166 .background-color-N1{background-color:#0A0F25;} + .d2-1296623166 .background-color-N2{background-color:#676C7E;} + .d2-1296623166 .background-color-N3{background-color:#9499AB;} + .d2-1296623166 .background-color-N4{background-color:#CFD2DD;} + .d2-1296623166 .background-color-N5{background-color:#DEE1EB;} + .d2-1296623166 .background-color-N6{background-color:#EEF1F8;} + .d2-1296623166 .background-color-N7{background-color:#FFFFFF;} + .d2-1296623166 .background-color-B1{background-color:#0D32B2;} + .d2-1296623166 .background-color-B2{background-color:#0D32B2;} + .d2-1296623166 .background-color-B3{background-color:#E3E9FD;} + .d2-1296623166 .background-color-B4{background-color:#E3E9FD;} + .d2-1296623166 .background-color-B5{background-color:#EDF0FD;} + .d2-1296623166 .background-color-B6{background-color:#F7F8FE;} + .d2-1296623166 .background-color-AA2{background-color:#4A6FF3;} + .d2-1296623166 .background-color-AA4{background-color:#EDF0FD;} + .d2-1296623166 .background-color-AA5{background-color:#F7F8FE;} + .d2-1296623166 .background-color-AB4{background-color:#EDF0FD;} + .d2-1296623166 .background-color-AB5{background-color:#F7F8FE;} + .d2-1296623166 .color-N1{color:#0A0F25;} + .d2-1296623166 .color-N2{color:#676C7E;} + .d2-1296623166 .color-N3{color:#9499AB;} + .d2-1296623166 .color-N4{color:#CFD2DD;} + .d2-1296623166 .color-N5{color:#DEE1EB;} + .d2-1296623166 .color-N6{color:#EEF1F8;} + .d2-1296623166 .color-N7{color:#FFFFFF;} + .d2-1296623166 .color-B1{color:#0D32B2;} + .d2-1296623166 .color-B2{color:#0D32B2;} + .d2-1296623166 .color-B3{color:#E3E9FD;} + .d2-1296623166 .color-B4{color:#E3E9FD;} + .d2-1296623166 .color-B5{color:#EDF0FD;} + .d2-1296623166 .color-B6{color:#F7F8FE;} + .d2-1296623166 .color-AA2{color:#4A6FF3;} + .d2-1296623166 .color-AA4{color:#EDF0FD;} + .d2-1296623166 .color-AA5{color:#F7F8FE;} + .d2-1296623166 .color-AB4{color:#EDF0FD;} + .d2-1296623166 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>programprofits + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json index f4fb7592e..15b658c79 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 128, - "height": 123, + "height": 128, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg index 7a4404b24..a21c37ef2 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - - + .d2-735676195 .fill-N1{fill:#0A0F25;} + .d2-735676195 .fill-N2{fill:#676C7E;} + .d2-735676195 .fill-N3{fill:#9499AB;} + .d2-735676195 .fill-N4{fill:#CFD2DD;} + .d2-735676195 .fill-N5{fill:#DEE1EB;} + .d2-735676195 .fill-N6{fill:#EEF1F8;} + .d2-735676195 .fill-N7{fill:#FFFFFF;} + .d2-735676195 .fill-B1{fill:#0D32B2;} + .d2-735676195 .fill-B2{fill:#0D32B2;} + .d2-735676195 .fill-B3{fill:#E3E9FD;} + .d2-735676195 .fill-B4{fill:#E3E9FD;} + .d2-735676195 .fill-B5{fill:#EDF0FD;} + .d2-735676195 .fill-B6{fill:#F7F8FE;} + .d2-735676195 .fill-AA2{fill:#4A6FF3;} + .d2-735676195 .fill-AA4{fill:#EDF0FD;} + .d2-735676195 .fill-AA5{fill:#F7F8FE;} + .d2-735676195 .fill-AB4{fill:#EDF0FD;} + .d2-735676195 .fill-AB5{fill:#F7F8FE;} + .d2-735676195 .stroke-N1{stroke:#0A0F25;} + .d2-735676195 .stroke-N2{stroke:#676C7E;} + .d2-735676195 .stroke-N3{stroke:#9499AB;} + .d2-735676195 .stroke-N4{stroke:#CFD2DD;} + .d2-735676195 .stroke-N5{stroke:#DEE1EB;} + .d2-735676195 .stroke-N6{stroke:#EEF1F8;} + .d2-735676195 .stroke-N7{stroke:#FFFFFF;} + .d2-735676195 .stroke-B1{stroke:#0D32B2;} + .d2-735676195 .stroke-B2{stroke:#0D32B2;} + .d2-735676195 .stroke-B3{stroke:#E3E9FD;} + .d2-735676195 .stroke-B4{stroke:#E3E9FD;} + .d2-735676195 .stroke-B5{stroke:#EDF0FD;} + .d2-735676195 .stroke-B6{stroke:#F7F8FE;} + .d2-735676195 .stroke-AA2{stroke:#4A6FF3;} + .d2-735676195 .stroke-AA4{stroke:#EDF0FD;} + .d2-735676195 .stroke-AA5{stroke:#F7F8FE;} + .d2-735676195 .stroke-AB4{stroke:#EDF0FD;} + .d2-735676195 .stroke-AB5{stroke:#F7F8FE;} + .d2-735676195 .background-color-N1{background-color:#0A0F25;} + .d2-735676195 .background-color-N2{background-color:#676C7E;} + .d2-735676195 .background-color-N3{background-color:#9499AB;} + .d2-735676195 .background-color-N4{background-color:#CFD2DD;} + .d2-735676195 .background-color-N5{background-color:#DEE1EB;} + .d2-735676195 .background-color-N6{background-color:#EEF1F8;} + .d2-735676195 .background-color-N7{background-color:#FFFFFF;} + .d2-735676195 .background-color-B1{background-color:#0D32B2;} + .d2-735676195 .background-color-B2{background-color:#0D32B2;} + .d2-735676195 .background-color-B3{background-color:#E3E9FD;} + .d2-735676195 .background-color-B4{background-color:#E3E9FD;} + .d2-735676195 .background-color-B5{background-color:#EDF0FD;} + .d2-735676195 .background-color-B6{background-color:#F7F8FE;} + .d2-735676195 .background-color-AA2{background-color:#4A6FF3;} + .d2-735676195 .background-color-AA4{background-color:#EDF0FD;} + .d2-735676195 .background-color-AA5{background-color:#F7F8FE;} + .d2-735676195 .background-color-AB4{background-color:#EDF0FD;} + .d2-735676195 .background-color-AB5{background-color:#F7F8FE;} + .d2-735676195 .color-N1{color:#0A0F25;} + .d2-735676195 .color-N2{color:#676C7E;} + .d2-735676195 .color-N3{color:#9499AB;} + .d2-735676195 .color-N4{color:#CFD2DD;} + .d2-735676195 .color-N5{color:#DEE1EB;} + .d2-735676195 .color-N6{color:#EEF1F8;} + .d2-735676195 .color-N7{color:#FFFFFF;} + .d2-735676195 .color-B1{color:#0D32B2;} + .d2-735676195 .color-B2{color:#0D32B2;} + .d2-735676195 .color-B3{color:#E3E9FD;} + .d2-735676195 .color-B4{color:#E3E9FD;} + .d2-735676195 .color-B5{color:#EDF0FD;} + .d2-735676195 .color-B6{color:#F7F8FE;} + .d2-735676195 .color-AA2{color:#4A6FF3;} + .d2-735676195 .color-AA4{color:#EDF0FD;} + .d2-735676195 .color-AA5{color:#F7F8FE;} + .d2-735676195 .color-AB4{color:#EDF0FD;} + .d2-735676195 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> + \ No newline at end of file diff --git a/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json b/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json index 953d15c18..ad3c5a684 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json +++ b/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 222, - "y": 248 + "y": 235 }, "width": 80, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 442, - "y": 248 + "y": 235 }, "width": 80, "height": 66, diff --git a/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg b/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg index 5d25002a3..931948359 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -container1container2container3firstsecondthirdchildchild + .d2-1877500101 .fill-N1{fill:#0A0F25;} + .d2-1877500101 .fill-N2{fill:#676C7E;} + .d2-1877500101 .fill-N3{fill:#9499AB;} + .d2-1877500101 .fill-N4{fill:#CFD2DD;} + .d2-1877500101 .fill-N5{fill:#DEE1EB;} + .d2-1877500101 .fill-N6{fill:#EEF1F8;} + .d2-1877500101 .fill-N7{fill:#FFFFFF;} + .d2-1877500101 .fill-B1{fill:#0D32B2;} + .d2-1877500101 .fill-B2{fill:#0D32B2;} + .d2-1877500101 .fill-B3{fill:#E3E9FD;} + .d2-1877500101 .fill-B4{fill:#E3E9FD;} + .d2-1877500101 .fill-B5{fill:#EDF0FD;} + .d2-1877500101 .fill-B6{fill:#F7F8FE;} + .d2-1877500101 .fill-AA2{fill:#4A6FF3;} + .d2-1877500101 .fill-AA4{fill:#EDF0FD;} + .d2-1877500101 .fill-AA5{fill:#F7F8FE;} + .d2-1877500101 .fill-AB4{fill:#EDF0FD;} + .d2-1877500101 .fill-AB5{fill:#F7F8FE;} + .d2-1877500101 .stroke-N1{stroke:#0A0F25;} + .d2-1877500101 .stroke-N2{stroke:#676C7E;} + .d2-1877500101 .stroke-N3{stroke:#9499AB;} + .d2-1877500101 .stroke-N4{stroke:#CFD2DD;} + .d2-1877500101 .stroke-N5{stroke:#DEE1EB;} + .d2-1877500101 .stroke-N6{stroke:#EEF1F8;} + .d2-1877500101 .stroke-N7{stroke:#FFFFFF;} + .d2-1877500101 .stroke-B1{stroke:#0D32B2;} + .d2-1877500101 .stroke-B2{stroke:#0D32B2;} + .d2-1877500101 .stroke-B3{stroke:#E3E9FD;} + .d2-1877500101 .stroke-B4{stroke:#E3E9FD;} + .d2-1877500101 .stroke-B5{stroke:#EDF0FD;} + .d2-1877500101 .stroke-B6{stroke:#F7F8FE;} + .d2-1877500101 .stroke-AA2{stroke:#4A6FF3;} + .d2-1877500101 .stroke-AA4{stroke:#EDF0FD;} + .d2-1877500101 .stroke-AA5{stroke:#F7F8FE;} + .d2-1877500101 .stroke-AB4{stroke:#EDF0FD;} + .d2-1877500101 .stroke-AB5{stroke:#F7F8FE;} + .d2-1877500101 .background-color-N1{background-color:#0A0F25;} + .d2-1877500101 .background-color-N2{background-color:#676C7E;} + .d2-1877500101 .background-color-N3{background-color:#9499AB;} + .d2-1877500101 .background-color-N4{background-color:#CFD2DD;} + .d2-1877500101 .background-color-N5{background-color:#DEE1EB;} + .d2-1877500101 .background-color-N6{background-color:#EEF1F8;} + .d2-1877500101 .background-color-N7{background-color:#FFFFFF;} + .d2-1877500101 .background-color-B1{background-color:#0D32B2;} + .d2-1877500101 .background-color-B2{background-color:#0D32B2;} + .d2-1877500101 .background-color-B3{background-color:#E3E9FD;} + .d2-1877500101 .background-color-B4{background-color:#E3E9FD;} + .d2-1877500101 .background-color-B5{background-color:#EDF0FD;} + .d2-1877500101 .background-color-B6{background-color:#F7F8FE;} + .d2-1877500101 .background-color-AA2{background-color:#4A6FF3;} + .d2-1877500101 .background-color-AA4{background-color:#EDF0FD;} + .d2-1877500101 .background-color-AA5{background-color:#F7F8FE;} + .d2-1877500101 .background-color-AB4{background-color:#EDF0FD;} + .d2-1877500101 .background-color-AB5{background-color:#F7F8FE;} + .d2-1877500101 .color-N1{color:#0A0F25;} + .d2-1877500101 .color-N2{color:#676C7E;} + .d2-1877500101 .color-N3{color:#9499AB;} + .d2-1877500101 .color-N4{color:#CFD2DD;} + .d2-1877500101 .color-N5{color:#DEE1EB;} + .d2-1877500101 .color-N6{color:#EEF1F8;} + .d2-1877500101 .color-N7{color:#FFFFFF;} + .d2-1877500101 .color-B1{color:#0D32B2;} + .d2-1877500101 .color-B2{color:#0D32B2;} + .d2-1877500101 .color-B3{color:#E3E9FD;} + .d2-1877500101 .color-B4{color:#E3E9FD;} + .d2-1877500101 .color-B5{color:#EDF0FD;} + .d2-1877500101 .color-B6{color:#F7F8FE;} + .d2-1877500101 .color-AA2{color:#4A6FF3;} + .d2-1877500101 .color-AA4{color:#EDF0FD;} + .d2-1877500101 .color-AA5{color:#F7F8FE;} + .d2-1877500101 .color-AB4{color:#EDF0FD;} + .d2-1877500101 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>container1container2container3firstsecondthirdchildchild @@ -104,6 +104,6 @@ - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json index 644bffb9d..23adad5c4 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json @@ -157,7 +157,7 @@ "y": 88 }, { - "x": 83, + "x": 84, "y": 158 } ], diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg index d98b4013a..cbff151d5 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3329834545 .fill-N1{fill:#0A0F25;} + .d2-3329834545 .fill-N2{fill:#676C7E;} + .d2-3329834545 .fill-N3{fill:#9499AB;} + .d2-3329834545 .fill-N4{fill:#CFD2DD;} + .d2-3329834545 .fill-N5{fill:#DEE1EB;} + .d2-3329834545 .fill-N6{fill:#EEF1F8;} + .d2-3329834545 .fill-N7{fill:#FFFFFF;} + .d2-3329834545 .fill-B1{fill:#0D32B2;} + .d2-3329834545 .fill-B2{fill:#0D32B2;} + .d2-3329834545 .fill-B3{fill:#E3E9FD;} + .d2-3329834545 .fill-B4{fill:#E3E9FD;} + .d2-3329834545 .fill-B5{fill:#EDF0FD;} + .d2-3329834545 .fill-B6{fill:#F7F8FE;} + .d2-3329834545 .fill-AA2{fill:#4A6FF3;} + .d2-3329834545 .fill-AA4{fill:#EDF0FD;} + .d2-3329834545 .fill-AA5{fill:#F7F8FE;} + .d2-3329834545 .fill-AB4{fill:#EDF0FD;} + .d2-3329834545 .fill-AB5{fill:#F7F8FE;} + .d2-3329834545 .stroke-N1{stroke:#0A0F25;} + .d2-3329834545 .stroke-N2{stroke:#676C7E;} + .d2-3329834545 .stroke-N3{stroke:#9499AB;} + .d2-3329834545 .stroke-N4{stroke:#CFD2DD;} + .d2-3329834545 .stroke-N5{stroke:#DEE1EB;} + .d2-3329834545 .stroke-N6{stroke:#EEF1F8;} + .d2-3329834545 .stroke-N7{stroke:#FFFFFF;} + .d2-3329834545 .stroke-B1{stroke:#0D32B2;} + .d2-3329834545 .stroke-B2{stroke:#0D32B2;} + .d2-3329834545 .stroke-B3{stroke:#E3E9FD;} + .d2-3329834545 .stroke-B4{stroke:#E3E9FD;} + .d2-3329834545 .stroke-B5{stroke:#EDF0FD;} + .d2-3329834545 .stroke-B6{stroke:#F7F8FE;} + .d2-3329834545 .stroke-AA2{stroke:#4A6FF3;} + .d2-3329834545 .stroke-AA4{stroke:#EDF0FD;} + .d2-3329834545 .stroke-AA5{stroke:#F7F8FE;} + .d2-3329834545 .stroke-AB4{stroke:#EDF0FD;} + .d2-3329834545 .stroke-AB5{stroke:#F7F8FE;} + .d2-3329834545 .background-color-N1{background-color:#0A0F25;} + .d2-3329834545 .background-color-N2{background-color:#676C7E;} + .d2-3329834545 .background-color-N3{background-color:#9499AB;} + .d2-3329834545 .background-color-N4{background-color:#CFD2DD;} + .d2-3329834545 .background-color-N5{background-color:#DEE1EB;} + .d2-3329834545 .background-color-N6{background-color:#EEF1F8;} + .d2-3329834545 .background-color-N7{background-color:#FFFFFF;} + .d2-3329834545 .background-color-B1{background-color:#0D32B2;} + .d2-3329834545 .background-color-B2{background-color:#0D32B2;} + .d2-3329834545 .background-color-B3{background-color:#E3E9FD;} + .d2-3329834545 .background-color-B4{background-color:#E3E9FD;} + .d2-3329834545 .background-color-B5{background-color:#EDF0FD;} + .d2-3329834545 .background-color-B6{background-color:#F7F8FE;} + .d2-3329834545 .background-color-AA2{background-color:#4A6FF3;} + .d2-3329834545 .background-color-AA4{background-color:#EDF0FD;} + .d2-3329834545 .background-color-AA5{background-color:#F7F8FE;} + .d2-3329834545 .background-color-AB4{background-color:#EDF0FD;} + .d2-3329834545 .background-color-AB5{background-color:#F7F8FE;} + .d2-3329834545 .color-N1{color:#0A0F25;} + .d2-3329834545 .color-N2{color:#676C7E;} + .d2-3329834545 .color-N3{color:#9499AB;} + .d2-3329834545 .color-N4{color:#CFD2DD;} + .d2-3329834545 .color-N5{color:#DEE1EB;} + .d2-3329834545 .color-N6{color:#EEF1F8;} + .d2-3329834545 .color-N7{color:#FFFFFF;} + .d2-3329834545 .color-B1{color:#0D32B2;} + .d2-3329834545 .color-B2{color:#0D32B2;} + .d2-3329834545 .color-B3{color:#E3E9FD;} + .d2-3329834545 .color-B4{color:#E3E9FD;} + .d2-3329834545 .color-B5{color:#EDF0FD;} + .d2-3329834545 .color-B6{color:#F7F8FE;} + .d2-3329834545 .color-AA2{color:#4A6FF3;} + .d2-3329834545 .color-AA4{color:#EDF0FD;} + .d2-3329834545 .color-AA5{color:#F7F8FE;} + .d2-3329834545 .color-AB4{color:#EDF0FD;} + .d2-3329834545 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> hexagon rect -square +square diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json index 47c10804b..a4e95e3a8 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -884,7 +884,7 @@ "y": 114 }, { - "x": 455, + "x": 454, "y": 195 } ], @@ -922,7 +922,7 @@ "y": 278 }, { - "x": 455, + "x": 454, "y": 358 } ], @@ -960,7 +960,7 @@ "y": 107 }, { - "x": 611, + "x": 612, "y": 198 } ], @@ -998,8 +998,8 @@ "y": 274 }, { - "x": 612, - "y": 358 + "x": 611, + "y": 359 } ], "animated": false, diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg index 818967e8a..013f52d7d 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3214214930 .fill-N1{fill:#0A0F25;} + .d2-3214214930 .fill-N2{fill:#676C7E;} + .d2-3214214930 .fill-N3{fill:#9499AB;} + .d2-3214214930 .fill-N4{fill:#CFD2DD;} + .d2-3214214930 .fill-N5{fill:#DEE1EB;} + .d2-3214214930 .fill-N6{fill:#EEF1F8;} + .d2-3214214930 .fill-N7{fill:#FFFFFF;} + .d2-3214214930 .fill-B1{fill:#0D32B2;} + .d2-3214214930 .fill-B2{fill:#0D32B2;} + .d2-3214214930 .fill-B3{fill:#E3E9FD;} + .d2-3214214930 .fill-B4{fill:#E3E9FD;} + .d2-3214214930 .fill-B5{fill:#EDF0FD;} + .d2-3214214930 .fill-B6{fill:#F7F8FE;} + .d2-3214214930 .fill-AA2{fill:#4A6FF3;} + .d2-3214214930 .fill-AA4{fill:#EDF0FD;} + .d2-3214214930 .fill-AA5{fill:#F7F8FE;} + .d2-3214214930 .fill-AB4{fill:#EDF0FD;} + .d2-3214214930 .fill-AB5{fill:#F7F8FE;} + .d2-3214214930 .stroke-N1{stroke:#0A0F25;} + .d2-3214214930 .stroke-N2{stroke:#676C7E;} + .d2-3214214930 .stroke-N3{stroke:#9499AB;} + .d2-3214214930 .stroke-N4{stroke:#CFD2DD;} + .d2-3214214930 .stroke-N5{stroke:#DEE1EB;} + .d2-3214214930 .stroke-N6{stroke:#EEF1F8;} + .d2-3214214930 .stroke-N7{stroke:#FFFFFF;} + .d2-3214214930 .stroke-B1{stroke:#0D32B2;} + .d2-3214214930 .stroke-B2{stroke:#0D32B2;} + .d2-3214214930 .stroke-B3{stroke:#E3E9FD;} + .d2-3214214930 .stroke-B4{stroke:#E3E9FD;} + .d2-3214214930 .stroke-B5{stroke:#EDF0FD;} + .d2-3214214930 .stroke-B6{stroke:#F7F8FE;} + .d2-3214214930 .stroke-AA2{stroke:#4A6FF3;} + .d2-3214214930 .stroke-AA4{stroke:#EDF0FD;} + .d2-3214214930 .stroke-AA5{stroke:#F7F8FE;} + .d2-3214214930 .stroke-AB4{stroke:#EDF0FD;} + .d2-3214214930 .stroke-AB5{stroke:#F7F8FE;} + .d2-3214214930 .background-color-N1{background-color:#0A0F25;} + .d2-3214214930 .background-color-N2{background-color:#676C7E;} + .d2-3214214930 .background-color-N3{background-color:#9499AB;} + .d2-3214214930 .background-color-N4{background-color:#CFD2DD;} + .d2-3214214930 .background-color-N5{background-color:#DEE1EB;} + .d2-3214214930 .background-color-N6{background-color:#EEF1F8;} + .d2-3214214930 .background-color-N7{background-color:#FFFFFF;} + .d2-3214214930 .background-color-B1{background-color:#0D32B2;} + .d2-3214214930 .background-color-B2{background-color:#0D32B2;} + .d2-3214214930 .background-color-B3{background-color:#E3E9FD;} + .d2-3214214930 .background-color-B4{background-color:#E3E9FD;} + .d2-3214214930 .background-color-B5{background-color:#EDF0FD;} + .d2-3214214930 .background-color-B6{background-color:#F7F8FE;} + .d2-3214214930 .background-color-AA2{background-color:#4A6FF3;} + .d2-3214214930 .background-color-AA4{background-color:#EDF0FD;} + .d2-3214214930 .background-color-AA5{background-color:#F7F8FE;} + .d2-3214214930 .background-color-AB4{background-color:#EDF0FD;} + .d2-3214214930 .background-color-AB5{background-color:#F7F8FE;} + .d2-3214214930 .color-N1{color:#0A0F25;} + .d2-3214214930 .color-N2{color:#676C7E;} + .d2-3214214930 .color-N3{color:#9499AB;} + .d2-3214214930 .color-N4{color:#CFD2DD;} + .d2-3214214930 .color-N5{color:#DEE1EB;} + .d2-3214214930 .color-N6{color:#EEF1F8;} + .d2-3214214930 .color-N7{color:#FFFFFF;} + .d2-3214214930 .color-B1{color:#0D32B2;} + .d2-3214214930 .color-B2{color:#0D32B2;} + .d2-3214214930 .color-B3{color:#E3E9FD;} + .d2-3214214930 .color-B4{color:#E3E9FD;} + .d2-3214214930 .color-B5{color:#EDF0FD;} + .d2-3214214930 .color-B6{color:#F7F8FE;} + .d2-3214214930 .color-AA2{color:#4A6FF3;} + .d2-3214214930 .color-AA4{color:#EDF0FD;} + .d2-3214214930 .color-AA5{color:#F7F8FE;} + .d2-3214214930 .color-AB4{color:#EDF0FD;} + .d2-3214214930 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/cycle-order/elk/board.exp.json b/e2etests/testdata/stable/cycle-order/elk/board.exp.json index 306f59430..013018d81 100644 --- a/e2etests/testdata/stable/cycle-order/elk/board.exp.json +++ b/e2etests/testdata/stable/cycle-order/elk/board.exp.json @@ -577,7 +577,7 @@ "x": 792, "y": 62 }, - "width": 77, + "width": 70, "height": 70, "opacity": 1, "strokeDash": 0, @@ -633,7 +633,7 @@ "x": 1039, "y": 62 }, - "width": 77, + "width": 70, "height": 70, "opacity": 1, "strokeDash": 0, @@ -689,7 +689,7 @@ "x": 1286, "y": 62 }, - "width": 97, + "width": 70, "height": 70, "opacity": 1, "strokeDash": 0, @@ -745,7 +745,7 @@ "x": 1553, "y": 62 }, - "width": 87, + "width": 70, "height": 70, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg index b053b5e08..df1ebb011 100644 --- a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + .d2-3587231517 .fill-N1{fill:#0A0F25;} + .d2-3587231517 .fill-N2{fill:#676C7E;} + .d2-3587231517 .fill-N3{fill:#9499AB;} + .d2-3587231517 .fill-N4{fill:#CFD2DD;} + .d2-3587231517 .fill-N5{fill:#DEE1EB;} + .d2-3587231517 .fill-N6{fill:#EEF1F8;} + .d2-3587231517 .fill-N7{fill:#FFFFFF;} + .d2-3587231517 .fill-B1{fill:#0D32B2;} + .d2-3587231517 .fill-B2{fill:#0D32B2;} + .d2-3587231517 .fill-B3{fill:#E3E9FD;} + .d2-3587231517 .fill-B4{fill:#E3E9FD;} + .d2-3587231517 .fill-B5{fill:#EDF0FD;} + .d2-3587231517 .fill-B6{fill:#F7F8FE;} + .d2-3587231517 .fill-AA2{fill:#4A6FF3;} + .d2-3587231517 .fill-AA4{fill:#EDF0FD;} + .d2-3587231517 .fill-AA5{fill:#F7F8FE;} + .d2-3587231517 .fill-AB4{fill:#EDF0FD;} + .d2-3587231517 .fill-AB5{fill:#F7F8FE;} + .d2-3587231517 .stroke-N1{stroke:#0A0F25;} + .d2-3587231517 .stroke-N2{stroke:#676C7E;} + .d2-3587231517 .stroke-N3{stroke:#9499AB;} + .d2-3587231517 .stroke-N4{stroke:#CFD2DD;} + .d2-3587231517 .stroke-N5{stroke:#DEE1EB;} + .d2-3587231517 .stroke-N6{stroke:#EEF1F8;} + .d2-3587231517 .stroke-N7{stroke:#FFFFFF;} + .d2-3587231517 .stroke-B1{stroke:#0D32B2;} + .d2-3587231517 .stroke-B2{stroke:#0D32B2;} + .d2-3587231517 .stroke-B3{stroke:#E3E9FD;} + .d2-3587231517 .stroke-B4{stroke:#E3E9FD;} + .d2-3587231517 .stroke-B5{stroke:#EDF0FD;} + .d2-3587231517 .stroke-B6{stroke:#F7F8FE;} + .d2-3587231517 .stroke-AA2{stroke:#4A6FF3;} + .d2-3587231517 .stroke-AA4{stroke:#EDF0FD;} + .d2-3587231517 .stroke-AA5{stroke:#F7F8FE;} + .d2-3587231517 .stroke-AB4{stroke:#EDF0FD;} + .d2-3587231517 .stroke-AB5{stroke:#F7F8FE;} + .d2-3587231517 .background-color-N1{background-color:#0A0F25;} + .d2-3587231517 .background-color-N2{background-color:#676C7E;} + .d2-3587231517 .background-color-N3{background-color:#9499AB;} + .d2-3587231517 .background-color-N4{background-color:#CFD2DD;} + .d2-3587231517 .background-color-N5{background-color:#DEE1EB;} + .d2-3587231517 .background-color-N6{background-color:#EEF1F8;} + .d2-3587231517 .background-color-N7{background-color:#FFFFFF;} + .d2-3587231517 .background-color-B1{background-color:#0D32B2;} + .d2-3587231517 .background-color-B2{background-color:#0D32B2;} + .d2-3587231517 .background-color-B3{background-color:#E3E9FD;} + .d2-3587231517 .background-color-B4{background-color:#E3E9FD;} + .d2-3587231517 .background-color-B5{background-color:#EDF0FD;} + .d2-3587231517 .background-color-B6{background-color:#F7F8FE;} + .d2-3587231517 .background-color-AA2{background-color:#4A6FF3;} + .d2-3587231517 .background-color-AA4{background-color:#EDF0FD;} + .d2-3587231517 .background-color-AA5{background-color:#F7F8FE;} + .d2-3587231517 .background-color-AB4{background-color:#EDF0FD;} + .d2-3587231517 .background-color-AB5{background-color:#F7F8FE;} + .d2-3587231517 .color-N1{color:#0A0F25;} + .d2-3587231517 .color-N2{color:#676C7E;} + .d2-3587231517 .color-N3{color:#9499AB;} + .d2-3587231517 .color-N4{color:#CFD2DD;} + .d2-3587231517 .color-N5{color:#DEE1EB;} + .d2-3587231517 .color-N6{color:#EEF1F8;} + .d2-3587231517 .color-N7{color:#FFFFFF;} + .d2-3587231517 .color-B1{color:#0D32B2;} + .d2-3587231517 .color-B2{color:#0D32B2;} + .d2-3587231517 .color-B3{color:#E3E9FD;} + .d2-3587231517 .color-B4{color:#E3E9FD;} + .d2-3587231517 .color-B5{color:#EDF0FD;} + .d2-3587231517 .color-B6{color:#F7F8FE;} + .d2-3587231517 .color-AA2{color:#4A6FF3;} + .d2-3587231517 .color-AA4{color:#EDF0FD;} + .d2-3587231517 .color-AA5{color:#F7F8FE;} + .d2-3587231517 .color-AB4{color:#EDF0FD;} + .d2-3587231517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana @@ -110,10 +110,10 @@ - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json index bf4ed86cf..e6a4ed52f 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json @@ -10,8 +10,8 @@ "x": 184, "y": 373 }, - "width": 513, - "height": 579, + "width": 487, + "height": 585, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -133,8 +133,8 @@ "x": 253, "y": 679 }, - "width": 393, - "height": 218, + "width": 367, + "height": 224, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -175,7 +175,7 @@ ], "pos": { "x": 303, - "y": 729 + "y": 771 }, "width": 54, "height": 82, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 377, - "y": 755 + "y": 758 }, "width": 54, "height": 66, @@ -256,8 +256,8 @@ "id": "s", "type": "rectangle", "pos": { - "x": 387, - "y": 1453 + "x": 381, + "y": 1549 }, "width": 424, "height": 290, @@ -300,8 +300,8 @@ "icon" ], "pos": { - "x": 437, - "y": 1503 + "x": 431, + "y": 1599 }, "width": 151, "height": 190, @@ -354,7 +354,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 786 + "y": 792 }, "width": 152, "height": 166, @@ -395,7 +395,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 836 + "y": 842 }, "width": 52, "height": 66, @@ -435,11 +435,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 255, - "y": 1092 + "x": 245, + "y": 1098 }, "width": 694, - "height": 271, + "height": 361, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -476,8 +476,8 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 305, - "y": 1147 + "x": 295, + "y": 1153 }, "width": 54, "height": 66, @@ -644,8 +644,8 @@ "IconOutsideLeftTop" ], "pos": { - "x": 520, - "y": 729 + "x": 494, + "y": 735 }, "width": 76, "height": 118, @@ -700,11 +700,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 379, - "y": 1147 + "x": 369, + "y": 1153 }, "width": 150, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -744,8 +744,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 429, - "y": 1197 + "x": 419, + "y": 1181 }, "width": 50, "height": 66, @@ -788,8 +788,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 549, - "y": 1247 + "x": 539, + "y": 1343 }, "width": 195, "height": 66, @@ -829,8 +829,8 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 608, - "y": 1508 + "x": 602, + "y": 1604 }, "width": 153, "height": 166, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 658, - "y": 1558 + "x": 652, + "y": 1654 }, "width": 53, "height": 66, @@ -911,8 +911,8 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 487, - "y": 1577 + "x": 481, + "y": 1673 }, "width": 51, "height": 66, @@ -952,8 +952,8 @@ "id": "y", "type": "rectangle", "pos": { - "x": 437, - "y": 1823 + "x": 431, + "y": 1919 }, "width": 151, "height": 166, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 487, - "y": 1873 + "x": 481, + "y": 1969 }, "width": 51, "height": 66, @@ -1152,7 +1152,7 @@ }, { "x": 330.25, - "y": 687 + "y": 729 } ], "animated": false, @@ -1186,27 +1186,27 @@ "route": [ { "x": 404.25, - "y": 821 + "y": 824 }, { "x": 404.25, - "y": 997 + "y": 1003 }, { - "x": 214, - "y": 997 + "x": 204.125, + "y": 1003 }, { - "x": 214, - "y": 1408 + "x": 204.125, + "y": 1504 }, { - "x": 513, - "y": 1408 + "x": 506.5, + "y": 1504 }, { - "x": 513, - "y": 1503 + "x": 506.5, + "y": 1599 } ], "animated": false, @@ -1240,19 +1240,19 @@ "route": [ { "x": 88, - "y": 902 + "y": 908 }, { "x": 88, - "y": 1047 + "y": 1053 }, { - "x": 332, - "y": 1047 + "x": 322.125, + "y": 1053 }, { - "x": 332, - "y": 1147 + "x": 322.125, + "y": 1153 } ], "animated": false, @@ -1298,7 +1298,7 @@ }, { "x": 404.25, - "y": 755 + "y": 758 } ], "animated": false, @@ -1331,20 +1331,20 @@ "labelPercentage": 0, "route": [ { - "x": 523.75, - "y": 847 + "x": 510.75, + "y": 853 }, { - "x": 523.75, - "y": 997 + "x": 510.75, + "y": 1003 }, { - "x": 454, - "y": 997 + "x": 444.125, + "y": 1003 }, { - "x": 454, - "y": 1197 + "x": 444.125, + "y": 1181 } ], "animated": false, @@ -1377,12 +1377,12 @@ "labelPercentage": 0, "route": [ { - "x": 685, - "y": 1313 + "x": 678.5, + "y": 1409 }, { - "x": 685, - "y": 1558 + "x": 678.5, + "y": 1654 } ], "animated": false, @@ -1415,12 +1415,12 @@ "labelPercentage": 0, "route": [ { - "x": 513, - "y": 1693 + "x": 506.5, + "y": 1789 }, { - "x": 513, - "y": 1873 + "x": 506.5, + "y": 1969 } ], "animated": false, @@ -1453,19 +1453,19 @@ "labelPercentage": 0, "route": [ { - "x": 513, - "y": 1939 + "x": 506.5, + "y": 2035 }, { - "x": 513, - "y": 2034 + "x": 506.5, + "y": 2130 }, { - "x": 973.5, - "y": 2034 + "x": 963.625, + "y": 2130 }, { - "x": 973.5, + "x": 963.625, "y": 328 }, { diff --git a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg index e7c1fe517..430a49e11 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - + .d2-2155987667 .fill-N1{fill:#0A0F25;} + .d2-2155987667 .fill-N2{fill:#676C7E;} + .d2-2155987667 .fill-N3{fill:#9499AB;} + .d2-2155987667 .fill-N4{fill:#CFD2DD;} + .d2-2155987667 .fill-N5{fill:#DEE1EB;} + .d2-2155987667 .fill-N6{fill:#EEF1F8;} + .d2-2155987667 .fill-N7{fill:#FFFFFF;} + .d2-2155987667 .fill-B1{fill:#0D32B2;} + .d2-2155987667 .fill-B2{fill:#0D32B2;} + .d2-2155987667 .fill-B3{fill:#E3E9FD;} + .d2-2155987667 .fill-B4{fill:#E3E9FD;} + .d2-2155987667 .fill-B5{fill:#EDF0FD;} + .d2-2155987667 .fill-B6{fill:#F7F8FE;} + .d2-2155987667 .fill-AA2{fill:#4A6FF3;} + .d2-2155987667 .fill-AA4{fill:#EDF0FD;} + .d2-2155987667 .fill-AA5{fill:#F7F8FE;} + .d2-2155987667 .fill-AB4{fill:#EDF0FD;} + .d2-2155987667 .fill-AB5{fill:#F7F8FE;} + .d2-2155987667 .stroke-N1{stroke:#0A0F25;} + .d2-2155987667 .stroke-N2{stroke:#676C7E;} + .d2-2155987667 .stroke-N3{stroke:#9499AB;} + .d2-2155987667 .stroke-N4{stroke:#CFD2DD;} + .d2-2155987667 .stroke-N5{stroke:#DEE1EB;} + .d2-2155987667 .stroke-N6{stroke:#EEF1F8;} + .d2-2155987667 .stroke-N7{stroke:#FFFFFF;} + .d2-2155987667 .stroke-B1{stroke:#0D32B2;} + .d2-2155987667 .stroke-B2{stroke:#0D32B2;} + .d2-2155987667 .stroke-B3{stroke:#E3E9FD;} + .d2-2155987667 .stroke-B4{stroke:#E3E9FD;} + .d2-2155987667 .stroke-B5{stroke:#EDF0FD;} + .d2-2155987667 .stroke-B6{stroke:#F7F8FE;} + .d2-2155987667 .stroke-AA2{stroke:#4A6FF3;} + .d2-2155987667 .stroke-AA4{stroke:#EDF0FD;} + .d2-2155987667 .stroke-AA5{stroke:#F7F8FE;} + .d2-2155987667 .stroke-AB4{stroke:#EDF0FD;} + .d2-2155987667 .stroke-AB5{stroke:#F7F8FE;} + .d2-2155987667 .background-color-N1{background-color:#0A0F25;} + .d2-2155987667 .background-color-N2{background-color:#676C7E;} + .d2-2155987667 .background-color-N3{background-color:#9499AB;} + .d2-2155987667 .background-color-N4{background-color:#CFD2DD;} + .d2-2155987667 .background-color-N5{background-color:#DEE1EB;} + .d2-2155987667 .background-color-N6{background-color:#EEF1F8;} + .d2-2155987667 .background-color-N7{background-color:#FFFFFF;} + .d2-2155987667 .background-color-B1{background-color:#0D32B2;} + .d2-2155987667 .background-color-B2{background-color:#0D32B2;} + .d2-2155987667 .background-color-B3{background-color:#E3E9FD;} + .d2-2155987667 .background-color-B4{background-color:#E3E9FD;} + .d2-2155987667 .background-color-B5{background-color:#EDF0FD;} + .d2-2155987667 .background-color-B6{background-color:#F7F8FE;} + .d2-2155987667 .background-color-AA2{background-color:#4A6FF3;} + .d2-2155987667 .background-color-AA4{background-color:#EDF0FD;} + .d2-2155987667 .background-color-AA5{background-color:#F7F8FE;} + .d2-2155987667 .background-color-AB4{background-color:#EDF0FD;} + .d2-2155987667 .background-color-AB5{background-color:#F7F8FE;} + .d2-2155987667 .color-N1{color:#0A0F25;} + .d2-2155987667 .color-N2{color:#676C7E;} + .d2-2155987667 .color-N3{color:#9499AB;} + .d2-2155987667 .color-N4{color:#CFD2DD;} + .d2-2155987667 .color-N5{color:#DEE1EB;} + .d2-2155987667 .color-N6{color:#EEF1F8;} + .d2-2155987667 .color-N7{color:#FFFFFF;} + .d2-2155987667 .color-B1{color:#0D32B2;} + .d2-2155987667 .color-B2{color:#0D32B2;} + .d2-2155987667 .color-B3{color:#E3E9FD;} + .d2-2155987667 .color-B4{color:#E3E9FD;} + .d2-2155987667 .color-B5{color:#EDF0FD;} + .d2-2155987667 .color-B6{color:#F7F8FE;} + .d2-2155987667 .color-AA2{color:#4A6FF3;} + .d2-2155987667 .color-AA4{color:#EDF0FD;} + .d2-2155987667 .color-AA5{color:#F7F8FE;} + .d2-2155987667 .color-AB4{color:#EDF0FD;} + .d2-2155987667 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + - + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json index b53b2c7b7..b2a164720 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json @@ -1266,12 +1266,12 @@ "y": 451 }, { - "x": 803.4000244140625, - "y": 582.5999755859375 + "x": 801, + "y": 570.4000244140625 }, { - "x": 905, - "y": 1109 + "x": 893, + "y": 1048 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg index 7fa208a55..c12a7e327 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-476290811 .fill-N1{fill:#0A0F25;} + .d2-476290811 .fill-N2{fill:#676C7E;} + .d2-476290811 .fill-N3{fill:#9499AB;} + .d2-476290811 .fill-N4{fill:#CFD2DD;} + .d2-476290811 .fill-N5{fill:#DEE1EB;} + .d2-476290811 .fill-N6{fill:#EEF1F8;} + .d2-476290811 .fill-N7{fill:#FFFFFF;} + .d2-476290811 .fill-B1{fill:#0D32B2;} + .d2-476290811 .fill-B2{fill:#0D32B2;} + .d2-476290811 .fill-B3{fill:#E3E9FD;} + .d2-476290811 .fill-B4{fill:#E3E9FD;} + .d2-476290811 .fill-B5{fill:#EDF0FD;} + .d2-476290811 .fill-B6{fill:#F7F8FE;} + .d2-476290811 .fill-AA2{fill:#4A6FF3;} + .d2-476290811 .fill-AA4{fill:#EDF0FD;} + .d2-476290811 .fill-AA5{fill:#F7F8FE;} + .d2-476290811 .fill-AB4{fill:#EDF0FD;} + .d2-476290811 .fill-AB5{fill:#F7F8FE;} + .d2-476290811 .stroke-N1{stroke:#0A0F25;} + .d2-476290811 .stroke-N2{stroke:#676C7E;} + .d2-476290811 .stroke-N3{stroke:#9499AB;} + .d2-476290811 .stroke-N4{stroke:#CFD2DD;} + .d2-476290811 .stroke-N5{stroke:#DEE1EB;} + .d2-476290811 .stroke-N6{stroke:#EEF1F8;} + .d2-476290811 .stroke-N7{stroke:#FFFFFF;} + .d2-476290811 .stroke-B1{stroke:#0D32B2;} + .d2-476290811 .stroke-B2{stroke:#0D32B2;} + .d2-476290811 .stroke-B3{stroke:#E3E9FD;} + .d2-476290811 .stroke-B4{stroke:#E3E9FD;} + .d2-476290811 .stroke-B5{stroke:#EDF0FD;} + .d2-476290811 .stroke-B6{stroke:#F7F8FE;} + .d2-476290811 .stroke-AA2{stroke:#4A6FF3;} + .d2-476290811 .stroke-AA4{stroke:#EDF0FD;} + .d2-476290811 .stroke-AA5{stroke:#F7F8FE;} + .d2-476290811 .stroke-AB4{stroke:#EDF0FD;} + .d2-476290811 .stroke-AB5{stroke:#F7F8FE;} + .d2-476290811 .background-color-N1{background-color:#0A0F25;} + .d2-476290811 .background-color-N2{background-color:#676C7E;} + .d2-476290811 .background-color-N3{background-color:#9499AB;} + .d2-476290811 .background-color-N4{background-color:#CFD2DD;} + .d2-476290811 .background-color-N5{background-color:#DEE1EB;} + .d2-476290811 .background-color-N6{background-color:#EEF1F8;} + .d2-476290811 .background-color-N7{background-color:#FFFFFF;} + .d2-476290811 .background-color-B1{background-color:#0D32B2;} + .d2-476290811 .background-color-B2{background-color:#0D32B2;} + .d2-476290811 .background-color-B3{background-color:#E3E9FD;} + .d2-476290811 .background-color-B4{background-color:#E3E9FD;} + .d2-476290811 .background-color-B5{background-color:#EDF0FD;} + .d2-476290811 .background-color-B6{background-color:#F7F8FE;} + .d2-476290811 .background-color-AA2{background-color:#4A6FF3;} + .d2-476290811 .background-color-AA4{background-color:#EDF0FD;} + .d2-476290811 .background-color-AA5{background-color:#F7F8FE;} + .d2-476290811 .background-color-AB4{background-color:#EDF0FD;} + .d2-476290811 .background-color-AB5{background-color:#F7F8FE;} + .d2-476290811 .color-N1{color:#0A0F25;} + .d2-476290811 .color-N2{color:#676C7E;} + .d2-476290811 .color-N3{color:#9499AB;} + .d2-476290811 .color-N4{color:#CFD2DD;} + .d2-476290811 .color-N5{color:#DEE1EB;} + .d2-476290811 .color-N6{color:#EEF1F8;} + .d2-476290811 .color-N7{color:#FFFFFF;} + .d2-476290811 .color-B1{color:#0D32B2;} + .d2-476290811 .color-B2{color:#0D32B2;} + .d2-476290811 .color-B3{color:#E3E9FD;} + .d2-476290811 .color-B4{color:#E3E9FD;} + .d2-476290811 .color-B5{color:#EDF0FD;} + .d2-476290811 .color-B6{color:#F7F8FE;} + .d2-476290811 .color-AA2{color:#4A6FF3;} + .d2-476290811 .color-AA4{color:#EDF0FD;} + .d2-476290811 .color-AA5{color:#F7F8FE;} + .d2-476290811 .color-AB4{color:#EDF0FD;} + .d2-476290811 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json index 3cb0c0cf7..a25b67e74 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json @@ -10,8 +10,8 @@ "x": 359, "y": 198 }, - "width": 591, - "height": 513, + "width": 565, + "height": 548, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 409, - "y": 248 + "y": 273 }, "width": 151, "height": 166, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 459, - "y": 298 + "y": 323 }, "width": 51, "height": 66, @@ -131,10 +131,10 @@ "type": "rectangle", "pos": { "x": 650, - "y": 254 + "y": 248 }, - "width": 245, - "height": 406, + "width": 219, + "height": 448, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -175,7 +175,7 @@ ], "pos": { "x": 700, - "y": 304 + "y": 340 }, "width": 54, "height": 82, @@ -215,8 +215,8 @@ "id": "a.f.g", "type": "rectangle", "pos": { - "x": 745, - "y": 406 + "x": 732, + "y": 442 }, "width": 54, "height": 66, @@ -256,8 +256,8 @@ "id": "s", "type": "rectangle", "pos": { - "x": 1630, - "y": 319 + "x": 1604, + "y": 377 }, "width": 258, "height": 476, @@ -300,8 +300,8 @@ "icon" ], "pos": { - "x": 1683, - "y": 369 + "x": 1657, + "y": 427 }, "width": 151, "height": 190, @@ -353,7 +353,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 798, + "x": 772, "y": 12 }, "width": 152, @@ -394,7 +394,7 @@ "id": "k.s", "type": "rectangle", "pos": { - "x": 848, + "x": 822, "y": 62 }, "width": 52, @@ -435,11 +435,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 1090, - "y": 332 + "x": 1064, + "y": 323 }, "width": 450, - "height": 438, + "height": 528, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -476,8 +476,8 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 1145, - "y": 382 + "x": 1119, + "y": 373 }, "width": 54, "height": 66, @@ -518,7 +518,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 321 + "y": 346 }, "width": 257, "height": 266, @@ -559,7 +559,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 371 + "y": 396 }, "width": 152, "height": 166, @@ -600,7 +600,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 421 + "y": 446 }, "width": 52, "height": 66, @@ -644,8 +644,8 @@ "IconOutsideLeftTop" ], "pos": { - "x": 769, - "y": 492 + "x": 743, + "y": 528 }, "width": 76, "height": 118, @@ -700,11 +700,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 1145, - "y": 468 + "x": 1119, + "y": 459 }, "width": 150, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -744,8 +744,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 1195, - "y": 518 + "x": 1169, + "y": 487 }, "width": 50, "height": 66, @@ -788,8 +788,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 1140, - "y": 654 + "x": 1114, + "y": 735 }, "width": 195, "height": 66, @@ -829,8 +829,8 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 1685, - "y": 579 + "x": 1659, + "y": 637 }, "width": 153, "height": 166, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 1735, - "y": 629 + "x": 1709, + "y": 687 }, "width": 53, "height": 66, @@ -911,8 +911,8 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 1733, - "y": 443 + "x": 1707, + "y": 501 }, "width": 51, "height": 66, @@ -952,8 +952,8 @@ "id": "y", "type": "rectangle", "pos": { - "x": 1968, - "y": 381 + "x": 1942, + "y": 439 }, "width": 151, "height": 166, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 2018, - "y": 431 + "x": 1992, + "y": 489 }, "width": 51, "height": 66, @@ -1035,7 +1035,7 @@ "type": "rectangle", "pos": { "x": 414, - "y": 495 + "y": 520 }, "width": 149, "height": 166, @@ -1076,7 +1076,7 @@ "type": "rectangle", "pos": { "x": 464, - "y": 545 + "y": 570 }, "width": 49, "height": 66, @@ -1140,11 +1140,11 @@ "route": [ { "x": 510, - "y": 345.5 + "y": 360 }, { "x": 700, - "y": 345.5 + "y": 360 } ], "animated": false, @@ -1177,28 +1177,28 @@ "labelPercentage": 0, "route": [ { - "x": 799, - "y": 439.5 + "x": 786, + "y": 475 }, { - "x": 995, - "y": 439.5 + "x": 969, + "y": 475 }, { - "x": 995, - "y": 291.5 + "x": 969, + "y": 282 }, { - "x": 1585, - "y": 291.5 + "x": 1559, + "y": 282 }, { - "x": 1585, - "y": 464.5 + "x": 1559, + "y": 522.5 }, { - "x": 1684, - "y": 464.5 + "x": 1658, + "y": 522.5 } ], "animated": false, @@ -1231,20 +1231,20 @@ "labelPercentage": 0, "route": [ { - "x": 900, + "x": 874, "y": 95 }, { - "x": 1045, + "x": 1019, "y": 95 }, { - "x": 1045, - "y": 415.5 + "x": 1019, + "y": 406 }, { - "x": 1145, - "y": 415.5 + "x": 1119, + "y": 406 } ], "animated": false, @@ -1278,19 +1278,11 @@ "route": [ { "x": 164, - "y": 454 + "y": 479 }, { - "x": 605, - "y": 454 - }, - { - "x": 605, - "y": 439.5 - }, - { - "x": 746, - "y": 439.5 + "x": 733, + "y": 479 } ], "animated": false, @@ -1323,12 +1315,12 @@ "labelPercentage": 0, "route": [ { - "x": 845, - "y": 551.5 + "x": 819, + "y": 587 }, { - "x": 1195, - "y": 551.5 + "x": 1169, + "y": 533 } ], "animated": false, @@ -1361,20 +1353,20 @@ "labelPercentage": 0, "route": [ { - "x": 1495, - "y": 687.5 + "x": 1469, + "y": 768 }, { - "x": 1585, - "y": 687.5 + "x": 1559, + "y": 768 }, { - "x": 1585, - "y": 662.5 + "x": 1559, + "y": 720.5 }, { - "x": 1735, - "y": 662.5 + "x": 1709, + "y": 720.5 } ], "animated": false, @@ -1407,12 +1399,12 @@ "labelPercentage": 0, "route": [ { - "x": 1834, - "y": 464.5 + "x": 1808, + "y": 522.5 }, { - "x": 2018, - "y": 464.5 + "x": 1992, + "y": 522.5 } ], "animated": false, @@ -1445,28 +1437,28 @@ "labelPercentage": 0, "route": [ { - "x": 2069, - "y": 464.5 + "x": 2043, + "y": 522.5 }, { - "x": 2164, - "y": 464.5 + "x": 2138, + "y": 522.5 }, { - "x": 2164, - "y": 898.75 + "x": 2138, + "y": 956.5 }, { "x": 314, - "y": 898.75 + "y": 956.5 }, { "x": 314, - "y": 578 + "y": 603 }, { "x": 464, - "y": 578 + "y": 603 } ], "animated": false, diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg index e865643eb..f2bf68dfb 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1511896059 .fill-N1{fill:#0A0F25;} + .d2-1511896059 .fill-N2{fill:#676C7E;} + .d2-1511896059 .fill-N3{fill:#9499AB;} + .d2-1511896059 .fill-N4{fill:#CFD2DD;} + .d2-1511896059 .fill-N5{fill:#DEE1EB;} + .d2-1511896059 .fill-N6{fill:#EEF1F8;} + .d2-1511896059 .fill-N7{fill:#FFFFFF;} + .d2-1511896059 .fill-B1{fill:#0D32B2;} + .d2-1511896059 .fill-B2{fill:#0D32B2;} + .d2-1511896059 .fill-B3{fill:#E3E9FD;} + .d2-1511896059 .fill-B4{fill:#E3E9FD;} + .d2-1511896059 .fill-B5{fill:#EDF0FD;} + .d2-1511896059 .fill-B6{fill:#F7F8FE;} + .d2-1511896059 .fill-AA2{fill:#4A6FF3;} + .d2-1511896059 .fill-AA4{fill:#EDF0FD;} + .d2-1511896059 .fill-AA5{fill:#F7F8FE;} + .d2-1511896059 .fill-AB4{fill:#EDF0FD;} + .d2-1511896059 .fill-AB5{fill:#F7F8FE;} + .d2-1511896059 .stroke-N1{stroke:#0A0F25;} + .d2-1511896059 .stroke-N2{stroke:#676C7E;} + .d2-1511896059 .stroke-N3{stroke:#9499AB;} + .d2-1511896059 .stroke-N4{stroke:#CFD2DD;} + .d2-1511896059 .stroke-N5{stroke:#DEE1EB;} + .d2-1511896059 .stroke-N6{stroke:#EEF1F8;} + .d2-1511896059 .stroke-N7{stroke:#FFFFFF;} + .d2-1511896059 .stroke-B1{stroke:#0D32B2;} + .d2-1511896059 .stroke-B2{stroke:#0D32B2;} + .d2-1511896059 .stroke-B3{stroke:#E3E9FD;} + .d2-1511896059 .stroke-B4{stroke:#E3E9FD;} + .d2-1511896059 .stroke-B5{stroke:#EDF0FD;} + .d2-1511896059 .stroke-B6{stroke:#F7F8FE;} + .d2-1511896059 .stroke-AA2{stroke:#4A6FF3;} + .d2-1511896059 .stroke-AA4{stroke:#EDF0FD;} + .d2-1511896059 .stroke-AA5{stroke:#F7F8FE;} + .d2-1511896059 .stroke-AB4{stroke:#EDF0FD;} + .d2-1511896059 .stroke-AB5{stroke:#F7F8FE;} + .d2-1511896059 .background-color-N1{background-color:#0A0F25;} + .d2-1511896059 .background-color-N2{background-color:#676C7E;} + .d2-1511896059 .background-color-N3{background-color:#9499AB;} + .d2-1511896059 .background-color-N4{background-color:#CFD2DD;} + .d2-1511896059 .background-color-N5{background-color:#DEE1EB;} + .d2-1511896059 .background-color-N6{background-color:#EEF1F8;} + .d2-1511896059 .background-color-N7{background-color:#FFFFFF;} + .d2-1511896059 .background-color-B1{background-color:#0D32B2;} + .d2-1511896059 .background-color-B2{background-color:#0D32B2;} + .d2-1511896059 .background-color-B3{background-color:#E3E9FD;} + .d2-1511896059 .background-color-B4{background-color:#E3E9FD;} + .d2-1511896059 .background-color-B5{background-color:#EDF0FD;} + .d2-1511896059 .background-color-B6{background-color:#F7F8FE;} + .d2-1511896059 .background-color-AA2{background-color:#4A6FF3;} + .d2-1511896059 .background-color-AA4{background-color:#EDF0FD;} + .d2-1511896059 .background-color-AA5{background-color:#F7F8FE;} + .d2-1511896059 .background-color-AB4{background-color:#EDF0FD;} + .d2-1511896059 .background-color-AB5{background-color:#F7F8FE;} + .d2-1511896059 .color-N1{color:#0A0F25;} + .d2-1511896059 .color-N2{color:#676C7E;} + .d2-1511896059 .color-N3{color:#9499AB;} + .d2-1511896059 .color-N4{color:#CFD2DD;} + .d2-1511896059 .color-N5{color:#DEE1EB;} + .d2-1511896059 .color-N6{color:#EEF1F8;} + .d2-1511896059 .color-N7{color:#FFFFFF;} + .d2-1511896059 .color-B1{color:#0D32B2;} + .d2-1511896059 .color-B2{color:#0D32B2;} + .d2-1511896059 .color-B3{color:#E3E9FD;} + .d2-1511896059 .color-B4{color:#E3E9FD;} + .d2-1511896059 .color-B5{color:#EDF0FD;} + .d2-1511896059 .color-B6{color:#F7F8FE;} + .d2-1511896059 .color-AA2{color:#4A6FF3;} + .d2-1511896059 .color-AA4{color:#EDF0FD;} + .d2-1511896059 .color-AA5{color:#F7F8FE;} + .d2-1511896059 .color-AB4{color:#EDF0FD;} + .d2-1511896059 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json b/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json index 5e8ce7f14..a1c51c754 100644 --- a/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 660, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 373, - "y": 384 + "y": 420 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 1227, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 954, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 1234, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 251, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 373, - "y": 1029 + "y": 1065 }, "width": 53, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 947, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 1241, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 653, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 1521, - "y": 384 + "y": 420 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 660, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 667, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 1643, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 954, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 947, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -664,7 +664,7 @@ "type": "rectangle", "pos": { "x": 1234, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 940, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 1241, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -787,7 +787,7 @@ "type": "rectangle", "pos": { "x": 1521, - "y": 1029 + "y": 1065 }, "width": 53, "height": 66, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 667, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 706, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 1000, - "y": 405 + "y": 441 }, "width": 54, "height": 66, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 1574, - "y": 1029 + "y": 1065 }, "width": 54, "height": 66, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 720, - "y": 1352 + "y": 1388 }, "width": 54, "height": 66, @@ -1033,7 +1033,7 @@ "type": "rectangle", "pos": { "x": 993, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -1074,7 +1074,7 @@ "type": "rectangle", "pos": { "x": 1294, - "y": 62 + "y": 98 }, "width": 54, "height": 66, @@ -1115,7 +1115,7 @@ "type": "rectangle", "pos": { "x": 1007, - "y": 62 + "y": 98 }, "width": 54, "height": 66, @@ -1156,7 +1156,7 @@ "type": "rectangle", "pos": { "x": 1280, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -1197,7 +1197,7 @@ "type": "rectangle", "pos": { "x": 1287, - "y": 405 + "y": 441 }, "width": 54, "height": 66, @@ -1238,7 +1238,7 @@ "type": "rectangle", "pos": { "x": 1696, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -1279,7 +1279,7 @@ "type": "rectangle", "pos": { "x": 1287, - "y": 1009 + "y": 1045 }, "width": 54, "height": 66, @@ -1320,7 +1320,7 @@ "type": "rectangle", "pos": { "x": 1007, - "y": 1352 + "y": 1388 }, "width": 54, "height": 66, @@ -1361,7 +1361,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 405 + "y": 441 }, "width": 54, "height": 66, @@ -1402,7 +1402,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 1009 + "y": 1045 }, "width": 54, "height": 66, @@ -1443,7 +1443,7 @@ "type": "rectangle", "pos": { "x": 1000, - "y": 1009 + "y": 1045 }, "width": 54, "height": 66, @@ -1484,7 +1484,7 @@ "type": "rectangle", "pos": { "x": 1294, - "y": 1352 + "y": 1388 }, "width": 54, "height": 66, @@ -1525,7 +1525,7 @@ "type": "rectangle", "pos": { "x": 304, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -1566,7 +1566,7 @@ "type": "rectangle", "pos": { "x": 720, - "y": 62 + "y": 98 }, "width": 54, "height": 66, @@ -1607,7 +1607,7 @@ "type": "rectangle", "pos": { "x": 426, - "y": 384 + "y": 420 }, "width": 54, "height": 66, @@ -1648,7 +1648,7 @@ "type": "rectangle", "pos": { "x": 426, - "y": 1029 + "y": 1065 }, "width": 54, "height": 66, @@ -1689,7 +1689,7 @@ "type": "rectangle", "pos": { "x": 1574, - "y": 384 + "y": 420 }, "width": 54, "height": 66, @@ -1730,7 +1730,7 @@ "type": "rectangle", "pos": { "x": 767, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -1771,7 +1771,7 @@ "type": "rectangle", "pos": { "x": 1047, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -1812,7 +1812,7 @@ "type": "rectangle", "pos": { "x": 1348, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -1853,7 +1853,7 @@ "type": "rectangle", "pos": { "x": 774, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -1894,7 +1894,7 @@ "type": "rectangle", "pos": { "x": 480, - "y": 1029 + "y": 1065 }, "width": 53, "height": 66, @@ -1935,7 +1935,7 @@ "type": "rectangle", "pos": { "x": 480, - "y": 384 + "y": 420 }, "width": 53, "height": 66, @@ -1976,7 +1976,7 @@ "type": "rectangle", "pos": { "x": 358, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -2017,7 +2017,7 @@ "type": "rectangle", "pos": { "x": 1054, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -2058,7 +2058,7 @@ "type": "rectangle", "pos": { "x": 1061, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -2099,7 +2099,7 @@ "type": "rectangle", "pos": { "x": 767, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -2140,7 +2140,7 @@ "type": "rectangle", "pos": { "x": 1341, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -2181,7 +2181,7 @@ "type": "rectangle", "pos": { "x": 1628, - "y": 384 + "y": 420 }, "width": 53, "height": 66, @@ -2222,7 +2222,7 @@ "type": "rectangle", "pos": { "x": 1750, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -2263,7 +2263,7 @@ "type": "rectangle", "pos": { "x": 1341, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -2304,7 +2304,7 @@ "type": "rectangle", "pos": { "x": 1061, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -2345,7 +2345,7 @@ "type": "rectangle", "pos": { "x": 760, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -2386,7 +2386,7 @@ "type": "rectangle", "pos": { "x": 1334, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -2427,7 +2427,7 @@ "type": "rectangle", "pos": { "x": 774, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -2468,7 +2468,7 @@ "type": "rectangle", "pos": { "x": 1348, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -2509,7 +2509,7 @@ "type": "rectangle", "pos": { "x": 1628, - "y": 1029 + "y": 1065 }, "width": 53, "height": 66, @@ -2550,7 +2550,7 @@ "type": "rectangle", "pos": { "x": 1054, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -2591,7 +2591,7 @@ "type": "rectangle", "pos": { "x": 1803, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -2632,7 +2632,7 @@ "type": "rectangle", "pos": { "x": 1394, - "y": 405 + "y": 441 }, "width": 54, "height": 66, @@ -2673,7 +2673,7 @@ "type": "rectangle", "pos": { "x": 1100, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -2714,7 +2714,7 @@ "type": "rectangle", "pos": { "x": 1107, - "y": 405 + "y": 441 }, "width": 54, "height": 66, @@ -2755,7 +2755,7 @@ "type": "rectangle", "pos": { "x": 1401, - "y": 62 + "y": 98 }, "width": 54, "height": 66, @@ -2796,7 +2796,7 @@ "type": "rectangle", "pos": { "x": 1114, - "y": 62 + "y": 98 }, "width": 54, "height": 66, @@ -2837,7 +2837,7 @@ "type": "rectangle", "pos": { "x": 813, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -2878,7 +2878,7 @@ "type": "rectangle", "pos": { "x": 1387, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -2919,7 +2919,7 @@ "type": "rectangle", "pos": { "x": 1394, - "y": 1009 + "y": 1045 }, "width": 54, "height": 66, @@ -2960,7 +2960,7 @@ "type": "rectangle", "pos": { "x": 827, - "y": 1352 + "y": 1388 }, "width": 54, "height": 66, @@ -3001,7 +3001,7 @@ "type": "rectangle", "pos": { "x": 820, - "y": 405 + "y": 441 }, "width": 54, "height": 66, @@ -3042,7 +3042,7 @@ "type": "rectangle", "pos": { "x": 1681, - "y": 1029 + "y": 1065 }, "width": 54, "height": 66, @@ -3083,7 +3083,7 @@ "type": "rectangle", "pos": { "x": 1107, - "y": 1009 + "y": 1045 }, "width": 54, "height": 66, @@ -3124,7 +3124,7 @@ "type": "rectangle", "pos": { "x": 1114, - "y": 1352 + "y": 1388 }, "width": 54, "height": 66, @@ -3165,7 +3165,7 @@ "type": "rectangle", "pos": { "x": 411, - "y": 707 + "y": 743 }, "width": 54, "height": 66, @@ -3206,7 +3206,7 @@ "type": "rectangle", "pos": { "x": 820, - "y": 1009 + "y": 1045 }, "width": 54, "height": 66, @@ -3247,7 +3247,7 @@ "type": "rectangle", "pos": { "x": 827, - "y": 62 + "y": 98 }, "width": 54, "height": 66, @@ -3288,7 +3288,7 @@ "type": "rectangle", "pos": { "x": 533, - "y": 1029 + "y": 1065 }, "width": 54, "height": 66, @@ -3329,7 +3329,7 @@ "type": "rectangle", "pos": { "x": 1681, - "y": 384 + "y": 420 }, "width": 54, "height": 66, @@ -3370,7 +3370,7 @@ "type": "rectangle", "pos": { "x": 533, - "y": 384 + "y": 420 }, "width": 54, "height": 66, @@ -3411,7 +3411,7 @@ "type": "rectangle", "pos": { "x": 1401, - "y": 1352 + "y": 1388 }, "width": 54, "height": 66, @@ -3452,7 +3452,7 @@ "type": "rectangle", "pos": { "x": 1154, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -3493,7 +3493,7 @@ "type": "rectangle", "pos": { "x": 1161, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -3534,7 +3534,7 @@ "type": "rectangle", "pos": { "x": 1735, - "y": 384 + "y": 420 }, "width": 53, "height": 66, @@ -3575,7 +3575,7 @@ "type": "rectangle", "pos": { "x": 1441, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -3616,7 +3616,7 @@ "type": "rectangle", "pos": { "x": 874, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -3657,7 +3657,7 @@ "type": "rectangle", "pos": { "x": 1455, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -3698,7 +3698,7 @@ "type": "rectangle", "pos": { "x": 881, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -3739,7 +3739,7 @@ "type": "rectangle", "pos": { "x": 1857, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -3780,7 +3780,7 @@ "type": "rectangle", "pos": { "x": 587, - "y": 1029 + "y": 1065 }, "width": 53, "height": 66, @@ -3821,7 +3821,7 @@ "type": "rectangle", "pos": { "x": 1168, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -3862,7 +3862,7 @@ "type": "rectangle", "pos": { "x": 587, - "y": 384 + "y": 420 }, "width": 53, "height": 66, @@ -3903,7 +3903,7 @@ "type": "rectangle", "pos": { "x": 881, - "y": 1352 + "y": 1388 }, "width": 53, "height": 66, @@ -3944,7 +3944,7 @@ "type": "rectangle", "pos": { "x": 1168, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -3985,7 +3985,7 @@ "type": "rectangle", "pos": { "x": 874, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -4026,7 +4026,7 @@ "type": "rectangle", "pos": { "x": 465, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -4067,7 +4067,7 @@ "type": "rectangle", "pos": { "x": 1161, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -4108,7 +4108,7 @@ "type": "rectangle", "pos": { "x": 867, - "y": 707 + "y": 743 }, "width": 53, "height": 66, @@ -4149,7 +4149,7 @@ "type": "rectangle", "pos": { "x": 1735, - "y": 1029 + "y": 1065 }, "width": 53, "height": 66, @@ -4190,7 +4190,7 @@ "type": "rectangle", "pos": { "x": 1448, - "y": 405 + "y": 441 }, "width": 53, "height": 66, @@ -4231,7 +4231,7 @@ "type": "rectangle", "pos": { "x": 1448, - "y": 1009 + "y": 1045 }, "width": 53, "height": 66, @@ -4272,7 +4272,7 @@ "type": "rectangle", "pos": { "x": 1455, - "y": 62 + "y": 98 }, "width": 53, "height": 66, @@ -4313,7 +4313,7 @@ "type": "rectangle", "pos": { "x": 1234, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -4354,7 +4354,7 @@ "type": "rectangle", "pos": { "x": 373, - "y": 1095 + "y": 1131 }, "width": 53, "height": 66, @@ -4395,7 +4395,7 @@ "type": "rectangle", "pos": { "x": 1241, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -4436,7 +4436,7 @@ "type": "rectangle", "pos": { "x": 947, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -4477,7 +4477,7 @@ "type": "rectangle", "pos": { "x": 1521, - "y": 1095 + "y": 1131 }, "width": 53, "height": 66, @@ -4518,7 +4518,7 @@ "type": "rectangle", "pos": { "x": 653, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -4559,7 +4559,7 @@ "type": "rectangle", "pos": { "x": 251, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -4600,7 +4600,7 @@ "type": "rectangle", "pos": { "x": 660, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -4641,7 +4641,7 @@ "type": "rectangle", "pos": { "x": 954, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -4682,7 +4682,7 @@ "type": "rectangle", "pos": { "x": 667, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -4723,7 +4723,7 @@ "type": "rectangle", "pos": { "x": 373, - "y": 450 + "y": 486 }, "width": 53, "height": 66, @@ -4764,7 +4764,7 @@ "type": "rectangle", "pos": { "x": 1234, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -4805,7 +4805,7 @@ "type": "rectangle", "pos": { "x": 954, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -4846,7 +4846,7 @@ "type": "rectangle", "pos": { "x": 1643, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -4887,7 +4887,7 @@ "type": "rectangle", "pos": { "x": 947, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -4928,7 +4928,7 @@ "type": "rectangle", "pos": { "x": 667, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -4969,7 +4969,7 @@ "type": "rectangle", "pos": { "x": 940, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -5010,7 +5010,7 @@ "type": "rectangle", "pos": { "x": 1241, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -5051,7 +5051,7 @@ "type": "rectangle", "pos": { "x": 660, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -5092,7 +5092,7 @@ "type": "rectangle", "pos": { "x": 1227, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -5133,7 +5133,7 @@ "type": "rectangle", "pos": { "x": 1521, - "y": 450 + "y": 486 }, "width": 53, "height": 66, @@ -5174,7 +5174,7 @@ "type": "rectangle", "pos": { "x": 426, - "y": 450 + "y": 486 }, "width": 54, "height": 66, @@ -5215,7 +5215,7 @@ "type": "rectangle", "pos": { "x": 426, - "y": 1095 + "y": 1131 }, "width": 54, "height": 66, @@ -5256,7 +5256,7 @@ "type": "rectangle", "pos": { "x": 1294, - "y": 1418 + "y": 1454 }, "width": 54, "height": 66, @@ -5297,7 +5297,7 @@ "type": "rectangle", "pos": { "x": 1574, - "y": 450 + "y": 486 }, "width": 54, "height": 66, @@ -5338,7 +5338,7 @@ "type": "rectangle", "pos": { "x": 1007, - "y": 1418 + "y": 1454 }, "width": 54, "height": 66, @@ -5379,7 +5379,7 @@ "type": "rectangle", "pos": { "x": 720, - "y": 128 + "y": 164 }, "width": 54, "height": 66, @@ -5420,7 +5420,7 @@ "type": "rectangle", "pos": { "x": 720, - "y": 1418 + "y": 1454 }, "width": 54, "height": 66, @@ -5461,7 +5461,7 @@ "type": "rectangle", "pos": { "x": 1280, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -5502,7 +5502,7 @@ "type": "rectangle", "pos": { "x": 1287, - "y": 471 + "y": 507 }, "width": 54, "height": 66, @@ -5543,7 +5543,7 @@ "type": "rectangle", "pos": { "x": 1007, - "y": 128 + "y": 164 }, "width": 54, "height": 66, @@ -5584,7 +5584,7 @@ "type": "rectangle", "pos": { "x": 1574, - "y": 1095 + "y": 1131 }, "width": 54, "height": 66, @@ -5625,7 +5625,7 @@ "type": "rectangle", "pos": { "x": 304, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -5666,7 +5666,7 @@ "type": "rectangle", "pos": { "x": 1287, - "y": 1075 + "y": 1111 }, "width": 54, "height": 66, @@ -5707,7 +5707,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 471 + "y": 507 }, "width": 54, "height": 66, @@ -5748,7 +5748,7 @@ "type": "rectangle", "pos": { "x": 1294, - "y": 128 + "y": 164 }, "width": 54, "height": 66, @@ -5789,7 +5789,7 @@ "type": "rectangle", "pos": { "x": 993, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -5830,7 +5830,7 @@ "type": "rectangle", "pos": { "x": 1000, - "y": 1075 + "y": 1111 }, "width": 54, "height": 66, @@ -5871,7 +5871,7 @@ "type": "rectangle", "pos": { "x": 1000, - "y": 471 + "y": 507 }, "width": 54, "height": 66, @@ -5912,7 +5912,7 @@ "type": "rectangle", "pos": { "x": 1696, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -5953,7 +5953,7 @@ "type": "rectangle", "pos": { "x": 706, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -5994,7 +5994,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 1075 + "y": 1111 }, "width": 54, "height": 66, @@ -6035,7 +6035,7 @@ "type": "rectangle", "pos": { "x": 1348, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -6076,7 +6076,7 @@ "type": "rectangle", "pos": { "x": 767, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -6117,7 +6117,7 @@ "type": "rectangle", "pos": { "x": 1341, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -6158,7 +6158,7 @@ "type": "rectangle", "pos": { "x": 1341, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -6199,7 +6199,7 @@ "type": "rectangle", "pos": { "x": 1334, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -6240,7 +6240,7 @@ "type": "rectangle", "pos": { "x": 774, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -6281,7 +6281,7 @@ "type": "rectangle", "pos": { "x": 480, - "y": 450 + "y": 486 }, "width": 53, "height": 66, @@ -6322,7 +6322,7 @@ "type": "rectangle", "pos": { "x": 1054, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -6363,7 +6363,7 @@ "type": "rectangle", "pos": { "x": 1047, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -6404,7 +6404,7 @@ "type": "rectangle", "pos": { "x": 1061, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -6445,7 +6445,7 @@ "type": "rectangle", "pos": { "x": 480, - "y": 1095 + "y": 1131 }, "width": 53, "height": 66, @@ -6486,7 +6486,7 @@ "type": "rectangle", "pos": { "x": 767, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -6527,7 +6527,7 @@ "type": "rectangle", "pos": { "x": 1054, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -6568,7 +6568,7 @@ "type": "rectangle", "pos": { "x": 1348, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -6609,7 +6609,7 @@ "type": "rectangle", "pos": { "x": 774, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -6650,7 +6650,7 @@ "type": "rectangle", "pos": { "x": 1628, - "y": 450 + "y": 486 }, "width": 53, "height": 66, @@ -6691,7 +6691,7 @@ "type": "rectangle", "pos": { "x": 1750, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -6732,7 +6732,7 @@ "type": "rectangle", "pos": { "x": 1061, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -6773,7 +6773,7 @@ "type": "rectangle", "pos": { "x": 358, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -6814,7 +6814,7 @@ "type": "rectangle", "pos": { "x": 760, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -6855,7 +6855,7 @@ "type": "rectangle", "pos": { "x": 1628, - "y": 1095 + "y": 1131 }, "width": 53, "height": 66, @@ -6896,7 +6896,7 @@ "type": "rectangle", "pos": { "x": 533, - "y": 1095 + "y": 1131 }, "width": 54, "height": 66, @@ -6937,7 +6937,7 @@ "type": "rectangle", "pos": { "x": 1100, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -6978,7 +6978,7 @@ "type": "rectangle", "pos": { "x": 1681, - "y": 1095 + "y": 1131 }, "width": 54, "height": 66, @@ -7019,7 +7019,7 @@ "type": "rectangle", "pos": { "x": 1803, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -7060,7 +7060,7 @@ "type": "rectangle", "pos": { "x": 813, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -7101,7 +7101,7 @@ "type": "rectangle", "pos": { "x": 1114, - "y": 1418 + "y": 1454 }, "width": 54, "height": 66, @@ -7142,7 +7142,7 @@ "type": "rectangle", "pos": { "x": 1681, - "y": 450 + "y": 486 }, "width": 54, "height": 66, @@ -7183,7 +7183,7 @@ "type": "rectangle", "pos": { "x": 1401, - "y": 128 + "y": 164 }, "width": 54, "height": 66, @@ -7224,7 +7224,7 @@ "type": "rectangle", "pos": { "x": 827, - "y": 1418 + "y": 1454 }, "width": 54, "height": 66, @@ -7265,7 +7265,7 @@ "type": "rectangle", "pos": { "x": 1394, - "y": 471 + "y": 507 }, "width": 54, "height": 66, @@ -7306,7 +7306,7 @@ "type": "rectangle", "pos": { "x": 1114, - "y": 128 + "y": 164 }, "width": 54, "height": 66, @@ -7347,7 +7347,7 @@ "type": "rectangle", "pos": { "x": 820, - "y": 1075 + "y": 1111 }, "width": 54, "height": 66, @@ -7388,7 +7388,7 @@ "type": "rectangle", "pos": { "x": 1107, - "y": 1075 + "y": 1111 }, "width": 54, "height": 66, @@ -7429,7 +7429,7 @@ "type": "rectangle", "pos": { "x": 827, - "y": 128 + "y": 164 }, "width": 54, "height": 66, @@ -7470,7 +7470,7 @@ "type": "rectangle", "pos": { "x": 1387, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -7511,7 +7511,7 @@ "type": "rectangle", "pos": { "x": 820, - "y": 471 + "y": 507 }, "width": 54, "height": 66, @@ -7552,7 +7552,7 @@ "type": "rectangle", "pos": { "x": 1107, - "y": 471 + "y": 507 }, "width": 54, "height": 66, @@ -7593,7 +7593,7 @@ "type": "rectangle", "pos": { "x": 1394, - "y": 1075 + "y": 1111 }, "width": 54, "height": 66, @@ -7634,7 +7634,7 @@ "type": "rectangle", "pos": { "x": 533, - "y": 450 + "y": 486 }, "width": 54, "height": 66, @@ -7675,7 +7675,7 @@ "type": "rectangle", "pos": { "x": 1401, - "y": 1418 + "y": 1454 }, "width": 54, "height": 66, @@ -7716,7 +7716,7 @@ "type": "rectangle", "pos": { "x": 411, - "y": 773 + "y": 809 }, "width": 54, "height": 66, @@ -7757,7 +7757,7 @@ "type": "rectangle", "pos": { "x": 1161, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -7798,7 +7798,7 @@ "type": "rectangle", "pos": { "x": 1441, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -7839,7 +7839,7 @@ "type": "rectangle", "pos": { "x": 1154, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -7880,7 +7880,7 @@ "type": "rectangle", "pos": { "x": 1448, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -7921,7 +7921,7 @@ "type": "rectangle", "pos": { "x": 1161, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -7962,7 +7962,7 @@ "type": "rectangle", "pos": { "x": 881, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -8003,7 +8003,7 @@ "type": "rectangle", "pos": { "x": 1168, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -8044,7 +8044,7 @@ "type": "rectangle", "pos": { "x": 1448, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -8085,7 +8085,7 @@ "type": "rectangle", "pos": { "x": 1455, - "y": 128 + "y": 164 }, "width": 53, "height": 66, @@ -8126,7 +8126,7 @@ "type": "rectangle", "pos": { "x": 1168, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -8167,7 +8167,7 @@ "type": "rectangle", "pos": { "x": 881, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -8208,7 +8208,7 @@ "type": "rectangle", "pos": { "x": 465, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -8249,7 +8249,7 @@ "type": "rectangle", "pos": { "x": 1735, - "y": 450 + "y": 486 }, "width": 53, "height": 66, @@ -8290,7 +8290,7 @@ "type": "rectangle", "pos": { "x": 874, - "y": 1075 + "y": 1111 }, "width": 53, "height": 66, @@ -8331,7 +8331,7 @@ "type": "rectangle", "pos": { "x": 1735, - "y": 1095 + "y": 1131 }, "width": 53, "height": 66, @@ -8372,7 +8372,7 @@ "type": "rectangle", "pos": { "x": 867, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -8413,7 +8413,7 @@ "type": "rectangle", "pos": { "x": 874, - "y": 471 + "y": 507 }, "width": 53, "height": 66, @@ -8454,7 +8454,7 @@ "type": "rectangle", "pos": { "x": 587, - "y": 1095 + "y": 1131 }, "width": 53, "height": 66, @@ -8495,7 +8495,7 @@ "type": "rectangle", "pos": { "x": 1857, - "y": 773 + "y": 809 }, "width": 53, "height": 66, @@ -8536,7 +8536,7 @@ "type": "rectangle", "pos": { "x": 587, - "y": 450 + "y": 486 }, "width": 53, "height": 66, @@ -8577,7 +8577,7 @@ "type": "rectangle", "pos": { "x": 1455, - "y": 1418 + "y": 1454 }, "width": 53, "height": 66, @@ -8621,7 +8621,7 @@ "y": 12 }, "width": 1181, - "height": 232, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8658,7 +8658,7 @@ "type": "rectangle", "pos": { "x": 163, - "y": 314 + "y": 350 }, "width": 1849, "height": 273, @@ -8698,7 +8698,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 657 + "y": 693 }, "width": 2151, "height": 232, @@ -8738,7 +8738,7 @@ "type": "rectangle", "pos": { "x": 126, - "y": 959 + "y": 995 }, "width": 1923, "height": 273, @@ -8778,10 +8778,10 @@ "type": "rectangle", "pos": { "x": 497, - "y": 1302 + "y": 1338 }, "width": 1181, - "height": 232, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -8818,7 +8818,7 @@ "type": "rectangle", "pos": { "x": 547, - "y": 78 + "y": 96 }, "width": 100, "height": 100, @@ -8858,7 +8858,7 @@ "type": "rectangle", "pos": { "x": 667, - "y": 62 + "y": 98 }, "width": 267, "height": 132, @@ -8899,7 +8899,7 @@ "type": "rectangle", "pos": { "x": 954, - "y": 62 + "y": 98 }, "width": 267, "height": 132, @@ -8940,7 +8940,7 @@ "type": "rectangle", "pos": { "x": 1241, - "y": 62 + "y": 98 }, "width": 267, "height": 132, @@ -8981,7 +8981,7 @@ "type": "rectangle", "pos": { "x": 1528, - "y": 78 + "y": 96 }, "width": 100, "height": 100, @@ -9021,7 +9021,7 @@ "type": "rectangle", "pos": { "x": 373, - "y": 384 + "y": 420 }, "width": 267, "height": 132, @@ -9062,7 +9062,7 @@ "type": "rectangle", "pos": { "x": 660, - "y": 364 + "y": 400 }, "width": 267, "height": 173, @@ -9103,7 +9103,7 @@ "type": "rectangle", "pos": { "x": 947, - "y": 364 + "y": 400 }, "width": 267, "height": 173, @@ -9144,7 +9144,7 @@ "type": "rectangle", "pos": { "x": 1234, - "y": 364 + "y": 400 }, "width": 267, "height": 173, @@ -9185,7 +9185,7 @@ "type": "rectangle", "pos": { "x": 1521, - "y": 384 + "y": 420 }, "width": 267, "height": 132, @@ -9226,7 +9226,7 @@ "type": "rectangle", "pos": { "x": 251, - "y": 707 + "y": 743 }, "width": 267, "height": 132, @@ -9267,7 +9267,7 @@ "type": "rectangle", "pos": { "x": 538, - "y": 707 + "y": 743 }, "width": 382, "height": 132, @@ -9308,7 +9308,7 @@ "type": "rectangle", "pos": { "x": 940, - "y": 707 + "y": 743 }, "width": 267, "height": 132, @@ -9349,7 +9349,7 @@ "type": "rectangle", "pos": { "x": 1227, - "y": 707 + "y": 743 }, "width": 396, "height": 132, @@ -9390,7 +9390,7 @@ "type": "rectangle", "pos": { "x": 1643, - "y": 707 + "y": 743 }, "width": 267, "height": 132, @@ -9431,7 +9431,7 @@ "type": "rectangle", "pos": { "x": 373, - "y": 1029 + "y": 1065 }, "width": 267, "height": 132, @@ -9472,7 +9472,7 @@ "type": "rectangle", "pos": { "x": 660, - "y": 1009 + "y": 1045 }, "width": 267, "height": 173, @@ -9513,7 +9513,7 @@ "type": "rectangle", "pos": { "x": 947, - "y": 1009 + "y": 1045 }, "width": 267, "height": 173, @@ -9554,7 +9554,7 @@ "type": "rectangle", "pos": { "x": 1234, - "y": 1009 + "y": 1045 }, "width": 267, "height": 173, @@ -9595,7 +9595,7 @@ "type": "rectangle", "pos": { "x": 1521, - "y": 1029 + "y": 1065 }, "width": 267, "height": 132, @@ -9636,7 +9636,7 @@ "type": "rectangle", "pos": { "x": 547, - "y": 1368 + "y": 1422 }, "width": 100, "height": 100, @@ -9676,7 +9676,7 @@ "type": "rectangle", "pos": { "x": 667, - "y": 1352 + "y": 1388 }, "width": 267, "height": 132, @@ -9717,7 +9717,7 @@ "type": "rectangle", "pos": { "x": 954, - "y": 1352 + "y": 1388 }, "width": 267, "height": 132, @@ -9758,7 +9758,7 @@ "type": "rectangle", "pos": { "x": 1241, - "y": 1352 + "y": 1388 }, "width": 267, "height": 132, @@ -9799,7 +9799,7 @@ "type": "rectangle", "pos": { "x": 1528, - "y": 1368 + "y": 1422 }, "width": 100, "height": 100, @@ -9862,11 +9862,11 @@ "route": [ { "x": 1087.5, - "y": 244 + "y": 280 }, { "x": 1087.5, - "y": 314 + "y": 350 } ], "animated": false, @@ -9900,11 +9900,11 @@ "route": [ { "x": 1087.5, - "y": 587 + "y": 623 }, { "x": 1087.5, - "y": 657 + "y": 693 } ], "animated": false, @@ -9938,11 +9938,11 @@ "route": [ { "x": 1087.5, - "y": 889 + "y": 925 }, { "x": 1087.5, - "y": 959 + "y": 995 } ], "animated": false, @@ -9976,11 +9976,11 @@ "route": [ { "x": 1087.5, - "y": 1232 + "y": 1268 }, { "x": 1087.5, - "y": 1302 + "y": 1338 } ], "animated": false, diff --git a/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg index e267aa25b..895af5ee1 100644 --- a/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccdddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeefffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhiiiiiiiiiiiiiiiiiiiiijjjjjjjjjjjjjjjjjjjjj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1511710467 .fill-N1{fill:#0A0F25;} + .d2-1511710467 .fill-N2{fill:#676C7E;} + .d2-1511710467 .fill-N3{fill:#9499AB;} + .d2-1511710467 .fill-N4{fill:#CFD2DD;} + .d2-1511710467 .fill-N5{fill:#DEE1EB;} + .d2-1511710467 .fill-N6{fill:#EEF1F8;} + .d2-1511710467 .fill-N7{fill:#FFFFFF;} + .d2-1511710467 .fill-B1{fill:#0D32B2;} + .d2-1511710467 .fill-B2{fill:#0D32B2;} + .d2-1511710467 .fill-B3{fill:#E3E9FD;} + .d2-1511710467 .fill-B4{fill:#E3E9FD;} + .d2-1511710467 .fill-B5{fill:#EDF0FD;} + .d2-1511710467 .fill-B6{fill:#F7F8FE;} + .d2-1511710467 .fill-AA2{fill:#4A6FF3;} + .d2-1511710467 .fill-AA4{fill:#EDF0FD;} + .d2-1511710467 .fill-AA5{fill:#F7F8FE;} + .d2-1511710467 .fill-AB4{fill:#EDF0FD;} + .d2-1511710467 .fill-AB5{fill:#F7F8FE;} + .d2-1511710467 .stroke-N1{stroke:#0A0F25;} + .d2-1511710467 .stroke-N2{stroke:#676C7E;} + .d2-1511710467 .stroke-N3{stroke:#9499AB;} + .d2-1511710467 .stroke-N4{stroke:#CFD2DD;} + .d2-1511710467 .stroke-N5{stroke:#DEE1EB;} + .d2-1511710467 .stroke-N6{stroke:#EEF1F8;} + .d2-1511710467 .stroke-N7{stroke:#FFFFFF;} + .d2-1511710467 .stroke-B1{stroke:#0D32B2;} + .d2-1511710467 .stroke-B2{stroke:#0D32B2;} + .d2-1511710467 .stroke-B3{stroke:#E3E9FD;} + .d2-1511710467 .stroke-B4{stroke:#E3E9FD;} + .d2-1511710467 .stroke-B5{stroke:#EDF0FD;} + .d2-1511710467 .stroke-B6{stroke:#F7F8FE;} + .d2-1511710467 .stroke-AA2{stroke:#4A6FF3;} + .d2-1511710467 .stroke-AA4{stroke:#EDF0FD;} + .d2-1511710467 .stroke-AA5{stroke:#F7F8FE;} + .d2-1511710467 .stroke-AB4{stroke:#EDF0FD;} + .d2-1511710467 .stroke-AB5{stroke:#F7F8FE;} + .d2-1511710467 .background-color-N1{background-color:#0A0F25;} + .d2-1511710467 .background-color-N2{background-color:#676C7E;} + .d2-1511710467 .background-color-N3{background-color:#9499AB;} + .d2-1511710467 .background-color-N4{background-color:#CFD2DD;} + .d2-1511710467 .background-color-N5{background-color:#DEE1EB;} + .d2-1511710467 .background-color-N6{background-color:#EEF1F8;} + .d2-1511710467 .background-color-N7{background-color:#FFFFFF;} + .d2-1511710467 .background-color-B1{background-color:#0D32B2;} + .d2-1511710467 .background-color-B2{background-color:#0D32B2;} + .d2-1511710467 .background-color-B3{background-color:#E3E9FD;} + .d2-1511710467 .background-color-B4{background-color:#E3E9FD;} + .d2-1511710467 .background-color-B5{background-color:#EDF0FD;} + .d2-1511710467 .background-color-B6{background-color:#F7F8FE;} + .d2-1511710467 .background-color-AA2{background-color:#4A6FF3;} + .d2-1511710467 .background-color-AA4{background-color:#EDF0FD;} + .d2-1511710467 .background-color-AA5{background-color:#F7F8FE;} + .d2-1511710467 .background-color-AB4{background-color:#EDF0FD;} + .d2-1511710467 .background-color-AB5{background-color:#F7F8FE;} + .d2-1511710467 .color-N1{color:#0A0F25;} + .d2-1511710467 .color-N2{color:#676C7E;} + .d2-1511710467 .color-N3{color:#9499AB;} + .d2-1511710467 .color-N4{color:#CFD2DD;} + .d2-1511710467 .color-N5{color:#DEE1EB;} + .d2-1511710467 .color-N6{color:#EEF1F8;} + .d2-1511710467 .color-N7{color:#FFFFFF;} + .d2-1511710467 .color-B1{color:#0D32B2;} + .d2-1511710467 .color-B2{color:#0D32B2;} + .d2-1511710467 .color-B3{color:#E3E9FD;} + .d2-1511710467 .color-B4{color:#E3E9FD;} + .d2-1511710467 .color-B5{color:#EDF0FD;} + .d2-1511710467 .color-B6{color:#F7F8FE;} + .d2-1511710467 .color-AA2{color:#4A6FF3;} + .d2-1511710467 .color-AA4{color:#EDF0FD;} + .d2-1511710467 .color-AA5{color:#F7F8FE;} + .d2-1511710467 .color-AB4{color:#EDF0FD;} + .d2-1511710467 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccdddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeefffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhiiiiiiiiiiiiiiiiiiiiijjjjjjjjjjjjjjjjjjjjj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json b/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json index 5ace04c9d..21f554c1e 100644 --- a/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json @@ -10,8 +10,8 @@ "x": 12, "y": 12 }, - "width": 1333, - "height": 536, + "width": 1323, + "height": 521, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -133,7 +133,7 @@ "y": 265 }, "width": 370, - "height": 119, + "height": 104, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -170,8 +170,8 @@ "id": "container.braket plugin.ex", "type": "text", "pos": { - "x": 109, - "y": 315 + "x": 102, + "y": 307 }, "width": 37, "height": 19, @@ -211,7 +211,7 @@ "type": "rectangle", "pos": { "x": 32, - "y": 404 + "y": 389 }, "width": 385, "height": 124, @@ -252,7 +252,7 @@ "type": "text", "pos": { "x": 82, - "y": 454 + "y": 439 }, "width": 104, "height": 24, @@ -294,7 +294,7 @@ "x": 437, "y": 58 }, - "width": 295, + "width": 285, "height": 148, "opacity": 1, "strokeDash": 0, @@ -387,8 +387,8 @@ "x": 437, "y": 226 }, - "width": 364, - "height": 139, + "width": 354, + "height": 133, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -466,10 +466,10 @@ "type": "rectangle", "pos": { "x": 437, - "y": 395 + "y": 389 }, - "width": 354, - "height": 132, + "width": 344, + "height": 123, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -506,8 +506,8 @@ "id": "container.mhchem plugin.ex", "type": "text", "pos": { - "x": 487, - "y": 445 + "x": 482, + "y": 434 }, "width": 254, "height": 18, @@ -546,11 +546,11 @@ "id": "container.physics plugin", "type": "rectangle", "pos": { - "x": 821, + "x": 811, "y": 58 }, "width": 504, - "height": 135, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -587,7 +587,7 @@ "id": "container.physics plugin.ex", "type": "text", "pos": { - "x": 871, + "x": 861, "y": 108 }, "width": 128, @@ -627,8 +627,8 @@ "id": "container.multilines", "type": "rectangle", "pos": { - "x": 821, - "y": 213 + "x": 811, + "y": 204 }, "width": 504, "height": 152, @@ -668,8 +668,8 @@ "id": "container.multilines.ex", "type": "text", "pos": { - "x": 871, - "y": 263 + "x": 861, + "y": 254 }, "width": 404, "height": 52, @@ -708,11 +708,11 @@ "id": "container.asm", "type": "rectangle", "pos": { - "x": 821, - "y": 385 + "x": 811, + "y": 376 }, "width": 504, - "height": 142, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -749,8 +749,8 @@ "id": "container.asm.ex", "type": "text", "pos": { - "x": 871, - "y": 435 + "x": 861, + "y": 426 }, "width": 62, "height": 32, diff --git a/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg index 76ce61937..432c3eb75 100644 --- a/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -___________________________________container____________________________________amscd plugin - -braket plugincancel plugincolor plugingensymb pluginmhchem pluginphysics pluginmultilinesasmµ - - +___________________________________container____________________________________amscd plugin + +braket plugincancel plugincolor plugingensymb pluginmhchem pluginphysics pluginmultilinesasmµ + + - - - - - - - + + + + + + + - - + + - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/elk/board.exp.json b/e2etests/testdata/stable/icon_positions/elk/board.exp.json index 46b4d3c17..c5c6db1aa 100644 --- a/e2etests/testdata/stable/icon_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/icon_positions/elk/board.exp.json @@ -7,11 +7,11 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 818, + "x": 833, "y": 12 }, - "width": 5243, - "height": 266, + "width": 5213, + "height": 282, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -51,8 +51,8 @@ "icon" ], "pos": { - "x": 868, - "y": 86 + "x": 883, + "y": 94 }, "width": 122, "height": 118, @@ -108,8 +108,8 @@ "OutsideTopLeft" ], "pos": { - "x": 1010, - "y": 86 + "x": 1025, + "y": 126 }, "width": 182, "height": 118, @@ -165,8 +165,8 @@ "OutsideTopCenter" ], "pos": { - "x": 1212, - "y": 86 + "x": 1227, + "y": 126 }, "width": 202, "height": 118, @@ -222,8 +222,8 @@ "OutsideTopRight" ], "pos": { - "x": 1434, - "y": 86 + "x": 1449, + "y": 126 }, "width": 191, "height": 118, @@ -279,8 +279,8 @@ "OutsideLeftTop" ], "pos": { - "x": 1714, - "y": 86 + "x": 1724, + "y": 94 }, "width": 182, "height": 118, @@ -336,8 +336,8 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1985, - "y": 86 + "x": 1990, + "y": 94 }, "width": 202, "height": 118, @@ -394,7 +394,7 @@ ], "pos": { "x": 2276, - "y": 86 + "y": 94 }, "width": 207, "height": 118, @@ -451,7 +451,7 @@ ], "pos": { "x": 2503, - "y": 86 + "y": 94 }, "width": 191, "height": 118, @@ -507,8 +507,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 2783, - "y": 86 + "x": 2778, + "y": 94 }, "width": 212, "height": 118, @@ -564,8 +564,8 @@ "OutsideRightBottom" ], "pos": { - "x": 3084, - "y": 86 + "x": 3074, + "y": 94 }, "width": 217, "height": 118, @@ -621,8 +621,8 @@ "OutsideBottomLeft" ], "pos": { - "x": 3390, - "y": 86 + "x": 3375, + "y": 62 }, "width": 208, "height": 118, @@ -678,8 +678,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 3618, - "y": 86 + "x": 3603, + "y": 62 }, "width": 228, "height": 118, @@ -735,8 +735,8 @@ "OutsideBottomRight" ], "pos": { - "x": 3866, - "y": 86 + "x": 3851, + "y": 62 }, "width": 218, "height": 118, @@ -792,8 +792,8 @@ "InsideTopLeft" ], "pos": { - "x": 4104, - "y": 86 + "x": 4089, + "y": 94 }, "width": 168, "height": 118, @@ -849,8 +849,8 @@ "InsideTopCenter" ], "pos": { - "x": 4292, - "y": 86 + "x": 4277, + "y": 94 }, "width": 189, "height": 118, @@ -906,8 +906,8 @@ "InsideTopRight" ], "pos": { - "x": 4501, - "y": 86 + "x": 4486, + "y": 94 }, "width": 178, "height": 118, @@ -963,8 +963,8 @@ "InsideMiddleLeft" ], "pos": { - "x": 4699, - "y": 86 + "x": 4684, + "y": 94 }, "width": 189, "height": 118, @@ -1020,8 +1020,8 @@ "InsideMiddleCenter" ], "pos": { - "x": 4908, - "y": 86 + "x": 4893, + "y": 94 }, "width": 209, "height": 118, @@ -1077,8 +1077,8 @@ "InsideMiddleRight" ], "pos": { - "x": 5137, - "y": 86 + "x": 5122, + "y": 94 }, "width": 199, "height": 118, @@ -1134,8 +1134,8 @@ "InsideBottomLeft" ], "pos": { - "x": 5356, - "y": 86 + "x": 5341, + "y": 94 }, "width": 195, "height": 118, @@ -1191,8 +1191,8 @@ "InsideBottomCenter" ], "pos": { - "x": 5571, - "y": 86 + "x": 5556, + "y": 94 }, "width": 215, "height": 118, @@ -1248,8 +1248,8 @@ "InsideBottomRight" ], "pos": { - "x": 5806, - "y": 86 + "x": 5791, + "y": 94 }, "width": 205, "height": 118, @@ -1302,10 +1302,10 @@ "type": "rectangle", "pos": { "x": 12, - "y": 348 + "y": 364 }, "width": 6855, - "height": 338, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1346,7 +1346,7 @@ ], "pos": { "x": 62, - "y": 422 + "y": 427 }, "width": 196, "height": 190, @@ -1399,7 +1399,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 496 + "y": 501 }, "width": 96, "height": 66, @@ -1444,10 +1444,10 @@ ], "pos": { "x": 278, - "y": 434 + "y": 483 }, "width": 256, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1501,10 +1501,10 @@ ], "pos": { "x": 554, - "y": 434 + "y": 483 }, "width": 276, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1558,10 +1558,10 @@ ], "pos": { "x": 850, - "y": 434 + "y": 483 }, "width": 265, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1615,7 +1615,7 @@ ], "pos": { "x": 1204, - "y": 434 + "y": 439 }, "width": 236, "height": 166, @@ -1672,7 +1672,7 @@ ], "pos": { "x": 1529, - "y": 434 + "y": 439 }, "width": 265, "height": 166, @@ -1729,7 +1729,7 @@ ], "pos": { "x": 1883, - "y": 434 + "y": 439 }, "width": 273, "height": 166, @@ -1786,7 +1786,7 @@ ], "pos": { "x": 2176, - "y": 434 + "y": 439 }, "width": 250, "height": 166, @@ -1843,7 +1843,7 @@ ], "pos": { "x": 2515, - "y": 434 + "y": 439 }, "width": 279, "height": 166, @@ -1900,7 +1900,7 @@ ], "pos": { "x": 2883, - "y": 434 + "y": 439 }, "width": 287, "height": 166, @@ -1957,10 +1957,10 @@ ], "pos": { "x": 3259, - "y": 434 + "y": 414 }, "width": 282, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2014,10 +2014,10 @@ ], "pos": { "x": 3561, - "y": 434 + "y": 414 }, "width": 303, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2071,10 +2071,10 @@ ], "pos": { "x": 3884, - "y": 434 + "y": 414 }, "width": 292, - "height": 166, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2128,7 +2128,7 @@ ], "pos": { "x": 4196, - "y": 422 + "y": 427 }, "width": 242, "height": 190, @@ -2185,7 +2185,7 @@ ], "pos": { "x": 4458, - "y": 422 + "y": 427 }, "width": 263, "height": 190, @@ -2242,7 +2242,7 @@ ], "pos": { "x": 4741, - "y": 422 + "y": 427 }, "width": 252, "height": 190, @@ -2299,7 +2299,7 @@ ], "pos": { "x": 5013, - "y": 434 + "y": 439 }, "width": 287, "height": 166, @@ -2356,7 +2356,7 @@ ], "pos": { "x": 5320, - "y": 434 + "y": 439 }, "width": 283, "height": 166, @@ -2413,7 +2413,7 @@ ], "pos": { "x": 5623, - "y": 434 + "y": 439 }, "width": 297, "height": 166, @@ -2470,7 +2470,7 @@ ], "pos": { "x": 5940, - "y": 422 + "y": 427 }, "width": 269, "height": 190, @@ -2527,7 +2527,7 @@ ], "pos": { "x": 6229, - "y": 422 + "y": 427 }, "width": 289, "height": 190, @@ -2584,7 +2584,7 @@ ], "pos": { "x": 6538, - "y": 422 + "y": 427 }, "width": 279, "height": 190, @@ -2637,7 +2637,7 @@ "type": "rectangle", "pos": { "x": 328, - "y": 484 + "y": 524 }, "width": 156, "height": 66, @@ -2678,7 +2678,7 @@ "type": "rectangle", "pos": { "x": 604, - "y": 484 + "y": 524 }, "width": 176, "height": 66, @@ -2719,7 +2719,7 @@ "type": "rectangle", "pos": { "x": 900, - "y": 484 + "y": 524 }, "width": 165, "height": 66, @@ -2760,7 +2760,7 @@ "type": "rectangle", "pos": { "x": 1244, - "y": 484 + "y": 489 }, "width": 156, "height": 66, @@ -2801,7 +2801,7 @@ "type": "rectangle", "pos": { "x": 1573, - "y": 484 + "y": 489 }, "width": 176, "height": 66, @@ -2842,7 +2842,7 @@ "type": "rectangle", "pos": { "x": 1929, - "y": 484 + "y": 489 }, "width": 181, "height": 66, @@ -2883,7 +2883,7 @@ "type": "rectangle", "pos": { "x": 2218, - "y": 484 + "y": 489 }, "width": 165, "height": 66, @@ -2924,7 +2924,7 @@ "type": "rectangle", "pos": { "x": 2561, - "y": 484 + "y": 489 }, "width": 186, "height": 66, @@ -2965,7 +2965,7 @@ "type": "rectangle", "pos": { "x": 2931, - "y": 484 + "y": 489 }, "width": 191, "height": 66, @@ -3006,7 +3006,7 @@ "type": "rectangle", "pos": { "x": 3309, - "y": 484 + "y": 455 }, "width": 182, "height": 66, @@ -3047,7 +3047,7 @@ "type": "rectangle", "pos": { "x": 3611, - "y": 484 + "y": 455 }, "width": 202, "height": 66, @@ -3088,7 +3088,7 @@ "type": "rectangle", "pos": { "x": 3934, - "y": 484 + "y": 455 }, "width": 192, "height": 66, @@ -3129,7 +3129,7 @@ "type": "rectangle", "pos": { "x": 4246, - "y": 496 + "y": 501 }, "width": 142, "height": 66, @@ -3170,7 +3170,7 @@ "type": "rectangle", "pos": { "x": 4508, - "y": 496 + "y": 501 }, "width": 163, "height": 66, @@ -3211,7 +3211,7 @@ "type": "rectangle", "pos": { "x": 4791, - "y": 496 + "y": 501 }, "width": 152, "height": 66, @@ -3252,7 +3252,7 @@ "type": "rectangle", "pos": { "x": 5087, - "y": 484 + "y": 489 }, "width": 163, "height": 66, @@ -3293,7 +3293,7 @@ "type": "rectangle", "pos": { "x": 5370, - "y": 484 + "y": 489 }, "width": 183, "height": 66, @@ -3334,7 +3334,7 @@ "type": "rectangle", "pos": { "x": 5673, - "y": 484 + "y": 489 }, "width": 173, "height": 66, @@ -3375,7 +3375,7 @@ "type": "rectangle", "pos": { "x": 5990, - "y": 472 + "y": 477 }, "width": 169, "height": 66, @@ -3416,7 +3416,7 @@ "type": "rectangle", "pos": { "x": 6279, - "y": 472 + "y": 477 }, "width": 189, "height": 66, @@ -3457,7 +3457,7 @@ "type": "rectangle", "pos": { "x": 6588, - "y": 472 + "y": 477 }, "width": 179, "height": 66, @@ -3498,7 +3498,7 @@ "type": "rectangle", "pos": { "x": 1704, - "y": 756 + "y": 751 }, "width": 3470, "height": 254, @@ -3543,7 +3543,7 @@ ], "pos": { "x": 1754, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -3601,7 +3601,7 @@ ], "pos": { "x": 1902, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -3659,9 +3659,9 @@ ], "pos": { "x": 2050, - "y": 806 + "y": 801 }, - "width": 131, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -3717,7 +3717,7 @@ ], "pos": { "x": 2201, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -3775,7 +3775,7 @@ ], "pos": { "x": 2349, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -3833,9 +3833,9 @@ ], "pos": { "x": 2497, - "y": 806 + "y": 801 }, - "width": 131, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -3891,9 +3891,9 @@ ], "pos": { "x": 2648, - "y": 806 + "y": 801 }, - "width": 136, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -3949,7 +3949,7 @@ ], "pos": { "x": 2804, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -4007,9 +4007,9 @@ ], "pos": { "x": 2952, - "y": 806 + "y": 801 }, - "width": 141, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4065,9 +4065,9 @@ ], "pos": { "x": 3113, - "y": 806 + "y": 801 }, - "width": 146, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4123,9 +4123,9 @@ ], "pos": { "x": 3279, - "y": 806 + "y": 801 }, - "width": 137, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4181,9 +4181,9 @@ ], "pos": { "x": 3436, - "y": 806 + "y": 801 }, - "width": 157, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4239,9 +4239,9 @@ ], "pos": { "x": 3613, - "y": 806 + "y": 801 }, - "width": 147, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4297,7 +4297,7 @@ ], "pos": { "x": 3780, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -4355,7 +4355,7 @@ ], "pos": { "x": 3928, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -4413,7 +4413,7 @@ ], "pos": { "x": 4076, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -4471,7 +4471,7 @@ ], "pos": { "x": 4224, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -4529,9 +4529,9 @@ ], "pos": { "x": 4372, - "y": 806 + "y": 801 }, - "width": 138, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4587,7 +4587,7 @@ ], "pos": { "x": 4530, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -4645,7 +4645,7 @@ ], "pos": { "x": 4678, - "y": 806 + "y": 801 }, "width": 128, "height": 128, @@ -4703,9 +4703,9 @@ ], "pos": { "x": 4826, - "y": 806 + "y": 801 }, - "width": 144, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4761,9 +4761,9 @@ ], "pos": { "x": 4990, - "y": 806 + "y": 801 }, - "width": 134, + "width": 128, "height": 128, "opacity": 1, "strokeDash": 0, @@ -4837,11 +4837,11 @@ "route": [ { "x": 3439.5, - "y": 278 + "y": 294 }, { "x": 3439.5, - "y": 348 + "y": 364 } ], "animated": false, @@ -4875,11 +4875,11 @@ "route": [ { "x": 3439.5, - "y": 686 + "y": 681 }, { "x": 3439.5, - "y": 756 + "y": 751 } ], "animated": false, diff --git a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg index fb1fee464..e5b5fa92a 100644 --- a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - + .d2-3768176013 .fill-N1{fill:#0A0F25;} + .d2-3768176013 .fill-N2{fill:#676C7E;} + .d2-3768176013 .fill-N3{fill:#9499AB;} + .d2-3768176013 .fill-N4{fill:#CFD2DD;} + .d2-3768176013 .fill-N5{fill:#DEE1EB;} + .d2-3768176013 .fill-N6{fill:#EEF1F8;} + .d2-3768176013 .fill-N7{fill:#FFFFFF;} + .d2-3768176013 .fill-B1{fill:#0D32B2;} + .d2-3768176013 .fill-B2{fill:#0D32B2;} + .d2-3768176013 .fill-B3{fill:#E3E9FD;} + .d2-3768176013 .fill-B4{fill:#E3E9FD;} + .d2-3768176013 .fill-B5{fill:#EDF0FD;} + .d2-3768176013 .fill-B6{fill:#F7F8FE;} + .d2-3768176013 .fill-AA2{fill:#4A6FF3;} + .d2-3768176013 .fill-AA4{fill:#EDF0FD;} + .d2-3768176013 .fill-AA5{fill:#F7F8FE;} + .d2-3768176013 .fill-AB4{fill:#EDF0FD;} + .d2-3768176013 .fill-AB5{fill:#F7F8FE;} + .d2-3768176013 .stroke-N1{stroke:#0A0F25;} + .d2-3768176013 .stroke-N2{stroke:#676C7E;} + .d2-3768176013 .stroke-N3{stroke:#9499AB;} + .d2-3768176013 .stroke-N4{stroke:#CFD2DD;} + .d2-3768176013 .stroke-N5{stroke:#DEE1EB;} + .d2-3768176013 .stroke-N6{stroke:#EEF1F8;} + .d2-3768176013 .stroke-N7{stroke:#FFFFFF;} + .d2-3768176013 .stroke-B1{stroke:#0D32B2;} + .d2-3768176013 .stroke-B2{stroke:#0D32B2;} + .d2-3768176013 .stroke-B3{stroke:#E3E9FD;} + .d2-3768176013 .stroke-B4{stroke:#E3E9FD;} + .d2-3768176013 .stroke-B5{stroke:#EDF0FD;} + .d2-3768176013 .stroke-B6{stroke:#F7F8FE;} + .d2-3768176013 .stroke-AA2{stroke:#4A6FF3;} + .d2-3768176013 .stroke-AA4{stroke:#EDF0FD;} + .d2-3768176013 .stroke-AA5{stroke:#F7F8FE;} + .d2-3768176013 .stroke-AB4{stroke:#EDF0FD;} + .d2-3768176013 .stroke-AB5{stroke:#F7F8FE;} + .d2-3768176013 .background-color-N1{background-color:#0A0F25;} + .d2-3768176013 .background-color-N2{background-color:#676C7E;} + .d2-3768176013 .background-color-N3{background-color:#9499AB;} + .d2-3768176013 .background-color-N4{background-color:#CFD2DD;} + .d2-3768176013 .background-color-N5{background-color:#DEE1EB;} + .d2-3768176013 .background-color-N6{background-color:#EEF1F8;} + .d2-3768176013 .background-color-N7{background-color:#FFFFFF;} + .d2-3768176013 .background-color-B1{background-color:#0D32B2;} + .d2-3768176013 .background-color-B2{background-color:#0D32B2;} + .d2-3768176013 .background-color-B3{background-color:#E3E9FD;} + .d2-3768176013 .background-color-B4{background-color:#E3E9FD;} + .d2-3768176013 .background-color-B5{background-color:#EDF0FD;} + .d2-3768176013 .background-color-B6{background-color:#F7F8FE;} + .d2-3768176013 .background-color-AA2{background-color:#4A6FF3;} + .d2-3768176013 .background-color-AA4{background-color:#EDF0FD;} + .d2-3768176013 .background-color-AA5{background-color:#F7F8FE;} + .d2-3768176013 .background-color-AB4{background-color:#EDF0FD;} + .d2-3768176013 .background-color-AB5{background-color:#F7F8FE;} + .d2-3768176013 .color-N1{color:#0A0F25;} + .d2-3768176013 .color-N2{color:#676C7E;} + .d2-3768176013 .color-N3{color:#9499AB;} + .d2-3768176013 .color-N4{color:#CFD2DD;} + .d2-3768176013 .color-N5{color:#DEE1EB;} + .d2-3768176013 .color-N6{color:#EEF1F8;} + .d2-3768176013 .color-N7{color:#FFFFFF;} + .d2-3768176013 .color-B1{color:#0D32B2;} + .d2-3768176013 .color-B2{color:#0D32B2;} + .d2-3768176013 .color-B3{color:#E3E9FD;} + .d2-3768176013 .color-B4{color:#E3E9FD;} + .d2-3768176013 .color-B5{color:#EDF0FD;} + .d2-3768176013 .color-B6{color:#F7F8FE;} + .d2-3768176013 .color-AA2{color:#4A6FF3;} + .d2-3768176013 .color-AA4{color:#EDF0FD;} + .d2-3768176013 .color-AA5{color:#F7F8FE;} + .d2-3768176013 .color-AB4{color:#EDF0FD;} + .d2-3768176013 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/label-near/elk/board.exp.json b/e2etests/testdata/stable/label-near/elk/board.exp.json index 77309cf93..8dd364c10 100644 --- a/e2etests/testdata/stable/label-near/elk/board.exp.json +++ b/e2etests/testdata/stable/label-near/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 12 + "y": 76 }, "width": 123, "height": 118, @@ -137,11 +137,11 @@ "route": [ { "x": 135, - "y": 71 + "y": 103 }, { "x": 205, - "y": 71 + "y": 103 } ], "animated": false, diff --git a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg index 34f280260..865f88df0 100644 --- a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -workerprofits - - + .d2-1153667598 .fill-N1{fill:#0A0F25;} + .d2-1153667598 .fill-N2{fill:#676C7E;} + .d2-1153667598 .fill-N3{fill:#9499AB;} + .d2-1153667598 .fill-N4{fill:#CFD2DD;} + .d2-1153667598 .fill-N5{fill:#DEE1EB;} + .d2-1153667598 .fill-N6{fill:#EEF1F8;} + .d2-1153667598 .fill-N7{fill:#FFFFFF;} + .d2-1153667598 .fill-B1{fill:#0D32B2;} + .d2-1153667598 .fill-B2{fill:#0D32B2;} + .d2-1153667598 .fill-B3{fill:#E3E9FD;} + .d2-1153667598 .fill-B4{fill:#E3E9FD;} + .d2-1153667598 .fill-B5{fill:#EDF0FD;} + .d2-1153667598 .fill-B6{fill:#F7F8FE;} + .d2-1153667598 .fill-AA2{fill:#4A6FF3;} + .d2-1153667598 .fill-AA4{fill:#EDF0FD;} + .d2-1153667598 .fill-AA5{fill:#F7F8FE;} + .d2-1153667598 .fill-AB4{fill:#EDF0FD;} + .d2-1153667598 .fill-AB5{fill:#F7F8FE;} + .d2-1153667598 .stroke-N1{stroke:#0A0F25;} + .d2-1153667598 .stroke-N2{stroke:#676C7E;} + .d2-1153667598 .stroke-N3{stroke:#9499AB;} + .d2-1153667598 .stroke-N4{stroke:#CFD2DD;} + .d2-1153667598 .stroke-N5{stroke:#DEE1EB;} + .d2-1153667598 .stroke-N6{stroke:#EEF1F8;} + .d2-1153667598 .stroke-N7{stroke:#FFFFFF;} + .d2-1153667598 .stroke-B1{stroke:#0D32B2;} + .d2-1153667598 .stroke-B2{stroke:#0D32B2;} + .d2-1153667598 .stroke-B3{stroke:#E3E9FD;} + .d2-1153667598 .stroke-B4{stroke:#E3E9FD;} + .d2-1153667598 .stroke-B5{stroke:#EDF0FD;} + .d2-1153667598 .stroke-B6{stroke:#F7F8FE;} + .d2-1153667598 .stroke-AA2{stroke:#4A6FF3;} + .d2-1153667598 .stroke-AA4{stroke:#EDF0FD;} + .d2-1153667598 .stroke-AA5{stroke:#F7F8FE;} + .d2-1153667598 .stroke-AB4{stroke:#EDF0FD;} + .d2-1153667598 .stroke-AB5{stroke:#F7F8FE;} + .d2-1153667598 .background-color-N1{background-color:#0A0F25;} + .d2-1153667598 .background-color-N2{background-color:#676C7E;} + .d2-1153667598 .background-color-N3{background-color:#9499AB;} + .d2-1153667598 .background-color-N4{background-color:#CFD2DD;} + .d2-1153667598 .background-color-N5{background-color:#DEE1EB;} + .d2-1153667598 .background-color-N6{background-color:#EEF1F8;} + .d2-1153667598 .background-color-N7{background-color:#FFFFFF;} + .d2-1153667598 .background-color-B1{background-color:#0D32B2;} + .d2-1153667598 .background-color-B2{background-color:#0D32B2;} + .d2-1153667598 .background-color-B3{background-color:#E3E9FD;} + .d2-1153667598 .background-color-B4{background-color:#E3E9FD;} + .d2-1153667598 .background-color-B5{background-color:#EDF0FD;} + .d2-1153667598 .background-color-B6{background-color:#F7F8FE;} + .d2-1153667598 .background-color-AA2{background-color:#4A6FF3;} + .d2-1153667598 .background-color-AA4{background-color:#EDF0FD;} + .d2-1153667598 .background-color-AA5{background-color:#F7F8FE;} + .d2-1153667598 .background-color-AB4{background-color:#EDF0FD;} + .d2-1153667598 .background-color-AB5{background-color:#F7F8FE;} + .d2-1153667598 .color-N1{color:#0A0F25;} + .d2-1153667598 .color-N2{color:#676C7E;} + .d2-1153667598 .color-N3{color:#9499AB;} + .d2-1153667598 .color-N4{color:#CFD2DD;} + .d2-1153667598 .color-N5{color:#DEE1EB;} + .d2-1153667598 .color-N6{color:#EEF1F8;} + .d2-1153667598 .color-N7{color:#FFFFFF;} + .d2-1153667598 .color-B1{color:#0D32B2;} + .d2-1153667598 .color-B2{color:#0D32B2;} + .d2-1153667598 .color-B3{color:#E3E9FD;} + .d2-1153667598 .color-B4{color:#E3E9FD;} + .d2-1153667598 .color-B5{color:#EDF0FD;} + .d2-1153667598 .color-B6{color:#F7F8FE;} + .d2-1153667598 .color-AA2{color:#4A6FF3;} + .d2-1153667598 .color-AA4{color:#EDF0FD;} + .d2-1153667598 .color-AA5{color:#F7F8FE;} + .d2-1153667598 .color-AB4{color:#EDF0FD;} + .d2-1153667598 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>workerprofits + + \ No newline at end of file diff --git a/e2etests/testdata/stable/label_positions/elk/board.exp.json b/e2etests/testdata/stable/label_positions/elk/board.exp.json index a90f1e2e4..eba6a5c35 100644 --- a/e2etests/testdata/stable/label_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/label_positions/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 5072, - "height": 166, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 1422, - "y": 62 + "y": 75 }, "width": 96, "height": 66, @@ -93,7 +93,7 @@ ], "pos": { "x": 1538, - "y": 62 + "y": 88 }, "width": 156, "height": 66, @@ -137,7 +137,7 @@ ], "pos": { "x": 1714, - "y": 62 + "y": 88 }, "width": 176, "height": 66, @@ -181,7 +181,7 @@ ], "pos": { "x": 1910, - "y": 62 + "y": 88 }, "width": 165, "height": 66, @@ -225,7 +225,7 @@ ], "pos": { "x": 2211, - "y": 62 + "y": 75 }, "width": 156, "height": 66, @@ -269,7 +269,7 @@ ], "pos": { "x": 2523, - "y": 62 + "y": 75 }, "width": 176, "height": 66, @@ -313,7 +313,7 @@ ], "pos": { "x": 2860, - "y": 62 + "y": 75 }, "width": 181, "height": 66, @@ -357,7 +357,7 @@ ], "pos": { "x": 3061, - "y": 62 + "y": 75 }, "width": 165, "height": 66, @@ -401,7 +401,7 @@ ], "pos": { "x": 3371, - "y": 62 + "y": 75 }, "width": 186, "height": 66, @@ -445,7 +445,7 @@ ], "pos": { "x": 3723, - "y": 62 + "y": 75 }, "width": 191, "height": 66, @@ -621,7 +621,7 @@ ], "pos": { "x": 4721, - "y": 62 + "y": 75 }, "width": 142, "height": 66, @@ -665,7 +665,7 @@ ], "pos": { "x": 4883, - "y": 62 + "y": 75 }, "width": 163, "height": 66, @@ -709,7 +709,7 @@ ], "pos": { "x": 5066, - "y": 62 + "y": 75 }, "width": 152, "height": 66, @@ -753,7 +753,7 @@ ], "pos": { "x": 5238, - "y": 62 + "y": 75 }, "width": 163, "height": 66, @@ -797,7 +797,7 @@ ], "pos": { "x": 5421, - "y": 62 + "y": 75 }, "width": 183, "height": 66, @@ -841,7 +841,7 @@ ], "pos": { "x": 5624, - "y": 62 + "y": 75 }, "width": 173, "height": 66, @@ -885,7 +885,7 @@ ], "pos": { "x": 5817, - "y": 62 + "y": 75 }, "width": 169, "height": 66, @@ -929,7 +929,7 @@ ], "pos": { "x": 6006, - "y": 62 + "y": 75 }, "width": 189, "height": 66, @@ -973,7 +973,7 @@ ], "pos": { "x": 6215, - "y": 62 + "y": 75 }, "width": 179, "height": 66, @@ -1014,7 +1014,7 @@ "type": "rectangle", "pos": { "x": 120, - "y": 248 + "y": 274 }, "width": 7576, "height": 266, @@ -1055,7 +1055,7 @@ "type": "rectangle", "pos": { "x": 170, - "y": 298 + "y": 324 }, "width": 196, "height": 166, @@ -1096,7 +1096,7 @@ "type": "rectangle", "pos": { "x": 220, - "y": 348 + "y": 374 }, "width": 96, "height": 66, @@ -1140,10 +1140,10 @@ ], "pos": { "x": 386, - "y": 298 + "y": 360 }, "width": 256, - "height": 166, + "height": 130, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1184,10 +1184,10 @@ ], "pos": { "x": 662, - "y": 298 + "y": 360 }, "width": 276, - "height": 166, + "height": 130, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1228,10 +1228,10 @@ ], "pos": { "x": 958, - "y": 298 + "y": 360 }, "width": 265, - "height": 166, + "height": 130, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1272,7 +1272,7 @@ ], "pos": { "x": 1403, - "y": 298 + "y": 324 }, "width": 200, "height": 166, @@ -1316,7 +1316,7 @@ ], "pos": { "x": 1812, - "y": 298 + "y": 324 }, "width": 229, "height": 166, @@ -1360,7 +1360,7 @@ ], "pos": { "x": 2258, - "y": 298 + "y": 324 }, "width": 237, "height": 166, @@ -1404,7 +1404,7 @@ ], "pos": { "x": 2515, - "y": 298 + "y": 324 }, "width": 214, "height": 166, @@ -1448,7 +1448,7 @@ ], "pos": { "x": 2923, - "y": 298 + "y": 324 }, "width": 243, "height": 166, @@ -1492,7 +1492,7 @@ ], "pos": { "x": 3389, - "y": 298 + "y": 324 }, "width": 251, "height": 166, @@ -1536,10 +1536,10 @@ ], "pos": { "x": 3871, - "y": 298 + "y": 324 }, "width": 282, - "height": 166, + "height": 130, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1580,10 +1580,10 @@ ], "pos": { "x": 4173, - "y": 298 + "y": 324 }, "width": 302, - "height": 166, + "height": 130, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1624,10 +1624,10 @@ ], "pos": { "x": 4495, - "y": 298 + "y": 324 }, "width": 292, - "height": 166, + "height": 130, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1668,7 +1668,7 @@ ], "pos": { "x": 4807, - "y": 298 + "y": 324 }, "width": 242, "height": 166, @@ -1712,7 +1712,7 @@ ], "pos": { "x": 5069, - "y": 298 + "y": 324 }, "width": 263, "height": 166, @@ -1756,7 +1756,7 @@ ], "pos": { "x": 5352, - "y": 298 + "y": 324 }, "width": 252, "height": 166, @@ -1800,7 +1800,7 @@ ], "pos": { "x": 5624, - "y": 298 + "y": 324 }, "width": 389, "height": 166, @@ -1844,7 +1844,7 @@ ], "pos": { "x": 6033, - "y": 298 + "y": 324 }, "width": 283, "height": 166, @@ -1888,7 +1888,7 @@ ], "pos": { "x": 6336, - "y": 298 + "y": 324 }, "width": 413, "height": 166, @@ -1932,7 +1932,7 @@ ], "pos": { "x": 6769, - "y": 298 + "y": 324 }, "width": 269, "height": 166, @@ -1976,7 +1976,7 @@ ], "pos": { "x": 7058, - "y": 298 + "y": 324 }, "width": 289, "height": 166, @@ -2020,7 +2020,7 @@ ], "pos": { "x": 7367, - "y": 298 + "y": 324 }, "width": 279, "height": 166, @@ -2061,7 +2061,7 @@ "type": "rectangle", "pos": { "x": 436, - "y": 348 + "y": 392 }, "width": 156, "height": 66, @@ -2102,7 +2102,7 @@ "type": "rectangle", "pos": { "x": 712, - "y": 348 + "y": 392 }, "width": 176, "height": 66, @@ -2143,7 +2143,7 @@ "type": "rectangle", "pos": { "x": 1008, - "y": 348 + "y": 392 }, "width": 165, "height": 66, @@ -2184,7 +2184,7 @@ "type": "rectangle", "pos": { "x": 1425, - "y": 348 + "y": 374 }, "width": 156, "height": 66, @@ -2225,7 +2225,7 @@ "type": "rectangle", "pos": { "x": 1839, - "y": 348 + "y": 374 }, "width": 176, "height": 66, @@ -2266,7 +2266,7 @@ "type": "rectangle", "pos": { "x": 2286, - "y": 348 + "y": 374 }, "width": 181, "height": 66, @@ -2307,7 +2307,7 @@ "type": "rectangle", "pos": { "x": 2540, - "y": 348 + "y": 374 }, "width": 165, "height": 66, @@ -2348,7 +2348,7 @@ "type": "rectangle", "pos": { "x": 2952, - "y": 348 + "y": 374 }, "width": 186, "height": 66, @@ -2389,7 +2389,7 @@ "type": "rectangle", "pos": { "x": 3419, - "y": 348 + "y": 374 }, "width": 191, "height": 66, @@ -2430,7 +2430,7 @@ "type": "rectangle", "pos": { "x": 3921, - "y": 348 + "y": 356 }, "width": 182, "height": 66, @@ -2471,7 +2471,7 @@ "type": "rectangle", "pos": { "x": 4223, - "y": 348 + "y": 356 }, "width": 202, "height": 66, @@ -2512,7 +2512,7 @@ "type": "rectangle", "pos": { "x": 4545, - "y": 348 + "y": 356 }, "width": 192, "height": 66, @@ -2553,7 +2553,7 @@ "type": "rectangle", "pos": { "x": 4857, - "y": 348 + "y": 374 }, "width": 142, "height": 66, @@ -2594,7 +2594,7 @@ "type": "rectangle", "pos": { "x": 5119, - "y": 348 + "y": 374 }, "width": 163, "height": 66, @@ -2635,7 +2635,7 @@ "type": "rectangle", "pos": { "x": 5402, - "y": 348 + "y": 374 }, "width": 152, "height": 66, @@ -2676,7 +2676,7 @@ "type": "rectangle", "pos": { "x": 5800, - "y": 348 + "y": 374 }, "width": 163, "height": 66, @@ -2717,7 +2717,7 @@ "type": "rectangle", "pos": { "x": 6083, - "y": 348 + "y": 374 }, "width": 183, "height": 66, @@ -2758,7 +2758,7 @@ "type": "rectangle", "pos": { "x": 6386, - "y": 348 + "y": 374 }, "width": 173, "height": 66, @@ -2799,7 +2799,7 @@ "type": "rectangle", "pos": { "x": 6819, - "y": 348 + "y": 374 }, "width": 169, "height": 66, @@ -2840,7 +2840,7 @@ "type": "rectangle", "pos": { "x": 7108, - "y": 348 + "y": 374 }, "width": 189, "height": 66, @@ -2881,7 +2881,7 @@ "type": "rectangle", "pos": { "x": 7417, - "y": 348 + "y": 374 }, "width": 179, "height": 66, @@ -2922,10 +2922,10 @@ "type": "rectangle", "pos": { "x": 1086, - "y": 584 + "y": 610 }, "width": 5644, - "height": 218, + "height": 244, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2966,7 +2966,7 @@ ], "pos": { "x": 1136, - "y": 634 + "y": 673 }, "width": 122, "height": 118, @@ -3023,7 +3023,7 @@ ], "pos": { "x": 1278, - "y": 634 + "y": 686 }, "width": 182, "height": 118, @@ -3080,7 +3080,7 @@ ], "pos": { "x": 1480, - "y": 634 + "y": 686 }, "width": 202, "height": 118, @@ -3137,7 +3137,7 @@ ], "pos": { "x": 1702, - "y": 634 + "y": 686 }, "width": 191, "height": 118, @@ -3194,7 +3194,7 @@ ], "pos": { "x": 2029, - "y": 634 + "y": 673 }, "width": 182, "height": 118, @@ -3251,7 +3251,7 @@ ], "pos": { "x": 2367, - "y": 634 + "y": 673 }, "width": 202, "height": 118, @@ -3308,7 +3308,7 @@ ], "pos": { "x": 2730, - "y": 634 + "y": 673 }, "width": 207, "height": 118, @@ -3365,7 +3365,7 @@ ], "pos": { "x": 2957, - "y": 634 + "y": 673 }, "width": 191, "height": 118, @@ -3422,7 +3422,7 @@ ], "pos": { "x": 3293, - "y": 634 + "y": 673 }, "width": 212, "height": 118, @@ -3479,7 +3479,7 @@ ], "pos": { "x": 3671, - "y": 634 + "y": 673 }, "width": 217, "height": 118, @@ -3536,7 +3536,7 @@ ], "pos": { "x": 4059, - "y": 634 + "y": 660 }, "width": 208, "height": 118, @@ -3593,7 +3593,7 @@ ], "pos": { "x": 4287, - "y": 634 + "y": 660 }, "width": 228, "height": 118, @@ -3650,7 +3650,7 @@ ], "pos": { "x": 4535, - "y": 634 + "y": 660 }, "width": 218, "height": 118, @@ -3707,7 +3707,7 @@ ], "pos": { "x": 4773, - "y": 634 + "y": 673 }, "width": 168, "height": 118, @@ -3764,7 +3764,7 @@ ], "pos": { "x": 4961, - "y": 634 + "y": 673 }, "width": 189, "height": 118, @@ -3821,7 +3821,7 @@ ], "pos": { "x": 5170, - "y": 634 + "y": 673 }, "width": 178, "height": 118, @@ -3878,7 +3878,7 @@ ], "pos": { "x": 5368, - "y": 634 + "y": 673 }, "width": 189, "height": 118, @@ -3935,7 +3935,7 @@ ], "pos": { "x": 5577, - "y": 634 + "y": 673 }, "width": 209, "height": 118, @@ -3992,7 +3992,7 @@ ], "pos": { "x": 5806, - "y": 634 + "y": 673 }, "width": 199, "height": 118, @@ -4049,7 +4049,7 @@ ], "pos": { "x": 6025, - "y": 634 + "y": 673 }, "width": 195, "height": 118, @@ -4106,7 +4106,7 @@ ], "pos": { "x": 6240, - "y": 634 + "y": 673 }, "width": 215, "height": 118, @@ -4163,7 +4163,7 @@ ], "pos": { "x": 6475, - "y": 634 + "y": 673 }, "width": 205, "height": 118, @@ -4216,7 +4216,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 872 + "y": 924 }, "width": 7793, "height": 290, @@ -4260,7 +4260,7 @@ ], "pos": { "x": 62, - "y": 922 + "y": 974 }, "width": 196, "height": 190, @@ -4313,7 +4313,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 996 + "y": 1048 }, "width": 96, "height": 66, @@ -4358,10 +4358,10 @@ ], "pos": { "x": 278, - "y": 922 + "y": 1010 }, "width": 256, - "height": 190, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4411,7 +4411,7 @@ "type": "rectangle", "pos": { "x": 328, - "y": 996 + "y": 1066 }, "width": 156, "height": 66, @@ -4456,10 +4456,10 @@ ], "pos": { "x": 554, - "y": 922 + "y": 1010 }, "width": 276, - "height": 190, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4509,7 +4509,7 @@ "type": "rectangle", "pos": { "x": 604, - "y": 996 + "y": 1066 }, "width": 176, "height": 66, @@ -4554,10 +4554,10 @@ ], "pos": { "x": 850, - "y": 922 + "y": 1010 }, "width": 265, - "height": 190, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4607,7 +4607,7 @@ "type": "rectangle", "pos": { "x": 900, - "y": 996 + "y": 1066 }, "width": 165, "height": 66, @@ -4652,7 +4652,7 @@ ], "pos": { "x": 1295, - "y": 922 + "y": 974 }, "width": 236, "height": 190, @@ -4705,7 +4705,7 @@ "type": "rectangle", "pos": { "x": 1335, - "y": 996 + "y": 1048 }, "width": 156, "height": 66, @@ -4750,7 +4750,7 @@ ], "pos": { "x": 1740, - "y": 922 + "y": 974 }, "width": 265, "height": 190, @@ -4803,7 +4803,7 @@ "type": "rectangle", "pos": { "x": 1784, - "y": 996 + "y": 1048 }, "width": 176, "height": 66, @@ -4848,7 +4848,7 @@ ], "pos": { "x": 2222, - "y": 922 + "y": 974 }, "width": 273, "height": 190, @@ -4901,7 +4901,7 @@ "type": "rectangle", "pos": { "x": 2268, - "y": 996 + "y": 1048 }, "width": 181, "height": 66, @@ -4946,7 +4946,7 @@ ], "pos": { "x": 2515, - "y": 922 + "y": 974 }, "width": 250, "height": 190, @@ -4999,7 +4999,7 @@ "type": "rectangle", "pos": { "x": 2557, - "y": 996 + "y": 1048 }, "width": 165, "height": 66, @@ -5044,7 +5044,7 @@ ], "pos": { "x": 2959, - "y": 922 + "y": 974 }, "width": 279, "height": 190, @@ -5097,7 +5097,7 @@ "type": "rectangle", "pos": { "x": 3005, - "y": 996 + "y": 1048 }, "width": 186, "height": 66, @@ -5142,7 +5142,7 @@ ], "pos": { "x": 3461, - "y": 922 + "y": 974 }, "width": 287, "height": 190, @@ -5195,7 +5195,7 @@ "type": "rectangle", "pos": { "x": 3509, - "y": 996 + "y": 1048 }, "width": 191, "height": 66, @@ -5240,10 +5240,10 @@ ], "pos": { "x": 3979, - "y": 922 + "y": 974 }, "width": 282, - "height": 190, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5293,7 +5293,7 @@ "type": "rectangle", "pos": { "x": 4029, - "y": 996 + "y": 1030 }, "width": 182, "height": 66, @@ -5338,10 +5338,10 @@ ], "pos": { "x": 4281, - "y": 922 + "y": 974 }, "width": 303, - "height": 190, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5391,7 +5391,7 @@ "type": "rectangle", "pos": { "x": 4331, - "y": 996 + "y": 1030 }, "width": 202, "height": 66, @@ -5436,10 +5436,10 @@ ], "pos": { "x": 4604, - "y": 922 + "y": 974 }, "width": 292, - "height": 190, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5489,7 +5489,7 @@ "type": "rectangle", "pos": { "x": 4654, - "y": 996 + "y": 1030 }, "width": 192, "height": 66, @@ -5534,7 +5534,7 @@ ], "pos": { "x": 4916, - "y": 922 + "y": 974 }, "width": 242, "height": 190, @@ -5587,7 +5587,7 @@ "type": "rectangle", "pos": { "x": 4966, - "y": 996 + "y": 1048 }, "width": 142, "height": 66, @@ -5632,7 +5632,7 @@ ], "pos": { "x": 5178, - "y": 922 + "y": 974 }, "width": 263, "height": 190, @@ -5685,7 +5685,7 @@ "type": "rectangle", "pos": { "x": 5228, - "y": 996 + "y": 1048 }, "width": 163, "height": 66, @@ -5730,7 +5730,7 @@ ], "pos": { "x": 5461, - "y": 922 + "y": 974 }, "width": 252, "height": 190, @@ -5783,7 +5783,7 @@ "type": "rectangle", "pos": { "x": 5511, - "y": 996 + "y": 1048 }, "width": 152, "height": 66, @@ -5828,7 +5828,7 @@ ], "pos": { "x": 5733, - "y": 922 + "y": 974 }, "width": 389, "height": 190, @@ -5881,7 +5881,7 @@ "type": "rectangle", "pos": { "x": 5909, - "y": 996 + "y": 1048 }, "width": 163, "height": 66, @@ -5926,7 +5926,7 @@ ], "pos": { "x": 6142, - "y": 922 + "y": 974 }, "width": 283, "height": 190, @@ -5979,7 +5979,7 @@ "type": "rectangle", "pos": { "x": 6192, - "y": 996 + "y": 1048 }, "width": 183, "height": 66, @@ -6024,7 +6024,7 @@ ], "pos": { "x": 6445, - "y": 922 + "y": 974 }, "width": 413, "height": 190, @@ -6077,7 +6077,7 @@ "type": "rectangle", "pos": { "x": 6495, - "y": 996 + "y": 1048 }, "width": 173, "height": 66, @@ -6122,7 +6122,7 @@ ], "pos": { "x": 6878, - "y": 922 + "y": 974 }, "width": 269, "height": 190, @@ -6175,7 +6175,7 @@ "type": "rectangle", "pos": { "x": 6928, - "y": 996 + "y": 1048 }, "width": 169, "height": 66, @@ -6220,7 +6220,7 @@ ], "pos": { "x": 7167, - "y": 922 + "y": 974 }, "width": 289, "height": 190, @@ -6273,7 +6273,7 @@ "type": "rectangle", "pos": { "x": 7217, - "y": 996 + "y": 1048 }, "width": 189, "height": 66, @@ -6318,7 +6318,7 @@ ], "pos": { "x": 7476, - "y": 922 + "y": 974 }, "width": 279, "height": 190, @@ -6371,7 +6371,7 @@ "type": "rectangle", "pos": { "x": 7526, - "y": 996 + "y": 1048 }, "width": 179, "height": 66, @@ -6435,11 +6435,11 @@ "route": [ { "x": 3908.5, - "y": 178 + "y": 204 }, { "x": 3908.5, - "y": 248 + "y": 274 } ], "animated": false, @@ -6473,11 +6473,11 @@ "route": [ { "x": 3908.5, - "y": 514 + "y": 540 }, { "x": 3908.5, - "y": 584 + "y": 610 } ], "animated": false, @@ -6511,11 +6511,11 @@ "route": [ { "x": 3908.5, - "y": 802 + "y": 854 }, { "x": 3908.5, - "y": 872 + "y": 924 } ], "animated": false, diff --git a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg index b03bab5e9..68825f6d3 100644 --- a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - + .d2-209688564 .fill-N1{fill:#0A0F25;} + .d2-209688564 .fill-N2{fill:#676C7E;} + .d2-209688564 .fill-N3{fill:#9499AB;} + .d2-209688564 .fill-N4{fill:#CFD2DD;} + .d2-209688564 .fill-N5{fill:#DEE1EB;} + .d2-209688564 .fill-N6{fill:#EEF1F8;} + .d2-209688564 .fill-N7{fill:#FFFFFF;} + .d2-209688564 .fill-B1{fill:#0D32B2;} + .d2-209688564 .fill-B2{fill:#0D32B2;} + .d2-209688564 .fill-B3{fill:#E3E9FD;} + .d2-209688564 .fill-B4{fill:#E3E9FD;} + .d2-209688564 .fill-B5{fill:#EDF0FD;} + .d2-209688564 .fill-B6{fill:#F7F8FE;} + .d2-209688564 .fill-AA2{fill:#4A6FF3;} + .d2-209688564 .fill-AA4{fill:#EDF0FD;} + .d2-209688564 .fill-AA5{fill:#F7F8FE;} + .d2-209688564 .fill-AB4{fill:#EDF0FD;} + .d2-209688564 .fill-AB5{fill:#F7F8FE;} + .d2-209688564 .stroke-N1{stroke:#0A0F25;} + .d2-209688564 .stroke-N2{stroke:#676C7E;} + .d2-209688564 .stroke-N3{stroke:#9499AB;} + .d2-209688564 .stroke-N4{stroke:#CFD2DD;} + .d2-209688564 .stroke-N5{stroke:#DEE1EB;} + .d2-209688564 .stroke-N6{stroke:#EEF1F8;} + .d2-209688564 .stroke-N7{stroke:#FFFFFF;} + .d2-209688564 .stroke-B1{stroke:#0D32B2;} + .d2-209688564 .stroke-B2{stroke:#0D32B2;} + .d2-209688564 .stroke-B3{stroke:#E3E9FD;} + .d2-209688564 .stroke-B4{stroke:#E3E9FD;} + .d2-209688564 .stroke-B5{stroke:#EDF0FD;} + .d2-209688564 .stroke-B6{stroke:#F7F8FE;} + .d2-209688564 .stroke-AA2{stroke:#4A6FF3;} + .d2-209688564 .stroke-AA4{stroke:#EDF0FD;} + .d2-209688564 .stroke-AA5{stroke:#F7F8FE;} + .d2-209688564 .stroke-AB4{stroke:#EDF0FD;} + .d2-209688564 .stroke-AB5{stroke:#F7F8FE;} + .d2-209688564 .background-color-N1{background-color:#0A0F25;} + .d2-209688564 .background-color-N2{background-color:#676C7E;} + .d2-209688564 .background-color-N3{background-color:#9499AB;} + .d2-209688564 .background-color-N4{background-color:#CFD2DD;} + .d2-209688564 .background-color-N5{background-color:#DEE1EB;} + .d2-209688564 .background-color-N6{background-color:#EEF1F8;} + .d2-209688564 .background-color-N7{background-color:#FFFFFF;} + .d2-209688564 .background-color-B1{background-color:#0D32B2;} + .d2-209688564 .background-color-B2{background-color:#0D32B2;} + .d2-209688564 .background-color-B3{background-color:#E3E9FD;} + .d2-209688564 .background-color-B4{background-color:#E3E9FD;} + .d2-209688564 .background-color-B5{background-color:#EDF0FD;} + .d2-209688564 .background-color-B6{background-color:#F7F8FE;} + .d2-209688564 .background-color-AA2{background-color:#4A6FF3;} + .d2-209688564 .background-color-AA4{background-color:#EDF0FD;} + .d2-209688564 .background-color-AA5{background-color:#F7F8FE;} + .d2-209688564 .background-color-AB4{background-color:#EDF0FD;} + .d2-209688564 .background-color-AB5{background-color:#F7F8FE;} + .d2-209688564 .color-N1{color:#0A0F25;} + .d2-209688564 .color-N2{color:#676C7E;} + .d2-209688564 .color-N3{color:#9499AB;} + .d2-209688564 .color-N4{color:#CFD2DD;} + .d2-209688564 .color-N5{color:#DEE1EB;} + .d2-209688564 .color-N6{color:#EEF1F8;} + .d2-209688564 .color-N7{color:#FFFFFF;} + .d2-209688564 .color-B1{color:#0D32B2;} + .d2-209688564 .color-B2{color:#0D32B2;} + .d2-209688564 .color-B3{color:#E3E9FD;} + .d2-209688564 .color-B4{color:#E3E9FD;} + .d2-209688564 .color-B5{color:#EDF0FD;} + .d2-209688564 .color-B6{color:#F7F8FE;} + .d2-209688564 .color-AA2{color:#4A6FF3;} + .d2-209688564 .color-AA4{color:#EDF0FD;} + .d2-209688564 .color-AA5{color:#F7F8FE;} + .d2-209688564 .color-AB4{color:#EDF0FD;} + .d2-209688564 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json index f9f1eb196..07a9ea89a 100644 --- a/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json @@ -92,8 +92,8 @@ "x": 112, "y": 273 }, - "width": 208, - "height": 176, + "width": 198, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,8 +130,8 @@ "id": "outer.vg.vd.volume", "type": "rectangle", "pos": { - "x": 162, - "y": 333 + "x": 157, + "y": 328 }, "width": 98, "height": 66, @@ -280,8 +280,8 @@ "y": 78 }, { - "x": 216, - "y": 323 + "x": 211, + "y": 318 } ], "animated": false, @@ -314,8 +314,8 @@ "labelPercentage": 0, "route": [ { - "x": 216, - "y": 399 + "x": 211, + "y": 394 }, { "x": 216, diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg index 3fd01445d..847ff1511 100644 --- a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume + .d2-236292005 .fill-N1{fill:#0A0F25;} + .d2-236292005 .fill-N2{fill:#676C7E;} + .d2-236292005 .fill-N3{fill:#9499AB;} + .d2-236292005 .fill-N4{fill:#CFD2DD;} + .d2-236292005 .fill-N5{fill:#DEE1EB;} + .d2-236292005 .fill-N6{fill:#EEF1F8;} + .d2-236292005 .fill-N7{fill:#FFFFFF;} + .d2-236292005 .fill-B1{fill:#0D32B2;} + .d2-236292005 .fill-B2{fill:#0D32B2;} + .d2-236292005 .fill-B3{fill:#E3E9FD;} + .d2-236292005 .fill-B4{fill:#E3E9FD;} + .d2-236292005 .fill-B5{fill:#EDF0FD;} + .d2-236292005 .fill-B6{fill:#F7F8FE;} + .d2-236292005 .fill-AA2{fill:#4A6FF3;} + .d2-236292005 .fill-AA4{fill:#EDF0FD;} + .d2-236292005 .fill-AA5{fill:#F7F8FE;} + .d2-236292005 .fill-AB4{fill:#EDF0FD;} + .d2-236292005 .fill-AB5{fill:#F7F8FE;} + .d2-236292005 .stroke-N1{stroke:#0A0F25;} + .d2-236292005 .stroke-N2{stroke:#676C7E;} + .d2-236292005 .stroke-N3{stroke:#9499AB;} + .d2-236292005 .stroke-N4{stroke:#CFD2DD;} + .d2-236292005 .stroke-N5{stroke:#DEE1EB;} + .d2-236292005 .stroke-N6{stroke:#EEF1F8;} + .d2-236292005 .stroke-N7{stroke:#FFFFFF;} + .d2-236292005 .stroke-B1{stroke:#0D32B2;} + .d2-236292005 .stroke-B2{stroke:#0D32B2;} + .d2-236292005 .stroke-B3{stroke:#E3E9FD;} + .d2-236292005 .stroke-B4{stroke:#E3E9FD;} + .d2-236292005 .stroke-B5{stroke:#EDF0FD;} + .d2-236292005 .stroke-B6{stroke:#F7F8FE;} + .d2-236292005 .stroke-AA2{stroke:#4A6FF3;} + .d2-236292005 .stroke-AA4{stroke:#EDF0FD;} + .d2-236292005 .stroke-AA5{stroke:#F7F8FE;} + .d2-236292005 .stroke-AB4{stroke:#EDF0FD;} + .d2-236292005 .stroke-AB5{stroke:#F7F8FE;} + .d2-236292005 .background-color-N1{background-color:#0A0F25;} + .d2-236292005 .background-color-N2{background-color:#676C7E;} + .d2-236292005 .background-color-N3{background-color:#9499AB;} + .d2-236292005 .background-color-N4{background-color:#CFD2DD;} + .d2-236292005 .background-color-N5{background-color:#DEE1EB;} + .d2-236292005 .background-color-N6{background-color:#EEF1F8;} + .d2-236292005 .background-color-N7{background-color:#FFFFFF;} + .d2-236292005 .background-color-B1{background-color:#0D32B2;} + .d2-236292005 .background-color-B2{background-color:#0D32B2;} + .d2-236292005 .background-color-B3{background-color:#E3E9FD;} + .d2-236292005 .background-color-B4{background-color:#E3E9FD;} + .d2-236292005 .background-color-B5{background-color:#EDF0FD;} + .d2-236292005 .background-color-B6{background-color:#F7F8FE;} + .d2-236292005 .background-color-AA2{background-color:#4A6FF3;} + .d2-236292005 .background-color-AA4{background-color:#EDF0FD;} + .d2-236292005 .background-color-AA5{background-color:#F7F8FE;} + .d2-236292005 .background-color-AB4{background-color:#EDF0FD;} + .d2-236292005 .background-color-AB5{background-color:#F7F8FE;} + .d2-236292005 .color-N1{color:#0A0F25;} + .d2-236292005 .color-N2{color:#676C7E;} + .d2-236292005 .color-N3{color:#9499AB;} + .d2-236292005 .color-N4{color:#CFD2DD;} + .d2-236292005 .color-N5{color:#DEE1EB;} + .d2-236292005 .color-N6{color:#EEF1F8;} + .d2-236292005 .color-N7{color:#FFFFFF;} + .d2-236292005 .color-B1{color:#0D32B2;} + .d2-236292005 .color-B2{color:#0D32B2;} + .d2-236292005 .color-B3{color:#E3E9FD;} + .d2-236292005 .color-B4{color:#E3E9FD;} + .d2-236292005 .color-B5{color:#EDF0FD;} + .d2-236292005 .color-B6{color:#F7F8FE;} + .d2-236292005 .color-AA2{color:#4A6FF3;} + .d2-236292005 .color-AA4{color:#EDF0FD;} + .d2-236292005 .color-AA5{color:#F7F8FE;} + .d2-236292005 .color-AB4{color:#EDF0FD;} + .d2-236292005 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>outerstartendvolume groupvolume definitionvolume - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset/elk/board.exp.json b/e2etests/testdata/stable/multiple_offset/elk/board.exp.json index 9c8483c2d..be7577a12 100644 --- a/e2etests/testdata/stable/multiple_offset/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset/elk/board.exp.json @@ -256,8 +256,8 @@ "x": 383, "y": 32 }, - "width": 163, - "height": 312, + "width": 153, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "n3.a", "type": "rectangle", "pos": { - "x": 438, - "y": 82 + "x": 433, + "y": 77 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "n3.b", "type": "rectangle", "pos": { - "x": 433, - "y": 228 + "x": 428, + "y": 223 }, "width": 53, "height": 66, @@ -379,8 +379,8 @@ "x": 566, "y": 34 }, - "width": 168, - "height": 317, + "width": 153, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,8 +417,8 @@ "id": "n4.a", "type": "rectangle", "pos": { - "x": 623, - "y": 84 + "x": 616, + "y": 77 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "n4.b", "type": "rectangle", "pos": { - "x": 616, - "y": 235 + "x": 608, + "y": 228 }, "width": 53, "height": 66, @@ -502,8 +502,8 @@ "x": 754, "y": 37 }, - "width": 153, - "height": 302, + "width": 143, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,8 +540,8 @@ "id": "n5.a", "type": "rectangle", "pos": { - "x": 804, - "y": 87 + "x": 799, + "y": 82 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "n5.b", "type": "rectangle", "pos": { - "x": 804, - "y": 223 + "x": 799, + "y": 218 }, "width": 53, "height": 66, @@ -625,8 +625,8 @@ "x": 927, "y": 42 }, - "width": 153, - "height": 302, + "width": 138, + "height": 287, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -663,8 +663,8 @@ "id": "n6.a", "type": "rectangle", "pos": { - "x": 977, - "y": 92 + "x": 969, + "y": 84 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "n6.b", "type": "rectangle", "pos": { - "x": 977, - "y": 228 + "x": 969, + "y": 220 }, "width": 53, "height": 66, @@ -748,8 +748,8 @@ "x": 1100, "y": 32 }, - "width": 163, - "height": 312, + "width": 153, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,8 +786,8 @@ "id": "n7.a", "type": "rectangle", "pos": { - "x": 1150, - "y": 92 + "x": 1145, + "y": 87 }, "width": 53, "height": 66, @@ -827,8 +827,8 @@ "id": "n7.b", "type": "rectangle", "pos": { - "x": 1155, - "y": 228 + "x": 1150, + "y": 223 }, "width": 53, "height": 66, @@ -871,8 +871,8 @@ "x": 1283, "y": 34 }, - "width": 168, - "height": 317, + "width": 153, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -909,8 +909,8 @@ "id": "n8.a", "type": "rectangle", "pos": { - "x": 1333, - "y": 99 + "x": 1325, + "y": 92 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "n8.b", "type": "rectangle", "pos": { - "x": 1340, - "y": 235 + "x": 1333, + "y": 228 }, "width": 53, "height": 66, @@ -994,8 +994,8 @@ "x": 1471, "y": 27 }, - "width": 163, - "height": 322, + "width": 153, + "height": 312, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,8 +1032,8 @@ "id": "n9.a", "type": "rectangle", "pos": { - "x": 1521, - "y": 87 + "x": 1516, + "y": 82 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "n9.b", "type": "rectangle", "pos": { - "x": 1521, - "y": 233 + "x": 1516, + "y": 228 }, "width": 53, "height": 66, @@ -1117,8 +1117,8 @@ "x": 1654, "y": 27 }, - "width": 168, - "height": 332, + "width": 153, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1155,8 +1155,8 @@ "id": "n10.a", "type": "rectangle", "pos": { - "x": 1704, - "y": 92 + "x": 1696, + "y": 84 }, "width": 53, "height": 66, @@ -1196,8 +1196,8 @@ "id": "n10.b", "type": "rectangle", "pos": { - "x": 1704, - "y": 243 + "x": 1696, + "y": 235 }, "width": 53, "height": 66, @@ -1336,12 +1336,12 @@ "labelPercentage": 0, "route": [ { - "x": 464.5, - "y": 148 + "x": 459.5, + "y": 143 }, { - "x": 464.5, - "y": 218 + "x": 459.5, + "y": 213 } ], "animated": false, @@ -1374,12 +1374,12 @@ "labelPercentage": 0, "route": [ { - "x": 650, - "y": 150.5 + "x": 642.5, + "y": 143 }, { - "x": 650, - "y": 220.5 + "x": 642.5, + "y": 213 } ], "animated": false, @@ -1412,12 +1412,12 @@ "labelPercentage": 0, "route": [ { - "x": 830.5, - "y": 153 + "x": 825.5, + "y": 148 }, { - "x": 830.5, - "y": 223 + "x": 825.5, + "y": 218 } ], "animated": false, @@ -1450,12 +1450,12 @@ "labelPercentage": 0, "route": [ { - "x": 1003.5, - "y": 158 + "x": 996, + "y": 150.5 }, { - "x": 1003.5, - "y": 228 + "x": 996, + "y": 220.5 } ], "animated": false, @@ -1488,12 +1488,12 @@ "labelPercentage": 0, "route": [ { - "x": 1181.5, - "y": 158 + "x": 1176.5, + "y": 153 }, { - "x": 1181.5, - "y": 228 + "x": 1176.5, + "y": 223 } ], "animated": false, @@ -1526,12 +1526,12 @@ "labelPercentage": 0, "route": [ { - "x": 1367, - "y": 165.5 + "x": 1359.5, + "y": 158 }, { - "x": 1367, - "y": 235.5 + "x": 1359.5, + "y": 228 } ], "animated": false, @@ -1564,12 +1564,12 @@ "labelPercentage": 0, "route": [ { - "x": 1552.5, - "y": 153 + "x": 1547.5, + "y": 148 }, { - "x": 1552.5, - "y": 223 + "x": 1547.5, + "y": 218 } ], "animated": false, @@ -1602,12 +1602,12 @@ "labelPercentage": 0, "route": [ { - "x": 1738, - "y": 158 + "x": 1730.5, + "y": 150.5 }, { - "x": 1738, - "y": 228 + "x": 1730.5, + "y": 220.5 } ], "animated": false, diff --git a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg index 08e73a6a0..5494fac39 100644 --- a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 - -n4n5 - -n6n7 - -n8n9 - -n10aba + .d2-4020186194 .fill-N1{fill:#0A0F25;} + .d2-4020186194 .fill-N2{fill:#676C7E;} + .d2-4020186194 .fill-N3{fill:#9499AB;} + .d2-4020186194 .fill-N4{fill:#CFD2DD;} + .d2-4020186194 .fill-N5{fill:#DEE1EB;} + .d2-4020186194 .fill-N6{fill:#EEF1F8;} + .d2-4020186194 .fill-N7{fill:#FFFFFF;} + .d2-4020186194 .fill-B1{fill:#0D32B2;} + .d2-4020186194 .fill-B2{fill:#0D32B2;} + .d2-4020186194 .fill-B3{fill:#E3E9FD;} + .d2-4020186194 .fill-B4{fill:#E3E9FD;} + .d2-4020186194 .fill-B5{fill:#EDF0FD;} + .d2-4020186194 .fill-B6{fill:#F7F8FE;} + .d2-4020186194 .fill-AA2{fill:#4A6FF3;} + .d2-4020186194 .fill-AA4{fill:#EDF0FD;} + .d2-4020186194 .fill-AA5{fill:#F7F8FE;} + .d2-4020186194 .fill-AB4{fill:#EDF0FD;} + .d2-4020186194 .fill-AB5{fill:#F7F8FE;} + .d2-4020186194 .stroke-N1{stroke:#0A0F25;} + .d2-4020186194 .stroke-N2{stroke:#676C7E;} + .d2-4020186194 .stroke-N3{stroke:#9499AB;} + .d2-4020186194 .stroke-N4{stroke:#CFD2DD;} + .d2-4020186194 .stroke-N5{stroke:#DEE1EB;} + .d2-4020186194 .stroke-N6{stroke:#EEF1F8;} + .d2-4020186194 .stroke-N7{stroke:#FFFFFF;} + .d2-4020186194 .stroke-B1{stroke:#0D32B2;} + .d2-4020186194 .stroke-B2{stroke:#0D32B2;} + .d2-4020186194 .stroke-B3{stroke:#E3E9FD;} + .d2-4020186194 .stroke-B4{stroke:#E3E9FD;} + .d2-4020186194 .stroke-B5{stroke:#EDF0FD;} + .d2-4020186194 .stroke-B6{stroke:#F7F8FE;} + .d2-4020186194 .stroke-AA2{stroke:#4A6FF3;} + .d2-4020186194 .stroke-AA4{stroke:#EDF0FD;} + .d2-4020186194 .stroke-AA5{stroke:#F7F8FE;} + .d2-4020186194 .stroke-AB4{stroke:#EDF0FD;} + .d2-4020186194 .stroke-AB5{stroke:#F7F8FE;} + .d2-4020186194 .background-color-N1{background-color:#0A0F25;} + .d2-4020186194 .background-color-N2{background-color:#676C7E;} + .d2-4020186194 .background-color-N3{background-color:#9499AB;} + .d2-4020186194 .background-color-N4{background-color:#CFD2DD;} + .d2-4020186194 .background-color-N5{background-color:#DEE1EB;} + .d2-4020186194 .background-color-N6{background-color:#EEF1F8;} + .d2-4020186194 .background-color-N7{background-color:#FFFFFF;} + .d2-4020186194 .background-color-B1{background-color:#0D32B2;} + .d2-4020186194 .background-color-B2{background-color:#0D32B2;} + .d2-4020186194 .background-color-B3{background-color:#E3E9FD;} + .d2-4020186194 .background-color-B4{background-color:#E3E9FD;} + .d2-4020186194 .background-color-B5{background-color:#EDF0FD;} + .d2-4020186194 .background-color-B6{background-color:#F7F8FE;} + .d2-4020186194 .background-color-AA2{background-color:#4A6FF3;} + .d2-4020186194 .background-color-AA4{background-color:#EDF0FD;} + .d2-4020186194 .background-color-AA5{background-color:#F7F8FE;} + .d2-4020186194 .background-color-AB4{background-color:#EDF0FD;} + .d2-4020186194 .background-color-AB5{background-color:#F7F8FE;} + .d2-4020186194 .color-N1{color:#0A0F25;} + .d2-4020186194 .color-N2{color:#676C7E;} + .d2-4020186194 .color-N3{color:#9499AB;} + .d2-4020186194 .color-N4{color:#CFD2DD;} + .d2-4020186194 .color-N5{color:#DEE1EB;} + .d2-4020186194 .color-N6{color:#EEF1F8;} + .d2-4020186194 .color-N7{color:#FFFFFF;} + .d2-4020186194 .color-B1{color:#0D32B2;} + .d2-4020186194 .color-B2{color:#0D32B2;} + .d2-4020186194 .color-B3{color:#E3E9FD;} + .d2-4020186194 .color-B4{color:#E3E9FD;} + .d2-4020186194 .color-B5{color:#EDF0FD;} + .d2-4020186194 .color-B6{color:#F7F8FE;} + .d2-4020186194 .color-AA2{color:#4A6FF3;} + .d2-4020186194 .color-AA4{color:#EDF0FD;} + .d2-4020186194 .color-AA5{color:#F7F8FE;} + .d2-4020186194 .color-AB4{color:#EDF0FD;} + .d2-4020186194 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>n1n2n3 + +n4n5 + +n6n7 + +n8n9 + +n10aba -baba - -bababab - -abab - -a - -b - +baba + +bababab + +abab + +a + +b + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json b/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json index 480bdb042..54075d48a 100644 --- a/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json @@ -256,8 +256,8 @@ "x": 22, "y": 419 }, - "width": 286, - "height": 176, + "width": 276, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "n3.a", "type": "rectangle", "pos": { - "x": 205, - "y": 474 + "x": 200, + "y": 469 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "n3.b", "type": "rectangle", "pos": { - "x": 72, - "y": 479 + "x": 67, + "y": 474 }, "width": 53, "height": 66, @@ -379,8 +379,8 @@ "x": 19, "y": 620 }, - "width": 291, - "height": 181, + "width": 276, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,8 +417,8 @@ "id": "n4.a", "type": "rectangle", "pos": { - "x": 207, - "y": 677 + "x": 200, + "y": 670 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "n4.b", "type": "rectangle", "pos": { - "x": 69, - "y": 685 + "x": 62, + "y": 677 }, "width": 53, "height": 66, @@ -502,8 +502,8 @@ "x": 27, "y": 816 }, - "width": 276, - "height": 166, + "width": 266, + "height": 156, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,8 +540,8 @@ "id": "n5.a", "type": "rectangle", "pos": { - "x": 200, - "y": 866 + "x": 195, + "y": 861 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "n5.b", "type": "rectangle", "pos": { - "x": 77, - "y": 866 + "x": 72, + "y": 861 }, "width": 53, "height": 66, @@ -625,8 +625,8 @@ "x": 27, "y": 1007 }, - "width": 276, - "height": 166, + "width": 261, + "height": 151, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -663,8 +663,8 @@ "id": "n6.a", "type": "rectangle", "pos": { - "x": 200, - "y": 1057 + "x": 192, + "y": 1049 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "n6.b", "type": "rectangle", "pos": { - "x": 77, - "y": 1057 + "x": 69, + "y": 1049 }, "width": 53, "height": 66, @@ -748,8 +748,8 @@ "x": 22, "y": 1188 }, - "width": 286, - "height": 176, + "width": 276, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,8 +786,8 @@ "id": "n7.a", "type": "rectangle", "pos": { - "x": 195, - "y": 1248 + "x": 190, + "y": 1243 }, "width": 53, "height": 66, @@ -827,8 +827,8 @@ "id": "n7.b", "type": "rectangle", "pos": { - "x": 72, - "y": 1243 + "x": 67, + "y": 1238 }, "width": 53, "height": 66, @@ -871,8 +871,8 @@ "x": 19, "y": 1389 }, - "width": 291, - "height": 181, + "width": 276, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -909,8 +909,8 @@ "id": "n8.a", "type": "rectangle", "pos": { - "x": 192, - "y": 1454 + "x": 185, + "y": 1446 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "n8.b", "type": "rectangle", "pos": { - "x": 69, - "y": 1446 + "x": 62, + "y": 1439 }, "width": 53, "height": 66, @@ -994,8 +994,8 @@ "x": 17, "y": 1585 }, - "width": 296, - "height": 176, + "width": 286, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,8 +1032,8 @@ "id": "n9.a", "type": "rectangle", "pos": { - "x": 200, - "y": 1645 + "x": 195, + "y": 1640 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "n9.b", "type": "rectangle", "pos": { - "x": 67, - "y": 1645 + "x": 62, + "y": 1640 }, "width": 53, "height": 66, @@ -1117,8 +1117,8 @@ "x": 12, "y": 1786 }, - "width": 306, - "height": 181, + "width": 291, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1155,8 +1155,8 @@ "id": "n10.a", "type": "rectangle", "pos": { - "x": 200, - "y": 1851 + "x": 192, + "y": 1843 }, "width": 53, "height": 66, @@ -1196,8 +1196,8 @@ "id": "n10.b", "type": "rectangle", "pos": { - "x": 62, - "y": 1851 + "x": 54, + "y": 1843 }, "width": 53, "height": 66, @@ -1336,12 +1336,12 @@ "labelPercentage": 0, "route": [ { - "x": 205, - "y": 507 + "x": 200, + "y": 502 }, { - "x": 135, - "y": 507 + "x": 130, + "y": 502 } ], "animated": false, @@ -1374,12 +1374,12 @@ "labelPercentage": 0, "route": [ { - "x": 207.5, - "y": 710.5 + "x": 200, + "y": 703 }, { - "x": 137.5, - "y": 710.5 + "x": 130, + "y": 703 } ], "animated": false, @@ -1412,12 +1412,12 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 899 + "x": 195, + "y": 894 }, { - "x": 130, - "y": 899 + "x": 125, + "y": 894 } ], "animated": false, @@ -1450,12 +1450,12 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 1090 + "x": 192.5, + "y": 1082.5 }, { - "x": 130, - "y": 1090 + "x": 122.5, + "y": 1082.5 } ], "animated": false, @@ -1488,12 +1488,12 @@ "labelPercentage": 0, "route": [ { - "x": 195, - "y": 1276 + "x": 190, + "y": 1271 }, { - "x": 125, - "y": 1276 + "x": 120, + "y": 1271 } ], "animated": false, @@ -1526,12 +1526,12 @@ "labelPercentage": 0, "route": [ { - "x": 192.5, - "y": 1479.5 + "x": 185, + "y": 1472 }, { - "x": 122.5, - "y": 1479.5 + "x": 115, + "y": 1472 } ], "animated": false, @@ -1564,12 +1564,12 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 1673 + "x": 195, + "y": 1668 }, { - "x": 130, - "y": 1673 + "x": 125, + "y": 1668 } ], "animated": false, @@ -1602,12 +1602,12 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 1876.5 + "x": 192.5, + "y": 1869 }, { - "x": 130, - "y": 1876.5 + "x": 122.5, + "y": 1869 } ], "animated": false, diff --git a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg index 371182edc..42fad9d3d 100644 --- a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 - -n4n5 - -n6n7 - -n8n9 - -n10aba + .d2-2183146186 .fill-N1{fill:#0A0F25;} + .d2-2183146186 .fill-N2{fill:#676C7E;} + .d2-2183146186 .fill-N3{fill:#9499AB;} + .d2-2183146186 .fill-N4{fill:#CFD2DD;} + .d2-2183146186 .fill-N5{fill:#DEE1EB;} + .d2-2183146186 .fill-N6{fill:#EEF1F8;} + .d2-2183146186 .fill-N7{fill:#FFFFFF;} + .d2-2183146186 .fill-B1{fill:#0D32B2;} + .d2-2183146186 .fill-B2{fill:#0D32B2;} + .d2-2183146186 .fill-B3{fill:#E3E9FD;} + .d2-2183146186 .fill-B4{fill:#E3E9FD;} + .d2-2183146186 .fill-B5{fill:#EDF0FD;} + .d2-2183146186 .fill-B6{fill:#F7F8FE;} + .d2-2183146186 .fill-AA2{fill:#4A6FF3;} + .d2-2183146186 .fill-AA4{fill:#EDF0FD;} + .d2-2183146186 .fill-AA5{fill:#F7F8FE;} + .d2-2183146186 .fill-AB4{fill:#EDF0FD;} + .d2-2183146186 .fill-AB5{fill:#F7F8FE;} + .d2-2183146186 .stroke-N1{stroke:#0A0F25;} + .d2-2183146186 .stroke-N2{stroke:#676C7E;} + .d2-2183146186 .stroke-N3{stroke:#9499AB;} + .d2-2183146186 .stroke-N4{stroke:#CFD2DD;} + .d2-2183146186 .stroke-N5{stroke:#DEE1EB;} + .d2-2183146186 .stroke-N6{stroke:#EEF1F8;} + .d2-2183146186 .stroke-N7{stroke:#FFFFFF;} + .d2-2183146186 .stroke-B1{stroke:#0D32B2;} + .d2-2183146186 .stroke-B2{stroke:#0D32B2;} + .d2-2183146186 .stroke-B3{stroke:#E3E9FD;} + .d2-2183146186 .stroke-B4{stroke:#E3E9FD;} + .d2-2183146186 .stroke-B5{stroke:#EDF0FD;} + .d2-2183146186 .stroke-B6{stroke:#F7F8FE;} + .d2-2183146186 .stroke-AA2{stroke:#4A6FF3;} + .d2-2183146186 .stroke-AA4{stroke:#EDF0FD;} + .d2-2183146186 .stroke-AA5{stroke:#F7F8FE;} + .d2-2183146186 .stroke-AB4{stroke:#EDF0FD;} + .d2-2183146186 .stroke-AB5{stroke:#F7F8FE;} + .d2-2183146186 .background-color-N1{background-color:#0A0F25;} + .d2-2183146186 .background-color-N2{background-color:#676C7E;} + .d2-2183146186 .background-color-N3{background-color:#9499AB;} + .d2-2183146186 .background-color-N4{background-color:#CFD2DD;} + .d2-2183146186 .background-color-N5{background-color:#DEE1EB;} + .d2-2183146186 .background-color-N6{background-color:#EEF1F8;} + .d2-2183146186 .background-color-N7{background-color:#FFFFFF;} + .d2-2183146186 .background-color-B1{background-color:#0D32B2;} + .d2-2183146186 .background-color-B2{background-color:#0D32B2;} + .d2-2183146186 .background-color-B3{background-color:#E3E9FD;} + .d2-2183146186 .background-color-B4{background-color:#E3E9FD;} + .d2-2183146186 .background-color-B5{background-color:#EDF0FD;} + .d2-2183146186 .background-color-B6{background-color:#F7F8FE;} + .d2-2183146186 .background-color-AA2{background-color:#4A6FF3;} + .d2-2183146186 .background-color-AA4{background-color:#EDF0FD;} + .d2-2183146186 .background-color-AA5{background-color:#F7F8FE;} + .d2-2183146186 .background-color-AB4{background-color:#EDF0FD;} + .d2-2183146186 .background-color-AB5{background-color:#F7F8FE;} + .d2-2183146186 .color-N1{color:#0A0F25;} + .d2-2183146186 .color-N2{color:#676C7E;} + .d2-2183146186 .color-N3{color:#9499AB;} + .d2-2183146186 .color-N4{color:#CFD2DD;} + .d2-2183146186 .color-N5{color:#DEE1EB;} + .d2-2183146186 .color-N6{color:#EEF1F8;} + .d2-2183146186 .color-N7{color:#FFFFFF;} + .d2-2183146186 .color-B1{color:#0D32B2;} + .d2-2183146186 .color-B2{color:#0D32B2;} + .d2-2183146186 .color-B3{color:#E3E9FD;} + .d2-2183146186 .color-B4{color:#E3E9FD;} + .d2-2183146186 .color-B5{color:#EDF0FD;} + .d2-2183146186 .color-B6{color:#F7F8FE;} + .d2-2183146186 .color-AA2{color:#4A6FF3;} + .d2-2183146186 .color-AA4{color:#EDF0FD;} + .d2-2183146186 .color-AA5{color:#F7F8FE;} + .d2-2183146186 .color-AB4{color:#EDF0FD;} + .d2-2183146186 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>n1n2n3 + +n4n5 + +n6n7 + +n8n9 + +n10aba -baba - -bababab - -abab - -a - -b - +baba + +bababab + +abab + +a + +b + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nesting_power/elk/board.exp.json b/e2etests/testdata/stable/nesting_power/elk/board.exp.json index 6835dd774..5c3f56e34 100644 --- a/e2etests/testdata/stable/nesting_power/elk/board.exp.json +++ b/e2etests/testdata/stable/nesting_power/elk/board.exp.json @@ -7224,7 +7224,7 @@ "y": 164 }, { - "x": 811, + "x": 810, "y": 243 } ], @@ -7262,7 +7262,7 @@ "y": 315 }, { - "x": 810, + "x": 811, "y": 408 } ], @@ -7452,7 +7452,7 @@ "y": 162 }, { - "x": 1322, + "x": 1321, "y": 246 } ], @@ -7490,7 +7490,7 @@ "y": 326 }, { - "x": 1321, + "x": 1322, "y": 408 } ], @@ -7528,8 +7528,8 @@ "y": 164 }, { - "x": 1493, - "y": 239 + "x": 1494, + "y": 238 } ], "animated": false, diff --git a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg index e59d9a270..9fc41e9bb 100644 --- a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-2722166108 .fill-N1{fill:#0A0F25;} + .d2-2722166108 .fill-N2{fill:#676C7E;} + .d2-2722166108 .fill-N3{fill:#9499AB;} + .d2-2722166108 .fill-N4{fill:#CFD2DD;} + .d2-2722166108 .fill-N5{fill:#DEE1EB;} + .d2-2722166108 .fill-N6{fill:#EEF1F8;} + .d2-2722166108 .fill-N7{fill:#FFFFFF;} + .d2-2722166108 .fill-B1{fill:#0D32B2;} + .d2-2722166108 .fill-B2{fill:#0D32B2;} + .d2-2722166108 .fill-B3{fill:#E3E9FD;} + .d2-2722166108 .fill-B4{fill:#E3E9FD;} + .d2-2722166108 .fill-B5{fill:#EDF0FD;} + .d2-2722166108 .fill-B6{fill:#F7F8FE;} + .d2-2722166108 .fill-AA2{fill:#4A6FF3;} + .d2-2722166108 .fill-AA4{fill:#EDF0FD;} + .d2-2722166108 .fill-AA5{fill:#F7F8FE;} + .d2-2722166108 .fill-AB4{fill:#EDF0FD;} + .d2-2722166108 .fill-AB5{fill:#F7F8FE;} + .d2-2722166108 .stroke-N1{stroke:#0A0F25;} + .d2-2722166108 .stroke-N2{stroke:#676C7E;} + .d2-2722166108 .stroke-N3{stroke:#9499AB;} + .d2-2722166108 .stroke-N4{stroke:#CFD2DD;} + .d2-2722166108 .stroke-N5{stroke:#DEE1EB;} + .d2-2722166108 .stroke-N6{stroke:#EEF1F8;} + .d2-2722166108 .stroke-N7{stroke:#FFFFFF;} + .d2-2722166108 .stroke-B1{stroke:#0D32B2;} + .d2-2722166108 .stroke-B2{stroke:#0D32B2;} + .d2-2722166108 .stroke-B3{stroke:#E3E9FD;} + .d2-2722166108 .stroke-B4{stroke:#E3E9FD;} + .d2-2722166108 .stroke-B5{stroke:#EDF0FD;} + .d2-2722166108 .stroke-B6{stroke:#F7F8FE;} + .d2-2722166108 .stroke-AA2{stroke:#4A6FF3;} + .d2-2722166108 .stroke-AA4{stroke:#EDF0FD;} + .d2-2722166108 .stroke-AA5{stroke:#F7F8FE;} + .d2-2722166108 .stroke-AB4{stroke:#EDF0FD;} + .d2-2722166108 .stroke-AB5{stroke:#F7F8FE;} + .d2-2722166108 .background-color-N1{background-color:#0A0F25;} + .d2-2722166108 .background-color-N2{background-color:#676C7E;} + .d2-2722166108 .background-color-N3{background-color:#9499AB;} + .d2-2722166108 .background-color-N4{background-color:#CFD2DD;} + .d2-2722166108 .background-color-N5{background-color:#DEE1EB;} + .d2-2722166108 .background-color-N6{background-color:#EEF1F8;} + .d2-2722166108 .background-color-N7{background-color:#FFFFFF;} + .d2-2722166108 .background-color-B1{background-color:#0D32B2;} + .d2-2722166108 .background-color-B2{background-color:#0D32B2;} + .d2-2722166108 .background-color-B3{background-color:#E3E9FD;} + .d2-2722166108 .background-color-B4{background-color:#E3E9FD;} + .d2-2722166108 .background-color-B5{background-color:#EDF0FD;} + .d2-2722166108 .background-color-B6{background-color:#F7F8FE;} + .d2-2722166108 .background-color-AA2{background-color:#4A6FF3;} + .d2-2722166108 .background-color-AA4{background-color:#EDF0FD;} + .d2-2722166108 .background-color-AA5{background-color:#F7F8FE;} + .d2-2722166108 .background-color-AB4{background-color:#EDF0FD;} + .d2-2722166108 .background-color-AB5{background-color:#F7F8FE;} + .d2-2722166108 .color-N1{color:#0A0F25;} + .d2-2722166108 .color-N2{color:#676C7E;} + .d2-2722166108 .color-N3{color:#9499AB;} + .d2-2722166108 .color-N4{color:#CFD2DD;} + .d2-2722166108 .color-N5{color:#DEE1EB;} + .d2-2722166108 .color-N6{color:#EEF1F8;} + .d2-2722166108 .color-N7{color:#FFFFFF;} + .d2-2722166108 .color-B1{color:#0D32B2;} + .d2-2722166108 .color-B2{color:#0D32B2;} + .d2-2722166108 .color-B3{color:#E3E9FD;} + .d2-2722166108 .color-B4{color:#E3E9FD;} + .d2-2722166108 .color-B5{color:#EDF0FD;} + .d2-2722166108 .color-B6{color:#F7F8FE;} + .d2-2722166108 .color-AA2{color:#4A6FF3;} + .d2-2722166108 .color-AA4{color:#EDF0FD;} + .d2-2722166108 .color-AA5{color:#F7F8FE;} + .d2-2722166108 .color-AB4{color:#EDF0FD;} + .d2-2722166108 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -113,7 +113,7 @@ Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax -ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json index f7d744bab..1875b17a2 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 171, - "height": 302, + "height": 328, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -134,10 +134,10 @@ ], "pos": { "x": 203, - "y": 42 + "y": 25 }, "width": 207, - "height": 242, + "height": 301, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -190,7 +190,7 @@ ], "pos": { "x": 253, - "y": 116 + "y": 158 }, "width": 107, "height": 118, @@ -246,10 +246,10 @@ ], "pos": { "x": 430, - "y": 42 + "y": 12 }, "width": 208, - "height": 242, + "height": 327, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -302,7 +302,7 @@ ], "pos": { "x": 480, - "y": 92 + "y": 88 }, "width": 108, "height": 118, @@ -358,9 +358,9 @@ ], "pos": { "x": 658, - "y": 54 + "y": 67 }, - "width": 614, + "width": 609, "height": 218, "opacity": 1, "strokeDash": 0, @@ -413,8 +413,8 @@ "icon" ], "pos": { - "x": 801, - "y": 104 + "x": 796, + "y": 117 }, "width": 132, "height": 118, diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg index 71f719808..dd92e3e63 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff - - - - - + .d2-1950801162 .fill-N1{fill:#0A0F25;} + .d2-1950801162 .fill-N2{fill:#676C7E;} + .d2-1950801162 .fill-N3{fill:#9499AB;} + .d2-1950801162 .fill-N4{fill:#CFD2DD;} + .d2-1950801162 .fill-N5{fill:#DEE1EB;} + .d2-1950801162 .fill-N6{fill:#EEF1F8;} + .d2-1950801162 .fill-N7{fill:#FFFFFF;} + .d2-1950801162 .fill-B1{fill:#0D32B2;} + .d2-1950801162 .fill-B2{fill:#0D32B2;} + .d2-1950801162 .fill-B3{fill:#E3E9FD;} + .d2-1950801162 .fill-B4{fill:#E3E9FD;} + .d2-1950801162 .fill-B5{fill:#EDF0FD;} + .d2-1950801162 .fill-B6{fill:#F7F8FE;} + .d2-1950801162 .fill-AA2{fill:#4A6FF3;} + .d2-1950801162 .fill-AA4{fill:#EDF0FD;} + .d2-1950801162 .fill-AA5{fill:#F7F8FE;} + .d2-1950801162 .fill-AB4{fill:#EDF0FD;} + .d2-1950801162 .fill-AB5{fill:#F7F8FE;} + .d2-1950801162 .stroke-N1{stroke:#0A0F25;} + .d2-1950801162 .stroke-N2{stroke:#676C7E;} + .d2-1950801162 .stroke-N3{stroke:#9499AB;} + .d2-1950801162 .stroke-N4{stroke:#CFD2DD;} + .d2-1950801162 .stroke-N5{stroke:#DEE1EB;} + .d2-1950801162 .stroke-N6{stroke:#EEF1F8;} + .d2-1950801162 .stroke-N7{stroke:#FFFFFF;} + .d2-1950801162 .stroke-B1{stroke:#0D32B2;} + .d2-1950801162 .stroke-B2{stroke:#0D32B2;} + .d2-1950801162 .stroke-B3{stroke:#E3E9FD;} + .d2-1950801162 .stroke-B4{stroke:#E3E9FD;} + .d2-1950801162 .stroke-B5{stroke:#EDF0FD;} + .d2-1950801162 .stroke-B6{stroke:#F7F8FE;} + .d2-1950801162 .stroke-AA2{stroke:#4A6FF3;} + .d2-1950801162 .stroke-AA4{stroke:#EDF0FD;} + .d2-1950801162 .stroke-AA5{stroke:#F7F8FE;} + .d2-1950801162 .stroke-AB4{stroke:#EDF0FD;} + .d2-1950801162 .stroke-AB5{stroke:#F7F8FE;} + .d2-1950801162 .background-color-N1{background-color:#0A0F25;} + .d2-1950801162 .background-color-N2{background-color:#676C7E;} + .d2-1950801162 .background-color-N3{background-color:#9499AB;} + .d2-1950801162 .background-color-N4{background-color:#CFD2DD;} + .d2-1950801162 .background-color-N5{background-color:#DEE1EB;} + .d2-1950801162 .background-color-N6{background-color:#EEF1F8;} + .d2-1950801162 .background-color-N7{background-color:#FFFFFF;} + .d2-1950801162 .background-color-B1{background-color:#0D32B2;} + .d2-1950801162 .background-color-B2{background-color:#0D32B2;} + .d2-1950801162 .background-color-B3{background-color:#E3E9FD;} + .d2-1950801162 .background-color-B4{background-color:#E3E9FD;} + .d2-1950801162 .background-color-B5{background-color:#EDF0FD;} + .d2-1950801162 .background-color-B6{background-color:#F7F8FE;} + .d2-1950801162 .background-color-AA2{background-color:#4A6FF3;} + .d2-1950801162 .background-color-AA4{background-color:#EDF0FD;} + .d2-1950801162 .background-color-AA5{background-color:#F7F8FE;} + .d2-1950801162 .background-color-AB4{background-color:#EDF0FD;} + .d2-1950801162 .background-color-AB5{background-color:#F7F8FE;} + .d2-1950801162 .color-N1{color:#0A0F25;} + .d2-1950801162 .color-N2{color:#676C7E;} + .d2-1950801162 .color-N3{color:#9499AB;} + .d2-1950801162 .color-N4{color:#CFD2DD;} + .d2-1950801162 .color-N5{color:#DEE1EB;} + .d2-1950801162 .color-N6{color:#EEF1F8;} + .d2-1950801162 .color-N7{color:#FFFFFF;} + .d2-1950801162 .color-B1{color:#0D32B2;} + .d2-1950801162 .color-B2{color:#0D32B2;} + .d2-1950801162 .color-B3{color:#E3E9FD;} + .d2-1950801162 .color-B4{color:#E3E9FD;} + .d2-1950801162 .color-B5{color:#EDF0FD;} + .d2-1950801162 .color-B6{color:#F7F8FE;} + .d2-1950801162 .color-AA2{color:#4A6FF3;} + .d2-1950801162 .color-AA4{color:#EDF0FD;} + .d2-1950801162 .color-AA5{color:#F7F8FE;} + .d2-1950801162 .color-AB4{color:#EDF0FD;} + .d2-1950801162 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + + + + + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json index 96f60f080..a986f5e44 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json @@ -698,7 +698,7 @@ "route": [ { "x": 278.6659851074219, - "y": 825 + "y": 799 }, { "x": 278.6659851074219, @@ -744,7 +744,7 @@ "route": [ { "x": 321.3330078125, - "y": 825 + "y": 799 }, { "x": 321.3330078125, @@ -790,7 +790,7 @@ "route": [ { "x": 774.666015625, - "y": 825 + "y": 799 }, { "x": 774.666015625, @@ -836,7 +836,7 @@ "route": [ { "x": 817.3330078125, - "y": 825 + "y": 799 }, { "x": 817.3330078125, @@ -882,7 +882,7 @@ "route": [ { "x": 526.666015625, - "y": 445 + "y": 419 }, { "x": 526.666015625, @@ -928,7 +928,7 @@ "route": [ { "x": 569.3330078125, - "y": 445 + "y": 419 }, { "x": 569.3330078125, diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg index 94825f6f3..cbefc87a7 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + .d2-2207580108 .fill-N1{fill:#0A0F25;} + .d2-2207580108 .fill-N2{fill:#676C7E;} + .d2-2207580108 .fill-N3{fill:#9499AB;} + .d2-2207580108 .fill-N4{fill:#CFD2DD;} + .d2-2207580108 .fill-N5{fill:#DEE1EB;} + .d2-2207580108 .fill-N6{fill:#EEF1F8;} + .d2-2207580108 .fill-N7{fill:#FFFFFF;} + .d2-2207580108 .fill-B1{fill:#0D32B2;} + .d2-2207580108 .fill-B2{fill:#0D32B2;} + .d2-2207580108 .fill-B3{fill:#E3E9FD;} + .d2-2207580108 .fill-B4{fill:#E3E9FD;} + .d2-2207580108 .fill-B5{fill:#EDF0FD;} + .d2-2207580108 .fill-B6{fill:#F7F8FE;} + .d2-2207580108 .fill-AA2{fill:#4A6FF3;} + .d2-2207580108 .fill-AA4{fill:#EDF0FD;} + .d2-2207580108 .fill-AA5{fill:#F7F8FE;} + .d2-2207580108 .fill-AB4{fill:#EDF0FD;} + .d2-2207580108 .fill-AB5{fill:#F7F8FE;} + .d2-2207580108 .stroke-N1{stroke:#0A0F25;} + .d2-2207580108 .stroke-N2{stroke:#676C7E;} + .d2-2207580108 .stroke-N3{stroke:#9499AB;} + .d2-2207580108 .stroke-N4{stroke:#CFD2DD;} + .d2-2207580108 .stroke-N5{stroke:#DEE1EB;} + .d2-2207580108 .stroke-N6{stroke:#EEF1F8;} + .d2-2207580108 .stroke-N7{stroke:#FFFFFF;} + .d2-2207580108 .stroke-B1{stroke:#0D32B2;} + .d2-2207580108 .stroke-B2{stroke:#0D32B2;} + .d2-2207580108 .stroke-B3{stroke:#E3E9FD;} + .d2-2207580108 .stroke-B4{stroke:#E3E9FD;} + .d2-2207580108 .stroke-B5{stroke:#EDF0FD;} + .d2-2207580108 .stroke-B6{stroke:#F7F8FE;} + .d2-2207580108 .stroke-AA2{stroke:#4A6FF3;} + .d2-2207580108 .stroke-AA4{stroke:#EDF0FD;} + .d2-2207580108 .stroke-AA5{stroke:#F7F8FE;} + .d2-2207580108 .stroke-AB4{stroke:#EDF0FD;} + .d2-2207580108 .stroke-AB5{stroke:#F7F8FE;} + .d2-2207580108 .background-color-N1{background-color:#0A0F25;} + .d2-2207580108 .background-color-N2{background-color:#676C7E;} + .d2-2207580108 .background-color-N3{background-color:#9499AB;} + .d2-2207580108 .background-color-N4{background-color:#CFD2DD;} + .d2-2207580108 .background-color-N5{background-color:#DEE1EB;} + .d2-2207580108 .background-color-N6{background-color:#EEF1F8;} + .d2-2207580108 .background-color-N7{background-color:#FFFFFF;} + .d2-2207580108 .background-color-B1{background-color:#0D32B2;} + .d2-2207580108 .background-color-B2{background-color:#0D32B2;} + .d2-2207580108 .background-color-B3{background-color:#E3E9FD;} + .d2-2207580108 .background-color-B4{background-color:#E3E9FD;} + .d2-2207580108 .background-color-B5{background-color:#EDF0FD;} + .d2-2207580108 .background-color-B6{background-color:#F7F8FE;} + .d2-2207580108 .background-color-AA2{background-color:#4A6FF3;} + .d2-2207580108 .background-color-AA4{background-color:#EDF0FD;} + .d2-2207580108 .background-color-AA5{background-color:#F7F8FE;} + .d2-2207580108 .background-color-AB4{background-color:#EDF0FD;} + .d2-2207580108 .background-color-AB5{background-color:#F7F8FE;} + .d2-2207580108 .color-N1{color:#0A0F25;} + .d2-2207580108 .color-N2{color:#676C7E;} + .d2-2207580108 .color-N3{color:#9499AB;} + .d2-2207580108 .color-N4{color:#CFD2DD;} + .d2-2207580108 .color-N5{color:#DEE1EB;} + .d2-2207580108 .color-N6{color:#EEF1F8;} + .d2-2207580108 .color-N7{color:#FFFFFF;} + .d2-2207580108 .color-B1{color:#0D32B2;} + .d2-2207580108 .color-B2{color:#0D32B2;} + .d2-2207580108 .color-B3{color:#E3E9FD;} + .d2-2207580108 .color-B4{color:#E3E9FD;} + .d2-2207580108 .color-B5{color:#EDF0FD;} + .d2-2207580108 .color-B6{color:#F7F8FE;} + .d2-2207580108 .color-AA2{color:#4A6FF3;} + .d2-2207580108 .color-AA4{color:#EDF0FD;} + .d2-2207580108 .color-AA5{color:#F7F8FE;} + .d2-2207580108 .color-AB4{color:#EDF0FD;} + .d2-2207580108 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root @@ -118,10 +118,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-icon/elk/board.exp.json b/e2etests/testdata/txtar/sql-icon/elk/board.exp.json index 140aded18..ca4d10f2c 100644 --- a/e2etests/testdata/txtar/sql-icon/elk/board.exp.json +++ b/e2etests/testdata/txtar/sql-icon/elk/board.exp.json @@ -253,7 +253,7 @@ "y": 330 }, "width": 972, - "height": 262, + "height": 307, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -291,7 +291,7 @@ "type": "sql_table", "pos": { "x": 62, - "y": 404 + "y": 421 }, "width": 106, "height": 72, @@ -375,7 +375,7 @@ "type": "class", "pos": { "x": 188, - "y": 404 + "y": 449 }, "width": 204, "height": 138, @@ -436,7 +436,7 @@ "type": "code", "pos": { "x": 412, - "y": 404 + "y": 417 }, "width": 74, "height": 37, @@ -488,7 +488,7 @@ "type": "text", "pos": { "x": 506, - "y": 404 + "y": 431 }, "width": 428, "height": 91, @@ -567,7 +567,7 @@ }, { "x": 115, - "y": 404 + "y": 421 } ], "animated": false, @@ -605,7 +605,7 @@ }, { "x": 290, - "y": 404 + "y": 449 } ], "animated": false, @@ -643,7 +643,7 @@ }, { "x": 449, - "y": 404 + "y": 417 } ], "animated": false, @@ -681,7 +681,7 @@ }, { "x": 720, - "y": 404 + "y": 431 } ], "animated": false, diff --git a/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg b/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg index 8a6a3288d..4e11e2d8e 100644 --- a/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -withoutwithtableExabclassEx+aba := 1a := 1

This is for all ill-treated fellows

+withoutwithtableExabclassEx+aba := 1a := 1

This is for all ill-treated fellows

You will live a long, healthy, happy life and make bags of money.

-
tableExabclassEx+aba := 1a := 1

This is for all ill-treated fellows

+
tableExabclassEx+aba := 1a := 1

This is for all ill-treated fellows

You will live a long, healthy, happy life and make bags of money.

-
 - +
 + - - + + \ No newline at end of file