diff --git a/d2cli/main.go b/d2cli/main.go index 601f1953f..12128e956 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -552,9 +552,9 @@ func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, fs case PDF: pageMap := buildBoardIDToIndex(diagram, nil, nil) path := []pdf.BoardTitle{ - {Name: "root", BoardID: "root"}, + {Name: diagram.Root.Label, BoardID: "root"}, } - pdf, err := renderPDF(ctx, ms, plugin, renderOpts, outputPath, page, ruler, diagram, nil, path, pageMap) + pdf, err := renderPDF(ctx, ms, plugin, renderOpts, outputPath, page, ruler, diagram, nil, path, pageMap, diagram.Root.Label != "") if err != nil { return pdf, false, err } @@ -566,10 +566,10 @@ func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, fs if user, err := user.Current(); err == nil { username = user.Username } - description := "Presentation generated with D2 - https://d2lang.com/" + description := "Presentation generated with D2 - https://d2lang.com" rootName := getFileName(outputPath) // version must be only numbers to avoid issues with PowerPoint - p := pptx.NewPresentation(rootName, description, rootName, username, version.OnlyNumbers()) + p := pptx.NewPresentation(rootName, description, rootName, username, version.OnlyNumbers(), diagram.Root.Label != "") boardIdToIndex := buildBoardIDToIndex(diagram, nil, nil) path := []pptx.BoardTitle{ @@ -914,7 +914,7 @@ func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts return svg, nil } -func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts d2svg.RenderOpts, outputPath string, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram, doc *pdf.GoFPDF, boardPath []pdf.BoardTitle, pageMap map[string]int) (svg []byte, err error) { +func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts d2svg.RenderOpts, outputPath string, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram, doc *pdf.GoFPDF, boardPath []pdf.BoardTitle, pageMap map[string]int, includeNav bool) (svg []byte, err error) { var isRoot bool if doc == nil { doc = pdf.Init() @@ -973,7 +973,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opt if err != nil { return svg, err } - err = doc.AddPDFPage(pngImg, boardPath, *opts.ThemeID, rootFill, diagram.Shapes, *opts.Pad, viewboxX, viewboxY, pageMap) + err = doc.AddPDFPage(pngImg, boardPath, *opts.ThemeID, rootFill, diagram.Shapes, *opts.Pad, viewboxX, viewboxY, pageMap, includeNav) if err != nil { return svg, err } @@ -981,30 +981,30 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opt for _, dl := range diagram.Layers { path := append(boardPath, pdf.BoardTitle{ - Name: dl.Name, + Name: dl.Root.Label, BoardID: strings.Join([]string{boardPath[len(boardPath)-1].BoardID, LAYERS, dl.Name}, "."), }) - _, err := renderPDF(ctx, ms, plugin, opts, "", page, ruler, dl, doc, path, pageMap) + _, err := renderPDF(ctx, ms, plugin, opts, "", page, ruler, dl, doc, path, pageMap, includeNav) if err != nil { return nil, err } } for _, dl := range diagram.Scenarios { path := append(boardPath, pdf.BoardTitle{ - Name: dl.Name, + Name: dl.Root.Label, BoardID: strings.Join([]string{boardPath[len(boardPath)-1].BoardID, SCENARIOS, dl.Name}, "."), }) - _, err := renderPDF(ctx, ms, plugin, opts, "", page, ruler, dl, doc, path, pageMap) + _, err := renderPDF(ctx, ms, plugin, opts, "", page, ruler, dl, doc, path, pageMap, includeNav) if err != nil { return nil, err } } for _, dl := range diagram.Steps { path := append(boardPath, pdf.BoardTitle{ - Name: dl.Name, + Name: dl.Root.Label, BoardID: strings.Join([]string{boardPath[len(boardPath)-1].BoardID, STEPS, dl.Name}, "."), }) - _, err := renderPDF(ctx, ms, plugin, opts, "", page, ruler, dl, doc, path, pageMap) + _, err := renderPDF(ctx, ms, plugin, opts, "", page, ruler, dl, doc, path, pageMap, includeNav) if err != nil { return nil, err } diff --git a/d2exporter/export.go b/d2exporter/export.go index 7a959ae07..6c25d5b8f 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -2,11 +2,14 @@ package d2exporter import ( "context" + "net/url" "strconv" + "strings" "oss.terrastruct.com/util-go/go2" "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2parser" "oss.terrastruct.com/d2/d2renderers/d2fonts" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/d2themes" @@ -17,6 +20,11 @@ import ( func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamily) (*d2target.Diagram, error) { diagram := d2target.NewDiagram() applyStyles(&diagram.Root, g.Root) + if g.Root.Label.MapKey == nil { + diagram.Root.Label = g.Name + } else { + diagram.Root.Label = g.Root.Label.Value + } diagram.Name = g.Name diagram.IsFolderOnly = g.IsFolderOnly if fontFamily == nil { @@ -29,7 +37,7 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil diagram.Shapes = make([]d2target.Shape, len(g.Objects)) for i := range g.Objects { - diagram.Shapes[i] = toShape(g.Objects[i], g.Theme) + diagram.Shapes[i] = toShape(g.Objects[i], g) } diagram.Connections = make([]d2target.Connection, len(g.Edges)) @@ -126,7 +134,7 @@ func applyStyles(shape *d2target.Shape, obj *d2graph.Object) { } } -func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { +func toShape(obj *d2graph.Object, g *d2graph.Graph) d2target.Shape { shape := d2target.BaseShape() shape.SetType(obj.Shape.Value) shape.ID = obj.AbsID() @@ -152,7 +160,7 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { } applyStyles(shape, obj) - applyTheme(shape, obj, theme) + applyTheme(shape, obj, g.Theme) shape.Color = text.GetColor(shape.Italic) applyStyles(shape, obj) @@ -188,6 +196,7 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { } if obj.Link != nil { shape.Link = obj.Link.Value + shape.PrettyLink = toPrettyLink(g, obj.Link.Value) } shape.Icon = obj.Icon if obj.IconPosition != nil { @@ -197,6 +206,50 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { return *shape } +func toPrettyLink(g *d2graph.Graph, link string) string { + u, err := url.ParseRequestURI(link) + if err == nil && u.Host != "" && len(u.RawPath) > 30 { + return u.Scheme + "://" + u.Host + u.RawPath[:10] + "..." + u.RawPath[len(u.RawPath)-10:] + } else if err != nil { + linkKey, err := d2parser.ParseKey(link) + if err != nil { + return link + } + rootG := g + for rootG.Parent != nil { + rootG = rootG.Parent + } + var prettyLink []string + FOR: + for i := 0; i < len(linkKey.Path); i++ { + p := linkKey.Path[i].Unbox().ScalarString() + if i > 0 { + switch p { + case "layers", "scenarios", "steps": + continue FOR + } + rootG = rootG.GetBoard(p) + if rootG == nil { + return link + } + } + if rootG.Root.Label.MapKey != nil { + prettyLink = append(prettyLink, rootG.Root.Label.Value) + } else { + prettyLink = append(prettyLink, rootG.Name) + } + } + for _, l := range prettyLink { + // If any part of it is blank, "x > > y" looks stupid, so just use the last + if l == "" { + return prettyLink[len(prettyLink)-1] + } + } + return strings.Join(prettyLink, " > ") + } + return link +} + func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection { connection := d2target.BaseConnection() connection.ID = edge.AbsID() diff --git a/d2renderers/d2svg/appendix/appendix.go b/d2renderers/d2svg/appendix/appendix.go index 736e39d62..8ebf19252 100644 --- a/d2renderers/d2svg/appendix/appendix.go +++ b/d2renderers/d2svg/appendix/appendix.go @@ -12,7 +12,6 @@ import ( "strings" "oss.terrastruct.com/d2/d2graph" - "oss.terrastruct.com/d2/d2parser" "oss.terrastruct.com/d2/d2renderers/d2fonts" "oss.terrastruct.com/d2/d2renderers/d2svg" "oss.terrastruct.com/d2/d2target" @@ -193,31 +192,6 @@ func Append(diagram *d2target.Diagram, ruler *textmeasure.Ruler, in []byte) []by return []byte(svg) } -// transformInternalLink turns -// "root.layers.x.layers.y" -// into -// "root > x > y" -func transformInternalLink(link string) string { - if link == "" || !strings.HasPrefix(link, "root") { - return link - } - - mk, err := d2parser.ParseMapKey(link) - if err != nil { - return "" - } - - key := d2graph.Key(mk.Key) - - if len(key) > 1 { - for i := 1; i < len(key); i += 2 { - key[i] = ">" - } - } - - return strings.Join(key, " ") -} - func generateAppendix(diagram *d2target.Diagram, ruler *textmeasure.Ruler, svg string) (string, int, int) { tl, br := diagram.BoundingBox() @@ -227,7 +201,7 @@ func generateAppendix(diagram *d2target.Diagram, ruler *textmeasure.Ruler, svg s i := 1 for _, s := range diagram.Shapes { - for _, txt := range []string{s.Tooltip, transformInternalLink(s.Link)} { + for _, txt := range []string{s.Tooltip, s.PrettyLink} { if txt != "" { line, w, h := generateLine(i, br.Y+(PAD_TOP*2)+totalHeight, txt, ruler) i++ diff --git a/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg index 9855dae29..f335be4fc 100644 --- a/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg @@ -1,12 +1,12 @@ -x1 + .d2-1118191387 .fill-N1{fill:#0A0F25;} + .d2-1118191387 .fill-N2{fill:#676C7E;} + .d2-1118191387 .fill-N3{fill:#9499AB;} + .d2-1118191387 .fill-N4{fill:#CFD2DD;} + .d2-1118191387 .fill-N5{fill:#DEE1EB;} + .d2-1118191387 .fill-N6{fill:#EEF1F8;} + .d2-1118191387 .fill-N7{fill:#FFFFFF;} + .d2-1118191387 .fill-B1{fill:#0D32B2;} + .d2-1118191387 .fill-B2{fill:#0D32B2;} + .d2-1118191387 .fill-B3{fill:#E3E9FD;} + .d2-1118191387 .fill-B4{fill:#E3E9FD;} + .d2-1118191387 .fill-B5{fill:#EDF0FD;} + .d2-1118191387 .fill-B6{fill:#F7F8FE;} + .d2-1118191387 .fill-AA2{fill:#4A6FF3;} + .d2-1118191387 .fill-AA4{fill:#EDF0FD;} + .d2-1118191387 .fill-AA5{fill:#F7F8FE;} + .d2-1118191387 .fill-AB4{fill:#EDF0FD;} + .d2-1118191387 .fill-AB5{fill:#F7F8FE;} + .d2-1118191387 .stroke-N1{stroke:#0A0F25;} + .d2-1118191387 .stroke-N2{stroke:#676C7E;} + .d2-1118191387 .stroke-N3{stroke:#9499AB;} + .d2-1118191387 .stroke-N4{stroke:#CFD2DD;} + .d2-1118191387 .stroke-N5{stroke:#DEE1EB;} + .d2-1118191387 .stroke-N6{stroke:#EEF1F8;} + .d2-1118191387 .stroke-N7{stroke:#FFFFFF;} + .d2-1118191387 .stroke-B1{stroke:#0D32B2;} + .d2-1118191387 .stroke-B2{stroke:#0D32B2;} + .d2-1118191387 .stroke-B3{stroke:#E3E9FD;} + .d2-1118191387 .stroke-B4{stroke:#E3E9FD;} + .d2-1118191387 .stroke-B5{stroke:#EDF0FD;} + .d2-1118191387 .stroke-B6{stroke:#F7F8FE;} + .d2-1118191387 .stroke-AA2{stroke:#4A6FF3;} + .d2-1118191387 .stroke-AA4{stroke:#EDF0FD;} + .d2-1118191387 .stroke-AA5{stroke:#F7F8FE;} + .d2-1118191387 .stroke-AB4{stroke:#EDF0FD;} + .d2-1118191387 .stroke-AB5{stroke:#F7F8FE;} + .d2-1118191387 .background-color-N1{background-color:#0A0F25;} + .d2-1118191387 .background-color-N2{background-color:#676C7E;} + .d2-1118191387 .background-color-N3{background-color:#9499AB;} + .d2-1118191387 .background-color-N4{background-color:#CFD2DD;} + .d2-1118191387 .background-color-N5{background-color:#DEE1EB;} + .d2-1118191387 .background-color-N6{background-color:#EEF1F8;} + .d2-1118191387 .background-color-N7{background-color:#FFFFFF;} + .d2-1118191387 .background-color-B1{background-color:#0D32B2;} + .d2-1118191387 .background-color-B2{background-color:#0D32B2;} + .d2-1118191387 .background-color-B3{background-color:#E3E9FD;} + .d2-1118191387 .background-color-B4{background-color:#E3E9FD;} + .d2-1118191387 .background-color-B5{background-color:#EDF0FD;} + .d2-1118191387 .background-color-B6{background-color:#F7F8FE;} + .d2-1118191387 .background-color-AA2{background-color:#4A6FF3;} + .d2-1118191387 .background-color-AA4{background-color:#EDF0FD;} + .d2-1118191387 .background-color-AA5{background-color:#F7F8FE;} + .d2-1118191387 .background-color-AB4{background-color:#EDF0FD;} + .d2-1118191387 .background-color-AB5{background-color:#F7F8FE;} + .d2-1118191387 .color-N1{color:#0A0F25;} + .d2-1118191387 .color-N2{color:#676C7E;} + .d2-1118191387 .color-N3{color:#9499AB;} + .d2-1118191387 .color-N4{color:#CFD2DD;} + .d2-1118191387 .color-N5{color:#DEE1EB;} + .d2-1118191387 .color-N6{color:#EEF1F8;} + .d2-1118191387 .color-N7{color:#FFFFFF;} + .d2-1118191387 .color-B1{color:#0D32B2;} + .d2-1118191387 .color-B2{color:#0D32B2;} + .d2-1118191387 .color-B3{color:#E3E9FD;} + .d2-1118191387 .color-B4{color:#E3E9FD;} + .d2-1118191387 .color-B5{color:#EDF0FD;} + .d2-1118191387 .color-B6{color:#F7F8FE;} + .d2-1118191387 .color-AA2{color:#4A6FF3;} + .d2-1118191387 .color-AA4{color:#EDF0FD;} + .d2-1118191387 .color-AA5{color:#F7F8FE;} + .d2-1118191387 .color-AB4{color:#EDF0FD;} + .d2-1118191387 .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}]]>x1 -1root > x +1x xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 + .d2-2990259904 .fill-N1{fill:#0A0F25;} + .d2-2990259904 .fill-N2{fill:#676C7E;} + .d2-2990259904 .fill-N3{fill:#9499AB;} + .d2-2990259904 .fill-N4{fill:#CFD2DD;} + .d2-2990259904 .fill-N5{fill:#DEE1EB;} + .d2-2990259904 .fill-N6{fill:#EEF1F8;} + .d2-2990259904 .fill-N7{fill:#FFFFFF;} + .d2-2990259904 .fill-B1{fill:#0D32B2;} + .d2-2990259904 .fill-B2{fill:#0D32B2;} + .d2-2990259904 .fill-B3{fill:#E3E9FD;} + .d2-2990259904 .fill-B4{fill:#E3E9FD;} + .d2-2990259904 .fill-B5{fill:#EDF0FD;} + .d2-2990259904 .fill-B6{fill:#F7F8FE;} + .d2-2990259904 .fill-AA2{fill:#4A6FF3;} + .d2-2990259904 .fill-AA4{fill:#EDF0FD;} + .d2-2990259904 .fill-AA5{fill:#F7F8FE;} + .d2-2990259904 .fill-AB4{fill:#EDF0FD;} + .d2-2990259904 .fill-AB5{fill:#F7F8FE;} + .d2-2990259904 .stroke-N1{stroke:#0A0F25;} + .d2-2990259904 .stroke-N2{stroke:#676C7E;} + .d2-2990259904 .stroke-N3{stroke:#9499AB;} + .d2-2990259904 .stroke-N4{stroke:#CFD2DD;} + .d2-2990259904 .stroke-N5{stroke:#DEE1EB;} + .d2-2990259904 .stroke-N6{stroke:#EEF1F8;} + .d2-2990259904 .stroke-N7{stroke:#FFFFFF;} + .d2-2990259904 .stroke-B1{stroke:#0D32B2;} + .d2-2990259904 .stroke-B2{stroke:#0D32B2;} + .d2-2990259904 .stroke-B3{stroke:#E3E9FD;} + .d2-2990259904 .stroke-B4{stroke:#E3E9FD;} + .d2-2990259904 .stroke-B5{stroke:#EDF0FD;} + .d2-2990259904 .stroke-B6{stroke:#F7F8FE;} + .d2-2990259904 .stroke-AA2{stroke:#4A6FF3;} + .d2-2990259904 .stroke-AA4{stroke:#EDF0FD;} + .d2-2990259904 .stroke-AA5{stroke:#F7F8FE;} + .d2-2990259904 .stroke-AB4{stroke:#EDF0FD;} + .d2-2990259904 .stroke-AB5{stroke:#F7F8FE;} + .d2-2990259904 .background-color-N1{background-color:#0A0F25;} + .d2-2990259904 .background-color-N2{background-color:#676C7E;} + .d2-2990259904 .background-color-N3{background-color:#9499AB;} + .d2-2990259904 .background-color-N4{background-color:#CFD2DD;} + .d2-2990259904 .background-color-N5{background-color:#DEE1EB;} + .d2-2990259904 .background-color-N6{background-color:#EEF1F8;} + .d2-2990259904 .background-color-N7{background-color:#FFFFFF;} + .d2-2990259904 .background-color-B1{background-color:#0D32B2;} + .d2-2990259904 .background-color-B2{background-color:#0D32B2;} + .d2-2990259904 .background-color-B3{background-color:#E3E9FD;} + .d2-2990259904 .background-color-B4{background-color:#E3E9FD;} + .d2-2990259904 .background-color-B5{background-color:#EDF0FD;} + .d2-2990259904 .background-color-B6{background-color:#F7F8FE;} + .d2-2990259904 .background-color-AA2{background-color:#4A6FF3;} + .d2-2990259904 .background-color-AA4{background-color:#EDF0FD;} + .d2-2990259904 .background-color-AA5{background-color:#F7F8FE;} + .d2-2990259904 .background-color-AB4{background-color:#EDF0FD;} + .d2-2990259904 .background-color-AB5{background-color:#F7F8FE;} + .d2-2990259904 .color-N1{color:#0A0F25;} + .d2-2990259904 .color-N2{color:#676C7E;} + .d2-2990259904 .color-N3{color:#9499AB;} + .d2-2990259904 .color-N4{color:#CFD2DD;} + .d2-2990259904 .color-N5{color:#DEE1EB;} + .d2-2990259904 .color-N6{color:#EEF1F8;} + .d2-2990259904 .color-N7{color:#FFFFFF;} + .d2-2990259904 .color-B1{color:#0D32B2;} + .d2-2990259904 .color-B2{color:#0D32B2;} + .d2-2990259904 .color-B3{color:#E3E9FD;} + .d2-2990259904 .color-B4{color:#E3E9FD;} + .d2-2990259904 .color-B5{color:#EDF0FD;} + .d2-2990259904 .color-B6{color:#F7F8FE;} + .d2-2990259904 .color-AA2{color:#4A6FF3;} + .d2-2990259904 .color-AA4{color:#EDF0FD;} + .d2-2990259904 .color-AA5{color:#F7F8FE;} + .d2-2990259904 .color-AB4{color:#EDF0FD;} + .d2-2990259904 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg index 689866651..cc99aa488 100644 --- a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 + .d2-3058966282 .fill-N1{fill:#CDD6F4;} + .d2-3058966282 .fill-N2{fill:#BAC2DE;} + .d2-3058966282 .fill-N3{fill:#A6ADC8;} + .d2-3058966282 .fill-N4{fill:#585B70;} + .d2-3058966282 .fill-N5{fill:#45475A;} + .d2-3058966282 .fill-N6{fill:#313244;} + .d2-3058966282 .fill-N7{fill:#1E1E2E;} + .d2-3058966282 .fill-B1{fill:#CBA6f7;} + .d2-3058966282 .fill-B2{fill:#CBA6f7;} + .d2-3058966282 .fill-B3{fill:#6C7086;} + .d2-3058966282 .fill-B4{fill:#585B70;} + .d2-3058966282 .fill-B5{fill:#45475A;} + .d2-3058966282 .fill-B6{fill:#313244;} + .d2-3058966282 .fill-AA2{fill:#f38BA8;} + .d2-3058966282 .fill-AA4{fill:#45475A;} + .d2-3058966282 .fill-AA5{fill:#313244;} + .d2-3058966282 .fill-AB4{fill:#45475A;} + .d2-3058966282 .fill-AB5{fill:#313244;} + .d2-3058966282 .stroke-N1{stroke:#CDD6F4;} + .d2-3058966282 .stroke-N2{stroke:#BAC2DE;} + .d2-3058966282 .stroke-N3{stroke:#A6ADC8;} + .d2-3058966282 .stroke-N4{stroke:#585B70;} + .d2-3058966282 .stroke-N5{stroke:#45475A;} + .d2-3058966282 .stroke-N6{stroke:#313244;} + .d2-3058966282 .stroke-N7{stroke:#1E1E2E;} + .d2-3058966282 .stroke-B1{stroke:#CBA6f7;} + .d2-3058966282 .stroke-B2{stroke:#CBA6f7;} + .d2-3058966282 .stroke-B3{stroke:#6C7086;} + .d2-3058966282 .stroke-B4{stroke:#585B70;} + .d2-3058966282 .stroke-B5{stroke:#45475A;} + .d2-3058966282 .stroke-B6{stroke:#313244;} + .d2-3058966282 .stroke-AA2{stroke:#f38BA8;} + .d2-3058966282 .stroke-AA4{stroke:#45475A;} + .d2-3058966282 .stroke-AA5{stroke:#313244;} + .d2-3058966282 .stroke-AB4{stroke:#45475A;} + .d2-3058966282 .stroke-AB5{stroke:#313244;} + .d2-3058966282 .background-color-N1{background-color:#CDD6F4;} + .d2-3058966282 .background-color-N2{background-color:#BAC2DE;} + .d2-3058966282 .background-color-N3{background-color:#A6ADC8;} + .d2-3058966282 .background-color-N4{background-color:#585B70;} + .d2-3058966282 .background-color-N5{background-color:#45475A;} + .d2-3058966282 .background-color-N6{background-color:#313244;} + .d2-3058966282 .background-color-N7{background-color:#1E1E2E;} + .d2-3058966282 .background-color-B1{background-color:#CBA6f7;} + .d2-3058966282 .background-color-B2{background-color:#CBA6f7;} + .d2-3058966282 .background-color-B3{background-color:#6C7086;} + .d2-3058966282 .background-color-B4{background-color:#585B70;} + .d2-3058966282 .background-color-B5{background-color:#45475A;} + .d2-3058966282 .background-color-B6{background-color:#313244;} + .d2-3058966282 .background-color-AA2{background-color:#f38BA8;} + .d2-3058966282 .background-color-AA4{background-color:#45475A;} + .d2-3058966282 .background-color-AA5{background-color:#313244;} + .d2-3058966282 .background-color-AB4{background-color:#45475A;} + .d2-3058966282 .background-color-AB5{background-color:#313244;} + .d2-3058966282 .color-N1{color:#CDD6F4;} + .d2-3058966282 .color-N2{color:#BAC2DE;} + .d2-3058966282 .color-N3{color:#A6ADC8;} + .d2-3058966282 .color-N4{color:#585B70;} + .d2-3058966282 .color-N5{color:#45475A;} + .d2-3058966282 .color-N6{color:#313244;} + .d2-3058966282 .color-N7{color:#1E1E2E;} + .d2-3058966282 .color-B1{color:#CBA6f7;} + .d2-3058966282 .color-B2{color:#CBA6f7;} + .d2-3058966282 .color-B3{color:#6C7086;} + .d2-3058966282 .color-B4{color:#585B70;} + .d2-3058966282 .color-B5{color:#45475A;} + .d2-3058966282 .color-B6{color:#313244;} + .d2-3058966282 .color-AA2{color:#f38BA8;} + .d2-3058966282 .color-AA4{color:#45475A;} + .d2-3058966282 .color-AA5{color:#313244;} + .d2-3058966282 .color-AB4{color:#45475A;} + .d2-3058966282 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2target/d2target.go b/d2target/d2target.go index c8af3fb7f..f5448c2f0 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -381,6 +381,7 @@ func (diagram Diagram) GetCorpus() string { appendixCount++ corpus += fmt.Sprint(appendixCount) } + corpus += s.PrettyLink if s.Type == ShapeClass { for _, cf := range s.Fields { corpus += cf.Text(0).Text + cf.VisibilityToken() @@ -446,6 +447,7 @@ type Shape struct { Tooltip string `json:"tooltip"` Link string `json:"link"` + PrettyLink string `json:"prettyLink,omitempty"` Icon *url.URL `json:"icon"` IconPosition string `json:"iconPosition"` diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go index 8a4d074f2..c0e1a7ac1 100644 --- a/e2etests-cli/main_test.go +++ b/e2etests-cli/main_test.go @@ -638,6 +638,86 @@ i used to read assert.Testdata(t, ".svg", svg) }, }, + { + name: "renamed-board", + skipCI: true, + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "in.d2", `cat: how does the cat go? { + link: layers.cat +} +a.link: "https://www.google.com/maps/place/Smoked+Out+BBQ/@37.3848007,-121.9513887,17z/data=!3m1!4b1!4m6!3m5!1s0x808fc9182ad4d38d:0x8e2f39c3e927b296!8m2!3d37.3848007!4d-121.9492!16s%2Fg%2F11gjt85zvf" +label: blah +layers: { + cat: { + label: dog + home: { + link: _ + } + the cat -> meow: goes + } +} +`) + err := runTestMain(t, ctx, dir, env, "in.d2", "out.pdf") + assert.Success(t, err) + + pdf := readFile(t, dir, "out.pdf") + testdataIgnoreDiff(t, ".pdf", pdf) + }, + }, + { + name: "no-nav-pdf", + skipCI: true, + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "in.d2", `cat: how does the cat go? { + link: layers.cat +} +a.link: "https://www.google.com/maps/place/Smoked+Out+BBQ/@37.3848007,-121.9513887,17z/data=!3m1!4b1!4m6!3m5!1s0x808fc9182ad4d38d:0x8e2f39c3e927b296!8m2!3d37.3848007!4d-121.9492!16s%2Fg%2F11gjt85zvf" +label: "" +layers: { + cat: { + label: dog + home: { + link: _ + } + the cat -> meow: goes + } +} +`) + err := runTestMain(t, ctx, dir, env, "in.d2", "out.pdf") + assert.Success(t, err) + + pdf := readFile(t, dir, "out.pdf") + testdataIgnoreDiff(t, ".pdf", pdf) + }, + }, + { + name: "no-nav-pptx", + skipCI: true, + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "in.d2", `cat: how does the cat go? { + link: layers.cat +} +a.link: "https://www.google.com/maps/place/Smoked+Out+BBQ/@37.3848007,-121.9513887,17z/data=!3m1!4b1!4m6!3m5!1s0x808fc9182ad4d38d:0x8e2f39c3e927b296!8m2!3d37.3848007!4d-121.9492!16s%2Fg%2F11gjt85zvf" +label: "" +layers: { + cat: { + label: dog + home: { + link: _ + } + the cat -> meow: goes + } +} +`) + err := runTestMain(t, ctx, dir, env, "in.d2", "out.pptx") + assert.Success(t, err) + + file := readFile(t, dir, "out.pptx") + // err = pptx.Validate(file, 2) + assert.Success(t, err) + testdataIgnoreDiff(t, ".pptx", file) + }, + }, { name: "basic-fmt", run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { diff --git a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg index d238dd067..538fd615f 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg @@ -1,16 +1,16 @@ Chicken's plan +}]]>Chicken's plan -Chicken's planApproach road +Chicken's planApproach road -Chicken's planApproach roadCross road +Chicken's planApproach roadCross road -Chicken's planApproach roadCross roadMake you wonder why +Chicken's planApproach roadCross roadMake you wonder why diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg index 77fe10ed4..214647b9d 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg @@ -1,9 +1,9 @@ -meow + .d2-3109420268 .fill-N1{fill:#0A0F25;} + .d2-3109420268 .fill-N2{fill:#676C7E;} + .d2-3109420268 .fill-N3{fill:#9499AB;} + .d2-3109420268 .fill-N4{fill:#CFD2DD;} + .d2-3109420268 .fill-N5{fill:#DEE1EB;} + .d2-3109420268 .fill-N6{fill:#EEF1F8;} + .d2-3109420268 .fill-N7{fill:#FFFFFF;} + .d2-3109420268 .fill-B1{fill:#0D32B2;} + .d2-3109420268 .fill-B2{fill:#0D32B2;} + .d2-3109420268 .fill-B3{fill:#E3E9FD;} + .d2-3109420268 .fill-B4{fill:#E3E9FD;} + .d2-3109420268 .fill-B5{fill:#EDF0FD;} + .d2-3109420268 .fill-B6{fill:#F7F8FE;} + .d2-3109420268 .fill-AA2{fill:#4A6FF3;} + .d2-3109420268 .fill-AA4{fill:#EDF0FD;} + .d2-3109420268 .fill-AA5{fill:#F7F8FE;} + .d2-3109420268 .fill-AB4{fill:#EDF0FD;} + .d2-3109420268 .fill-AB5{fill:#F7F8FE;} + .d2-3109420268 .stroke-N1{stroke:#0A0F25;} + .d2-3109420268 .stroke-N2{stroke:#676C7E;} + .d2-3109420268 .stroke-N3{stroke:#9499AB;} + .d2-3109420268 .stroke-N4{stroke:#CFD2DD;} + .d2-3109420268 .stroke-N5{stroke:#DEE1EB;} + .d2-3109420268 .stroke-N6{stroke:#EEF1F8;} + .d2-3109420268 .stroke-N7{stroke:#FFFFFF;} + .d2-3109420268 .stroke-B1{stroke:#0D32B2;} + .d2-3109420268 .stroke-B2{stroke:#0D32B2;} + .d2-3109420268 .stroke-B3{stroke:#E3E9FD;} + .d2-3109420268 .stroke-B4{stroke:#E3E9FD;} + .d2-3109420268 .stroke-B5{stroke:#EDF0FD;} + .d2-3109420268 .stroke-B6{stroke:#F7F8FE;} + .d2-3109420268 .stroke-AA2{stroke:#4A6FF3;} + .d2-3109420268 .stroke-AA4{stroke:#EDF0FD;} + .d2-3109420268 .stroke-AA5{stroke:#F7F8FE;} + .d2-3109420268 .stroke-AB4{stroke:#EDF0FD;} + .d2-3109420268 .stroke-AB5{stroke:#F7F8FE;} + .d2-3109420268 .background-color-N1{background-color:#0A0F25;} + .d2-3109420268 .background-color-N2{background-color:#676C7E;} + .d2-3109420268 .background-color-N3{background-color:#9499AB;} + .d2-3109420268 .background-color-N4{background-color:#CFD2DD;} + .d2-3109420268 .background-color-N5{background-color:#DEE1EB;} + .d2-3109420268 .background-color-N6{background-color:#EEF1F8;} + .d2-3109420268 .background-color-N7{background-color:#FFFFFF;} + .d2-3109420268 .background-color-B1{background-color:#0D32B2;} + .d2-3109420268 .background-color-B2{background-color:#0D32B2;} + .d2-3109420268 .background-color-B3{background-color:#E3E9FD;} + .d2-3109420268 .background-color-B4{background-color:#E3E9FD;} + .d2-3109420268 .background-color-B5{background-color:#EDF0FD;} + .d2-3109420268 .background-color-B6{background-color:#F7F8FE;} + .d2-3109420268 .background-color-AA2{background-color:#4A6FF3;} + .d2-3109420268 .background-color-AA4{background-color:#EDF0FD;} + .d2-3109420268 .background-color-AA5{background-color:#F7F8FE;} + .d2-3109420268 .background-color-AB4{background-color:#EDF0FD;} + .d2-3109420268 .background-color-AB5{background-color:#F7F8FE;} + .d2-3109420268 .color-N1{color:#0A0F25;} + .d2-3109420268 .color-N2{color:#676C7E;} + .d2-3109420268 .color-N3{color:#9499AB;} + .d2-3109420268 .color-N4{color:#CFD2DD;} + .d2-3109420268 .color-N5{color:#DEE1EB;} + .d2-3109420268 .color-N6{color:#EEF1F8;} + .d2-3109420268 .color-N7{color:#FFFFFF;} + .d2-3109420268 .color-B1{color:#0D32B2;} + .d2-3109420268 .color-B2{color:#0D32B2;} + .d2-3109420268 .color-B3{color:#E3E9FD;} + .d2-3109420268 .color-B4{color:#E3E9FD;} + .d2-3109420268 .color-B5{color:#EDF0FD;} + .d2-3109420268 .color-B6{color:#F7F8FE;} + .d2-3109420268 .color-AA2{color:#4A6FF3;} + .d2-3109420268 .color-AA4{color:#EDF0FD;} + .d2-3109420268 .color-AA5{color:#F7F8FE;} + .d2-3109420268 .color-AB4{color:#EDF0FD;} + .d2-3109420268 .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}]]>meow diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg index 21ba9b1a9..8c47ef933 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg @@ -1,12 +1,12 @@ -y + .d2-4088621414 .fill-N1{fill:#0A0F25;} + .d2-4088621414 .fill-N2{fill:#676C7E;} + .d2-4088621414 .fill-N3{fill:#9499AB;} + .d2-4088621414 .fill-N4{fill:#CFD2DD;} + .d2-4088621414 .fill-N5{fill:#DEE1EB;} + .d2-4088621414 .fill-N6{fill:#EEF1F8;} + .d2-4088621414 .fill-N7{fill:#FFFFFF;} + .d2-4088621414 .fill-B1{fill:#0D32B2;} + .d2-4088621414 .fill-B2{fill:#0D32B2;} + .d2-4088621414 .fill-B3{fill:#E3E9FD;} + .d2-4088621414 .fill-B4{fill:#E3E9FD;} + .d2-4088621414 .fill-B5{fill:#EDF0FD;} + .d2-4088621414 .fill-B6{fill:#F7F8FE;} + .d2-4088621414 .fill-AA2{fill:#4A6FF3;} + .d2-4088621414 .fill-AA4{fill:#EDF0FD;} + .d2-4088621414 .fill-AA5{fill:#F7F8FE;} + .d2-4088621414 .fill-AB4{fill:#EDF0FD;} + .d2-4088621414 .fill-AB5{fill:#F7F8FE;} + .d2-4088621414 .stroke-N1{stroke:#0A0F25;} + .d2-4088621414 .stroke-N2{stroke:#676C7E;} + .d2-4088621414 .stroke-N3{stroke:#9499AB;} + .d2-4088621414 .stroke-N4{stroke:#CFD2DD;} + .d2-4088621414 .stroke-N5{stroke:#DEE1EB;} + .d2-4088621414 .stroke-N6{stroke:#EEF1F8;} + .d2-4088621414 .stroke-N7{stroke:#FFFFFF;} + .d2-4088621414 .stroke-B1{stroke:#0D32B2;} + .d2-4088621414 .stroke-B2{stroke:#0D32B2;} + .d2-4088621414 .stroke-B3{stroke:#E3E9FD;} + .d2-4088621414 .stroke-B4{stroke:#E3E9FD;} + .d2-4088621414 .stroke-B5{stroke:#EDF0FD;} + .d2-4088621414 .stroke-B6{stroke:#F7F8FE;} + .d2-4088621414 .stroke-AA2{stroke:#4A6FF3;} + .d2-4088621414 .stroke-AA4{stroke:#EDF0FD;} + .d2-4088621414 .stroke-AA5{stroke:#F7F8FE;} + .d2-4088621414 .stroke-AB4{stroke:#EDF0FD;} + .d2-4088621414 .stroke-AB5{stroke:#F7F8FE;} + .d2-4088621414 .background-color-N1{background-color:#0A0F25;} + .d2-4088621414 .background-color-N2{background-color:#676C7E;} + .d2-4088621414 .background-color-N3{background-color:#9499AB;} + .d2-4088621414 .background-color-N4{background-color:#CFD2DD;} + .d2-4088621414 .background-color-N5{background-color:#DEE1EB;} + .d2-4088621414 .background-color-N6{background-color:#EEF1F8;} + .d2-4088621414 .background-color-N7{background-color:#FFFFFF;} + .d2-4088621414 .background-color-B1{background-color:#0D32B2;} + .d2-4088621414 .background-color-B2{background-color:#0D32B2;} + .d2-4088621414 .background-color-B3{background-color:#E3E9FD;} + .d2-4088621414 .background-color-B4{background-color:#E3E9FD;} + .d2-4088621414 .background-color-B5{background-color:#EDF0FD;} + .d2-4088621414 .background-color-B6{background-color:#F7F8FE;} + .d2-4088621414 .background-color-AA2{background-color:#4A6FF3;} + .d2-4088621414 .background-color-AA4{background-color:#EDF0FD;} + .d2-4088621414 .background-color-AA5{background-color:#F7F8FE;} + .d2-4088621414 .background-color-AB4{background-color:#EDF0FD;} + .d2-4088621414 .background-color-AB5{background-color:#F7F8FE;} + .d2-4088621414 .color-N1{color:#0A0F25;} + .d2-4088621414 .color-N2{color:#676C7E;} + .d2-4088621414 .color-N3{color:#9499AB;} + .d2-4088621414 .color-N4{color:#CFD2DD;} + .d2-4088621414 .color-N5{color:#DEE1EB;} + .d2-4088621414 .color-N6{color:#EEF1F8;} + .d2-4088621414 .color-N7{color:#FFFFFF;} + .d2-4088621414 .color-B1{color:#0D32B2;} + .d2-4088621414 .color-B2{color:#0D32B2;} + .d2-4088621414 .color-B3{color:#E3E9FD;} + .d2-4088621414 .color-B4{color:#E3E9FD;} + .d2-4088621414 .color-B5{color:#EDF0FD;} + .d2-4088621414 .color-B6{color:#F7F8FE;} + .d2-4088621414 .color-AA2{color:#4A6FF3;} + .d2-4088621414 .color-AA4{color:#EDF0FD;} + .d2-4088621414 .color-AA5{color:#F7F8FE;} + .d2-4088621414 .color-AB4{color:#EDF0FD;} + .d2-4088621414 .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}]]>y @@ -104,7 +104,7 @@ - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg index 05e961e64..80a5dac42 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg @@ -1,12 +1,12 @@ -x + .d2-1416247347 .fill-N1{fill:#0A0F25;} + .d2-1416247347 .fill-N2{fill:#676C7E;} + .d2-1416247347 .fill-N3{fill:#9499AB;} + .d2-1416247347 .fill-N4{fill:#CFD2DD;} + .d2-1416247347 .fill-N5{fill:#DEE1EB;} + .d2-1416247347 .fill-N6{fill:#EEF1F8;} + .d2-1416247347 .fill-N7{fill:#FFFFFF;} + .d2-1416247347 .fill-B1{fill:#0D32B2;} + .d2-1416247347 .fill-B2{fill:#0D32B2;} + .d2-1416247347 .fill-B3{fill:#E3E9FD;} + .d2-1416247347 .fill-B4{fill:#E3E9FD;} + .d2-1416247347 .fill-B5{fill:#EDF0FD;} + .d2-1416247347 .fill-B6{fill:#F7F8FE;} + .d2-1416247347 .fill-AA2{fill:#4A6FF3;} + .d2-1416247347 .fill-AA4{fill:#EDF0FD;} + .d2-1416247347 .fill-AA5{fill:#F7F8FE;} + .d2-1416247347 .fill-AB4{fill:#EDF0FD;} + .d2-1416247347 .fill-AB5{fill:#F7F8FE;} + .d2-1416247347 .stroke-N1{stroke:#0A0F25;} + .d2-1416247347 .stroke-N2{stroke:#676C7E;} + .d2-1416247347 .stroke-N3{stroke:#9499AB;} + .d2-1416247347 .stroke-N4{stroke:#CFD2DD;} + .d2-1416247347 .stroke-N5{stroke:#DEE1EB;} + .d2-1416247347 .stroke-N6{stroke:#EEF1F8;} + .d2-1416247347 .stroke-N7{stroke:#FFFFFF;} + .d2-1416247347 .stroke-B1{stroke:#0D32B2;} + .d2-1416247347 .stroke-B2{stroke:#0D32B2;} + .d2-1416247347 .stroke-B3{stroke:#E3E9FD;} + .d2-1416247347 .stroke-B4{stroke:#E3E9FD;} + .d2-1416247347 .stroke-B5{stroke:#EDF0FD;} + .d2-1416247347 .stroke-B6{stroke:#F7F8FE;} + .d2-1416247347 .stroke-AA2{stroke:#4A6FF3;} + .d2-1416247347 .stroke-AA4{stroke:#EDF0FD;} + .d2-1416247347 .stroke-AA5{stroke:#F7F8FE;} + .d2-1416247347 .stroke-AB4{stroke:#EDF0FD;} + .d2-1416247347 .stroke-AB5{stroke:#F7F8FE;} + .d2-1416247347 .background-color-N1{background-color:#0A0F25;} + .d2-1416247347 .background-color-N2{background-color:#676C7E;} + .d2-1416247347 .background-color-N3{background-color:#9499AB;} + .d2-1416247347 .background-color-N4{background-color:#CFD2DD;} + .d2-1416247347 .background-color-N5{background-color:#DEE1EB;} + .d2-1416247347 .background-color-N6{background-color:#EEF1F8;} + .d2-1416247347 .background-color-N7{background-color:#FFFFFF;} + .d2-1416247347 .background-color-B1{background-color:#0D32B2;} + .d2-1416247347 .background-color-B2{background-color:#0D32B2;} + .d2-1416247347 .background-color-B3{background-color:#E3E9FD;} + .d2-1416247347 .background-color-B4{background-color:#E3E9FD;} + .d2-1416247347 .background-color-B5{background-color:#EDF0FD;} + .d2-1416247347 .background-color-B6{background-color:#F7F8FE;} + .d2-1416247347 .background-color-AA2{background-color:#4A6FF3;} + .d2-1416247347 .background-color-AA4{background-color:#EDF0FD;} + .d2-1416247347 .background-color-AA5{background-color:#F7F8FE;} + .d2-1416247347 .background-color-AB4{background-color:#EDF0FD;} + .d2-1416247347 .background-color-AB5{background-color:#F7F8FE;} + .d2-1416247347 .color-N1{color:#0A0F25;} + .d2-1416247347 .color-N2{color:#676C7E;} + .d2-1416247347 .color-N3{color:#9499AB;} + .d2-1416247347 .color-N4{color:#CFD2DD;} + .d2-1416247347 .color-N5{color:#DEE1EB;} + .d2-1416247347 .color-N6{color:#EEF1F8;} + .d2-1416247347 .color-N7{color:#FFFFFF;} + .d2-1416247347 .color-B1{color:#0D32B2;} + .d2-1416247347 .color-B2{color:#0D32B2;} + .d2-1416247347 .color-B3{color:#E3E9FD;} + .d2-1416247347 .color-B4{color:#E3E9FD;} + .d2-1416247347 .color-B5{color:#EDF0FD;} + .d2-1416247347 .color-B6{color:#F7F8FE;} + .d2-1416247347 .color-AA2{color:#4A6FF3;} + .d2-1416247347 .color-AA4{color:#EDF0FD;} + .d2-1416247347 .color-AA5{color:#F7F8FE;} + .d2-1416247347 .color-AB4{color:#EDF0FD;} + .d2-1416247347 .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}]]>x @@ -104,7 +104,7 @@ - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg index d121d7553..d0e566873 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg @@ -1,9 +1,9 @@ ab +}]]>ab -abdc +abdc -abdce +abdce diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 975a67423..751aa45ac 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg index 265e553ba..f7b9746ca 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg @@ -1,12 +1,12 @@ -doh + .d2-2347425782 .fill-N1{fill:#0A0F25;} + .d2-2347425782 .fill-N2{fill:#676C7E;} + .d2-2347425782 .fill-N3{fill:#9499AB;} + .d2-2347425782 .fill-N4{fill:#CFD2DD;} + .d2-2347425782 .fill-N5{fill:#DEE1EB;} + .d2-2347425782 .fill-N6{fill:#EEF1F8;} + .d2-2347425782 .fill-N7{fill:#FFFFFF;} + .d2-2347425782 .fill-B1{fill:#0D32B2;} + .d2-2347425782 .fill-B2{fill:#0D32B2;} + .d2-2347425782 .fill-B3{fill:#E3E9FD;} + .d2-2347425782 .fill-B4{fill:#E3E9FD;} + .d2-2347425782 .fill-B5{fill:#EDF0FD;} + .d2-2347425782 .fill-B6{fill:#F7F8FE;} + .d2-2347425782 .fill-AA2{fill:#4A6FF3;} + .d2-2347425782 .fill-AA4{fill:#EDF0FD;} + .d2-2347425782 .fill-AA5{fill:#F7F8FE;} + .d2-2347425782 .fill-AB4{fill:#EDF0FD;} + .d2-2347425782 .fill-AB5{fill:#F7F8FE;} + .d2-2347425782 .stroke-N1{stroke:#0A0F25;} + .d2-2347425782 .stroke-N2{stroke:#676C7E;} + .d2-2347425782 .stroke-N3{stroke:#9499AB;} + .d2-2347425782 .stroke-N4{stroke:#CFD2DD;} + .d2-2347425782 .stroke-N5{stroke:#DEE1EB;} + .d2-2347425782 .stroke-N6{stroke:#EEF1F8;} + .d2-2347425782 .stroke-N7{stroke:#FFFFFF;} + .d2-2347425782 .stroke-B1{stroke:#0D32B2;} + .d2-2347425782 .stroke-B2{stroke:#0D32B2;} + .d2-2347425782 .stroke-B3{stroke:#E3E9FD;} + .d2-2347425782 .stroke-B4{stroke:#E3E9FD;} + .d2-2347425782 .stroke-B5{stroke:#EDF0FD;} + .d2-2347425782 .stroke-B6{stroke:#F7F8FE;} + .d2-2347425782 .stroke-AA2{stroke:#4A6FF3;} + .d2-2347425782 .stroke-AA4{stroke:#EDF0FD;} + .d2-2347425782 .stroke-AA5{stroke:#F7F8FE;} + .d2-2347425782 .stroke-AB4{stroke:#EDF0FD;} + .d2-2347425782 .stroke-AB5{stroke:#F7F8FE;} + .d2-2347425782 .background-color-N1{background-color:#0A0F25;} + .d2-2347425782 .background-color-N2{background-color:#676C7E;} + .d2-2347425782 .background-color-N3{background-color:#9499AB;} + .d2-2347425782 .background-color-N4{background-color:#CFD2DD;} + .d2-2347425782 .background-color-N5{background-color:#DEE1EB;} + .d2-2347425782 .background-color-N6{background-color:#EEF1F8;} + .d2-2347425782 .background-color-N7{background-color:#FFFFFF;} + .d2-2347425782 .background-color-B1{background-color:#0D32B2;} + .d2-2347425782 .background-color-B2{background-color:#0D32B2;} + .d2-2347425782 .background-color-B3{background-color:#E3E9FD;} + .d2-2347425782 .background-color-B4{background-color:#E3E9FD;} + .d2-2347425782 .background-color-B5{background-color:#EDF0FD;} + .d2-2347425782 .background-color-B6{background-color:#F7F8FE;} + .d2-2347425782 .background-color-AA2{background-color:#4A6FF3;} + .d2-2347425782 .background-color-AA4{background-color:#EDF0FD;} + .d2-2347425782 .background-color-AA5{background-color:#F7F8FE;} + .d2-2347425782 .background-color-AB4{background-color:#EDF0FD;} + .d2-2347425782 .background-color-AB5{background-color:#F7F8FE;} + .d2-2347425782 .color-N1{color:#0A0F25;} + .d2-2347425782 .color-N2{color:#676C7E;} + .d2-2347425782 .color-N3{color:#9499AB;} + .d2-2347425782 .color-N4{color:#CFD2DD;} + .d2-2347425782 .color-N5{color:#DEE1EB;} + .d2-2347425782 .color-N6{color:#EEF1F8;} + .d2-2347425782 .color-N7{color:#FFFFFF;} + .d2-2347425782 .color-B1{color:#0D32B2;} + .d2-2347425782 .color-B2{color:#0D32B2;} + .d2-2347425782 .color-B3{color:#E3E9FD;} + .d2-2347425782 .color-B4{color:#E3E9FD;} + .d2-2347425782 .color-B5{color:#EDF0FD;} + .d2-2347425782 .color-B6{color:#F7F8FE;} + .d2-2347425782 .color-AA2{color:#4A6FF3;} + .d2-2347425782 .color-AA4{color:#EDF0FD;} + .d2-2347425782 .color-AA5{color:#F7F8FE;} + .d2-2347425782 .color-AB4{color:#EDF0FD;} + .d2-2347425782 .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}]]>doh @@ -104,7 +104,7 @@ - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg index 29f1d1157..4797b64e4 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg @@ -1,12 +1,12 @@ -I'm a Mac + .d2-525054211 .fill-N1{fill:#0A0F25;} + .d2-525054211 .fill-N2{fill:#676C7E;} + .d2-525054211 .fill-N3{fill:#9499AB;} + .d2-525054211 .fill-N4{fill:#CFD2DD;} + .d2-525054211 .fill-N5{fill:#DEE1EB;} + .d2-525054211 .fill-N6{fill:#EEF1F8;} + .d2-525054211 .fill-N7{fill:#FFFFFF;} + .d2-525054211 .fill-B1{fill:#0D32B2;} + .d2-525054211 .fill-B2{fill:#0D32B2;} + .d2-525054211 .fill-B3{fill:#E3E9FD;} + .d2-525054211 .fill-B4{fill:#E3E9FD;} + .d2-525054211 .fill-B5{fill:#EDF0FD;} + .d2-525054211 .fill-B6{fill:#F7F8FE;} + .d2-525054211 .fill-AA2{fill:#4A6FF3;} + .d2-525054211 .fill-AA4{fill:#EDF0FD;} + .d2-525054211 .fill-AA5{fill:#F7F8FE;} + .d2-525054211 .fill-AB4{fill:#EDF0FD;} + .d2-525054211 .fill-AB5{fill:#F7F8FE;} + .d2-525054211 .stroke-N1{stroke:#0A0F25;} + .d2-525054211 .stroke-N2{stroke:#676C7E;} + .d2-525054211 .stroke-N3{stroke:#9499AB;} + .d2-525054211 .stroke-N4{stroke:#CFD2DD;} + .d2-525054211 .stroke-N5{stroke:#DEE1EB;} + .d2-525054211 .stroke-N6{stroke:#EEF1F8;} + .d2-525054211 .stroke-N7{stroke:#FFFFFF;} + .d2-525054211 .stroke-B1{stroke:#0D32B2;} + .d2-525054211 .stroke-B2{stroke:#0D32B2;} + .d2-525054211 .stroke-B3{stroke:#E3E9FD;} + .d2-525054211 .stroke-B4{stroke:#E3E9FD;} + .d2-525054211 .stroke-B5{stroke:#EDF0FD;} + .d2-525054211 .stroke-B6{stroke:#F7F8FE;} + .d2-525054211 .stroke-AA2{stroke:#4A6FF3;} + .d2-525054211 .stroke-AA4{stroke:#EDF0FD;} + .d2-525054211 .stroke-AA5{stroke:#F7F8FE;} + .d2-525054211 .stroke-AB4{stroke:#EDF0FD;} + .d2-525054211 .stroke-AB5{stroke:#F7F8FE;} + .d2-525054211 .background-color-N1{background-color:#0A0F25;} + .d2-525054211 .background-color-N2{background-color:#676C7E;} + .d2-525054211 .background-color-N3{background-color:#9499AB;} + .d2-525054211 .background-color-N4{background-color:#CFD2DD;} + .d2-525054211 .background-color-N5{background-color:#DEE1EB;} + .d2-525054211 .background-color-N6{background-color:#EEF1F8;} + .d2-525054211 .background-color-N7{background-color:#FFFFFF;} + .d2-525054211 .background-color-B1{background-color:#0D32B2;} + .d2-525054211 .background-color-B2{background-color:#0D32B2;} + .d2-525054211 .background-color-B3{background-color:#E3E9FD;} + .d2-525054211 .background-color-B4{background-color:#E3E9FD;} + .d2-525054211 .background-color-B5{background-color:#EDF0FD;} + .d2-525054211 .background-color-B6{background-color:#F7F8FE;} + .d2-525054211 .background-color-AA2{background-color:#4A6FF3;} + .d2-525054211 .background-color-AA4{background-color:#EDF0FD;} + .d2-525054211 .background-color-AA5{background-color:#F7F8FE;} + .d2-525054211 .background-color-AB4{background-color:#EDF0FD;} + .d2-525054211 .background-color-AB5{background-color:#F7F8FE;} + .d2-525054211 .color-N1{color:#0A0F25;} + .d2-525054211 .color-N2{color:#676C7E;} + .d2-525054211 .color-N3{color:#9499AB;} + .d2-525054211 .color-N4{color:#CFD2DD;} + .d2-525054211 .color-N5{color:#DEE1EB;} + .d2-525054211 .color-N6{color:#EEF1F8;} + .d2-525054211 .color-N7{color:#FFFFFF;} + .d2-525054211 .color-B1{color:#0D32B2;} + .d2-525054211 .color-B2{color:#0D32B2;} + .d2-525054211 .color-B3{color:#E3E9FD;} + .d2-525054211 .color-B4{color:#E3E9FD;} + .d2-525054211 .color-B5{color:#EDF0FD;} + .d2-525054211 .color-B6{color:#F7F8FE;} + .d2-525054211 .color-AA2{color:#4A6FF3;} + .d2-525054211 .color-AA4{color:#EDF0FD;} + .d2-525054211 .color-AA5{color:#F7F8FE;} + .d2-525054211 .color-AB4{color:#EDF0FD;} + .d2-525054211 .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}]]>I'm a Mac @@ -104,7 +104,7 @@ - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg index e5ab84a42..badd8405b 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3748359424 .fill-N1{fill:#0A0F25;} + .d2-3748359424 .fill-N2{fill:#676C7E;} + .d2-3748359424 .fill-N3{fill:#9499AB;} + .d2-3748359424 .fill-N4{fill:#CFD2DD;} + .d2-3748359424 .fill-N5{fill:#DEE1EB;} + .d2-3748359424 .fill-N6{fill:#EEF1F8;} + .d2-3748359424 .fill-N7{fill:#FFFFFF;} + .d2-3748359424 .fill-B1{fill:#0D32B2;} + .d2-3748359424 .fill-B2{fill:#0D32B2;} + .d2-3748359424 .fill-B3{fill:#E3E9FD;} + .d2-3748359424 .fill-B4{fill:#E3E9FD;} + .d2-3748359424 .fill-B5{fill:#EDF0FD;} + .d2-3748359424 .fill-B6{fill:#F7F8FE;} + .d2-3748359424 .fill-AA2{fill:#4A6FF3;} + .d2-3748359424 .fill-AA4{fill:#EDF0FD;} + .d2-3748359424 .fill-AA5{fill:#F7F8FE;} + .d2-3748359424 .fill-AB4{fill:#EDF0FD;} + .d2-3748359424 .fill-AB5{fill:#F7F8FE;} + .d2-3748359424 .stroke-N1{stroke:#0A0F25;} + .d2-3748359424 .stroke-N2{stroke:#676C7E;} + .d2-3748359424 .stroke-N3{stroke:#9499AB;} + .d2-3748359424 .stroke-N4{stroke:#CFD2DD;} + .d2-3748359424 .stroke-N5{stroke:#DEE1EB;} + .d2-3748359424 .stroke-N6{stroke:#EEF1F8;} + .d2-3748359424 .stroke-N7{stroke:#FFFFFF;} + .d2-3748359424 .stroke-B1{stroke:#0D32B2;} + .d2-3748359424 .stroke-B2{stroke:#0D32B2;} + .d2-3748359424 .stroke-B3{stroke:#E3E9FD;} + .d2-3748359424 .stroke-B4{stroke:#E3E9FD;} + .d2-3748359424 .stroke-B5{stroke:#EDF0FD;} + .d2-3748359424 .stroke-B6{stroke:#F7F8FE;} + .d2-3748359424 .stroke-AA2{stroke:#4A6FF3;} + .d2-3748359424 .stroke-AA4{stroke:#EDF0FD;} + .d2-3748359424 .stroke-AA5{stroke:#F7F8FE;} + .d2-3748359424 .stroke-AB4{stroke:#EDF0FD;} + .d2-3748359424 .stroke-AB5{stroke:#F7F8FE;} + .d2-3748359424 .background-color-N1{background-color:#0A0F25;} + .d2-3748359424 .background-color-N2{background-color:#676C7E;} + .d2-3748359424 .background-color-N3{background-color:#9499AB;} + .d2-3748359424 .background-color-N4{background-color:#CFD2DD;} + .d2-3748359424 .background-color-N5{background-color:#DEE1EB;} + .d2-3748359424 .background-color-N6{background-color:#EEF1F8;} + .d2-3748359424 .background-color-N7{background-color:#FFFFFF;} + .d2-3748359424 .background-color-B1{background-color:#0D32B2;} + .d2-3748359424 .background-color-B2{background-color:#0D32B2;} + .d2-3748359424 .background-color-B3{background-color:#E3E9FD;} + .d2-3748359424 .background-color-B4{background-color:#E3E9FD;} + .d2-3748359424 .background-color-B5{background-color:#EDF0FD;} + .d2-3748359424 .background-color-B6{background-color:#F7F8FE;} + .d2-3748359424 .background-color-AA2{background-color:#4A6FF3;} + .d2-3748359424 .background-color-AA4{background-color:#EDF0FD;} + .d2-3748359424 .background-color-AA5{background-color:#F7F8FE;} + .d2-3748359424 .background-color-AB4{background-color:#EDF0FD;} + .d2-3748359424 .background-color-AB5{background-color:#F7F8FE;} + .d2-3748359424 .color-N1{color:#0A0F25;} + .d2-3748359424 .color-N2{color:#676C7E;} + .d2-3748359424 .color-N3{color:#9499AB;} + .d2-3748359424 .color-N4{color:#CFD2DD;} + .d2-3748359424 .color-N5{color:#DEE1EB;} + .d2-3748359424 .color-N6{color:#EEF1F8;} + .d2-3748359424 .color-N7{color:#FFFFFF;} + .d2-3748359424 .color-B1{color:#0D32B2;} + .d2-3748359424 .color-B2{color:#0D32B2;} + .d2-3748359424 .color-B3{color:#E3E9FD;} + .d2-3748359424 .color-B4{color:#E3E9FD;} + .d2-3748359424 .color-B5{color:#EDF0FD;} + .d2-3748359424 .color-B6{color:#F7F8FE;} + .d2-3748359424 .color-AA2{color:#4A6FF3;} + .d2-3748359424 .color-AA4{color:#EDF0FD;} + .d2-3748359424 .color-AA5{color:#F7F8FE;} + .d2-3748359424 .color-AB4{color:#EDF0FD;} + .d2-3748359424 .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}]]>xy diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg index 4c6d26df0..2427c5c1b 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg @@ -1,9 +1,9 @@ -mortgagerealtor + .d2-1388351072 .fill-N1{fill:#0A0F25;} + .d2-1388351072 .fill-N2{fill:#676C7E;} + .d2-1388351072 .fill-N3{fill:#9499AB;} + .d2-1388351072 .fill-N4{fill:#CFD2DD;} + .d2-1388351072 .fill-N5{fill:#DEE1EB;} + .d2-1388351072 .fill-N6{fill:#EEF1F8;} + .d2-1388351072 .fill-N7{fill:#FFFFFF;} + .d2-1388351072 .fill-B1{fill:#0D32B2;} + .d2-1388351072 .fill-B2{fill:#0D32B2;} + .d2-1388351072 .fill-B3{fill:#E3E9FD;} + .d2-1388351072 .fill-B4{fill:#E3E9FD;} + .d2-1388351072 .fill-B5{fill:#EDF0FD;} + .d2-1388351072 .fill-B6{fill:#F7F8FE;} + .d2-1388351072 .fill-AA2{fill:#4A6FF3;} + .d2-1388351072 .fill-AA4{fill:#EDF0FD;} + .d2-1388351072 .fill-AA5{fill:#F7F8FE;} + .d2-1388351072 .fill-AB4{fill:#EDF0FD;} + .d2-1388351072 .fill-AB5{fill:#F7F8FE;} + .d2-1388351072 .stroke-N1{stroke:#0A0F25;} + .d2-1388351072 .stroke-N2{stroke:#676C7E;} + .d2-1388351072 .stroke-N3{stroke:#9499AB;} + .d2-1388351072 .stroke-N4{stroke:#CFD2DD;} + .d2-1388351072 .stroke-N5{stroke:#DEE1EB;} + .d2-1388351072 .stroke-N6{stroke:#EEF1F8;} + .d2-1388351072 .stroke-N7{stroke:#FFFFFF;} + .d2-1388351072 .stroke-B1{stroke:#0D32B2;} + .d2-1388351072 .stroke-B2{stroke:#0D32B2;} + .d2-1388351072 .stroke-B3{stroke:#E3E9FD;} + .d2-1388351072 .stroke-B4{stroke:#E3E9FD;} + .d2-1388351072 .stroke-B5{stroke:#EDF0FD;} + .d2-1388351072 .stroke-B6{stroke:#F7F8FE;} + .d2-1388351072 .stroke-AA2{stroke:#4A6FF3;} + .d2-1388351072 .stroke-AA4{stroke:#EDF0FD;} + .d2-1388351072 .stroke-AA5{stroke:#F7F8FE;} + .d2-1388351072 .stroke-AB4{stroke:#EDF0FD;} + .d2-1388351072 .stroke-AB5{stroke:#F7F8FE;} + .d2-1388351072 .background-color-N1{background-color:#0A0F25;} + .d2-1388351072 .background-color-N2{background-color:#676C7E;} + .d2-1388351072 .background-color-N3{background-color:#9499AB;} + .d2-1388351072 .background-color-N4{background-color:#CFD2DD;} + .d2-1388351072 .background-color-N5{background-color:#DEE1EB;} + .d2-1388351072 .background-color-N6{background-color:#EEF1F8;} + .d2-1388351072 .background-color-N7{background-color:#FFFFFF;} + .d2-1388351072 .background-color-B1{background-color:#0D32B2;} + .d2-1388351072 .background-color-B2{background-color:#0D32B2;} + .d2-1388351072 .background-color-B3{background-color:#E3E9FD;} + .d2-1388351072 .background-color-B4{background-color:#E3E9FD;} + .d2-1388351072 .background-color-B5{background-color:#EDF0FD;} + .d2-1388351072 .background-color-B6{background-color:#F7F8FE;} + .d2-1388351072 .background-color-AA2{background-color:#4A6FF3;} + .d2-1388351072 .background-color-AA4{background-color:#EDF0FD;} + .d2-1388351072 .background-color-AA5{background-color:#F7F8FE;} + .d2-1388351072 .background-color-AB4{background-color:#EDF0FD;} + .d2-1388351072 .background-color-AB5{background-color:#F7F8FE;} + .d2-1388351072 .color-N1{color:#0A0F25;} + .d2-1388351072 .color-N2{color:#676C7E;} + .d2-1388351072 .color-N3{color:#9499AB;} + .d2-1388351072 .color-N4{color:#CFD2DD;} + .d2-1388351072 .color-N5{color:#DEE1EB;} + .d2-1388351072 .color-N6{color:#EEF1F8;} + .d2-1388351072 .color-N7{color:#FFFFFF;} + .d2-1388351072 .color-B1{color:#0D32B2;} + .d2-1388351072 .color-B2{color:#0D32B2;} + .d2-1388351072 .color-B3{color:#E3E9FD;} + .d2-1388351072 .color-B4{color:#E3E9FD;} + .d2-1388351072 .color-B5{color:#EDF0FD;} + .d2-1388351072 .color-B6{color:#F7F8FE;} + .d2-1388351072 .color-AA2{color:#4A6FF3;} + .d2-1388351072 .color-AA4{color:#EDF0FD;} + .d2-1388351072 .color-AA5{color:#F7F8FE;} + .d2-1388351072 .color-AB4{color:#EDF0FD;} + .d2-1388351072 .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}]]>mortgagerealtor diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg index 6906656c7..76fb31c1b 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg @@ -1,9 +1,9 @@ -belieffooddiet + .d2-669623016 .fill-N1{fill:#0A0F25;} + .d2-669623016 .fill-N2{fill:#676C7E;} + .d2-669623016 .fill-N3{fill:#9499AB;} + .d2-669623016 .fill-N4{fill:#CFD2DD;} + .d2-669623016 .fill-N5{fill:#DEE1EB;} + .d2-669623016 .fill-N6{fill:#EEF1F8;} + .d2-669623016 .fill-N7{fill:#FFFFFF;} + .d2-669623016 .fill-B1{fill:#0D32B2;} + .d2-669623016 .fill-B2{fill:#0D32B2;} + .d2-669623016 .fill-B3{fill:#E3E9FD;} + .d2-669623016 .fill-B4{fill:#E3E9FD;} + .d2-669623016 .fill-B5{fill:#EDF0FD;} + .d2-669623016 .fill-B6{fill:#F7F8FE;} + .d2-669623016 .fill-AA2{fill:#4A6FF3;} + .d2-669623016 .fill-AA4{fill:#EDF0FD;} + .d2-669623016 .fill-AA5{fill:#F7F8FE;} + .d2-669623016 .fill-AB4{fill:#EDF0FD;} + .d2-669623016 .fill-AB5{fill:#F7F8FE;} + .d2-669623016 .stroke-N1{stroke:#0A0F25;} + .d2-669623016 .stroke-N2{stroke:#676C7E;} + .d2-669623016 .stroke-N3{stroke:#9499AB;} + .d2-669623016 .stroke-N4{stroke:#CFD2DD;} + .d2-669623016 .stroke-N5{stroke:#DEE1EB;} + .d2-669623016 .stroke-N6{stroke:#EEF1F8;} + .d2-669623016 .stroke-N7{stroke:#FFFFFF;} + .d2-669623016 .stroke-B1{stroke:#0D32B2;} + .d2-669623016 .stroke-B2{stroke:#0D32B2;} + .d2-669623016 .stroke-B3{stroke:#E3E9FD;} + .d2-669623016 .stroke-B4{stroke:#E3E9FD;} + .d2-669623016 .stroke-B5{stroke:#EDF0FD;} + .d2-669623016 .stroke-B6{stroke:#F7F8FE;} + .d2-669623016 .stroke-AA2{stroke:#4A6FF3;} + .d2-669623016 .stroke-AA4{stroke:#EDF0FD;} + .d2-669623016 .stroke-AA5{stroke:#F7F8FE;} + .d2-669623016 .stroke-AB4{stroke:#EDF0FD;} + .d2-669623016 .stroke-AB5{stroke:#F7F8FE;} + .d2-669623016 .background-color-N1{background-color:#0A0F25;} + .d2-669623016 .background-color-N2{background-color:#676C7E;} + .d2-669623016 .background-color-N3{background-color:#9499AB;} + .d2-669623016 .background-color-N4{background-color:#CFD2DD;} + .d2-669623016 .background-color-N5{background-color:#DEE1EB;} + .d2-669623016 .background-color-N6{background-color:#EEF1F8;} + .d2-669623016 .background-color-N7{background-color:#FFFFFF;} + .d2-669623016 .background-color-B1{background-color:#0D32B2;} + .d2-669623016 .background-color-B2{background-color:#0D32B2;} + .d2-669623016 .background-color-B3{background-color:#E3E9FD;} + .d2-669623016 .background-color-B4{background-color:#E3E9FD;} + .d2-669623016 .background-color-B5{background-color:#EDF0FD;} + .d2-669623016 .background-color-B6{background-color:#F7F8FE;} + .d2-669623016 .background-color-AA2{background-color:#4A6FF3;} + .d2-669623016 .background-color-AA4{background-color:#EDF0FD;} + .d2-669623016 .background-color-AA5{background-color:#F7F8FE;} + .d2-669623016 .background-color-AB4{background-color:#EDF0FD;} + .d2-669623016 .background-color-AB5{background-color:#F7F8FE;} + .d2-669623016 .color-N1{color:#0A0F25;} + .d2-669623016 .color-N2{color:#676C7E;} + .d2-669623016 .color-N3{color:#9499AB;} + .d2-669623016 .color-N4{color:#CFD2DD;} + .d2-669623016 .color-N5{color:#DEE1EB;} + .d2-669623016 .color-N6{color:#EEF1F8;} + .d2-669623016 .color-N7{color:#FFFFFF;} + .d2-669623016 .color-B1{color:#0D32B2;} + .d2-669623016 .color-B2{color:#0D32B2;} + .d2-669623016 .color-B3{color:#E3E9FD;} + .d2-669623016 .color-B4{color:#E3E9FD;} + .d2-669623016 .color-B5{color:#EDF0FD;} + .d2-669623016 .color-B6{color:#F7F8FE;} + .d2-669623016 .color-AA2{color:#4A6FF3;} + .d2-669623016 .color-AA4{color:#EDF0FD;} + .d2-669623016 .color-AA5{color:#F7F8FE;} + .d2-669623016 .color-AB4{color:#EDF0FD;} + .d2-669623016 .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}]]>belieffooddiet diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg index 16f9f8273..bc32c3a2d 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg @@ -1,9 +1,9 @@ -TSXNYSENASDAQ + .d2-3092847457 .fill-N1{fill:#0A0F25;} + .d2-3092847457 .fill-N2{fill:#676C7E;} + .d2-3092847457 .fill-N3{fill:#9499AB;} + .d2-3092847457 .fill-N4{fill:#CFD2DD;} + .d2-3092847457 .fill-N5{fill:#DEE1EB;} + .d2-3092847457 .fill-N6{fill:#EEF1F8;} + .d2-3092847457 .fill-N7{fill:#FFFFFF;} + .d2-3092847457 .fill-B1{fill:#0D32B2;} + .d2-3092847457 .fill-B2{fill:#0D32B2;} + .d2-3092847457 .fill-B3{fill:#E3E9FD;} + .d2-3092847457 .fill-B4{fill:#E3E9FD;} + .d2-3092847457 .fill-B5{fill:#EDF0FD;} + .d2-3092847457 .fill-B6{fill:#F7F8FE;} + .d2-3092847457 .fill-AA2{fill:#4A6FF3;} + .d2-3092847457 .fill-AA4{fill:#EDF0FD;} + .d2-3092847457 .fill-AA5{fill:#F7F8FE;} + .d2-3092847457 .fill-AB4{fill:#EDF0FD;} + .d2-3092847457 .fill-AB5{fill:#F7F8FE;} + .d2-3092847457 .stroke-N1{stroke:#0A0F25;} + .d2-3092847457 .stroke-N2{stroke:#676C7E;} + .d2-3092847457 .stroke-N3{stroke:#9499AB;} + .d2-3092847457 .stroke-N4{stroke:#CFD2DD;} + .d2-3092847457 .stroke-N5{stroke:#DEE1EB;} + .d2-3092847457 .stroke-N6{stroke:#EEF1F8;} + .d2-3092847457 .stroke-N7{stroke:#FFFFFF;} + .d2-3092847457 .stroke-B1{stroke:#0D32B2;} + .d2-3092847457 .stroke-B2{stroke:#0D32B2;} + .d2-3092847457 .stroke-B3{stroke:#E3E9FD;} + .d2-3092847457 .stroke-B4{stroke:#E3E9FD;} + .d2-3092847457 .stroke-B5{stroke:#EDF0FD;} + .d2-3092847457 .stroke-B6{stroke:#F7F8FE;} + .d2-3092847457 .stroke-AA2{stroke:#4A6FF3;} + .d2-3092847457 .stroke-AA4{stroke:#EDF0FD;} + .d2-3092847457 .stroke-AA5{stroke:#F7F8FE;} + .d2-3092847457 .stroke-AB4{stroke:#EDF0FD;} + .d2-3092847457 .stroke-AB5{stroke:#F7F8FE;} + .d2-3092847457 .background-color-N1{background-color:#0A0F25;} + .d2-3092847457 .background-color-N2{background-color:#676C7E;} + .d2-3092847457 .background-color-N3{background-color:#9499AB;} + .d2-3092847457 .background-color-N4{background-color:#CFD2DD;} + .d2-3092847457 .background-color-N5{background-color:#DEE1EB;} + .d2-3092847457 .background-color-N6{background-color:#EEF1F8;} + .d2-3092847457 .background-color-N7{background-color:#FFFFFF;} + .d2-3092847457 .background-color-B1{background-color:#0D32B2;} + .d2-3092847457 .background-color-B2{background-color:#0D32B2;} + .d2-3092847457 .background-color-B3{background-color:#E3E9FD;} + .d2-3092847457 .background-color-B4{background-color:#E3E9FD;} + .d2-3092847457 .background-color-B5{background-color:#EDF0FD;} + .d2-3092847457 .background-color-B6{background-color:#F7F8FE;} + .d2-3092847457 .background-color-AA2{background-color:#4A6FF3;} + .d2-3092847457 .background-color-AA4{background-color:#EDF0FD;} + .d2-3092847457 .background-color-AA5{background-color:#F7F8FE;} + .d2-3092847457 .background-color-AB4{background-color:#EDF0FD;} + .d2-3092847457 .background-color-AB5{background-color:#F7F8FE;} + .d2-3092847457 .color-N1{color:#0A0F25;} + .d2-3092847457 .color-N2{color:#676C7E;} + .d2-3092847457 .color-N3{color:#9499AB;} + .d2-3092847457 .color-N4{color:#CFD2DD;} + .d2-3092847457 .color-N5{color:#DEE1EB;} + .d2-3092847457 .color-N6{color:#EEF1F8;} + .d2-3092847457 .color-N7{color:#FFFFFF;} + .d2-3092847457 .color-B1{color:#0D32B2;} + .d2-3092847457 .color-B2{color:#0D32B2;} + .d2-3092847457 .color-B3{color:#E3E9FD;} + .d2-3092847457 .color-B4{color:#E3E9FD;} + .d2-3092847457 .color-B5{color:#EDF0FD;} + .d2-3092847457 .color-B6{color:#F7F8FE;} + .d2-3092847457 .color-AA2{color:#4A6FF3;} + .d2-3092847457 .color-AA4{color:#EDF0FD;} + .d2-3092847457 .color-AA5{color:#F7F8FE;} + .d2-3092847457 .color-AB4{color:#EDF0FD;} + .d2-3092847457 .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}]]>TSXNYSENASDAQ diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg index 43067e2ad..ce5ea840a 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-2626224973 .fill-N1{fill:#0A0F25;} + .d2-2626224973 .fill-N2{fill:#676C7E;} + .d2-2626224973 .fill-N3{fill:#9499AB;} + .d2-2626224973 .fill-N4{fill:#CFD2DD;} + .d2-2626224973 .fill-N5{fill:#DEE1EB;} + .d2-2626224973 .fill-N6{fill:#EEF1F8;} + .d2-2626224973 .fill-N7{fill:#FFFFFF;} + .d2-2626224973 .fill-B1{fill:#0D32B2;} + .d2-2626224973 .fill-B2{fill:#0D32B2;} + .d2-2626224973 .fill-B3{fill:#E3E9FD;} + .d2-2626224973 .fill-B4{fill:#E3E9FD;} + .d2-2626224973 .fill-B5{fill:#EDF0FD;} + .d2-2626224973 .fill-B6{fill:#F7F8FE;} + .d2-2626224973 .fill-AA2{fill:#4A6FF3;} + .d2-2626224973 .fill-AA4{fill:#EDF0FD;} + .d2-2626224973 .fill-AA5{fill:#F7F8FE;} + .d2-2626224973 .fill-AB4{fill:#EDF0FD;} + .d2-2626224973 .fill-AB5{fill:#F7F8FE;} + .d2-2626224973 .stroke-N1{stroke:#0A0F25;} + .d2-2626224973 .stroke-N2{stroke:#676C7E;} + .d2-2626224973 .stroke-N3{stroke:#9499AB;} + .d2-2626224973 .stroke-N4{stroke:#CFD2DD;} + .d2-2626224973 .stroke-N5{stroke:#DEE1EB;} + .d2-2626224973 .stroke-N6{stroke:#EEF1F8;} + .d2-2626224973 .stroke-N7{stroke:#FFFFFF;} + .d2-2626224973 .stroke-B1{stroke:#0D32B2;} + .d2-2626224973 .stroke-B2{stroke:#0D32B2;} + .d2-2626224973 .stroke-B3{stroke:#E3E9FD;} + .d2-2626224973 .stroke-B4{stroke:#E3E9FD;} + .d2-2626224973 .stroke-B5{stroke:#EDF0FD;} + .d2-2626224973 .stroke-B6{stroke:#F7F8FE;} + .d2-2626224973 .stroke-AA2{stroke:#4A6FF3;} + .d2-2626224973 .stroke-AA4{stroke:#EDF0FD;} + .d2-2626224973 .stroke-AA5{stroke:#F7F8FE;} + .d2-2626224973 .stroke-AB4{stroke:#EDF0FD;} + .d2-2626224973 .stroke-AB5{stroke:#F7F8FE;} + .d2-2626224973 .background-color-N1{background-color:#0A0F25;} + .d2-2626224973 .background-color-N2{background-color:#676C7E;} + .d2-2626224973 .background-color-N3{background-color:#9499AB;} + .d2-2626224973 .background-color-N4{background-color:#CFD2DD;} + .d2-2626224973 .background-color-N5{background-color:#DEE1EB;} + .d2-2626224973 .background-color-N6{background-color:#EEF1F8;} + .d2-2626224973 .background-color-N7{background-color:#FFFFFF;} + .d2-2626224973 .background-color-B1{background-color:#0D32B2;} + .d2-2626224973 .background-color-B2{background-color:#0D32B2;} + .d2-2626224973 .background-color-B3{background-color:#E3E9FD;} + .d2-2626224973 .background-color-B4{background-color:#E3E9FD;} + .d2-2626224973 .background-color-B5{background-color:#EDF0FD;} + .d2-2626224973 .background-color-B6{background-color:#F7F8FE;} + .d2-2626224973 .background-color-AA2{background-color:#4A6FF3;} + .d2-2626224973 .background-color-AA4{background-color:#EDF0FD;} + .d2-2626224973 .background-color-AA5{background-color:#F7F8FE;} + .d2-2626224973 .background-color-AB4{background-color:#EDF0FD;} + .d2-2626224973 .background-color-AB5{background-color:#F7F8FE;} + .d2-2626224973 .color-N1{color:#0A0F25;} + .d2-2626224973 .color-N2{color:#676C7E;} + .d2-2626224973 .color-N3{color:#9499AB;} + .d2-2626224973 .color-N4{color:#CFD2DD;} + .d2-2626224973 .color-N5{color:#DEE1EB;} + .d2-2626224973 .color-N6{color:#EEF1F8;} + .d2-2626224973 .color-N7{color:#FFFFFF;} + .d2-2626224973 .color-B1{color:#0D32B2;} + .d2-2626224973 .color-B2{color:#0D32B2;} + .d2-2626224973 .color-B3{color:#E3E9FD;} + .d2-2626224973 .color-B4{color:#E3E9FD;} + .d2-2626224973 .color-B5{color:#EDF0FD;} + .d2-2626224973 .color-B6{color:#F7F8FE;} + .d2-2626224973 .color-AA2{color:#4A6FF3;} + .d2-2626224973 .color-AA4{color:#EDF0FD;} + .d2-2626224973 .color-AA5{color:#F7F8FE;} + .d2-2626224973 .color-AB4{color:#EDF0FD;} + .d2-2626224973 .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}]]>xy diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg index e5ab84a42..badd8405b 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3748359424 .fill-N1{fill:#0A0F25;} + .d2-3748359424 .fill-N2{fill:#676C7E;} + .d2-3748359424 .fill-N3{fill:#9499AB;} + .d2-3748359424 .fill-N4{fill:#CFD2DD;} + .d2-3748359424 .fill-N5{fill:#DEE1EB;} + .d2-3748359424 .fill-N6{fill:#EEF1F8;} + .d2-3748359424 .fill-N7{fill:#FFFFFF;} + .d2-3748359424 .fill-B1{fill:#0D32B2;} + .d2-3748359424 .fill-B2{fill:#0D32B2;} + .d2-3748359424 .fill-B3{fill:#E3E9FD;} + .d2-3748359424 .fill-B4{fill:#E3E9FD;} + .d2-3748359424 .fill-B5{fill:#EDF0FD;} + .d2-3748359424 .fill-B6{fill:#F7F8FE;} + .d2-3748359424 .fill-AA2{fill:#4A6FF3;} + .d2-3748359424 .fill-AA4{fill:#EDF0FD;} + .d2-3748359424 .fill-AA5{fill:#F7F8FE;} + .d2-3748359424 .fill-AB4{fill:#EDF0FD;} + .d2-3748359424 .fill-AB5{fill:#F7F8FE;} + .d2-3748359424 .stroke-N1{stroke:#0A0F25;} + .d2-3748359424 .stroke-N2{stroke:#676C7E;} + .d2-3748359424 .stroke-N3{stroke:#9499AB;} + .d2-3748359424 .stroke-N4{stroke:#CFD2DD;} + .d2-3748359424 .stroke-N5{stroke:#DEE1EB;} + .d2-3748359424 .stroke-N6{stroke:#EEF1F8;} + .d2-3748359424 .stroke-N7{stroke:#FFFFFF;} + .d2-3748359424 .stroke-B1{stroke:#0D32B2;} + .d2-3748359424 .stroke-B2{stroke:#0D32B2;} + .d2-3748359424 .stroke-B3{stroke:#E3E9FD;} + .d2-3748359424 .stroke-B4{stroke:#E3E9FD;} + .d2-3748359424 .stroke-B5{stroke:#EDF0FD;} + .d2-3748359424 .stroke-B6{stroke:#F7F8FE;} + .d2-3748359424 .stroke-AA2{stroke:#4A6FF3;} + .d2-3748359424 .stroke-AA4{stroke:#EDF0FD;} + .d2-3748359424 .stroke-AA5{stroke:#F7F8FE;} + .d2-3748359424 .stroke-AB4{stroke:#EDF0FD;} + .d2-3748359424 .stroke-AB5{stroke:#F7F8FE;} + .d2-3748359424 .background-color-N1{background-color:#0A0F25;} + .d2-3748359424 .background-color-N2{background-color:#676C7E;} + .d2-3748359424 .background-color-N3{background-color:#9499AB;} + .d2-3748359424 .background-color-N4{background-color:#CFD2DD;} + .d2-3748359424 .background-color-N5{background-color:#DEE1EB;} + .d2-3748359424 .background-color-N6{background-color:#EEF1F8;} + .d2-3748359424 .background-color-N7{background-color:#FFFFFF;} + .d2-3748359424 .background-color-B1{background-color:#0D32B2;} + .d2-3748359424 .background-color-B2{background-color:#0D32B2;} + .d2-3748359424 .background-color-B3{background-color:#E3E9FD;} + .d2-3748359424 .background-color-B4{background-color:#E3E9FD;} + .d2-3748359424 .background-color-B5{background-color:#EDF0FD;} + .d2-3748359424 .background-color-B6{background-color:#F7F8FE;} + .d2-3748359424 .background-color-AA2{background-color:#4A6FF3;} + .d2-3748359424 .background-color-AA4{background-color:#EDF0FD;} + .d2-3748359424 .background-color-AA5{background-color:#F7F8FE;} + .d2-3748359424 .background-color-AB4{background-color:#EDF0FD;} + .d2-3748359424 .background-color-AB5{background-color:#F7F8FE;} + .d2-3748359424 .color-N1{color:#0A0F25;} + .d2-3748359424 .color-N2{color:#676C7E;} + .d2-3748359424 .color-N3{color:#9499AB;} + .d2-3748359424 .color-N4{color:#CFD2DD;} + .d2-3748359424 .color-N5{color:#DEE1EB;} + .d2-3748359424 .color-N6{color:#EEF1F8;} + .d2-3748359424 .color-N7{color:#FFFFFF;} + .d2-3748359424 .color-B1{color:#0D32B2;} + .d2-3748359424 .color-B2{color:#0D32B2;} + .d2-3748359424 .color-B3{color:#E3E9FD;} + .d2-3748359424 .color-B4{color:#E3E9FD;} + .d2-3748359424 .color-B5{color:#EDF0FD;} + .d2-3748359424 .color-B6{color:#F7F8FE;} + .d2-3748359424 .color-AA2{color:#4A6FF3;} + .d2-3748359424 .color-AA4{color:#EDF0FD;} + .d2-3748359424 .color-AA5{color:#F7F8FE;} + .d2-3748359424 .color-AB4{color:#EDF0FD;} + .d2-3748359424 .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}]]>xy diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg index 4c6d26df0..2427c5c1b 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg @@ -1,9 +1,9 @@ -mortgagerealtor + .d2-1388351072 .fill-N1{fill:#0A0F25;} + .d2-1388351072 .fill-N2{fill:#676C7E;} + .d2-1388351072 .fill-N3{fill:#9499AB;} + .d2-1388351072 .fill-N4{fill:#CFD2DD;} + .d2-1388351072 .fill-N5{fill:#DEE1EB;} + .d2-1388351072 .fill-N6{fill:#EEF1F8;} + .d2-1388351072 .fill-N7{fill:#FFFFFF;} + .d2-1388351072 .fill-B1{fill:#0D32B2;} + .d2-1388351072 .fill-B2{fill:#0D32B2;} + .d2-1388351072 .fill-B3{fill:#E3E9FD;} + .d2-1388351072 .fill-B4{fill:#E3E9FD;} + .d2-1388351072 .fill-B5{fill:#EDF0FD;} + .d2-1388351072 .fill-B6{fill:#F7F8FE;} + .d2-1388351072 .fill-AA2{fill:#4A6FF3;} + .d2-1388351072 .fill-AA4{fill:#EDF0FD;} + .d2-1388351072 .fill-AA5{fill:#F7F8FE;} + .d2-1388351072 .fill-AB4{fill:#EDF0FD;} + .d2-1388351072 .fill-AB5{fill:#F7F8FE;} + .d2-1388351072 .stroke-N1{stroke:#0A0F25;} + .d2-1388351072 .stroke-N2{stroke:#676C7E;} + .d2-1388351072 .stroke-N3{stroke:#9499AB;} + .d2-1388351072 .stroke-N4{stroke:#CFD2DD;} + .d2-1388351072 .stroke-N5{stroke:#DEE1EB;} + .d2-1388351072 .stroke-N6{stroke:#EEF1F8;} + .d2-1388351072 .stroke-N7{stroke:#FFFFFF;} + .d2-1388351072 .stroke-B1{stroke:#0D32B2;} + .d2-1388351072 .stroke-B2{stroke:#0D32B2;} + .d2-1388351072 .stroke-B3{stroke:#E3E9FD;} + .d2-1388351072 .stroke-B4{stroke:#E3E9FD;} + .d2-1388351072 .stroke-B5{stroke:#EDF0FD;} + .d2-1388351072 .stroke-B6{stroke:#F7F8FE;} + .d2-1388351072 .stroke-AA2{stroke:#4A6FF3;} + .d2-1388351072 .stroke-AA4{stroke:#EDF0FD;} + .d2-1388351072 .stroke-AA5{stroke:#F7F8FE;} + .d2-1388351072 .stroke-AB4{stroke:#EDF0FD;} + .d2-1388351072 .stroke-AB5{stroke:#F7F8FE;} + .d2-1388351072 .background-color-N1{background-color:#0A0F25;} + .d2-1388351072 .background-color-N2{background-color:#676C7E;} + .d2-1388351072 .background-color-N3{background-color:#9499AB;} + .d2-1388351072 .background-color-N4{background-color:#CFD2DD;} + .d2-1388351072 .background-color-N5{background-color:#DEE1EB;} + .d2-1388351072 .background-color-N6{background-color:#EEF1F8;} + .d2-1388351072 .background-color-N7{background-color:#FFFFFF;} + .d2-1388351072 .background-color-B1{background-color:#0D32B2;} + .d2-1388351072 .background-color-B2{background-color:#0D32B2;} + .d2-1388351072 .background-color-B3{background-color:#E3E9FD;} + .d2-1388351072 .background-color-B4{background-color:#E3E9FD;} + .d2-1388351072 .background-color-B5{background-color:#EDF0FD;} + .d2-1388351072 .background-color-B6{background-color:#F7F8FE;} + .d2-1388351072 .background-color-AA2{background-color:#4A6FF3;} + .d2-1388351072 .background-color-AA4{background-color:#EDF0FD;} + .d2-1388351072 .background-color-AA5{background-color:#F7F8FE;} + .d2-1388351072 .background-color-AB4{background-color:#EDF0FD;} + .d2-1388351072 .background-color-AB5{background-color:#F7F8FE;} + .d2-1388351072 .color-N1{color:#0A0F25;} + .d2-1388351072 .color-N2{color:#676C7E;} + .d2-1388351072 .color-N3{color:#9499AB;} + .d2-1388351072 .color-N4{color:#CFD2DD;} + .d2-1388351072 .color-N5{color:#DEE1EB;} + .d2-1388351072 .color-N6{color:#EEF1F8;} + .d2-1388351072 .color-N7{color:#FFFFFF;} + .d2-1388351072 .color-B1{color:#0D32B2;} + .d2-1388351072 .color-B2{color:#0D32B2;} + .d2-1388351072 .color-B3{color:#E3E9FD;} + .d2-1388351072 .color-B4{color:#E3E9FD;} + .d2-1388351072 .color-B5{color:#EDF0FD;} + .d2-1388351072 .color-B6{color:#F7F8FE;} + .d2-1388351072 .color-AA2{color:#4A6FF3;} + .d2-1388351072 .color-AA4{color:#EDF0FD;} + .d2-1388351072 .color-AA5{color:#F7F8FE;} + .d2-1388351072 .color-AB4{color:#EDF0FD;} + .d2-1388351072 .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}]]>mortgagerealtor diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg index 6906656c7..76fb31c1b 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg @@ -1,9 +1,9 @@ -belieffooddiet + .d2-669623016 .fill-N1{fill:#0A0F25;} + .d2-669623016 .fill-N2{fill:#676C7E;} + .d2-669623016 .fill-N3{fill:#9499AB;} + .d2-669623016 .fill-N4{fill:#CFD2DD;} + .d2-669623016 .fill-N5{fill:#DEE1EB;} + .d2-669623016 .fill-N6{fill:#EEF1F8;} + .d2-669623016 .fill-N7{fill:#FFFFFF;} + .d2-669623016 .fill-B1{fill:#0D32B2;} + .d2-669623016 .fill-B2{fill:#0D32B2;} + .d2-669623016 .fill-B3{fill:#E3E9FD;} + .d2-669623016 .fill-B4{fill:#E3E9FD;} + .d2-669623016 .fill-B5{fill:#EDF0FD;} + .d2-669623016 .fill-B6{fill:#F7F8FE;} + .d2-669623016 .fill-AA2{fill:#4A6FF3;} + .d2-669623016 .fill-AA4{fill:#EDF0FD;} + .d2-669623016 .fill-AA5{fill:#F7F8FE;} + .d2-669623016 .fill-AB4{fill:#EDF0FD;} + .d2-669623016 .fill-AB5{fill:#F7F8FE;} + .d2-669623016 .stroke-N1{stroke:#0A0F25;} + .d2-669623016 .stroke-N2{stroke:#676C7E;} + .d2-669623016 .stroke-N3{stroke:#9499AB;} + .d2-669623016 .stroke-N4{stroke:#CFD2DD;} + .d2-669623016 .stroke-N5{stroke:#DEE1EB;} + .d2-669623016 .stroke-N6{stroke:#EEF1F8;} + .d2-669623016 .stroke-N7{stroke:#FFFFFF;} + .d2-669623016 .stroke-B1{stroke:#0D32B2;} + .d2-669623016 .stroke-B2{stroke:#0D32B2;} + .d2-669623016 .stroke-B3{stroke:#E3E9FD;} + .d2-669623016 .stroke-B4{stroke:#E3E9FD;} + .d2-669623016 .stroke-B5{stroke:#EDF0FD;} + .d2-669623016 .stroke-B6{stroke:#F7F8FE;} + .d2-669623016 .stroke-AA2{stroke:#4A6FF3;} + .d2-669623016 .stroke-AA4{stroke:#EDF0FD;} + .d2-669623016 .stroke-AA5{stroke:#F7F8FE;} + .d2-669623016 .stroke-AB4{stroke:#EDF0FD;} + .d2-669623016 .stroke-AB5{stroke:#F7F8FE;} + .d2-669623016 .background-color-N1{background-color:#0A0F25;} + .d2-669623016 .background-color-N2{background-color:#676C7E;} + .d2-669623016 .background-color-N3{background-color:#9499AB;} + .d2-669623016 .background-color-N4{background-color:#CFD2DD;} + .d2-669623016 .background-color-N5{background-color:#DEE1EB;} + .d2-669623016 .background-color-N6{background-color:#EEF1F8;} + .d2-669623016 .background-color-N7{background-color:#FFFFFF;} + .d2-669623016 .background-color-B1{background-color:#0D32B2;} + .d2-669623016 .background-color-B2{background-color:#0D32B2;} + .d2-669623016 .background-color-B3{background-color:#E3E9FD;} + .d2-669623016 .background-color-B4{background-color:#E3E9FD;} + .d2-669623016 .background-color-B5{background-color:#EDF0FD;} + .d2-669623016 .background-color-B6{background-color:#F7F8FE;} + .d2-669623016 .background-color-AA2{background-color:#4A6FF3;} + .d2-669623016 .background-color-AA4{background-color:#EDF0FD;} + .d2-669623016 .background-color-AA5{background-color:#F7F8FE;} + .d2-669623016 .background-color-AB4{background-color:#EDF0FD;} + .d2-669623016 .background-color-AB5{background-color:#F7F8FE;} + .d2-669623016 .color-N1{color:#0A0F25;} + .d2-669623016 .color-N2{color:#676C7E;} + .d2-669623016 .color-N3{color:#9499AB;} + .d2-669623016 .color-N4{color:#CFD2DD;} + .d2-669623016 .color-N5{color:#DEE1EB;} + .d2-669623016 .color-N6{color:#EEF1F8;} + .d2-669623016 .color-N7{color:#FFFFFF;} + .d2-669623016 .color-B1{color:#0D32B2;} + .d2-669623016 .color-B2{color:#0D32B2;} + .d2-669623016 .color-B3{color:#E3E9FD;} + .d2-669623016 .color-B4{color:#E3E9FD;} + .d2-669623016 .color-B5{color:#EDF0FD;} + .d2-669623016 .color-B6{color:#F7F8FE;} + .d2-669623016 .color-AA2{color:#4A6FF3;} + .d2-669623016 .color-AA4{color:#EDF0FD;} + .d2-669623016 .color-AA5{color:#F7F8FE;} + .d2-669623016 .color-AB4{color:#EDF0FD;} + .d2-669623016 .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}]]>belieffooddiet diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg index 16f9f8273..bc32c3a2d 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg @@ -1,9 +1,9 @@ -TSXNYSENASDAQ + .d2-3092847457 .fill-N1{fill:#0A0F25;} + .d2-3092847457 .fill-N2{fill:#676C7E;} + .d2-3092847457 .fill-N3{fill:#9499AB;} + .d2-3092847457 .fill-N4{fill:#CFD2DD;} + .d2-3092847457 .fill-N5{fill:#DEE1EB;} + .d2-3092847457 .fill-N6{fill:#EEF1F8;} + .d2-3092847457 .fill-N7{fill:#FFFFFF;} + .d2-3092847457 .fill-B1{fill:#0D32B2;} + .d2-3092847457 .fill-B2{fill:#0D32B2;} + .d2-3092847457 .fill-B3{fill:#E3E9FD;} + .d2-3092847457 .fill-B4{fill:#E3E9FD;} + .d2-3092847457 .fill-B5{fill:#EDF0FD;} + .d2-3092847457 .fill-B6{fill:#F7F8FE;} + .d2-3092847457 .fill-AA2{fill:#4A6FF3;} + .d2-3092847457 .fill-AA4{fill:#EDF0FD;} + .d2-3092847457 .fill-AA5{fill:#F7F8FE;} + .d2-3092847457 .fill-AB4{fill:#EDF0FD;} + .d2-3092847457 .fill-AB5{fill:#F7F8FE;} + .d2-3092847457 .stroke-N1{stroke:#0A0F25;} + .d2-3092847457 .stroke-N2{stroke:#676C7E;} + .d2-3092847457 .stroke-N3{stroke:#9499AB;} + .d2-3092847457 .stroke-N4{stroke:#CFD2DD;} + .d2-3092847457 .stroke-N5{stroke:#DEE1EB;} + .d2-3092847457 .stroke-N6{stroke:#EEF1F8;} + .d2-3092847457 .stroke-N7{stroke:#FFFFFF;} + .d2-3092847457 .stroke-B1{stroke:#0D32B2;} + .d2-3092847457 .stroke-B2{stroke:#0D32B2;} + .d2-3092847457 .stroke-B3{stroke:#E3E9FD;} + .d2-3092847457 .stroke-B4{stroke:#E3E9FD;} + .d2-3092847457 .stroke-B5{stroke:#EDF0FD;} + .d2-3092847457 .stroke-B6{stroke:#F7F8FE;} + .d2-3092847457 .stroke-AA2{stroke:#4A6FF3;} + .d2-3092847457 .stroke-AA4{stroke:#EDF0FD;} + .d2-3092847457 .stroke-AA5{stroke:#F7F8FE;} + .d2-3092847457 .stroke-AB4{stroke:#EDF0FD;} + .d2-3092847457 .stroke-AB5{stroke:#F7F8FE;} + .d2-3092847457 .background-color-N1{background-color:#0A0F25;} + .d2-3092847457 .background-color-N2{background-color:#676C7E;} + .d2-3092847457 .background-color-N3{background-color:#9499AB;} + .d2-3092847457 .background-color-N4{background-color:#CFD2DD;} + .d2-3092847457 .background-color-N5{background-color:#DEE1EB;} + .d2-3092847457 .background-color-N6{background-color:#EEF1F8;} + .d2-3092847457 .background-color-N7{background-color:#FFFFFF;} + .d2-3092847457 .background-color-B1{background-color:#0D32B2;} + .d2-3092847457 .background-color-B2{background-color:#0D32B2;} + .d2-3092847457 .background-color-B3{background-color:#E3E9FD;} + .d2-3092847457 .background-color-B4{background-color:#E3E9FD;} + .d2-3092847457 .background-color-B5{background-color:#EDF0FD;} + .d2-3092847457 .background-color-B6{background-color:#F7F8FE;} + .d2-3092847457 .background-color-AA2{background-color:#4A6FF3;} + .d2-3092847457 .background-color-AA4{background-color:#EDF0FD;} + .d2-3092847457 .background-color-AA5{background-color:#F7F8FE;} + .d2-3092847457 .background-color-AB4{background-color:#EDF0FD;} + .d2-3092847457 .background-color-AB5{background-color:#F7F8FE;} + .d2-3092847457 .color-N1{color:#0A0F25;} + .d2-3092847457 .color-N2{color:#676C7E;} + .d2-3092847457 .color-N3{color:#9499AB;} + .d2-3092847457 .color-N4{color:#CFD2DD;} + .d2-3092847457 .color-N5{color:#DEE1EB;} + .d2-3092847457 .color-N6{color:#EEF1F8;} + .d2-3092847457 .color-N7{color:#FFFFFF;} + .d2-3092847457 .color-B1{color:#0D32B2;} + .d2-3092847457 .color-B2{color:#0D32B2;} + .d2-3092847457 .color-B3{color:#E3E9FD;} + .d2-3092847457 .color-B4{color:#E3E9FD;} + .d2-3092847457 .color-B5{color:#EDF0FD;} + .d2-3092847457 .color-B6{color:#F7F8FE;} + .d2-3092847457 .color-AA2{color:#4A6FF3;} + .d2-3092847457 .color-AA4{color:#EDF0FD;} + .d2-3092847457 .color-AA5{color:#F7F8FE;} + .d2-3092847457 .color-AB4{color:#EDF0FD;} + .d2-3092847457 .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}]]>TSXNYSENASDAQ diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg index 43067e2ad..ce5ea840a 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-2626224973 .fill-N1{fill:#0A0F25;} + .d2-2626224973 .fill-N2{fill:#676C7E;} + .d2-2626224973 .fill-N3{fill:#9499AB;} + .d2-2626224973 .fill-N4{fill:#CFD2DD;} + .d2-2626224973 .fill-N5{fill:#DEE1EB;} + .d2-2626224973 .fill-N6{fill:#EEF1F8;} + .d2-2626224973 .fill-N7{fill:#FFFFFF;} + .d2-2626224973 .fill-B1{fill:#0D32B2;} + .d2-2626224973 .fill-B2{fill:#0D32B2;} + .d2-2626224973 .fill-B3{fill:#E3E9FD;} + .d2-2626224973 .fill-B4{fill:#E3E9FD;} + .d2-2626224973 .fill-B5{fill:#EDF0FD;} + .d2-2626224973 .fill-B6{fill:#F7F8FE;} + .d2-2626224973 .fill-AA2{fill:#4A6FF3;} + .d2-2626224973 .fill-AA4{fill:#EDF0FD;} + .d2-2626224973 .fill-AA5{fill:#F7F8FE;} + .d2-2626224973 .fill-AB4{fill:#EDF0FD;} + .d2-2626224973 .fill-AB5{fill:#F7F8FE;} + .d2-2626224973 .stroke-N1{stroke:#0A0F25;} + .d2-2626224973 .stroke-N2{stroke:#676C7E;} + .d2-2626224973 .stroke-N3{stroke:#9499AB;} + .d2-2626224973 .stroke-N4{stroke:#CFD2DD;} + .d2-2626224973 .stroke-N5{stroke:#DEE1EB;} + .d2-2626224973 .stroke-N6{stroke:#EEF1F8;} + .d2-2626224973 .stroke-N7{stroke:#FFFFFF;} + .d2-2626224973 .stroke-B1{stroke:#0D32B2;} + .d2-2626224973 .stroke-B2{stroke:#0D32B2;} + .d2-2626224973 .stroke-B3{stroke:#E3E9FD;} + .d2-2626224973 .stroke-B4{stroke:#E3E9FD;} + .d2-2626224973 .stroke-B5{stroke:#EDF0FD;} + .d2-2626224973 .stroke-B6{stroke:#F7F8FE;} + .d2-2626224973 .stroke-AA2{stroke:#4A6FF3;} + .d2-2626224973 .stroke-AA4{stroke:#EDF0FD;} + .d2-2626224973 .stroke-AA5{stroke:#F7F8FE;} + .d2-2626224973 .stroke-AB4{stroke:#EDF0FD;} + .d2-2626224973 .stroke-AB5{stroke:#F7F8FE;} + .d2-2626224973 .background-color-N1{background-color:#0A0F25;} + .d2-2626224973 .background-color-N2{background-color:#676C7E;} + .d2-2626224973 .background-color-N3{background-color:#9499AB;} + .d2-2626224973 .background-color-N4{background-color:#CFD2DD;} + .d2-2626224973 .background-color-N5{background-color:#DEE1EB;} + .d2-2626224973 .background-color-N6{background-color:#EEF1F8;} + .d2-2626224973 .background-color-N7{background-color:#FFFFFF;} + .d2-2626224973 .background-color-B1{background-color:#0D32B2;} + .d2-2626224973 .background-color-B2{background-color:#0D32B2;} + .d2-2626224973 .background-color-B3{background-color:#E3E9FD;} + .d2-2626224973 .background-color-B4{background-color:#E3E9FD;} + .d2-2626224973 .background-color-B5{background-color:#EDF0FD;} + .d2-2626224973 .background-color-B6{background-color:#F7F8FE;} + .d2-2626224973 .background-color-AA2{background-color:#4A6FF3;} + .d2-2626224973 .background-color-AA4{background-color:#EDF0FD;} + .d2-2626224973 .background-color-AA5{background-color:#F7F8FE;} + .d2-2626224973 .background-color-AB4{background-color:#EDF0FD;} + .d2-2626224973 .background-color-AB5{background-color:#F7F8FE;} + .d2-2626224973 .color-N1{color:#0A0F25;} + .d2-2626224973 .color-N2{color:#676C7E;} + .d2-2626224973 .color-N3{color:#9499AB;} + .d2-2626224973 .color-N4{color:#CFD2DD;} + .d2-2626224973 .color-N5{color:#DEE1EB;} + .d2-2626224973 .color-N6{color:#EEF1F8;} + .d2-2626224973 .color-N7{color:#FFFFFF;} + .d2-2626224973 .color-B1{color:#0D32B2;} + .d2-2626224973 .color-B2{color:#0D32B2;} + .d2-2626224973 .color-B3{color:#E3E9FD;} + .d2-2626224973 .color-B4{color:#E3E9FD;} + .d2-2626224973 .color-B5{color:#EDF0FD;} + .d2-2626224973 .color-B6{color:#F7F8FE;} + .d2-2626224973 .color-AA2{color:#4A6FF3;} + .d2-2626224973 .color-AA4{color:#EDF0FD;} + .d2-2626224973 .color-AA5{color:#F7F8FE;} + .d2-2626224973 .color-AB4{color:#EDF0FD;} + .d2-2626224973 .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}]]>xy diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-board.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/no-nav-board.exp.pdf new file mode 100644 index 000000000..99d02d0df Binary files /dev/null and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-board.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf new file mode 100644 index 000000000..bfc825b34 Binary files /dev/null and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx new file mode 100644 index 000000000..acca7f844 Binary files /dev/null and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf new file mode 100644 index 000000000..6a9b2b0eb Binary files /dev/null and b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg index 7e93672b4..7451c1cb1 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg @@ -1,9 +1,9 @@ -Backup Plan + .d2-2211628542 .fill-N1{fill:#0A0F25;} + .d2-2211628542 .fill-N2{fill:#676C7E;} + .d2-2211628542 .fill-N3{fill:#9499AB;} + .d2-2211628542 .fill-N4{fill:#CFD2DD;} + .d2-2211628542 .fill-N5{fill:#DEE1EB;} + .d2-2211628542 .fill-N6{fill:#EEF1F8;} + .d2-2211628542 .fill-N7{fill:#FFFFFF;} + .d2-2211628542 .fill-B1{fill:#0D32B2;} + .d2-2211628542 .fill-B2{fill:#0D32B2;} + .d2-2211628542 .fill-B3{fill:#E3E9FD;} + .d2-2211628542 .fill-B4{fill:#E3E9FD;} + .d2-2211628542 .fill-B5{fill:#EDF0FD;} + .d2-2211628542 .fill-B6{fill:#F7F8FE;} + .d2-2211628542 .fill-AA2{fill:#4A6FF3;} + .d2-2211628542 .fill-AA4{fill:#EDF0FD;} + .d2-2211628542 .fill-AA5{fill:#F7F8FE;} + .d2-2211628542 .fill-AB4{fill:#EDF0FD;} + .d2-2211628542 .fill-AB5{fill:#F7F8FE;} + .d2-2211628542 .stroke-N1{stroke:#0A0F25;} + .d2-2211628542 .stroke-N2{stroke:#676C7E;} + .d2-2211628542 .stroke-N3{stroke:#9499AB;} + .d2-2211628542 .stroke-N4{stroke:#CFD2DD;} + .d2-2211628542 .stroke-N5{stroke:#DEE1EB;} + .d2-2211628542 .stroke-N6{stroke:#EEF1F8;} + .d2-2211628542 .stroke-N7{stroke:#FFFFFF;} + .d2-2211628542 .stroke-B1{stroke:#0D32B2;} + .d2-2211628542 .stroke-B2{stroke:#0D32B2;} + .d2-2211628542 .stroke-B3{stroke:#E3E9FD;} + .d2-2211628542 .stroke-B4{stroke:#E3E9FD;} + .d2-2211628542 .stroke-B5{stroke:#EDF0FD;} + .d2-2211628542 .stroke-B6{stroke:#F7F8FE;} + .d2-2211628542 .stroke-AA2{stroke:#4A6FF3;} + .d2-2211628542 .stroke-AA4{stroke:#EDF0FD;} + .d2-2211628542 .stroke-AA5{stroke:#F7F8FE;} + .d2-2211628542 .stroke-AB4{stroke:#EDF0FD;} + .d2-2211628542 .stroke-AB5{stroke:#F7F8FE;} + .d2-2211628542 .background-color-N1{background-color:#0A0F25;} + .d2-2211628542 .background-color-N2{background-color:#676C7E;} + .d2-2211628542 .background-color-N3{background-color:#9499AB;} + .d2-2211628542 .background-color-N4{background-color:#CFD2DD;} + .d2-2211628542 .background-color-N5{background-color:#DEE1EB;} + .d2-2211628542 .background-color-N6{background-color:#EEF1F8;} + .d2-2211628542 .background-color-N7{background-color:#FFFFFF;} + .d2-2211628542 .background-color-B1{background-color:#0D32B2;} + .d2-2211628542 .background-color-B2{background-color:#0D32B2;} + .d2-2211628542 .background-color-B3{background-color:#E3E9FD;} + .d2-2211628542 .background-color-B4{background-color:#E3E9FD;} + .d2-2211628542 .background-color-B5{background-color:#EDF0FD;} + .d2-2211628542 .background-color-B6{background-color:#F7F8FE;} + .d2-2211628542 .background-color-AA2{background-color:#4A6FF3;} + .d2-2211628542 .background-color-AA4{background-color:#EDF0FD;} + .d2-2211628542 .background-color-AA5{background-color:#F7F8FE;} + .d2-2211628542 .background-color-AB4{background-color:#EDF0FD;} + .d2-2211628542 .background-color-AB5{background-color:#F7F8FE;} + .d2-2211628542 .color-N1{color:#0A0F25;} + .d2-2211628542 .color-N2{color:#676C7E;} + .d2-2211628542 .color-N3{color:#9499AB;} + .d2-2211628542 .color-N4{color:#CFD2DD;} + .d2-2211628542 .color-N5{color:#DEE1EB;} + .d2-2211628542 .color-N6{color:#EEF1F8;} + .d2-2211628542 .color-N7{color:#FFFFFF;} + .d2-2211628542 .color-B1{color:#0D32B2;} + .d2-2211628542 .color-B2{color:#0D32B2;} + .d2-2211628542 .color-B3{color:#E3E9FD;} + .d2-2211628542 .color-B4{color:#E3E9FD;} + .d2-2211628542 .color-B5{color:#EDF0FD;} + .d2-2211628542 .color-B6{color:#F7F8FE;} + .d2-2211628542 .color-AA2{color:#4A6FF3;} + .d2-2211628542 .color-AA4{color:#EDF0FD;} + .d2-2211628542 .color-AA5{color:#F7F8FE;} + .d2-2211628542 .color-AB4{color:#EDF0FD;} + .d2-2211628542 .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}]]>Backup Plan diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg index 636e9a4fe..c6110ea55 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg @@ -1,9 +1,9 @@ -d + .d2-3453018447 .fill-N1{fill:#0A0F25;} + .d2-3453018447 .fill-N2{fill:#676C7E;} + .d2-3453018447 .fill-N3{fill:#9499AB;} + .d2-3453018447 .fill-N4{fill:#CFD2DD;} + .d2-3453018447 .fill-N5{fill:#DEE1EB;} + .d2-3453018447 .fill-N6{fill:#EEF1F8;} + .d2-3453018447 .fill-N7{fill:#FFFFFF;} + .d2-3453018447 .fill-B1{fill:#0D32B2;} + .d2-3453018447 .fill-B2{fill:#0D32B2;} + .d2-3453018447 .fill-B3{fill:#E3E9FD;} + .d2-3453018447 .fill-B4{fill:#E3E9FD;} + .d2-3453018447 .fill-B5{fill:#EDF0FD;} + .d2-3453018447 .fill-B6{fill:#F7F8FE;} + .d2-3453018447 .fill-AA2{fill:#4A6FF3;} + .d2-3453018447 .fill-AA4{fill:#EDF0FD;} + .d2-3453018447 .fill-AA5{fill:#F7F8FE;} + .d2-3453018447 .fill-AB4{fill:#EDF0FD;} + .d2-3453018447 .fill-AB5{fill:#F7F8FE;} + .d2-3453018447 .stroke-N1{stroke:#0A0F25;} + .d2-3453018447 .stroke-N2{stroke:#676C7E;} + .d2-3453018447 .stroke-N3{stroke:#9499AB;} + .d2-3453018447 .stroke-N4{stroke:#CFD2DD;} + .d2-3453018447 .stroke-N5{stroke:#DEE1EB;} + .d2-3453018447 .stroke-N6{stroke:#EEF1F8;} + .d2-3453018447 .stroke-N7{stroke:#FFFFFF;} + .d2-3453018447 .stroke-B1{stroke:#0D32B2;} + .d2-3453018447 .stroke-B2{stroke:#0D32B2;} + .d2-3453018447 .stroke-B3{stroke:#E3E9FD;} + .d2-3453018447 .stroke-B4{stroke:#E3E9FD;} + .d2-3453018447 .stroke-B5{stroke:#EDF0FD;} + .d2-3453018447 .stroke-B6{stroke:#F7F8FE;} + .d2-3453018447 .stroke-AA2{stroke:#4A6FF3;} + .d2-3453018447 .stroke-AA4{stroke:#EDF0FD;} + .d2-3453018447 .stroke-AA5{stroke:#F7F8FE;} + .d2-3453018447 .stroke-AB4{stroke:#EDF0FD;} + .d2-3453018447 .stroke-AB5{stroke:#F7F8FE;} + .d2-3453018447 .background-color-N1{background-color:#0A0F25;} + .d2-3453018447 .background-color-N2{background-color:#676C7E;} + .d2-3453018447 .background-color-N3{background-color:#9499AB;} + .d2-3453018447 .background-color-N4{background-color:#CFD2DD;} + .d2-3453018447 .background-color-N5{background-color:#DEE1EB;} + .d2-3453018447 .background-color-N6{background-color:#EEF1F8;} + .d2-3453018447 .background-color-N7{background-color:#FFFFFF;} + .d2-3453018447 .background-color-B1{background-color:#0D32B2;} + .d2-3453018447 .background-color-B2{background-color:#0D32B2;} + .d2-3453018447 .background-color-B3{background-color:#E3E9FD;} + .d2-3453018447 .background-color-B4{background-color:#E3E9FD;} + .d2-3453018447 .background-color-B5{background-color:#EDF0FD;} + .d2-3453018447 .background-color-B6{background-color:#F7F8FE;} + .d2-3453018447 .background-color-AA2{background-color:#4A6FF3;} + .d2-3453018447 .background-color-AA4{background-color:#EDF0FD;} + .d2-3453018447 .background-color-AA5{background-color:#F7F8FE;} + .d2-3453018447 .background-color-AB4{background-color:#EDF0FD;} + .d2-3453018447 .background-color-AB5{background-color:#F7F8FE;} + .d2-3453018447 .color-N1{color:#0A0F25;} + .d2-3453018447 .color-N2{color:#676C7E;} + .d2-3453018447 .color-N3{color:#9499AB;} + .d2-3453018447 .color-N4{color:#CFD2DD;} + .d2-3453018447 .color-N5{color:#DEE1EB;} + .d2-3453018447 .color-N6{color:#EEF1F8;} + .d2-3453018447 .color-N7{color:#FFFFFF;} + .d2-3453018447 .color-B1{color:#0D32B2;} + .d2-3453018447 .color-B2{color:#0D32B2;} + .d2-3453018447 .color-B3{color:#E3E9FD;} + .d2-3453018447 .color-B4{color:#E3E9FD;} + .d2-3453018447 .color-B5{color:#EDF0FD;} + .d2-3453018447 .color-B6{color:#F7F8FE;} + .d2-3453018447 .color-AA2{color:#4A6FF3;} + .d2-3453018447 .color-AA4{color:#EDF0FD;} + .d2-3453018447 .color-AA5{color:#F7F8FE;} + .d2-3453018447 .color-AB4{color:#EDF0FD;} + .d2-3453018447 .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}]]>d diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg index 185df765b..e0c8a6863 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg @@ -1,9 +1,9 @@ -cd + .d2-442995922 .fill-N1{fill:#0A0F25;} + .d2-442995922 .fill-N2{fill:#676C7E;} + .d2-442995922 .fill-N3{fill:#9499AB;} + .d2-442995922 .fill-N4{fill:#CFD2DD;} + .d2-442995922 .fill-N5{fill:#DEE1EB;} + .d2-442995922 .fill-N6{fill:#EEF1F8;} + .d2-442995922 .fill-N7{fill:#FFFFFF;} + .d2-442995922 .fill-B1{fill:#0D32B2;} + .d2-442995922 .fill-B2{fill:#0D32B2;} + .d2-442995922 .fill-B3{fill:#E3E9FD;} + .d2-442995922 .fill-B4{fill:#E3E9FD;} + .d2-442995922 .fill-B5{fill:#EDF0FD;} + .d2-442995922 .fill-B6{fill:#F7F8FE;} + .d2-442995922 .fill-AA2{fill:#4A6FF3;} + .d2-442995922 .fill-AA4{fill:#EDF0FD;} + .d2-442995922 .fill-AA5{fill:#F7F8FE;} + .d2-442995922 .fill-AB4{fill:#EDF0FD;} + .d2-442995922 .fill-AB5{fill:#F7F8FE;} + .d2-442995922 .stroke-N1{stroke:#0A0F25;} + .d2-442995922 .stroke-N2{stroke:#676C7E;} + .d2-442995922 .stroke-N3{stroke:#9499AB;} + .d2-442995922 .stroke-N4{stroke:#CFD2DD;} + .d2-442995922 .stroke-N5{stroke:#DEE1EB;} + .d2-442995922 .stroke-N6{stroke:#EEF1F8;} + .d2-442995922 .stroke-N7{stroke:#FFFFFF;} + .d2-442995922 .stroke-B1{stroke:#0D32B2;} + .d2-442995922 .stroke-B2{stroke:#0D32B2;} + .d2-442995922 .stroke-B3{stroke:#E3E9FD;} + .d2-442995922 .stroke-B4{stroke:#E3E9FD;} + .d2-442995922 .stroke-B5{stroke:#EDF0FD;} + .d2-442995922 .stroke-B6{stroke:#F7F8FE;} + .d2-442995922 .stroke-AA2{stroke:#4A6FF3;} + .d2-442995922 .stroke-AA4{stroke:#EDF0FD;} + .d2-442995922 .stroke-AA5{stroke:#F7F8FE;} + .d2-442995922 .stroke-AB4{stroke:#EDF0FD;} + .d2-442995922 .stroke-AB5{stroke:#F7F8FE;} + .d2-442995922 .background-color-N1{background-color:#0A0F25;} + .d2-442995922 .background-color-N2{background-color:#676C7E;} + .d2-442995922 .background-color-N3{background-color:#9499AB;} + .d2-442995922 .background-color-N4{background-color:#CFD2DD;} + .d2-442995922 .background-color-N5{background-color:#DEE1EB;} + .d2-442995922 .background-color-N6{background-color:#EEF1F8;} + .d2-442995922 .background-color-N7{background-color:#FFFFFF;} + .d2-442995922 .background-color-B1{background-color:#0D32B2;} + .d2-442995922 .background-color-B2{background-color:#0D32B2;} + .d2-442995922 .background-color-B3{background-color:#E3E9FD;} + .d2-442995922 .background-color-B4{background-color:#E3E9FD;} + .d2-442995922 .background-color-B5{background-color:#EDF0FD;} + .d2-442995922 .background-color-B6{background-color:#F7F8FE;} + .d2-442995922 .background-color-AA2{background-color:#4A6FF3;} + .d2-442995922 .background-color-AA4{background-color:#EDF0FD;} + .d2-442995922 .background-color-AA5{background-color:#F7F8FE;} + .d2-442995922 .background-color-AB4{background-color:#EDF0FD;} + .d2-442995922 .background-color-AB5{background-color:#F7F8FE;} + .d2-442995922 .color-N1{color:#0A0F25;} + .d2-442995922 .color-N2{color:#676C7E;} + .d2-442995922 .color-N3{color:#9499AB;} + .d2-442995922 .color-N4{color:#CFD2DD;} + .d2-442995922 .color-N5{color:#DEE1EB;} + .d2-442995922 .color-N6{color:#EEF1F8;} + .d2-442995922 .color-N7{color:#FFFFFF;} + .d2-442995922 .color-B1{color:#0D32B2;} + .d2-442995922 .color-B2{color:#0D32B2;} + .d2-442995922 .color-B3{color:#E3E9FD;} + .d2-442995922 .color-B4{color:#E3E9FD;} + .d2-442995922 .color-B5{color:#EDF0FD;} + .d2-442995922 .color-B6{color:#F7F8FE;} + .d2-442995922 .color-AA2{color:#4A6FF3;} + .d2-442995922 .color-AA4{color:#EDF0FD;} + .d2-442995922 .color-AA5{color:#F7F8FE;} + .d2-442995922 .color-AB4{color:#EDF0FD;} + .d2-442995922 .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}]]>cd diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg index 47a70650b..02b929183 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg @@ -1,9 +1,9 @@ -mad + .d2-3908899319 .fill-N1{fill:#0A0F25;} + .d2-3908899319 .fill-N2{fill:#676C7E;} + .d2-3908899319 .fill-N3{fill:#9499AB;} + .d2-3908899319 .fill-N4{fill:#CFD2DD;} + .d2-3908899319 .fill-N5{fill:#DEE1EB;} + .d2-3908899319 .fill-N6{fill:#EEF1F8;} + .d2-3908899319 .fill-N7{fill:#FFFFFF;} + .d2-3908899319 .fill-B1{fill:#0D32B2;} + .d2-3908899319 .fill-B2{fill:#0D32B2;} + .d2-3908899319 .fill-B3{fill:#E3E9FD;} + .d2-3908899319 .fill-B4{fill:#E3E9FD;} + .d2-3908899319 .fill-B5{fill:#EDF0FD;} + .d2-3908899319 .fill-B6{fill:#F7F8FE;} + .d2-3908899319 .fill-AA2{fill:#4A6FF3;} + .d2-3908899319 .fill-AA4{fill:#EDF0FD;} + .d2-3908899319 .fill-AA5{fill:#F7F8FE;} + .d2-3908899319 .fill-AB4{fill:#EDF0FD;} + .d2-3908899319 .fill-AB5{fill:#F7F8FE;} + .d2-3908899319 .stroke-N1{stroke:#0A0F25;} + .d2-3908899319 .stroke-N2{stroke:#676C7E;} + .d2-3908899319 .stroke-N3{stroke:#9499AB;} + .d2-3908899319 .stroke-N4{stroke:#CFD2DD;} + .d2-3908899319 .stroke-N5{stroke:#DEE1EB;} + .d2-3908899319 .stroke-N6{stroke:#EEF1F8;} + .d2-3908899319 .stroke-N7{stroke:#FFFFFF;} + .d2-3908899319 .stroke-B1{stroke:#0D32B2;} + .d2-3908899319 .stroke-B2{stroke:#0D32B2;} + .d2-3908899319 .stroke-B3{stroke:#E3E9FD;} + .d2-3908899319 .stroke-B4{stroke:#E3E9FD;} + .d2-3908899319 .stroke-B5{stroke:#EDF0FD;} + .d2-3908899319 .stroke-B6{stroke:#F7F8FE;} + .d2-3908899319 .stroke-AA2{stroke:#4A6FF3;} + .d2-3908899319 .stroke-AA4{stroke:#EDF0FD;} + .d2-3908899319 .stroke-AA5{stroke:#F7F8FE;} + .d2-3908899319 .stroke-AB4{stroke:#EDF0FD;} + .d2-3908899319 .stroke-AB5{stroke:#F7F8FE;} + .d2-3908899319 .background-color-N1{background-color:#0A0F25;} + .d2-3908899319 .background-color-N2{background-color:#676C7E;} + .d2-3908899319 .background-color-N3{background-color:#9499AB;} + .d2-3908899319 .background-color-N4{background-color:#CFD2DD;} + .d2-3908899319 .background-color-N5{background-color:#DEE1EB;} + .d2-3908899319 .background-color-N6{background-color:#EEF1F8;} + .d2-3908899319 .background-color-N7{background-color:#FFFFFF;} + .d2-3908899319 .background-color-B1{background-color:#0D32B2;} + .d2-3908899319 .background-color-B2{background-color:#0D32B2;} + .d2-3908899319 .background-color-B3{background-color:#E3E9FD;} + .d2-3908899319 .background-color-B4{background-color:#E3E9FD;} + .d2-3908899319 .background-color-B5{background-color:#EDF0FD;} + .d2-3908899319 .background-color-B6{background-color:#F7F8FE;} + .d2-3908899319 .background-color-AA2{background-color:#4A6FF3;} + .d2-3908899319 .background-color-AA4{background-color:#EDF0FD;} + .d2-3908899319 .background-color-AA5{background-color:#F7F8FE;} + .d2-3908899319 .background-color-AB4{background-color:#EDF0FD;} + .d2-3908899319 .background-color-AB5{background-color:#F7F8FE;} + .d2-3908899319 .color-N1{color:#0A0F25;} + .d2-3908899319 .color-N2{color:#676C7E;} + .d2-3908899319 .color-N3{color:#9499AB;} + .d2-3908899319 .color-N4{color:#CFD2DD;} + .d2-3908899319 .color-N5{color:#DEE1EB;} + .d2-3908899319 .color-N6{color:#EEF1F8;} + .d2-3908899319 .color-N7{color:#FFFFFF;} + .d2-3908899319 .color-B1{color:#0D32B2;} + .d2-3908899319 .color-B2{color:#0D32B2;} + .d2-3908899319 .color-B3{color:#E3E9FD;} + .d2-3908899319 .color-B4{color:#E3E9FD;} + .d2-3908899319 .color-B5{color:#EDF0FD;} + .d2-3908899319 .color-B6{color:#F7F8FE;} + .d2-3908899319 .color-AA2{color:#4A6FF3;} + .d2-3908899319 .color-AA4{color:#EDF0FD;} + .d2-3908899319 .color-AA5{color:#F7F8FE;} + .d2-3908899319 .color-AB4{color:#EDF0FD;} + .d2-3908899319 .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}]]>mad diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg index bda9e7318..773c44771 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -1,16 +1,16 @@ CHICKEN'S PLAN +}]]>CHICKEN'S PLAN -CHICKEN'S PLANAPPROACH ROAD +CHICKEN'S PLANAPPROACH ROAD -CHICKEN'S PLANAPPROACH ROADCROSS ROAD +CHICKEN'S PLANAPPROACH ROADCROSS ROAD -CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY +CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY diff --git a/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json b/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json index f704138e0..3e32254af 100644 --- a/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json +++ b/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json @@ -27,6 +27,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -115,6 +116,7 @@ "double-border": false, "tooltip": "tooltip", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg index 5dcc31020..d2aeaf450 100644 --- a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -linknonelink, tooltiptooltipnone + .d2-2017066640 .fill-N1{fill:#0A0F25;} + .d2-2017066640 .fill-N2{fill:#676C7E;} + .d2-2017066640 .fill-N3{fill:#9499AB;} + .d2-2017066640 .fill-N4{fill:#CFD2DD;} + .d2-2017066640 .fill-N5{fill:#DEE1EB;} + .d2-2017066640 .fill-N6{fill:#EEF1F8;} + .d2-2017066640 .fill-N7{fill:#FFFFFF;} + .d2-2017066640 .fill-B1{fill:#0D32B2;} + .d2-2017066640 .fill-B2{fill:#0D32B2;} + .d2-2017066640 .fill-B3{fill:#E3E9FD;} + .d2-2017066640 .fill-B4{fill:#E3E9FD;} + .d2-2017066640 .fill-B5{fill:#EDF0FD;} + .d2-2017066640 .fill-B6{fill:#F7F8FE;} + .d2-2017066640 .fill-AA2{fill:#4A6FF3;} + .d2-2017066640 .fill-AA4{fill:#EDF0FD;} + .d2-2017066640 .fill-AA5{fill:#F7F8FE;} + .d2-2017066640 .fill-AB4{fill:#EDF0FD;} + .d2-2017066640 .fill-AB5{fill:#F7F8FE;} + .d2-2017066640 .stroke-N1{stroke:#0A0F25;} + .d2-2017066640 .stroke-N2{stroke:#676C7E;} + .d2-2017066640 .stroke-N3{stroke:#9499AB;} + .d2-2017066640 .stroke-N4{stroke:#CFD2DD;} + .d2-2017066640 .stroke-N5{stroke:#DEE1EB;} + .d2-2017066640 .stroke-N6{stroke:#EEF1F8;} + .d2-2017066640 .stroke-N7{stroke:#FFFFFF;} + .d2-2017066640 .stroke-B1{stroke:#0D32B2;} + .d2-2017066640 .stroke-B2{stroke:#0D32B2;} + .d2-2017066640 .stroke-B3{stroke:#E3E9FD;} + .d2-2017066640 .stroke-B4{stroke:#E3E9FD;} + .d2-2017066640 .stroke-B5{stroke:#EDF0FD;} + .d2-2017066640 .stroke-B6{stroke:#F7F8FE;} + .d2-2017066640 .stroke-AA2{stroke:#4A6FF3;} + .d2-2017066640 .stroke-AA4{stroke:#EDF0FD;} + .d2-2017066640 .stroke-AA5{stroke:#F7F8FE;} + .d2-2017066640 .stroke-AB4{stroke:#EDF0FD;} + .d2-2017066640 .stroke-AB5{stroke:#F7F8FE;} + .d2-2017066640 .background-color-N1{background-color:#0A0F25;} + .d2-2017066640 .background-color-N2{background-color:#676C7E;} + .d2-2017066640 .background-color-N3{background-color:#9499AB;} + .d2-2017066640 .background-color-N4{background-color:#CFD2DD;} + .d2-2017066640 .background-color-N5{background-color:#DEE1EB;} + .d2-2017066640 .background-color-N6{background-color:#EEF1F8;} + .d2-2017066640 .background-color-N7{background-color:#FFFFFF;} + .d2-2017066640 .background-color-B1{background-color:#0D32B2;} + .d2-2017066640 .background-color-B2{background-color:#0D32B2;} + .d2-2017066640 .background-color-B3{background-color:#E3E9FD;} + .d2-2017066640 .background-color-B4{background-color:#E3E9FD;} + .d2-2017066640 .background-color-B5{background-color:#EDF0FD;} + .d2-2017066640 .background-color-B6{background-color:#F7F8FE;} + .d2-2017066640 .background-color-AA2{background-color:#4A6FF3;} + .d2-2017066640 .background-color-AA4{background-color:#EDF0FD;} + .d2-2017066640 .background-color-AA5{background-color:#F7F8FE;} + .d2-2017066640 .background-color-AB4{background-color:#EDF0FD;} + .d2-2017066640 .background-color-AB5{background-color:#F7F8FE;} + .d2-2017066640 .color-N1{color:#0A0F25;} + .d2-2017066640 .color-N2{color:#676C7E;} + .d2-2017066640 .color-N3{color:#9499AB;} + .d2-2017066640 .color-N4{color:#CFD2DD;} + .d2-2017066640 .color-N5{color:#DEE1EB;} + .d2-2017066640 .color-N6{color:#EEF1F8;} + .d2-2017066640 .color-N7{color:#FFFFFF;} + .d2-2017066640 .color-B1{color:#0D32B2;} + .d2-2017066640 .color-B2{color:#0D32B2;} + .d2-2017066640 .color-B3{color:#E3E9FD;} + .d2-2017066640 .color-B4{color:#E3E9FD;} + .d2-2017066640 .color-B5{color:#EDF0FD;} + .d2-2017066640 .color-B6{color:#F7F8FE;} + .d2-2017066640 .color-AA2{color:#4A6FF3;} + .d2-2017066640 .color-AA4{color:#EDF0FD;} + .d2-2017066640 .color-AA5{color:#F7F8FE;} + .d2-2017066640 .color-AB4{color:#EDF0FD;} + .d2-2017066640 .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}]]>linknonelink, tooltiptooltipnone @@ -129,7 +129,7 @@ - + diff --git a/e2etests/testdata/regression/icons_on_top/elk/board.exp.json b/e2etests/testdata/regression/icons_on_top/elk/board.exp.json index f704138e0..3e32254af 100644 --- a/e2etests/testdata/regression/icons_on_top/elk/board.exp.json +++ b/e2etests/testdata/regression/icons_on_top/elk/board.exp.json @@ -27,6 +27,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -115,6 +116,7 @@ "double-border": false, "tooltip": "tooltip", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg index 5dcc31020..d2aeaf450 100644 --- a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -linknonelink, tooltiptooltipnone + .d2-2017066640 .fill-N1{fill:#0A0F25;} + .d2-2017066640 .fill-N2{fill:#676C7E;} + .d2-2017066640 .fill-N3{fill:#9499AB;} + .d2-2017066640 .fill-N4{fill:#CFD2DD;} + .d2-2017066640 .fill-N5{fill:#DEE1EB;} + .d2-2017066640 .fill-N6{fill:#EEF1F8;} + .d2-2017066640 .fill-N7{fill:#FFFFFF;} + .d2-2017066640 .fill-B1{fill:#0D32B2;} + .d2-2017066640 .fill-B2{fill:#0D32B2;} + .d2-2017066640 .fill-B3{fill:#E3E9FD;} + .d2-2017066640 .fill-B4{fill:#E3E9FD;} + .d2-2017066640 .fill-B5{fill:#EDF0FD;} + .d2-2017066640 .fill-B6{fill:#F7F8FE;} + .d2-2017066640 .fill-AA2{fill:#4A6FF3;} + .d2-2017066640 .fill-AA4{fill:#EDF0FD;} + .d2-2017066640 .fill-AA5{fill:#F7F8FE;} + .d2-2017066640 .fill-AB4{fill:#EDF0FD;} + .d2-2017066640 .fill-AB5{fill:#F7F8FE;} + .d2-2017066640 .stroke-N1{stroke:#0A0F25;} + .d2-2017066640 .stroke-N2{stroke:#676C7E;} + .d2-2017066640 .stroke-N3{stroke:#9499AB;} + .d2-2017066640 .stroke-N4{stroke:#CFD2DD;} + .d2-2017066640 .stroke-N5{stroke:#DEE1EB;} + .d2-2017066640 .stroke-N6{stroke:#EEF1F8;} + .d2-2017066640 .stroke-N7{stroke:#FFFFFF;} + .d2-2017066640 .stroke-B1{stroke:#0D32B2;} + .d2-2017066640 .stroke-B2{stroke:#0D32B2;} + .d2-2017066640 .stroke-B3{stroke:#E3E9FD;} + .d2-2017066640 .stroke-B4{stroke:#E3E9FD;} + .d2-2017066640 .stroke-B5{stroke:#EDF0FD;} + .d2-2017066640 .stroke-B6{stroke:#F7F8FE;} + .d2-2017066640 .stroke-AA2{stroke:#4A6FF3;} + .d2-2017066640 .stroke-AA4{stroke:#EDF0FD;} + .d2-2017066640 .stroke-AA5{stroke:#F7F8FE;} + .d2-2017066640 .stroke-AB4{stroke:#EDF0FD;} + .d2-2017066640 .stroke-AB5{stroke:#F7F8FE;} + .d2-2017066640 .background-color-N1{background-color:#0A0F25;} + .d2-2017066640 .background-color-N2{background-color:#676C7E;} + .d2-2017066640 .background-color-N3{background-color:#9499AB;} + .d2-2017066640 .background-color-N4{background-color:#CFD2DD;} + .d2-2017066640 .background-color-N5{background-color:#DEE1EB;} + .d2-2017066640 .background-color-N6{background-color:#EEF1F8;} + .d2-2017066640 .background-color-N7{background-color:#FFFFFF;} + .d2-2017066640 .background-color-B1{background-color:#0D32B2;} + .d2-2017066640 .background-color-B2{background-color:#0D32B2;} + .d2-2017066640 .background-color-B3{background-color:#E3E9FD;} + .d2-2017066640 .background-color-B4{background-color:#E3E9FD;} + .d2-2017066640 .background-color-B5{background-color:#EDF0FD;} + .d2-2017066640 .background-color-B6{background-color:#F7F8FE;} + .d2-2017066640 .background-color-AA2{background-color:#4A6FF3;} + .d2-2017066640 .background-color-AA4{background-color:#EDF0FD;} + .d2-2017066640 .background-color-AA5{background-color:#F7F8FE;} + .d2-2017066640 .background-color-AB4{background-color:#EDF0FD;} + .d2-2017066640 .background-color-AB5{background-color:#F7F8FE;} + .d2-2017066640 .color-N1{color:#0A0F25;} + .d2-2017066640 .color-N2{color:#676C7E;} + .d2-2017066640 .color-N3{color:#9499AB;} + .d2-2017066640 .color-N4{color:#CFD2DD;} + .d2-2017066640 .color-N5{color:#DEE1EB;} + .d2-2017066640 .color-N6{color:#EEF1F8;} + .d2-2017066640 .color-N7{color:#FFFFFF;} + .d2-2017066640 .color-B1{color:#0D32B2;} + .d2-2017066640 .color-B2{color:#0D32B2;} + .d2-2017066640 .color-B3{color:#E3E9FD;} + .d2-2017066640 .color-B4{color:#E3E9FD;} + .d2-2017066640 .color-B5{color:#EDF0FD;} + .d2-2017066640 .color-B6{color:#F7F8FE;} + .d2-2017066640 .color-AA2{color:#4A6FF3;} + .d2-2017066640 .color-AA4{color:#EDF0FD;} + .d2-2017066640 .color-AA5{color:#F7F8FE;} + .d2-2017066640 .color-AB4{color:#EDF0FD;} + .d2-2017066640 .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}]]>linknonelink, tooltiptooltipnone @@ -129,7 +129,7 @@ - + diff --git a/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json b/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json index 0667ba543..87468cfa8 100644 --- a/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json +++ b/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json @@ -24,6 +24,7 @@ "double-border": false, "tooltip": "", "link": "https://calendar.google.com/calendar/u/0/r?tab=mc&pli=1", + "prettyLink": "https://calendar.google.com/calendar/u/0/r?tab=mc&pli=1", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg index 3e5a1aa33..002ddcd1c 100644 --- a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -a + .d2-2121058281 .fill-N1{fill:#0A0F25;} + .d2-2121058281 .fill-N2{fill:#676C7E;} + .d2-2121058281 .fill-N3{fill:#9499AB;} + .d2-2121058281 .fill-N4{fill:#CFD2DD;} + .d2-2121058281 .fill-N5{fill:#DEE1EB;} + .d2-2121058281 .fill-N6{fill:#EEF1F8;} + .d2-2121058281 .fill-N7{fill:#FFFFFF;} + .d2-2121058281 .fill-B1{fill:#0D32B2;} + .d2-2121058281 .fill-B2{fill:#0D32B2;} + .d2-2121058281 .fill-B3{fill:#E3E9FD;} + .d2-2121058281 .fill-B4{fill:#E3E9FD;} + .d2-2121058281 .fill-B5{fill:#EDF0FD;} + .d2-2121058281 .fill-B6{fill:#F7F8FE;} + .d2-2121058281 .fill-AA2{fill:#4A6FF3;} + .d2-2121058281 .fill-AA4{fill:#EDF0FD;} + .d2-2121058281 .fill-AA5{fill:#F7F8FE;} + .d2-2121058281 .fill-AB4{fill:#EDF0FD;} + .d2-2121058281 .fill-AB5{fill:#F7F8FE;} + .d2-2121058281 .stroke-N1{stroke:#0A0F25;} + .d2-2121058281 .stroke-N2{stroke:#676C7E;} + .d2-2121058281 .stroke-N3{stroke:#9499AB;} + .d2-2121058281 .stroke-N4{stroke:#CFD2DD;} + .d2-2121058281 .stroke-N5{stroke:#DEE1EB;} + .d2-2121058281 .stroke-N6{stroke:#EEF1F8;} + .d2-2121058281 .stroke-N7{stroke:#FFFFFF;} + .d2-2121058281 .stroke-B1{stroke:#0D32B2;} + .d2-2121058281 .stroke-B2{stroke:#0D32B2;} + .d2-2121058281 .stroke-B3{stroke:#E3E9FD;} + .d2-2121058281 .stroke-B4{stroke:#E3E9FD;} + .d2-2121058281 .stroke-B5{stroke:#EDF0FD;} + .d2-2121058281 .stroke-B6{stroke:#F7F8FE;} + .d2-2121058281 .stroke-AA2{stroke:#4A6FF3;} + .d2-2121058281 .stroke-AA4{stroke:#EDF0FD;} + .d2-2121058281 .stroke-AA5{stroke:#F7F8FE;} + .d2-2121058281 .stroke-AB4{stroke:#EDF0FD;} + .d2-2121058281 .stroke-AB5{stroke:#F7F8FE;} + .d2-2121058281 .background-color-N1{background-color:#0A0F25;} + .d2-2121058281 .background-color-N2{background-color:#676C7E;} + .d2-2121058281 .background-color-N3{background-color:#9499AB;} + .d2-2121058281 .background-color-N4{background-color:#CFD2DD;} + .d2-2121058281 .background-color-N5{background-color:#DEE1EB;} + .d2-2121058281 .background-color-N6{background-color:#EEF1F8;} + .d2-2121058281 .background-color-N7{background-color:#FFFFFF;} + .d2-2121058281 .background-color-B1{background-color:#0D32B2;} + .d2-2121058281 .background-color-B2{background-color:#0D32B2;} + .d2-2121058281 .background-color-B3{background-color:#E3E9FD;} + .d2-2121058281 .background-color-B4{background-color:#E3E9FD;} + .d2-2121058281 .background-color-B5{background-color:#EDF0FD;} + .d2-2121058281 .background-color-B6{background-color:#F7F8FE;} + .d2-2121058281 .background-color-AA2{background-color:#4A6FF3;} + .d2-2121058281 .background-color-AA4{background-color:#EDF0FD;} + .d2-2121058281 .background-color-AA5{background-color:#F7F8FE;} + .d2-2121058281 .background-color-AB4{background-color:#EDF0FD;} + .d2-2121058281 .background-color-AB5{background-color:#F7F8FE;} + .d2-2121058281 .color-N1{color:#0A0F25;} + .d2-2121058281 .color-N2{color:#676C7E;} + .d2-2121058281 .color-N3{color:#9499AB;} + .d2-2121058281 .color-N4{color:#CFD2DD;} + .d2-2121058281 .color-N5{color:#DEE1EB;} + .d2-2121058281 .color-N6{color:#EEF1F8;} + .d2-2121058281 .color-N7{color:#FFFFFF;} + .d2-2121058281 .color-B1{color:#0D32B2;} + .d2-2121058281 .color-B2{color:#0D32B2;} + .d2-2121058281 .color-B3{color:#E3E9FD;} + .d2-2121058281 .color-B4{color:#E3E9FD;} + .d2-2121058281 .color-B5{color:#EDF0FD;} + .d2-2121058281 .color-B6{color:#F7F8FE;} + .d2-2121058281 .color-AA2{color:#4A6FF3;} + .d2-2121058281 .color-AA4{color:#EDF0FD;} + .d2-2121058281 .color-AA5{color:#F7F8FE;} + .d2-2121058281 .color-AB4{color:#EDF0FD;} + .d2-2121058281 .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 @@ -104,7 +104,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json b/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json index 6ef099dc8..50b855fa6 100644 --- a/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json +++ b/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json @@ -24,6 +24,7 @@ "double-border": false, "tooltip": "", "link": "https://calendar.google.com/calendar/u/0/r?tab=mc&pli=1", + "prettyLink": "https://calendar.google.com/calendar/u/0/r?tab=mc&pli=1", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg index b56a4c46e..3609f70f3 100644 --- a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -a + .d2-2723259281 .fill-N1{fill:#0A0F25;} + .d2-2723259281 .fill-N2{fill:#676C7E;} + .d2-2723259281 .fill-N3{fill:#9499AB;} + .d2-2723259281 .fill-N4{fill:#CFD2DD;} + .d2-2723259281 .fill-N5{fill:#DEE1EB;} + .d2-2723259281 .fill-N6{fill:#EEF1F8;} + .d2-2723259281 .fill-N7{fill:#FFFFFF;} + .d2-2723259281 .fill-B1{fill:#0D32B2;} + .d2-2723259281 .fill-B2{fill:#0D32B2;} + .d2-2723259281 .fill-B3{fill:#E3E9FD;} + .d2-2723259281 .fill-B4{fill:#E3E9FD;} + .d2-2723259281 .fill-B5{fill:#EDF0FD;} + .d2-2723259281 .fill-B6{fill:#F7F8FE;} + .d2-2723259281 .fill-AA2{fill:#4A6FF3;} + .d2-2723259281 .fill-AA4{fill:#EDF0FD;} + .d2-2723259281 .fill-AA5{fill:#F7F8FE;} + .d2-2723259281 .fill-AB4{fill:#EDF0FD;} + .d2-2723259281 .fill-AB5{fill:#F7F8FE;} + .d2-2723259281 .stroke-N1{stroke:#0A0F25;} + .d2-2723259281 .stroke-N2{stroke:#676C7E;} + .d2-2723259281 .stroke-N3{stroke:#9499AB;} + .d2-2723259281 .stroke-N4{stroke:#CFD2DD;} + .d2-2723259281 .stroke-N5{stroke:#DEE1EB;} + .d2-2723259281 .stroke-N6{stroke:#EEF1F8;} + .d2-2723259281 .stroke-N7{stroke:#FFFFFF;} + .d2-2723259281 .stroke-B1{stroke:#0D32B2;} + .d2-2723259281 .stroke-B2{stroke:#0D32B2;} + .d2-2723259281 .stroke-B3{stroke:#E3E9FD;} + .d2-2723259281 .stroke-B4{stroke:#E3E9FD;} + .d2-2723259281 .stroke-B5{stroke:#EDF0FD;} + .d2-2723259281 .stroke-B6{stroke:#F7F8FE;} + .d2-2723259281 .stroke-AA2{stroke:#4A6FF3;} + .d2-2723259281 .stroke-AA4{stroke:#EDF0FD;} + .d2-2723259281 .stroke-AA5{stroke:#F7F8FE;} + .d2-2723259281 .stroke-AB4{stroke:#EDF0FD;} + .d2-2723259281 .stroke-AB5{stroke:#F7F8FE;} + .d2-2723259281 .background-color-N1{background-color:#0A0F25;} + .d2-2723259281 .background-color-N2{background-color:#676C7E;} + .d2-2723259281 .background-color-N3{background-color:#9499AB;} + .d2-2723259281 .background-color-N4{background-color:#CFD2DD;} + .d2-2723259281 .background-color-N5{background-color:#DEE1EB;} + .d2-2723259281 .background-color-N6{background-color:#EEF1F8;} + .d2-2723259281 .background-color-N7{background-color:#FFFFFF;} + .d2-2723259281 .background-color-B1{background-color:#0D32B2;} + .d2-2723259281 .background-color-B2{background-color:#0D32B2;} + .d2-2723259281 .background-color-B3{background-color:#E3E9FD;} + .d2-2723259281 .background-color-B4{background-color:#E3E9FD;} + .d2-2723259281 .background-color-B5{background-color:#EDF0FD;} + .d2-2723259281 .background-color-B6{background-color:#F7F8FE;} + .d2-2723259281 .background-color-AA2{background-color:#4A6FF3;} + .d2-2723259281 .background-color-AA4{background-color:#EDF0FD;} + .d2-2723259281 .background-color-AA5{background-color:#F7F8FE;} + .d2-2723259281 .background-color-AB4{background-color:#EDF0FD;} + .d2-2723259281 .background-color-AB5{background-color:#F7F8FE;} + .d2-2723259281 .color-N1{color:#0A0F25;} + .d2-2723259281 .color-N2{color:#676C7E;} + .d2-2723259281 .color-N3{color:#9499AB;} + .d2-2723259281 .color-N4{color:#CFD2DD;} + .d2-2723259281 .color-N5{color:#DEE1EB;} + .d2-2723259281 .color-N6{color:#EEF1F8;} + .d2-2723259281 .color-N7{color:#FFFFFF;} + .d2-2723259281 .color-B1{color:#0D32B2;} + .d2-2723259281 .color-B2{color:#0D32B2;} + .d2-2723259281 .color-B3{color:#E3E9FD;} + .d2-2723259281 .color-B4{color:#E3E9FD;} + .d2-2723259281 .color-B5{color:#EDF0FD;} + .d2-2723259281 .color-B6{color:#F7F8FE;} + .d2-2723259281 .color-AA2{color:#4A6FF3;} + .d2-2723259281 .color-AA4{color:#EDF0FD;} + .d2-2723259281 .color-AA5{color:#F7F8FE;} + .d2-2723259281 .color-AB4{color:#EDF0FD;} + .d2-2723259281 .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 @@ -104,7 +104,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json index a2a2af0f4..8871e3780 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json @@ -68,6 +68,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -112,6 +113,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -156,6 +158,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -200,6 +203,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -244,6 +248,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -288,6 +293,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -332,6 +338,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -376,6 +383,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -420,6 +428,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -464,6 +473,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -508,6 +518,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -552,6 +563,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -596,6 +608,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -640,6 +653,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -684,6 +698,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -728,6 +743,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -772,6 +788,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1649,6 +1666,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1694,6 +1712,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1739,6 +1758,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1784,6 +1804,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1829,6 +1850,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1874,6 +1896,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1919,6 +1942,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1964,6 +1988,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2009,6 +2034,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2054,6 +2080,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2099,6 +2126,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2144,6 +2172,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2189,6 +2218,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2234,6 +2264,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2279,6 +2310,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2324,6 +2356,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2369,6 +2402,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 975c55164..417fdc4a0 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-502624918 .fill-N1{fill:#0A0F25;} + .d2-502624918 .fill-N2{fill:#676C7E;} + .d2-502624918 .fill-N3{fill:#9499AB;} + .d2-502624918 .fill-N4{fill:#CFD2DD;} + .d2-502624918 .fill-N5{fill:#DEE1EB;} + .d2-502624918 .fill-N6{fill:#EEF1F8;} + .d2-502624918 .fill-N7{fill:#FFFFFF;} + .d2-502624918 .fill-B1{fill:#0D32B2;} + .d2-502624918 .fill-B2{fill:#0D32B2;} + .d2-502624918 .fill-B3{fill:#E3E9FD;} + .d2-502624918 .fill-B4{fill:#E3E9FD;} + .d2-502624918 .fill-B5{fill:#EDF0FD;} + .d2-502624918 .fill-B6{fill:#F7F8FE;} + .d2-502624918 .fill-AA2{fill:#4A6FF3;} + .d2-502624918 .fill-AA4{fill:#EDF0FD;} + .d2-502624918 .fill-AA5{fill:#F7F8FE;} + .d2-502624918 .fill-AB4{fill:#EDF0FD;} + .d2-502624918 .fill-AB5{fill:#F7F8FE;} + .d2-502624918 .stroke-N1{stroke:#0A0F25;} + .d2-502624918 .stroke-N2{stroke:#676C7E;} + .d2-502624918 .stroke-N3{stroke:#9499AB;} + .d2-502624918 .stroke-N4{stroke:#CFD2DD;} + .d2-502624918 .stroke-N5{stroke:#DEE1EB;} + .d2-502624918 .stroke-N6{stroke:#EEF1F8;} + .d2-502624918 .stroke-N7{stroke:#FFFFFF;} + .d2-502624918 .stroke-B1{stroke:#0D32B2;} + .d2-502624918 .stroke-B2{stroke:#0D32B2;} + .d2-502624918 .stroke-B3{stroke:#E3E9FD;} + .d2-502624918 .stroke-B4{stroke:#E3E9FD;} + .d2-502624918 .stroke-B5{stroke:#EDF0FD;} + .d2-502624918 .stroke-B6{stroke:#F7F8FE;} + .d2-502624918 .stroke-AA2{stroke:#4A6FF3;} + .d2-502624918 .stroke-AA4{stroke:#EDF0FD;} + .d2-502624918 .stroke-AA5{stroke:#F7F8FE;} + .d2-502624918 .stroke-AB4{stroke:#EDF0FD;} + .d2-502624918 .stroke-AB5{stroke:#F7F8FE;} + .d2-502624918 .background-color-N1{background-color:#0A0F25;} + .d2-502624918 .background-color-N2{background-color:#676C7E;} + .d2-502624918 .background-color-N3{background-color:#9499AB;} + .d2-502624918 .background-color-N4{background-color:#CFD2DD;} + .d2-502624918 .background-color-N5{background-color:#DEE1EB;} + .d2-502624918 .background-color-N6{background-color:#EEF1F8;} + .d2-502624918 .background-color-N7{background-color:#FFFFFF;} + .d2-502624918 .background-color-B1{background-color:#0D32B2;} + .d2-502624918 .background-color-B2{background-color:#0D32B2;} + .d2-502624918 .background-color-B3{background-color:#E3E9FD;} + .d2-502624918 .background-color-B4{background-color:#E3E9FD;} + .d2-502624918 .background-color-B5{background-color:#EDF0FD;} + .d2-502624918 .background-color-B6{background-color:#F7F8FE;} + .d2-502624918 .background-color-AA2{background-color:#4A6FF3;} + .d2-502624918 .background-color-AA4{background-color:#EDF0FD;} + .d2-502624918 .background-color-AA5{background-color:#F7F8FE;} + .d2-502624918 .background-color-AB4{background-color:#EDF0FD;} + .d2-502624918 .background-color-AB5{background-color:#F7F8FE;} + .d2-502624918 .color-N1{color:#0A0F25;} + .d2-502624918 .color-N2{color:#676C7E;} + .d2-502624918 .color-N3{color:#9499AB;} + .d2-502624918 .color-N4{color:#CFD2DD;} + .d2-502624918 .color-N5{color:#DEE1EB;} + .d2-502624918 .color-N6{color:#EEF1F8;} + .d2-502624918 .color-N7{color:#FFFFFF;} + .d2-502624918 .color-B1{color:#0D32B2;} + .d2-502624918 .color-B2{color:#0D32B2;} + .d2-502624918 .color-B3{color:#E3E9FD;} + .d2-502624918 .color-B4{color:#E3E9FD;} + .d2-502624918 .color-B5{color:#EDF0FD;} + .d2-502624918 .color-B6{color:#F7F8FE;} + .d2-502624918 .color-AA2{color:#4A6FF3;} + .d2-502624918 .color-AA4{color:#EDF0FD;} + .d2-502624918 .color-AA5{color:#F7F8FE;} + .d2-502624918 .color-AB4{color:#EDF0FD;} + .d2-502624918 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -949,7 +949,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json index 84b06dcc1..c6ce51551 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json @@ -68,6 +68,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -112,6 +113,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -156,6 +158,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -200,6 +203,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -244,6 +248,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -288,6 +293,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -332,6 +338,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -376,6 +383,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -420,6 +428,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -464,6 +473,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -508,6 +518,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -552,6 +563,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -596,6 +608,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -640,6 +653,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -684,6 +698,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -728,6 +743,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -772,6 +788,7 @@ "double-border": false, "tooltip": "", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1649,6 +1666,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1694,6 +1712,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1739,6 +1758,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1784,6 +1804,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1829,6 +1850,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1874,6 +1896,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1919,6 +1942,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -1964,6 +1988,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2009,6 +2034,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2054,6 +2080,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2099,6 +2126,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2144,6 +2172,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2189,6 +2218,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2234,6 +2264,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2279,6 +2310,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2324,6 +2356,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, @@ -2369,6 +2402,7 @@ "double-border": false, "tooltip": "example", "link": "example.com", + "prettyLink": "example.com", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index d9f2b6414..1298ce875 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-1967301925 .fill-N1{fill:#0A0F25;} + .d2-1967301925 .fill-N2{fill:#676C7E;} + .d2-1967301925 .fill-N3{fill:#9499AB;} + .d2-1967301925 .fill-N4{fill:#CFD2DD;} + .d2-1967301925 .fill-N5{fill:#DEE1EB;} + .d2-1967301925 .fill-N6{fill:#EEF1F8;} + .d2-1967301925 .fill-N7{fill:#FFFFFF;} + .d2-1967301925 .fill-B1{fill:#0D32B2;} + .d2-1967301925 .fill-B2{fill:#0D32B2;} + .d2-1967301925 .fill-B3{fill:#E3E9FD;} + .d2-1967301925 .fill-B4{fill:#E3E9FD;} + .d2-1967301925 .fill-B5{fill:#EDF0FD;} + .d2-1967301925 .fill-B6{fill:#F7F8FE;} + .d2-1967301925 .fill-AA2{fill:#4A6FF3;} + .d2-1967301925 .fill-AA4{fill:#EDF0FD;} + .d2-1967301925 .fill-AA5{fill:#F7F8FE;} + .d2-1967301925 .fill-AB4{fill:#EDF0FD;} + .d2-1967301925 .fill-AB5{fill:#F7F8FE;} + .d2-1967301925 .stroke-N1{stroke:#0A0F25;} + .d2-1967301925 .stroke-N2{stroke:#676C7E;} + .d2-1967301925 .stroke-N3{stroke:#9499AB;} + .d2-1967301925 .stroke-N4{stroke:#CFD2DD;} + .d2-1967301925 .stroke-N5{stroke:#DEE1EB;} + .d2-1967301925 .stroke-N6{stroke:#EEF1F8;} + .d2-1967301925 .stroke-N7{stroke:#FFFFFF;} + .d2-1967301925 .stroke-B1{stroke:#0D32B2;} + .d2-1967301925 .stroke-B2{stroke:#0D32B2;} + .d2-1967301925 .stroke-B3{stroke:#E3E9FD;} + .d2-1967301925 .stroke-B4{stroke:#E3E9FD;} + .d2-1967301925 .stroke-B5{stroke:#EDF0FD;} + .d2-1967301925 .stroke-B6{stroke:#F7F8FE;} + .d2-1967301925 .stroke-AA2{stroke:#4A6FF3;} + .d2-1967301925 .stroke-AA4{stroke:#EDF0FD;} + .d2-1967301925 .stroke-AA5{stroke:#F7F8FE;} + .d2-1967301925 .stroke-AB4{stroke:#EDF0FD;} + .d2-1967301925 .stroke-AB5{stroke:#F7F8FE;} + .d2-1967301925 .background-color-N1{background-color:#0A0F25;} + .d2-1967301925 .background-color-N2{background-color:#676C7E;} + .d2-1967301925 .background-color-N3{background-color:#9499AB;} + .d2-1967301925 .background-color-N4{background-color:#CFD2DD;} + .d2-1967301925 .background-color-N5{background-color:#DEE1EB;} + .d2-1967301925 .background-color-N6{background-color:#EEF1F8;} + .d2-1967301925 .background-color-N7{background-color:#FFFFFF;} + .d2-1967301925 .background-color-B1{background-color:#0D32B2;} + .d2-1967301925 .background-color-B2{background-color:#0D32B2;} + .d2-1967301925 .background-color-B3{background-color:#E3E9FD;} + .d2-1967301925 .background-color-B4{background-color:#E3E9FD;} + .d2-1967301925 .background-color-B5{background-color:#EDF0FD;} + .d2-1967301925 .background-color-B6{background-color:#F7F8FE;} + .d2-1967301925 .background-color-AA2{background-color:#4A6FF3;} + .d2-1967301925 .background-color-AA4{background-color:#EDF0FD;} + .d2-1967301925 .background-color-AA5{background-color:#F7F8FE;} + .d2-1967301925 .background-color-AB4{background-color:#EDF0FD;} + .d2-1967301925 .background-color-AB5{background-color:#F7F8FE;} + .d2-1967301925 .color-N1{color:#0A0F25;} + .d2-1967301925 .color-N2{color:#676C7E;} + .d2-1967301925 .color-N3{color:#9499AB;} + .d2-1967301925 .color-N4{color:#CFD2DD;} + .d2-1967301925 .color-N5{color:#DEE1EB;} + .d2-1967301925 .color-N6{color:#EEF1F8;} + .d2-1967301925 .color-N7{color:#FFFFFF;} + .d2-1967301925 .color-B1{color:#0D32B2;} + .d2-1967301925 .color-B2{color:#0D32B2;} + .d2-1967301925 .color-B3{color:#E3E9FD;} + .d2-1967301925 .color-B4{color:#E3E9FD;} + .d2-1967301925 .color-B5{color:#EDF0FD;} + .d2-1967301925 .color-B6{color:#F7F8FE;} + .d2-1967301925 .color-AA2{color:#4A6FF3;} + .d2-1967301925 .color-AA4{color:#EDF0FD;} + .d2-1967301925 .color-AA5{color:#F7F8FE;} + .d2-1967301925 .color-AB4{color:#EDF0FD;} + .d2-1967301925 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -949,7 +949,7 @@ - + diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json index 3f1c76ab7..3ceacbac4 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json @@ -285,7 +285,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "window", "fontSize": 0, "fontFamily": "", "language": "", @@ -456,7 +456,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "roof", "fontSize": 0, "fontFamily": "", "language": "", @@ -586,7 +586,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "garage", "fontSize": 0, "fontFamily": "", "language": "", @@ -633,7 +633,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "repair", "fontSize": 0, "fontFamily": "", "language": "", @@ -804,7 +804,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "1", "fontSize": 0, "fontFamily": "", "language": "", @@ -1064,7 +1064,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "2", "fontSize": 0, "fontFamily": "", "language": "", @@ -1453,7 +1453,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "3", "fontSize": 0, "fontFamily": "", "language": "", @@ -1930,7 +1930,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "4", "fontSize": 0, "fontFamily": "", "language": "", @@ -2228,7 +2228,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "storm", "fontSize": 0, "fontFamily": "", "language": "", diff --git a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg index 309f9f7e4..3040dafd7 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles -find contractorscraigslistfacebook +find contractorscraigslistfacebook -find contractorssolicit quotescraigslistfacebook +find contractorssolicit quotescraigslistfacebook -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -220,7 +220,7 @@ -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -229,7 +229,7 @@ -windowroofgaragewaterrainthunder +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/complex-layers/elk/board.exp.json b/e2etests/testdata/stable/complex-layers/elk/board.exp.json index cd538c972..4e4aca6ab 100644 --- a/e2etests/testdata/stable/complex-layers/elk/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/elk/board.exp.json @@ -285,7 +285,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "window", "fontSize": 0, "fontFamily": "", "language": "", @@ -456,7 +456,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "roof", "fontSize": 0, "fontFamily": "", "language": "", @@ -586,7 +586,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "garage", "fontSize": 0, "fontFamily": "", "language": "", @@ -633,7 +633,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "repair", "fontSize": 0, "fontFamily": "", "language": "", @@ -804,7 +804,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "1", "fontSize": 0, "fontFamily": "", "language": "", @@ -1055,7 +1055,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "2", "fontSize": 0, "fontFamily": "", "language": "", @@ -1426,7 +1426,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "3", "fontSize": 0, "fontFamily": "", "language": "", @@ -1876,7 +1876,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "4", "fontSize": 0, "fontFamily": "", "language": "", @@ -2174,7 +2174,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "storm", "fontSize": 0, "fontFamily": "", "language": "", diff --git a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg index dc00004a9..e7f00c2f4 100644 --- a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg @@ -1,16 +1,16 @@ windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles -find contractorscraigslistfacebook +find contractorscraigslistfacebook -find contractorssolicit quotescraigslistfacebook +find contractorssolicit quotescraigslistfacebook -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -220,7 +220,7 @@ -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -229,7 +229,7 @@ -windowroofgaragewaterrainthunder +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/grid_animated/dagre/board.exp.json b/e2etests/testdata/stable/grid_animated/dagre/board.exp.json index 1ade17c63..f9eee7255 100644 --- a/e2etests/testdata/stable/grid_animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_animated/dagre/board.exp.json @@ -285,7 +285,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "1", "fontSize": 0, "fontFamily": "", "language": "", @@ -497,7 +497,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "2", "fontSize": 0, "fontFamily": "", "language": "", @@ -750,7 +750,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "3", "fontSize": 0, "fontFamily": "", "language": "", @@ -1044,7 +1044,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "4", "fontSize": 0, "fontFamily": "", "language": "", @@ -1379,7 +1379,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "5", "fontSize": 0, "fontFamily": "", "language": "", @@ -1714,7 +1714,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "6", "fontSize": 0, "fontFamily": "", "language": "", @@ -2049,7 +2049,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "7", "fontSize": 0, "fontFamily": "", "language": "", @@ -2425,7 +2425,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "8", "fontSize": 0, "fontFamily": "", "language": "", @@ -2842,7 +2842,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "9", "fontSize": 0, "fontFamily": "", "language": "", @@ -3300,7 +3300,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "10", "fontSize": 0, "fontFamily": "", "language": "", @@ -3799,7 +3799,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "11", "fontSize": 0, "fontFamily": "", "language": "", @@ -4339,7 +4339,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "12", "fontSize": 0, "fontFamily": "", "language": "", @@ -4920,7 +4920,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "13", "fontSize": 0, "fontFamily": "", "language": "", @@ -5501,7 +5501,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "14", "fontSize": 0, "fontFamily": "", "language": "", diff --git a/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg index ff1eef266..672d3199f 100644 --- a/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ rows 2 columns 3 (<cap)a +}]]>rows 2 columns 3 (<cap)a -rows 2 columns 3 (<cap)ab +rows 2 columns 3 (<cap)ab -rows 2 columns 3 (<cap)abc +rows 2 columns 3 (<cap)abc -rows 2 columns 3 (<cap)abcd +rows 2 columns 3 (<cap)abcd -rows 2 columns 3 (<cap)abcde +rows 2 columns 3 (<cap)abcde @@ -273,7 +273,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -282,7 +282,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -291,7 +291,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -300,7 +300,7 @@ -rows 2 columns 3 (>cap)abcdefg +rows 2 columns 3 (>cap)abcdefg @@ -310,7 +310,7 @@ -rows 2 columns 3 (>cap)abcdefgh +rows 2 columns 3 (>cap)abcdefgh @@ -321,7 +321,7 @@ -rows 2 columns 3 (>cap)abcdefghi +rows 2 columns 3 (>cap)abcdefghi @@ -333,7 +333,7 @@ -rows 2 columns 3 (>cap)abcdefghij +rows 2 columns 3 (>cap)abcdefghij @@ -346,7 +346,7 @@ -rows 2 columns 3 (>cap)abcdefghijk +rows 2 columns 3 (>cap)abcdefghijk @@ -360,7 +360,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl @@ -375,7 +375,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl diff --git a/e2etests/testdata/stable/grid_animated/elk/board.exp.json b/e2etests/testdata/stable/grid_animated/elk/board.exp.json index 46cce9c0e..8ecc1270f 100644 --- a/e2etests/testdata/stable/grid_animated/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_animated/elk/board.exp.json @@ -285,7 +285,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "1", "fontSize": 0, "fontFamily": "", "language": "", @@ -497,7 +497,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "2", "fontSize": 0, "fontFamily": "", "language": "", @@ -750,7 +750,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "3", "fontSize": 0, "fontFamily": "", "language": "", @@ -1044,7 +1044,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "4", "fontSize": 0, "fontFamily": "", "language": "", @@ -1379,7 +1379,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "5", "fontSize": 0, "fontFamily": "", "language": "", @@ -1714,7 +1714,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "6", "fontSize": 0, "fontFamily": "", "language": "", @@ -2049,7 +2049,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "7", "fontSize": 0, "fontFamily": "", "language": "", @@ -2425,7 +2425,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "8", "fontSize": 0, "fontFamily": "", "language": "", @@ -2842,7 +2842,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "9", "fontSize": 0, "fontFamily": "", "language": "", @@ -3300,7 +3300,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "10", "fontSize": 0, "fontFamily": "", "language": "", @@ -3799,7 +3799,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "11", "fontSize": 0, "fontFamily": "", "language": "", @@ -4339,7 +4339,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "12", "fontSize": 0, "fontFamily": "", "language": "", @@ -4920,7 +4920,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "13", "fontSize": 0, "fontFamily": "", "language": "", @@ -5501,7 +5501,7 @@ "fields": null, "methods": null, "columns": null, - "label": "", + "label": "14", "fontSize": 0, "fontFamily": "", "language": "", diff --git a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg index e21065f90..1596d2cdb 100644 --- a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg @@ -1,16 +1,16 @@ rows 2 columns 3 (<cap)a +}]]>rows 2 columns 3 (<cap)a -rows 2 columns 3 (<cap)ab +rows 2 columns 3 (<cap)ab -rows 2 columns 3 (<cap)abc +rows 2 columns 3 (<cap)abc -rows 2 columns 3 (<cap)abcd +rows 2 columns 3 (<cap)abcd -rows 2 columns 3 (<cap)abcde +rows 2 columns 3 (<cap)abcde @@ -273,7 +273,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -282,7 +282,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -291,7 +291,7 @@ -rows 2 columns 3 (=cap)abcdef +rows 2 columns 3 (=cap)abcdef @@ -300,7 +300,7 @@ -rows 2 columns 3 (>cap)abcdefg +rows 2 columns 3 (>cap)abcdefg @@ -310,7 +310,7 @@ -rows 2 columns 3 (>cap)abcdefgh +rows 2 columns 3 (>cap)abcdefgh @@ -321,7 +321,7 @@ -rows 2 columns 3 (>cap)abcdefghi +rows 2 columns 3 (>cap)abcdefghi @@ -333,7 +333,7 @@ -rows 2 columns 3 (>cap)abcdefghij +rows 2 columns 3 (>cap)abcdefghij @@ -346,7 +346,7 @@ -rows 2 columns 3 (>cap)abcdefghijk +rows 2 columns 3 (>cap)abcdefghijk @@ -360,7 +360,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl @@ -375,7 +375,7 @@ -rows 2 columns 3 (>cap)abcdefghijkl +rows 2 columns 3 (>cap)abcdefghijkl diff --git a/e2etests/testdata/stable/links/dagre/board.exp.json b/e2etests/testdata/stable/links/dagre/board.exp.json index c61ebd02b..2b6959d56 100644 --- a/e2etests/testdata/stable/links/dagre/board.exp.json +++ b/e2etests/testdata/stable/links/dagre/board.exp.json @@ -24,6 +24,7 @@ "double-border": false, "tooltip": "", "link": "https://d2lang.com", + "prettyLink": "https://d2lang.com", "icon": null, "iconPosition": "", "blend": false, @@ -65,6 +66,7 @@ "double-border": false, "tooltip": "Gee, I feel kind of LIGHT in the head now,\nknowing I can't make my satellite dish PAYMENTS!", "link": "https://terrastruct.com", + "prettyLink": "https://terrastruct.com", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/stable/links/dagre/sketch.exp.svg b/e2etests/testdata/stable/links/dagre/sketch.exp.svg index 858248de3..62d5e9679 100644 --- a/e2etests/testdata/stable/links/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/links/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + .d2-2990259904 .fill-N1{fill:#0A0F25;} + .d2-2990259904 .fill-N2{fill:#676C7E;} + .d2-2990259904 .fill-N3{fill:#9499AB;} + .d2-2990259904 .fill-N4{fill:#CFD2DD;} + .d2-2990259904 .fill-N5{fill:#DEE1EB;} + .d2-2990259904 .fill-N6{fill:#EEF1F8;} + .d2-2990259904 .fill-N7{fill:#FFFFFF;} + .d2-2990259904 .fill-B1{fill:#0D32B2;} + .d2-2990259904 .fill-B2{fill:#0D32B2;} + .d2-2990259904 .fill-B3{fill:#E3E9FD;} + .d2-2990259904 .fill-B4{fill:#E3E9FD;} + .d2-2990259904 .fill-B5{fill:#EDF0FD;} + .d2-2990259904 .fill-B6{fill:#F7F8FE;} + .d2-2990259904 .fill-AA2{fill:#4A6FF3;} + .d2-2990259904 .fill-AA4{fill:#EDF0FD;} + .d2-2990259904 .fill-AA5{fill:#F7F8FE;} + .d2-2990259904 .fill-AB4{fill:#EDF0FD;} + .d2-2990259904 .fill-AB5{fill:#F7F8FE;} + .d2-2990259904 .stroke-N1{stroke:#0A0F25;} + .d2-2990259904 .stroke-N2{stroke:#676C7E;} + .d2-2990259904 .stroke-N3{stroke:#9499AB;} + .d2-2990259904 .stroke-N4{stroke:#CFD2DD;} + .d2-2990259904 .stroke-N5{stroke:#DEE1EB;} + .d2-2990259904 .stroke-N6{stroke:#EEF1F8;} + .d2-2990259904 .stroke-N7{stroke:#FFFFFF;} + .d2-2990259904 .stroke-B1{stroke:#0D32B2;} + .d2-2990259904 .stroke-B2{stroke:#0D32B2;} + .d2-2990259904 .stroke-B3{stroke:#E3E9FD;} + .d2-2990259904 .stroke-B4{stroke:#E3E9FD;} + .d2-2990259904 .stroke-B5{stroke:#EDF0FD;} + .d2-2990259904 .stroke-B6{stroke:#F7F8FE;} + .d2-2990259904 .stroke-AA2{stroke:#4A6FF3;} + .d2-2990259904 .stroke-AA4{stroke:#EDF0FD;} + .d2-2990259904 .stroke-AA5{stroke:#F7F8FE;} + .d2-2990259904 .stroke-AB4{stroke:#EDF0FD;} + .d2-2990259904 .stroke-AB5{stroke:#F7F8FE;} + .d2-2990259904 .background-color-N1{background-color:#0A0F25;} + .d2-2990259904 .background-color-N2{background-color:#676C7E;} + .d2-2990259904 .background-color-N3{background-color:#9499AB;} + .d2-2990259904 .background-color-N4{background-color:#CFD2DD;} + .d2-2990259904 .background-color-N5{background-color:#DEE1EB;} + .d2-2990259904 .background-color-N6{background-color:#EEF1F8;} + .d2-2990259904 .background-color-N7{background-color:#FFFFFF;} + .d2-2990259904 .background-color-B1{background-color:#0D32B2;} + .d2-2990259904 .background-color-B2{background-color:#0D32B2;} + .d2-2990259904 .background-color-B3{background-color:#E3E9FD;} + .d2-2990259904 .background-color-B4{background-color:#E3E9FD;} + .d2-2990259904 .background-color-B5{background-color:#EDF0FD;} + .d2-2990259904 .background-color-B6{background-color:#F7F8FE;} + .d2-2990259904 .background-color-AA2{background-color:#4A6FF3;} + .d2-2990259904 .background-color-AA4{background-color:#EDF0FD;} + .d2-2990259904 .background-color-AA5{background-color:#F7F8FE;} + .d2-2990259904 .background-color-AB4{background-color:#EDF0FD;} + .d2-2990259904 .background-color-AB5{background-color:#F7F8FE;} + .d2-2990259904 .color-N1{color:#0A0F25;} + .d2-2990259904 .color-N2{color:#676C7E;} + .d2-2990259904 .color-N3{color:#9499AB;} + .d2-2990259904 .color-N4{color:#CFD2DD;} + .d2-2990259904 .color-N5{color:#DEE1EB;} + .d2-2990259904 .color-N6{color:#EEF1F8;} + .d2-2990259904 .color-N7{color:#FFFFFF;} + .d2-2990259904 .color-B1{color:#0D32B2;} + .d2-2990259904 .color-B2{color:#0D32B2;} + .d2-2990259904 .color-B3{color:#E3E9FD;} + .d2-2990259904 .color-B4{color:#E3E9FD;} + .d2-2990259904 .color-B5{color:#EDF0FD;} + .d2-2990259904 .color-B6{color:#F7F8FE;} + .d2-2990259904 .color-AA2{color:#4A6FF3;} + .d2-2990259904 .color-AA4{color:#EDF0FD;} + .d2-2990259904 .color-AA5{color:#F7F8FE;} + .d2-2990259904 .color-AB4{color:#EDF0FD;} + .d2-2990259904 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -129,7 +129,7 @@ - + diff --git a/e2etests/testdata/stable/links/elk/board.exp.json b/e2etests/testdata/stable/links/elk/board.exp.json index 52bb04fae..7f3984ef9 100644 --- a/e2etests/testdata/stable/links/elk/board.exp.json +++ b/e2etests/testdata/stable/links/elk/board.exp.json @@ -24,6 +24,7 @@ "double-border": false, "tooltip": "", "link": "https://d2lang.com", + "prettyLink": "https://d2lang.com", "icon": null, "iconPosition": "", "blend": false, @@ -65,6 +66,7 @@ "double-border": false, "tooltip": "Gee, I feel kind of LIGHT in the head now,\nknowing I can't make my satellite dish PAYMENTS!", "link": "https://terrastruct.com", + "prettyLink": "https://terrastruct.com", "icon": null, "iconPosition": "", "blend": false, diff --git a/e2etests/testdata/stable/links/elk/sketch.exp.svg b/e2etests/testdata/stable/links/elk/sketch.exp.svg index ce0ec8910..3b2170e15 100644 --- a/e2etests/testdata/stable/links/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/links/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + .d2-1954138282 .fill-N1{fill:#0A0F25;} + .d2-1954138282 .fill-N2{fill:#676C7E;} + .d2-1954138282 .fill-N3{fill:#9499AB;} + .d2-1954138282 .fill-N4{fill:#CFD2DD;} + .d2-1954138282 .fill-N5{fill:#DEE1EB;} + .d2-1954138282 .fill-N6{fill:#EEF1F8;} + .d2-1954138282 .fill-N7{fill:#FFFFFF;} + .d2-1954138282 .fill-B1{fill:#0D32B2;} + .d2-1954138282 .fill-B2{fill:#0D32B2;} + .d2-1954138282 .fill-B3{fill:#E3E9FD;} + .d2-1954138282 .fill-B4{fill:#E3E9FD;} + .d2-1954138282 .fill-B5{fill:#EDF0FD;} + .d2-1954138282 .fill-B6{fill:#F7F8FE;} + .d2-1954138282 .fill-AA2{fill:#4A6FF3;} + .d2-1954138282 .fill-AA4{fill:#EDF0FD;} + .d2-1954138282 .fill-AA5{fill:#F7F8FE;} + .d2-1954138282 .fill-AB4{fill:#EDF0FD;} + .d2-1954138282 .fill-AB5{fill:#F7F8FE;} + .d2-1954138282 .stroke-N1{stroke:#0A0F25;} + .d2-1954138282 .stroke-N2{stroke:#676C7E;} + .d2-1954138282 .stroke-N3{stroke:#9499AB;} + .d2-1954138282 .stroke-N4{stroke:#CFD2DD;} + .d2-1954138282 .stroke-N5{stroke:#DEE1EB;} + .d2-1954138282 .stroke-N6{stroke:#EEF1F8;} + .d2-1954138282 .stroke-N7{stroke:#FFFFFF;} + .d2-1954138282 .stroke-B1{stroke:#0D32B2;} + .d2-1954138282 .stroke-B2{stroke:#0D32B2;} + .d2-1954138282 .stroke-B3{stroke:#E3E9FD;} + .d2-1954138282 .stroke-B4{stroke:#E3E9FD;} + .d2-1954138282 .stroke-B5{stroke:#EDF0FD;} + .d2-1954138282 .stroke-B6{stroke:#F7F8FE;} + .d2-1954138282 .stroke-AA2{stroke:#4A6FF3;} + .d2-1954138282 .stroke-AA4{stroke:#EDF0FD;} + .d2-1954138282 .stroke-AA5{stroke:#F7F8FE;} + .d2-1954138282 .stroke-AB4{stroke:#EDF0FD;} + .d2-1954138282 .stroke-AB5{stroke:#F7F8FE;} + .d2-1954138282 .background-color-N1{background-color:#0A0F25;} + .d2-1954138282 .background-color-N2{background-color:#676C7E;} + .d2-1954138282 .background-color-N3{background-color:#9499AB;} + .d2-1954138282 .background-color-N4{background-color:#CFD2DD;} + .d2-1954138282 .background-color-N5{background-color:#DEE1EB;} + .d2-1954138282 .background-color-N6{background-color:#EEF1F8;} + .d2-1954138282 .background-color-N7{background-color:#FFFFFF;} + .d2-1954138282 .background-color-B1{background-color:#0D32B2;} + .d2-1954138282 .background-color-B2{background-color:#0D32B2;} + .d2-1954138282 .background-color-B3{background-color:#E3E9FD;} + .d2-1954138282 .background-color-B4{background-color:#E3E9FD;} + .d2-1954138282 .background-color-B5{background-color:#EDF0FD;} + .d2-1954138282 .background-color-B6{background-color:#F7F8FE;} + .d2-1954138282 .background-color-AA2{background-color:#4A6FF3;} + .d2-1954138282 .background-color-AA4{background-color:#EDF0FD;} + .d2-1954138282 .background-color-AA5{background-color:#F7F8FE;} + .d2-1954138282 .background-color-AB4{background-color:#EDF0FD;} + .d2-1954138282 .background-color-AB5{background-color:#F7F8FE;} + .d2-1954138282 .color-N1{color:#0A0F25;} + .d2-1954138282 .color-N2{color:#676C7E;} + .d2-1954138282 .color-N3{color:#9499AB;} + .d2-1954138282 .color-N4{color:#CFD2DD;} + .d2-1954138282 .color-N5{color:#DEE1EB;} + .d2-1954138282 .color-N6{color:#EEF1F8;} + .d2-1954138282 .color-N7{color:#FFFFFF;} + .d2-1954138282 .color-B1{color:#0D32B2;} + .d2-1954138282 .color-B2{color:#0D32B2;} + .d2-1954138282 .color-B3{color:#E3E9FD;} + .d2-1954138282 .color-B4{color:#E3E9FD;} + .d2-1954138282 .color-B5{color:#EDF0FD;} + .d2-1954138282 .color-B6{color:#F7F8FE;} + .d2-1954138282 .color-AA2{color:#4A6FF3;} + .d2-1954138282 .color-AA4{color:#EDF0FD;} + .d2-1954138282 .color-AA5{color:#F7F8FE;} + .d2-1954138282 .color-AB4{color:#EDF0FD;} + .d2-1954138282 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -129,7 +129,7 @@ - + diff --git a/lib/pdf/pdf.go b/lib/pdf/pdf.go index 85d6b7971..c23bc09ee 100644 --- a/lib/pdf/pdf.go +++ b/lib/pdf/pdf.go @@ -66,7 +66,7 @@ func (g *GoFPDF) GetFillRGB(themeID int64, fill string) (color.RGB, error) { return color.Hex2RGB(fill) } -func (g *GoFPDF) AddPDFPage(png []byte, titlePath []BoardTitle, themeID int64, fill string, shapes []d2target.Shape, pad int64, viewboxX, viewboxY float64, pageMap map[string]int) error { +func (g *GoFPDF) AddPDFPage(png []byte, titlePath []BoardTitle, themeID int64, fill string, shapes []d2target.Shape, pad int64, viewboxX, viewboxY float64, pageMap map[string]int, includeNav bool) error { var opt gofpdf.ImageOptions opt.ImageType = "png" boardPath := make([]string, len(titlePath)) @@ -88,6 +88,12 @@ func (g *GoFPDF) AddPDFPage(png []byte, titlePath []BoardTitle, themeID int64, f pathString := strings.Join(boardPath, " / ") headerMargin := 28.0 headerWidth := g.pdf.GetStringWidth(pathString) + 2*headerMargin + headerHeight := 72.0 + if !includeNav { + headerMargin = 0. + headerWidth = 0. + headerHeight = 0. + } minPageDimension := 576.0 pageWidth = math.Max(math.Max(minPageDimension, imageWidth), headerWidth) @@ -99,45 +105,46 @@ func (g *GoFPDF) AddPDFPage(png []byte, titlePath []BoardTitle, themeID int64, f } // Add page - headerHeight := 72.0 g.pdf.AddPageFormat("", gofpdf.SizeType{Wd: pageWidth, Ht: pageHeight + headerHeight}) - // Draw header - g.pdf.SetFillColor(int(fillRGB.Red), int(fillRGB.Green), int(fillRGB.Blue)) - g.pdf.Rect(0, 0, pageWidth, pageHeight+headerHeight, "F") - if fillRGB.IsLight() { - g.pdf.SetTextColor(10, 15, 37) // steel-900 - } else { - g.pdf.SetTextColor(255, 255, 255) - } - g.pdf.SetFont("source", "", 14) - - // Draw board path prefix - prefixWidth := headerMargin - if len(titlePath) > 1 { - for _, t := range titlePath[:len(titlePath)-1] { - g.pdf.SetXY(prefixWidth, 0) - w := g.pdf.GetStringWidth(t.Name) - var linkID int - if pageNum, ok := pageMap[t.BoardID]; ok { - linkID = g.pdf.AddLink() - g.pdf.SetLink(linkID, 0, pageNum+1) - } - g.pdf.CellFormat(w, headerHeight, t.Name, "", 0, "", false, linkID, "") - prefixWidth += w - - g.pdf.SetXY(prefixWidth, 0) - w = g.pdf.GetStringWidth(TITLE_SEP) - g.pdf.CellFormat(prefixWidth, headerHeight, TITLE_SEP, "", 0, "", false, 0, "") - prefixWidth += w + if includeNav { + // Draw header + g.pdf.SetFillColor(int(fillRGB.Red), int(fillRGB.Green), int(fillRGB.Blue)) + g.pdf.Rect(0, 0, pageWidth, pageHeight+headerHeight, "F") + if fillRGB.IsLight() { + g.pdf.SetTextColor(10, 15, 37) // steel-900 + } else { + g.pdf.SetTextColor(255, 255, 255) } - } + g.pdf.SetFont("source", "", 14) - // Draw board name - boardName := boardPath[len(boardPath)-1] - g.pdf.SetFont("source", "B", 14) - g.pdf.SetXY(prefixWidth, 0) - g.pdf.CellFormat(pageWidth-prefixWidth-headerMargin, headerHeight, boardName, "", 0, "", false, 0, "") + // Draw board path prefix + prefixWidth := headerMargin + if len(titlePath) > 1 { + for _, t := range titlePath[:len(titlePath)-1] { + g.pdf.SetXY(prefixWidth, 0) + w := g.pdf.GetStringWidth(t.Name) + var linkID int + if pageNum, ok := pageMap[t.BoardID]; ok { + linkID = g.pdf.AddLink() + g.pdf.SetLink(linkID, 0, pageNum+1) + } + g.pdf.CellFormat(w, headerHeight, t.Name, "", 0, "", false, linkID, "") + prefixWidth += w + + g.pdf.SetXY(prefixWidth, 0) + w = g.pdf.GetStringWidth(TITLE_SEP) + g.pdf.CellFormat(prefixWidth, headerHeight, TITLE_SEP, "", 0, "", false, 0, "") + prefixWidth += w + } + } + + // Draw board name + boardName := boardPath[len(boardPath)-1] + g.pdf.SetFont("source", "B", 14) + g.pdf.SetXY(prefixWidth, 0) + g.pdf.CellFormat(pageWidth-prefixWidth-headerMargin, headerHeight, boardName, "", 0, "", false, 0, "") + } // Draw image imageX := (pageWidth - imageWidth) / 2 diff --git a/lib/pptx/pptx.go b/lib/pptx/pptx.go index 66d02e317..39cf7d7b0 100644 --- a/lib/pptx/pptx.go +++ b/lib/pptx/pptx.go @@ -34,7 +34,8 @@ type Presentation struct { Creator string // D2Version can't have letters, only numbers (`[0-9]`) and `.` // Otherwise, it may fail to open in PowerPoint - D2Version string + D2Version string + includeNav bool Slides []*Slide } @@ -73,16 +74,32 @@ type Link struct { Tooltip string } -func NewPresentation(title, description, subject, creator, d2Version string) *Presentation { +func NewPresentation(title, description, subject, creator, d2Version string, includeNav bool) *Presentation { return &Presentation{ Title: title, Description: description, Subject: subject, Creator: creator, D2Version: d2Version, + includeNav: includeNav, } } +func (p *Presentation) headerHeight() int { + if p.includeNav { + return HEADER_HEIGHT + } + return 0 +} + +func (p *Presentation) height() int { + return SLIDE_HEIGHT - p.headerHeight() +} + +func (p *Presentation) aspectRatio() float64 { + return float64(IMAGE_WIDTH) / float64(p.height()) +} + func (p *Presentation) AddSlide(pngContent []byte, titlePath []BoardTitle) (*Slide, error) { src, err := png.Decode(bytes.NewReader(pngContent)) if err != nil { @@ -111,7 +128,7 @@ func (p *Presentation) AddSlide(pngContent []byte, titlePath []BoardTitle) (*Sli // └──┴────────────────────────────────────────────┴──┘ ─┴─ ─┴─ // ├────────────────────SLIDE WIDTH───────────────────┤ // ├─────────────────IMAGE WIDTH────────────────┤ - if srcWidth/srcHeight >= IMAGE_ASPECT_RATIO { + if srcWidth/srcHeight >= p.aspectRatio() { // here, the image aspect ratio is, at least, equal to the slide aspect ratio // so, it makes sense to expand the image horizontally to use as much as space as possible width = SLIDE_WIDTH @@ -119,7 +136,7 @@ func (p *Presentation) AddSlide(pngContent []byte, titlePath []BoardTitle) (*Sli // first, try to make the image as wide as the slide // but, if this results in a tall image, use only the // image adjusted width to avoid overlapping with the header - if height > IMAGE_HEIGHT { + if height > p.height() { width = IMAGE_WIDTH height = int(float64(width) * (srcHeight / srcWidth)) } @@ -127,10 +144,10 @@ func (p *Presentation) AddSlide(pngContent []byte, titlePath []BoardTitle) (*Sli // here, the aspect ratio could be 4x3, in which the image is still wider than taller, // but expanding horizontally would result in an overflow // so, we expand to make it fit the available vertical space - height = IMAGE_HEIGHT + height = p.height() width = int(float64(height) * (srcWidth / srcHeight)) } - top := HEADER_HEIGHT + ((IMAGE_HEIGHT - height) / 2) + top := p.headerHeight() + ((p.height() - height) / 2) left := (SLIDE_WIDTH - width) / 2 slide := &Slide{ @@ -186,7 +203,7 @@ func (p *Presentation) SaveTo(filePath string) error { return err } - err = addFileFromTemplate(zipWriter, fmt.Sprintf("ppt/slides/%s.xml", slideFileName), SLIDE_XML, getSlideXmlContent(imageID, slide)) + err = addFileFromTemplate(zipWriter, fmt.Sprintf("ppt/slides/%s.xml", slideFileName), SLIDE_XML, p.getSlideXmlContent(imageID, slide)) if err != nil { return err } @@ -248,11 +265,8 @@ const SLIDE_WIDTH = 9_144_000 const SLIDE_HEIGHT = 5_143_500 const HEADER_HEIGHT = 392_471 -const IMAGE_HEIGHT = SLIDE_HEIGHT - HEADER_HEIGHT - // keep the right aspect ratio: SLIDE_WIDTH / SLIDE_HEIGHT = IMAGE_WIDTH / IMAGE_HEIGHT const IMAGE_WIDTH = 8_446_273 -const IMAGE_ASPECT_RATIO = float64(IMAGE_WIDTH) / float64(IMAGE_HEIGHT) //go:embed template.pptx var PPTX_TEMPLATE []byte @@ -344,7 +358,7 @@ type SlideXmlContent struct { Links []SlideLinkXmlContent } -func getSlideXmlContent(imageID string, slide *Slide) SlideXmlContent { +func (p *Presentation) getSlideXmlContent(imageID string, slide *Slide) SlideXmlContent { title := make([]SlideXmlTitlePathContent, len(slide.BoardTitle)-1) for i := 0; i < len(slide.BoardTitle)-1; i++ { t := slide.BoardTitle[i] @@ -354,16 +368,18 @@ func getSlideXmlContent(imageID string, slide *Slide) SlideXmlContent { } } content := SlideXmlContent{ - Title: slide.BoardTitle[len(slide.BoardTitle)-1].Name, - TitlePrefix: title, Description: slide.BoardTitle[len(slide.BoardTitle)-1].BoardID, - HeaderHeight: HEADER_HEIGHT, + HeaderHeight: p.headerHeight(), ImageID: imageID, ImageLeft: slide.ImageLeft, ImageTop: slide.ImageTop, ImageWidth: slide.ImageWidth, ImageHeight: slide.ImageHeight, } + if p.includeNav { + content.Title = slide.BoardTitle[len(slide.BoardTitle)-1].Name + content.TitlePrefix = title + } for _, link := range slide.Links { var action string