From 021011afbd11855413aa7be4db2b682d6edfa297 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 12 Aug 2024 08:23:47 +0800 Subject: [PATCH 1/4] d2render: class headers can render multiple lines correctly --- d2graph/d2graph.go | 2 +- d2renderers/d2svg/class.go | 7 +- .../dagre/board.exp.json | 396 ++++++++++++++++++ .../dagre/sketch.exp.svg | 102 +++++ .../elk/board.exp.json | 396 ++++++++++++++++++ .../elk/sketch.exp.svg | 102 +++++ e2etests/txtar.txt | 28 ++ 7 files changed, 1029 insertions(+), 4 deletions(-) create mode 100644 e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json create mode 100644 e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json create mode 100644 e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index da808ecfd..93a567c29 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -986,7 +986,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } if anyRowText != nil { rowHeight := GetTextDimensions(mtexts, ruler, anyRowText, go2.Pointer(d2fonts.SourceCodePro)).Height + d2target.VerticalPadding - dims.Height = rowHeight * (len(obj.Class.Fields) + len(obj.Class.Methods) + 2) + dims.Height = rowHeight*(len(obj.Class.Fields)+len(obj.Class.Methods)) + go2.Max(2*rowHeight, labelDims.Height+2*label.PADDING) } else { dims.Height = 2*go2.Max(12, labelDims.Height) + d2target.VerticalPadding } diff --git a/d2renderers/d2svg/class.go b/d2renderers/d2svg/class.go index 6f5c124bb..9fb15304c 100644 --- a/d2renderers/d2svg/class.go +++ b/d2renderers/d2svg/class.go @@ -4,6 +4,7 @@ import ( "fmt" "html" "io" + "math" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/d2themes" @@ -34,13 +35,13 @@ func classHeader(diagramHash string, shape d2target.Shape, box *geo.Box, text st textEl := d2themes.NewThemableElement("text") textEl.X = tl.X + textWidth/2 - textEl.Y = tl.Y + textHeight*3/4 + textEl.Y = tl.Y + fontSize textEl.Fill = shape.GetFontColor() textEl.ClassName = "text-mono" textEl.Style = fmt.Sprintf(`text-anchor:%s;font-size:%vpx;`, "middle", 4+fontSize, ) - textEl.Content = svg.EscapeText(text) + textEl.Content = RenderText(text, textEl.X, textHeight) str += textEl.Render() } return str @@ -107,7 +108,7 @@ func drawClass(writer io.Writer, diagramHash string, targetShape d2target.Shape) float64(targetShape.Height), ) rowHeight := box.Height / float64(2+len(targetShape.Class.Fields)+len(targetShape.Class.Methods)) - headerBox := geo.NewBox(box.TopLeft, box.Width, 2*rowHeight) + headerBox := geo.NewBox(box.TopLeft, box.Width, math.Max(2*rowHeight, float64(targetShape.LabelHeight)+2*label.PADDING)) fmt.Fprint(writer, classHeader(diagramHash, targetShape, headerBox, targetShape.Label, float64(targetShape.LabelWidth), float64(targetShape.LabelHeight), float64(targetShape.FontSize)), diff --git a/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json b/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json new file mode 100644 index 000000000..86a4accef --- /dev/null +++ b/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json @@ -0,0 +1,396 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "A", + "type": "class", + "pos": { + "x": 0, + "y": 13 + }, + "width": 319, + "height": 276, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "LeftAligned", + "type": "", + "visibility": "public" + }, + { + "name": "CenterAligned", + "type": "", + "visibility": "public" + }, + { + "name": "RightAligned", + "type": "", + "visibility": "public" + }, + { + "name": "Justified", + "type": "", + "visibility": "public" + } + ], + "methods": null, + "columns": null, + "label": "<>\nAlignment", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 214, + "labelHeight": 55, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "B", + "type": "sql_table", + "pos": { + "x": 379, + "y": 1 + }, + "width": 214, + "height": 300, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "LeftAligned", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 94, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "CenterAligned", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 117, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "RightAligned", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 105, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "Justified", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 72, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + } + ], + "label": "<>\nAlignment", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 189, + "labelHeight": 55, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "C", + "type": "class", + "pos": { + "x": 653, + "y": 13 + }, + "width": 254, + "height": 276, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "LeftAligned", + "type": "", + "visibility": "public" + }, + { + "name": "CenterAligned", + "type": "", + "visibility": "public" + }, + { + "name": "RightAligned", + "type": "", + "visibility": "public" + }, + { + "name": "Justified", + "type": "", + "visibility": "public" + } + ], + "methods": null, + "columns": null, + "label": "Alignment", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 130, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "D", + "type": "class", + "pos": { + "x": 967, + "y": 0 + }, + "width": 254, + "height": 302, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "LeftAligned", + "type": "", + "visibility": "public" + }, + { + "name": "CenterAligned", + "type": "", + "visibility": "public" + }, + { + "name": "RightAligned", + "type": "", + "visibility": "public" + }, + { + "name": "Justified", + "type": "", + "visibility": "public" + } + ], + "methods": null, + "columns": null, + "label": "Alignment\nOf\nAlignment\nOf", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 130, + "labelHeight": 103, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg b/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg new file mode 100644 index 000000000..450863edb --- /dev/null +++ b/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg @@ -0,0 +1,102 @@ +<<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+Justified<<enumeration>>AlignmentLeftAlignedCenterAlignedRightAlignedJustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json b/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json new file mode 100644 index 000000000..5718bb93b --- /dev/null +++ b/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json @@ -0,0 +1,396 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "A", + "type": "class", + "pos": { + "x": 12, + "y": 25 + }, + "width": 319, + "height": 276, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "LeftAligned", + "type": "", + "visibility": "public" + }, + { + "name": "CenterAligned", + "type": "", + "visibility": "public" + }, + { + "name": "RightAligned", + "type": "", + "visibility": "public" + }, + { + "name": "Justified", + "type": "", + "visibility": "public" + } + ], + "methods": null, + "columns": null, + "label": "<>\nAlignment", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 214, + "labelHeight": 55, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "B", + "type": "sql_table", + "pos": { + "x": 351, + "y": 13 + }, + "width": 214, + "height": 300, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "LeftAligned", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 94, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "CenterAligned", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 117, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "RightAligned", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 105, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "Justified", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 72, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + } + ], + "label": "<>\nAlignment", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 189, + "labelHeight": 55, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "C", + "type": "class", + "pos": { + "x": 585, + "y": 25 + }, + "width": 254, + "height": 276, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "LeftAligned", + "type": "", + "visibility": "public" + }, + { + "name": "CenterAligned", + "type": "", + "visibility": "public" + }, + { + "name": "RightAligned", + "type": "", + "visibility": "public" + }, + { + "name": "Justified", + "type": "", + "visibility": "public" + } + ], + "methods": null, + "columns": null, + "label": "Alignment", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 130, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "D", + "type": "class", + "pos": { + "x": 859, + "y": 12 + }, + "width": 254, + "height": 302, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "LeftAligned", + "type": "", + "visibility": "public" + }, + { + "name": "CenterAligned", + "type": "", + "visibility": "public" + }, + { + "name": "RightAligned", + "type": "", + "visibility": "public" + }, + { + "name": "Justified", + "type": "", + "visibility": "public" + } + ], + "methods": null, + "columns": null, + "label": "Alignment\nOf\nAlignment\nOf", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 130, + "labelHeight": 103, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg b/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg new file mode 100644 index 000000000..92afa3007 --- /dev/null +++ b/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +<<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+Justified<<enumeration>>AlignmentLeftAlignedCenterAlignedRightAlignedJustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified + + + \ No newline at end of file diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt index 82c816b95..41a1a2fbe 100644 --- a/e2etests/txtar.txt +++ b/e2etests/txtar.txt @@ -350,3 +350,31 @@ CD Front-End.t1 -> Libreria.t1: generatePresentationPayload() Libreria.t1 -> Libreria.t1: Generar y Firmar\nPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de Titularidad Libreria.t1 -> Front-End.t1: Presentacion Firmada + +-- multiline-class-headers -- +A: "<>\nAlignment"{ + shape: class + + LeftAligned + CenterAligned + RightAligned + Justified +} + +C: "Alignment"{ + shape: class + + LeftAligned + CenterAligned + RightAligned + Justified +} + +D: "Alignment\nOf\nAlignment\nOf"{ + shape: class + + LeftAligned + CenterAligned + RightAligned + Justified +} From b70f9783e26658db4a8822f0e33e6148b506ce18 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 13 Aug 2024 22:36:22 +0800 Subject: [PATCH 2/4] d2compiler: newlines in sql_tables are made invalid --- d2compiler/compile.go | 22 ++++++++++--------- d2compiler/compile_test.go | 15 +++++++++++++ .../sql-table-header-newline.exp.json | 15 +++++++++++++ 3 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 007e8cacd..b3a0380eb 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -1047,16 +1047,18 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) { func (c *compiler) validateLabels(g *d2graph.Graph) { for _, obj := range g.Objects { - if !strings.EqualFold(obj.Shape.Value, d2target.ShapeText) { - continue - } - if obj.Attributes.Language != "" { - // blockstrings have already been validated - continue - } - if strings.TrimSpace(obj.Label.Value) == "" { - c.errorf(obj.Label.MapKey, "shape text must have a non-empty label") - continue + if strings.EqualFold(obj.Shape.Value, d2target.ShapeText) { + if obj.Attributes.Language != "" { + // blockstrings have already been validated + continue + } + if strings.TrimSpace(obj.Label.Value) == "" { + c.errorf(obj.Label.MapKey, "shape text must have a non-empty label") + } + } else if strings.EqualFold(obj.Shape.Value, d2target.ShapeSQLTable) { + if strings.Contains(obj.Label.Value, "\n") { + c.errorf(obj.Label.MapKey, "shape sql_table cannot have newlines") + } } } } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 5b5368434..6d0e818bc 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3114,6 +3114,21 @@ layers: { "y/n.d2": "p", }, }, + { + name: "sql-table-header-newline", + text: `x: { + shape: sql_table + label: hello\nworld +} + +y: "hello\nworld" { + shape: sql_table + hi: there +} +`, + expErr: `d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:3:3: shape sql_table cannot have newlines +d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:6:1: shape sql_table cannot have newlines`, + }, } for _, tc := range testCases { diff --git a/testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json b/testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json new file mode 100644 index 000000000..b38cb4925 --- /dev/null +++ b/testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json @@ -0,0 +1,15 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2,2:2:26-2:21:45", + "errmsg": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:3:3: shape sql_table cannot have newlines" + }, + { + "range": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2,5:0:49-8:1:100", + "errmsg": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:6:1: shape sql_table cannot have newlines" + } + ] + } +} From dc56649a9b0766b8469683f2ecea0b0bddb18b0c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 14 Aug 2024 08:40:46 +0800 Subject: [PATCH 3/4] ta --- d2compiler/compile.go | 2 +- d2compiler/compile_test.go | 4 +- .../testdata/class/dark_theme.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../empty_class_height/dagre/sketch.exp.svg | 2 +- .../empty_class_height/elk/sketch.exp.svg | 2 +- .../regression/grid_oom/dagre/sketch.exp.svg | 2 +- .../regression/grid_oom/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../regression/slow_grid/dagre/sketch.exp.svg | 2 +- .../regression/slow_grid/elk/sketch.exp.svg | 2 +- .../stable/class/dagre/sketch.exp.svg | 2 +- .../testdata/stable/class/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../themes/terminal/dagre/sketch.exp.svg | 2 +- .../themes/terminal/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../shape_set_width_height/elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 160 +---------------- .../dagre/sketch.exp.svg | 161 +++++++++--------- .../elk/board.exp.json | 160 +---------------- .../elk/sketch.exp.svg | 161 +++++++++--------- .../txtar/sql-icon/dagre/sketch.exp.svg | 4 +- .../txtar/sql-icon/elk/sketch.exp.svg | 4 +- .../sql-table-header-newline.exp.json | 4 +- 34 files changed, 192 insertions(+), 518 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index b3a0380eb..e9a554e15 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -1057,7 +1057,7 @@ func (c *compiler) validateLabels(g *d2graph.Graph) { } } else if strings.EqualFold(obj.Shape.Value, d2target.ShapeSQLTable) { if strings.Contains(obj.Label.Value, "\n") { - c.errorf(obj.Label.MapKey, "shape sql_table cannot have newlines") + c.errorf(obj.Label.MapKey, "shape sql_table cannot have newlines in label") } } } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 6d0e818bc..28cfd513c 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3126,8 +3126,8 @@ y: "hello\nworld" { hi: there } `, - expErr: `d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:3:3: shape sql_table cannot have newlines -d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:6:1: shape sql_table cannot have newlines`, + expErr: `d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:3:3: shape sql_table cannot have newlines in label +d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:6:1: shape sql_table cannot have newlines in label`, }, } diff --git a/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg index 8ca54f238..df3649401 100644 --- a/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg @@ -89,7 +89,7 @@ .d2-2730605657 .color-AA4{color:#45475A;} .d2-2730605657 .color-AA5{color:#313244;} .d2-2730605657 .color-AB4{color:#45475A;} - .d2-2730605657 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2730605657 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg index b6133085e..6d5996e56 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-965117370 .color-AA4{color:#EDF0FD;} .d2-965117370 .color-AA5{color:#F7F8FE;} .d2-965117370 .color-AB4{color:#EDF0FD;} - .d2-965117370 .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}]]>a + .d2-965117370 .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}]]>a \ No newline at end of file diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg index b6133085e..6d5996e56 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-965117370 .color-AA4{color:#EDF0FD;} .d2-965117370 .color-AA5{color:#F7F8FE;} .d2-965117370 .color-AB4{color:#EDF0FD;} - .d2-965117370 .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}]]>a + .d2-965117370 .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}]]>a \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg index 487e8d9fd..ad750f71e 100644 --- a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-39546754 .color-AA4{color:#EDF0FD;} .d2-39546754 .color-AA5{color:#F7F8FE;} .d2-39546754 .color-AB4{color:#EDF0FD;} - .d2-39546754 .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}]]>class with rows-numint-timeoutintclass without rows + .d2-39546754 .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}]]>class with rows-numint-timeoutintclass without rows \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg index c7b1e9c54..5ebeb3e5e 100644 --- a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-817380429 .color-AA4{color:#EDF0FD;} .d2-817380429 .color-AA5{color:#F7F8FE;} .d2-817380429 .color-AB4{color:#EDF0FD;} - .d2-817380429 .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}]]>class with rows-numint-timeoutintclass without rows + .d2-817380429 .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}]]>class with rows-numint-timeoutintclass without rows \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg index 42458dc65..841063e6e 100644 --- a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-3513306046 .color-AA4{color:#EDF0FD;} .d2-3513306046 .color-AA5{color:#F7F8FE;} .d2-3513306046 .color-AB4{color:#EDF0FD;} - .d2-3513306046 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + .d2-3513306046 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg index 42458dc65..841063e6e 100644 --- a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-3513306046 .color-AA4{color:#EDF0FD;} .d2-3513306046 .color-AA5{color:#F7F8FE;} .d2-3513306046 .color-AB4{color:#EDF0FD;} - .d2-3513306046 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + .d2-3513306046 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg index 0f41ff938..20350dda5 100644 --- a/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-3631666954 .color-AA4{color:#EDF0FD;} .d2-3631666954 .color-AA5{color:#F7F8FE;} .d2-3631666954 .color-AB4{color:#EDF0FD;} - .d2-3631666954 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3631666954 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index 8efc9a619..d4835ca4f 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-505883705 .color-AA4{color:#EDF0FD;} .d2-505883705 .color-AA5{color:#F7F8FE;} .d2-505883705 .color-AB4{color:#EDF0FD;} - .d2-505883705 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-505883705 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg b/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg index 8e81aac96..901a6d96b 100644 --- a/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-1964087061 .color-AA4{color:#EDF0FD;} .d2-1964087061 .color-AA5{color:#F7F8FE;} .d2-1964087061 .color-AB4{color:#EDF0FD;} - .d2-1964087061 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- + .d2-1964087061 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg b/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg index 8e81aac96..901a6d96b 100644 --- a/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-1964087061 .color-AA4{color:#EDF0FD;} .d2-1964087061 .color-AA5{color:#F7F8FE;} .d2-1964087061 .color-AB4{color:#EDF0FD;} - .d2-1964087061 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- + .d2-1964087061 .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}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- \ No newline at end of file diff --git a/e2etests/testdata/stable/class/dagre/sketch.exp.svg b/e2etests/testdata/stable/class/dagre/sketch.exp.svg index 49602a3dc..0b84761d4 100644 --- a/e2etests/testdata/stable/class/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class/dagre/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-2730605657 .color-AA4{color:#EDF0FD;} .d2-2730605657 .color-AA5{color:#F7F8FE;} .d2-2730605657 .color-AB4{color:#EDF0FD;} - .d2-2730605657 .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}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2730605657 .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}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/class/elk/sketch.exp.svg b/e2etests/testdata/stable/class/elk/sketch.exp.svg index ecb93693e..49ea80667 100644 --- a/e2etests/testdata/stable/class/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class/elk/sketch.exp.svg @@ -89,7 +89,7 @@ .d2-3545685585 .color-AA4{color:#EDF0FD;} .d2-3545685585 .color-AA5{color:#F7F8FE;} .d2-3545685585 .color-AB4{color:#EDF0FD;} - .d2-3545685585 .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}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-3545685585 .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}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index bd7e29772..d0d6d7240 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-1612300372 .color-AA4{color:#EDF0FD;} .d2-1612300372 .color-AA5{color:#F7F8FE;} .d2-1612300372 .color-AB4{color:#EDF0FD;} - .d2-1612300372 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-1612300372 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index e8f6aa357..741f99c77 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-264894640 .color-AA4{color:#EDF0FD;} .d2-264894640 .color-AA5{color:#F7F8FE;} .d2-264894640 .color-AB4{color:#EDF0FD;} - .d2-264894640 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-264894640 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 8e7224c1c..bb6200119 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -110,7 +110,7 @@ .d2-1178036486 .color-AA4{color:#EDF0FD;} .d2-1178036486 .color-AA5{color:#F7F8FE;} .d2-1178036486 .color-AB4{color:#EDF0FD;} - .d2-1178036486 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1178036486 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 8e7224c1c..bb6200119 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -110,7 +110,7 @@ .d2-1178036486 .color-AA4{color:#EDF0FD;} .d2-1178036486 .color-AA5{color:#F7F8FE;} .d2-1178036486 .color-AB4{color:#EDF0FD;} - .d2-1178036486 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1178036486 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index 1aa5b837d..011e510ff 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-832122773 .color-AA4{color:#EDF0FD;} .d2-832122773 .color-AA5{color:#F7F8FE;} .d2-832122773 .color-AB4{color:#EDF0FD;} - .d2-832122773 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-832122773 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index 43ffd1c9a..06ffa890a 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-1454861019 .color-AA4{color:#EDF0FD;} .d2-1454861019 .color-AA5{color:#F7F8FE;} .d2-1454861019 .color-AB4{color:#EDF0FD;} - .d2-1454861019 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-1454861019 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index dcd109ab4..7a1246949 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -857,7 +857,7 @@ .d2-244125524 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

+networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

  • of
  • two cities
    • diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index bbf53359e..a36fc60fc 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -857,7 +857,7 @@ .d2-3715750574 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    +networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    • of
    • two cities
      • diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index 3fe4252c1..7564c1bf8 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -883,7 +883,7 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

      A TALE

      +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

      A TALE

      • OF
      • TWO CITIES
        • diff --git a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg index 6069bb9b2..78f39a4b7 100644 --- a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg @@ -883,7 +883,7 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

        A TALE

        +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

        A TALE

        • OF
        • TWO CITIES
          • diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index c6aeeba25..e2ae26340 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg @@ -850,7 +850,7 @@ .d2-4027952422 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index e37a603a6..722242609 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -850,7 +850,7 @@ .d2-510054392 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 diff --git a/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json b/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json index 86a4accef..7d93c2f35 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json +++ b/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json @@ -67,167 +67,11 @@ "secondaryAccentColor": "AA2", "neutralAccentColor": "N2" }, - { - "id": "B", - "type": "sql_table", - "pos": { - "x": 379, - "y": 1 - }, - "width": 214, - "height": 300, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N1", - "stroke": "N7", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": [ - { - "name": { - "label": "LeftAligned", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 94, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - }, - { - "name": { - "label": "CenterAligned", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 117, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - }, - { - "name": { - "label": "RightAligned", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 105, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - }, - { - "name": { - "label": "Justified", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 72, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - } - ], - "label": "<>\nAlignment", - "fontSize": 20, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 189, - "labelHeight": 55, - "zIndex": 0, - "level": 1, - "primaryAccentColor": "B2", - "secondaryAccentColor": "AA2", - "neutralAccentColor": "N2" - }, { "id": "C", "type": "class", "pos": { - "x": 653, + "x": 379, "y": 13 }, "width": 254, @@ -291,7 +135,7 @@ "id": "D", "type": "class", "pos": { - "x": 967, + "x": 693, "y": 0 }, "width": 254, diff --git a/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg b/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg index 450863edb..b07731a24 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg @@ -1,16 +1,9 @@ -<<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+Justified<<enumeration>>AlignmentLeftAlignedCenterAlignedRightAlignedJustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified - + .d2-2109734187 .fill-N1{fill:#0A0F25;} + .d2-2109734187 .fill-N2{fill:#676C7E;} + .d2-2109734187 .fill-N3{fill:#9499AB;} + .d2-2109734187 .fill-N4{fill:#CFD2DD;} + .d2-2109734187 .fill-N5{fill:#DEE1EB;} + .d2-2109734187 .fill-N6{fill:#EEF1F8;} + .d2-2109734187 .fill-N7{fill:#FFFFFF;} + .d2-2109734187 .fill-B1{fill:#0D32B2;} + .d2-2109734187 .fill-B2{fill:#0D32B2;} + .d2-2109734187 .fill-B3{fill:#E3E9FD;} + .d2-2109734187 .fill-B4{fill:#E3E9FD;} + .d2-2109734187 .fill-B5{fill:#EDF0FD;} + .d2-2109734187 .fill-B6{fill:#F7F8FE;} + .d2-2109734187 .fill-AA2{fill:#4A6FF3;} + .d2-2109734187 .fill-AA4{fill:#EDF0FD;} + .d2-2109734187 .fill-AA5{fill:#F7F8FE;} + .d2-2109734187 .fill-AB4{fill:#EDF0FD;} + .d2-2109734187 .fill-AB5{fill:#F7F8FE;} + .d2-2109734187 .stroke-N1{stroke:#0A0F25;} + .d2-2109734187 .stroke-N2{stroke:#676C7E;} + .d2-2109734187 .stroke-N3{stroke:#9499AB;} + .d2-2109734187 .stroke-N4{stroke:#CFD2DD;} + .d2-2109734187 .stroke-N5{stroke:#DEE1EB;} + .d2-2109734187 .stroke-N6{stroke:#EEF1F8;} + .d2-2109734187 .stroke-N7{stroke:#FFFFFF;} + .d2-2109734187 .stroke-B1{stroke:#0D32B2;} + .d2-2109734187 .stroke-B2{stroke:#0D32B2;} + .d2-2109734187 .stroke-B3{stroke:#E3E9FD;} + .d2-2109734187 .stroke-B4{stroke:#E3E9FD;} + .d2-2109734187 .stroke-B5{stroke:#EDF0FD;} + .d2-2109734187 .stroke-B6{stroke:#F7F8FE;} + .d2-2109734187 .stroke-AA2{stroke:#4A6FF3;} + .d2-2109734187 .stroke-AA4{stroke:#EDF0FD;} + .d2-2109734187 .stroke-AA5{stroke:#F7F8FE;} + .d2-2109734187 .stroke-AB4{stroke:#EDF0FD;} + .d2-2109734187 .stroke-AB5{stroke:#F7F8FE;} + .d2-2109734187 .background-color-N1{background-color:#0A0F25;} + .d2-2109734187 .background-color-N2{background-color:#676C7E;} + .d2-2109734187 .background-color-N3{background-color:#9499AB;} + .d2-2109734187 .background-color-N4{background-color:#CFD2DD;} + .d2-2109734187 .background-color-N5{background-color:#DEE1EB;} + .d2-2109734187 .background-color-N6{background-color:#EEF1F8;} + .d2-2109734187 .background-color-N7{background-color:#FFFFFF;} + .d2-2109734187 .background-color-B1{background-color:#0D32B2;} + .d2-2109734187 .background-color-B2{background-color:#0D32B2;} + .d2-2109734187 .background-color-B3{background-color:#E3E9FD;} + .d2-2109734187 .background-color-B4{background-color:#E3E9FD;} + .d2-2109734187 .background-color-B5{background-color:#EDF0FD;} + .d2-2109734187 .background-color-B6{background-color:#F7F8FE;} + .d2-2109734187 .background-color-AA2{background-color:#4A6FF3;} + .d2-2109734187 .background-color-AA4{background-color:#EDF0FD;} + .d2-2109734187 .background-color-AA5{background-color:#F7F8FE;} + .d2-2109734187 .background-color-AB4{background-color:#EDF0FD;} + .d2-2109734187 .background-color-AB5{background-color:#F7F8FE;} + .d2-2109734187 .color-N1{color:#0A0F25;} + .d2-2109734187 .color-N2{color:#676C7E;} + .d2-2109734187 .color-N3{color:#9499AB;} + .d2-2109734187 .color-N4{color:#CFD2DD;} + .d2-2109734187 .color-N5{color:#DEE1EB;} + .d2-2109734187 .color-N6{color:#EEF1F8;} + .d2-2109734187 .color-N7{color:#FFFFFF;} + .d2-2109734187 .color-B1{color:#0D32B2;} + .d2-2109734187 .color-B2{color:#0D32B2;} + .d2-2109734187 .color-B3{color:#E3E9FD;} + .d2-2109734187 .color-B4{color:#E3E9FD;} + .d2-2109734187 .color-B5{color:#EDF0FD;} + .d2-2109734187 .color-B6{color:#F7F8FE;} + .d2-2109734187 .color-AA2{color:#4A6FF3;} + .d2-2109734187 .color-AA4{color:#EDF0FD;} + .d2-2109734187 .color-AA5{color:#F7F8FE;} + .d2-2109734187 .color-AB4{color:#EDF0FD;} + .d2-2109734187 .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}]]><<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified + \ No newline at end of file diff --git a/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json b/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json index 5718bb93b..48f7f6976 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json +++ b/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json @@ -67,167 +67,11 @@ "secondaryAccentColor": "AA2", "neutralAccentColor": "N2" }, - { - "id": "B", - "type": "sql_table", - "pos": { - "x": 351, - "y": 13 - }, - "width": 214, - "height": 300, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "N1", - "stroke": "N7", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": [ - { - "name": { - "label": "LeftAligned", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 94, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - }, - { - "name": { - "label": "CenterAligned", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 117, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - }, - { - "name": { - "label": "RightAligned", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 105, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - }, - { - "name": { - "label": "Justified", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 72, - "labelHeight": 26 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": null, - "reference": "" - } - ], - "label": "<>\nAlignment", - "fontSize": 20, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 189, - "labelHeight": 55, - "zIndex": 0, - "level": 1, - "primaryAccentColor": "B2", - "secondaryAccentColor": "AA2", - "neutralAccentColor": "N2" - }, { "id": "C", "type": "class", "pos": { - "x": 585, + "x": 351, "y": 25 }, "width": 254, @@ -291,7 +135,7 @@ "id": "D", "type": "class", "pos": { - "x": 859, + "x": 625, "y": 12 }, "width": 254, diff --git a/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg b/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg index 92afa3007..b232e8394 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg @@ -1,16 +1,9 @@ -<<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+Justified<<enumeration>>AlignmentLeftAlignedCenterAlignedRightAlignedJustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified - + .d2-1792845480 .fill-N1{fill:#0A0F25;} + .d2-1792845480 .fill-N2{fill:#676C7E;} + .d2-1792845480 .fill-N3{fill:#9499AB;} + .d2-1792845480 .fill-N4{fill:#CFD2DD;} + .d2-1792845480 .fill-N5{fill:#DEE1EB;} + .d2-1792845480 .fill-N6{fill:#EEF1F8;} + .d2-1792845480 .fill-N7{fill:#FFFFFF;} + .d2-1792845480 .fill-B1{fill:#0D32B2;} + .d2-1792845480 .fill-B2{fill:#0D32B2;} + .d2-1792845480 .fill-B3{fill:#E3E9FD;} + .d2-1792845480 .fill-B4{fill:#E3E9FD;} + .d2-1792845480 .fill-B5{fill:#EDF0FD;} + .d2-1792845480 .fill-B6{fill:#F7F8FE;} + .d2-1792845480 .fill-AA2{fill:#4A6FF3;} + .d2-1792845480 .fill-AA4{fill:#EDF0FD;} + .d2-1792845480 .fill-AA5{fill:#F7F8FE;} + .d2-1792845480 .fill-AB4{fill:#EDF0FD;} + .d2-1792845480 .fill-AB5{fill:#F7F8FE;} + .d2-1792845480 .stroke-N1{stroke:#0A0F25;} + .d2-1792845480 .stroke-N2{stroke:#676C7E;} + .d2-1792845480 .stroke-N3{stroke:#9499AB;} + .d2-1792845480 .stroke-N4{stroke:#CFD2DD;} + .d2-1792845480 .stroke-N5{stroke:#DEE1EB;} + .d2-1792845480 .stroke-N6{stroke:#EEF1F8;} + .d2-1792845480 .stroke-N7{stroke:#FFFFFF;} + .d2-1792845480 .stroke-B1{stroke:#0D32B2;} + .d2-1792845480 .stroke-B2{stroke:#0D32B2;} + .d2-1792845480 .stroke-B3{stroke:#E3E9FD;} + .d2-1792845480 .stroke-B4{stroke:#E3E9FD;} + .d2-1792845480 .stroke-B5{stroke:#EDF0FD;} + .d2-1792845480 .stroke-B6{stroke:#F7F8FE;} + .d2-1792845480 .stroke-AA2{stroke:#4A6FF3;} + .d2-1792845480 .stroke-AA4{stroke:#EDF0FD;} + .d2-1792845480 .stroke-AA5{stroke:#F7F8FE;} + .d2-1792845480 .stroke-AB4{stroke:#EDF0FD;} + .d2-1792845480 .stroke-AB5{stroke:#F7F8FE;} + .d2-1792845480 .background-color-N1{background-color:#0A0F25;} + .d2-1792845480 .background-color-N2{background-color:#676C7E;} + .d2-1792845480 .background-color-N3{background-color:#9499AB;} + .d2-1792845480 .background-color-N4{background-color:#CFD2DD;} + .d2-1792845480 .background-color-N5{background-color:#DEE1EB;} + .d2-1792845480 .background-color-N6{background-color:#EEF1F8;} + .d2-1792845480 .background-color-N7{background-color:#FFFFFF;} + .d2-1792845480 .background-color-B1{background-color:#0D32B2;} + .d2-1792845480 .background-color-B2{background-color:#0D32B2;} + .d2-1792845480 .background-color-B3{background-color:#E3E9FD;} + .d2-1792845480 .background-color-B4{background-color:#E3E9FD;} + .d2-1792845480 .background-color-B5{background-color:#EDF0FD;} + .d2-1792845480 .background-color-B6{background-color:#F7F8FE;} + .d2-1792845480 .background-color-AA2{background-color:#4A6FF3;} + .d2-1792845480 .background-color-AA4{background-color:#EDF0FD;} + .d2-1792845480 .background-color-AA5{background-color:#F7F8FE;} + .d2-1792845480 .background-color-AB4{background-color:#EDF0FD;} + .d2-1792845480 .background-color-AB5{background-color:#F7F8FE;} + .d2-1792845480 .color-N1{color:#0A0F25;} + .d2-1792845480 .color-N2{color:#676C7E;} + .d2-1792845480 .color-N3{color:#9499AB;} + .d2-1792845480 .color-N4{color:#CFD2DD;} + .d2-1792845480 .color-N5{color:#DEE1EB;} + .d2-1792845480 .color-N6{color:#EEF1F8;} + .d2-1792845480 .color-N7{color:#FFFFFF;} + .d2-1792845480 .color-B1{color:#0D32B2;} + .d2-1792845480 .color-B2{color:#0D32B2;} + .d2-1792845480 .color-B3{color:#E3E9FD;} + .d2-1792845480 .color-B4{color:#E3E9FD;} + .d2-1792845480 .color-B5{color:#EDF0FD;} + .d2-1792845480 .color-B6{color:#F7F8FE;} + .d2-1792845480 .color-AA2{color:#4A6FF3;} + .d2-1792845480 .color-AA4{color:#EDF0FD;} + .d2-1792845480 .color-AA5{color:#F7F8FE;} + .d2-1792845480 .color-AB4{color:#EDF0FD;} + .d2-1792845480 .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}]]><<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg index feb9132a4..0b6d3fd2e 100644 --- a/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg @@ -843,9 +843,9 @@ .d2-2359177743 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -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.

           diff --git a/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg b/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg index e0d71c38b..39992d047 100644 --- a/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg @@ -843,9 +843,9 @@ .d2-3170058192 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -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.

           diff --git a/testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json b/testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json index b38cb4925..e8cb8f8cb 100644 --- a/testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json +++ b/testdata/d2compiler/TestCompile/sql-table-header-newline.exp.json @@ -4,11 +4,11 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2,2:2:26-2:21:45", - "errmsg": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:3:3: shape sql_table cannot have newlines" + "errmsg": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:3:3: shape sql_table cannot have newlines in label" }, { "range": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2,5:0:49-8:1:100", - "errmsg": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:6:1: shape sql_table cannot have newlines" + "errmsg": "d2/testdata/d2compiler/TestCompile/sql-table-header-newline.d2:6:1: shape sql_table cannot have newlines in label" } ] } From ca6fa9cf8a62337ac1f05df46638dceca71e9493 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 14 Aug 2024 08:42:47 +0800 Subject: [PATCH 4/4] next.md --- ci/release/changelogs/next.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 9e9668cdf..39ee5fdff 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,15 +1,17 @@ #### Features ๐Ÿš€ -- Variables definitions can now refer to other variables in the current scope [#2052](https://github.com/terrastruct/d2/pull/2052) +- Vars: Variable definitions can now refer to other variables in the current scope [#2052](https://github.com/terrastruct/d2/pull/2052) #### Improvements ๐Ÿงน -- Sequence diagram edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038) -- Sequence diagram self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040) +- Sequence diagram: edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038) +- Sequence diagram: self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040) - Sequence diagram: The spacing between self-referential edges and regular edges is uniform [#2043](https://github.com/terrastruct/d2/pull/2043) +- Compiler: Error on multi-line labels in `sql_table` shapes [#2057](https://github.com/terrastruct/d2/pull/2057) #### Bugfixes โ›‘๏ธ -- Sequence diagram multi-line edge labels no longer can collide with other elements [#2049](https://github.com/terrastruct/d2/pull/2049) -- Sequence diagram long self-referential edge labels no longer can collide neighboring actors (or its own) lifeline edges [#2050](https://github.com/terrastruct/d2/pull/2050) +- Sequence diagram: multi-line edge labels no longer can collide with other elements [#2049](https://github.com/terrastruct/d2/pull/2049) +- Sequence diagram: long self-referential edge labels no longer can collide neighboring actors (or its own) lifeline edges [#2050](https://github.com/terrastruct/d2/pull/2050) - Globs: An edge case was fixed where globs used in edges were creating nodes when it shouldn't have [#2051](https://github.com/terrastruct/d2/pull/2051) +- Render: Multi-line class labels/headers are rendered correctly [#2057](https://github.com/terrastruct/d2/pull/2057)