From 3de8d0b5c4af37221797719b3edb41f5ce579d51 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Feb 2023 11:33:13 -0800 Subject: [PATCH 1/3] fix connection label mask coordinates --- d2renderers/d2svg/d2svg.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 0b5192b7c..a842de536 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -64,10 +64,12 @@ type RenderOpts struct { Sketch bool } -func setViewbox(writer io.Writer, diagram *d2target.Diagram, pad int) (width int, height int) { +func setViewbox(writer io.Writer, diagram *d2target.Diagram, pad int) (left, top, width, height int) { tl, br := diagram.BoundingBox() - w := br.X - tl.X + pad*2 - h := br.Y - tl.Y + pad*2 + left = tl.X - pad + top = tl.Y - pad + width = br.X - tl.X + pad*2 + height = br.Y - tl.Y + pad*2 // TODO minify // TODO background stuff. e.g. dotted, grid, colors @@ -76,9 +78,9 @@ func setViewbox(writer io.Writer, diagram *d2target.Diagram, pad int) (width int id="d2-svg" style="background: white;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" -width="%d" height="%d" viewBox="%d %d %d %d">`, w, h, tl.X-pad, tl.Y-pad, w, h) +width="%d" height="%d" viewBox="%d %d %d %d">`, width, height, left, top, width, height) - return w, h + return left, top, width, height } func arrowheadMarkerID(isTarget bool, connection d2target.Connection) string { @@ -1263,7 +1265,8 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { } buf := &bytes.Buffer{} - w, h := setViewbox(buf, diagram, pad) + + left, top, w, h := setViewbox(buf, diagram, pad) styleCSS2 := "" if sketchRunner != nil { @@ -1348,10 +1351,10 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { // Note: we always want this since we reference it on connections even if there end up being no masked labels fmt.Fprint(buf, strings.Join([]string{ fmt.Sprintf(``, - labelMaskID, -pad, -pad, w, h, + labelMaskID, left, top, w, h, ), fmt.Sprintf(``, - -pad, -pad, w, h, + left, top, w, h, ), strings.Join(labelMasks, "\n"), ``, From 4825250819f17e104032883ea3163ace3f1a0e7f Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Feb 2023 11:48:14 -0800 Subject: [PATCH 2/3] update tests --- .../testdata/diagram_wider_than_tooltip/sketch.exp.svg | 4 ++-- d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg | 4 ++-- .../testdata/tooltip_wider_than_diagram/sketch.exp.svg | 4 ++-- e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg | 4 ++-- .../testdata/measured/empty-sql_table/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/ampersand-escape/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/ampersand-escape/elk/sketch.exp.svg | 4 ++-- .../code_leading_trailing_newlines/dagre/sketch.exp.svg | 4 ++-- .../code_leading_trailing_newlines/elk/sketch.exp.svg | 4 ++-- .../testdata/regression/dagre-disconnect/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/dagre-disconnect/elk/sketch.exp.svg | 4 ++-- .../regression/dagre_broken_arrowhead/dagre/sketch.exp.svg | 4 ++-- .../regression/dagre_broken_arrowhead/elk/sketch.exp.svg | 4 ++-- .../regression/dagre_edge_label_spacing/dagre/sketch.exp.svg | 4 ++-- .../regression/dagre_edge_label_spacing/elk/sketch.exp.svg | 4 ++-- .../regression/dagre_special_ids/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/dagre_special_ids/elk/sketch.exp.svg | 4 ++-- .../testdata/regression/elk_alignment/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg | 4 ++-- .../regression/elk_img_empty_label_panic/dagre/sketch.exp.svg | 4 ++-- .../regression/elk_img_empty_label_panic/elk/sketch.exp.svg | 4 ++-- .../testdata/regression/elk_loop_panic/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/elk_loop_panic/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/elk_order/elk/sketch.exp.svg | 4 ++-- .../regression/empty_class_height/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/empty_class_height/elk/sketch.exp.svg | 4 ++-- .../testdata/regression/empty_sequence/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/just-width/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/just-width/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg | 4 ++-- .../regression/only_header_class_table/dagre/sketch.exp.svg | 4 ++-- .../regression/only_header_class_table/elk/sketch.exp.svg | 4 ++-- .../testdata/regression/opacity-on-label/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/opacity-on-label/elk/sketch.exp.svg | 4 ++-- .../regression/overlapping-edge-label/dagre/sketch.exp.svg | 4 ++-- .../regression/overlapping-edge-label/elk/sketch.exp.svg | 4 ++-- .../regression/query_param_escape/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/query_param_escape/elk/sketch.exp.svg | 4 ++-- .../regression/sequence_diagram_name_crash/elk/sketch.exp.svg | 4 ++-- .../sequence_diagram_no_message/dagre/sketch.exp.svg | 4 ++-- .../regression/sequence_diagram_no_message/elk/sketch.exp.svg | 4 ++-- .../dagre/sketch.exp.svg | 4 ++-- .../elk/sketch.exp.svg | 4 ++-- .../sequence_diagram_span_cover/dagre/sketch.exp.svg | 4 ++-- .../regression/sequence_diagram_span_cover/elk/sketch.exp.svg | 4 ++-- .../regression/sql_table_overflow/dagre/sketch.exp.svg | 4 ++-- .../testdata/regression/sql_table_overflow/elk/sketch.exp.svg | 4 ++-- .../regression/unnamed_class_table_code/dagre/sketch.exp.svg | 4 ++-- .../regression/unnamed_class_table_code/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/sanity/basic/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/sanity/basic/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg | 4 ++-- .../testdata/sanity/connection_label/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/all_shapes_multiple/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/animated/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/animated/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/arrowhead_labels/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/border-radius/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/chaos1/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/chaos1/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/chaos2/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/circle_arrowhead/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/circular_dependency/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/circular_dependency/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/class/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/class/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/connected_container/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/connected_container/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/constant_near_stress/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/constant_near_stress/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/constant_near_title/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/constant_near_title/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/container_edges/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/dense/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/dense/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/different_subgraphs/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/different_subgraphs/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/direction/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/direction/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/font_colors/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg | 4 ++-- .../stable/font_sizes_containers_large/dagre/sketch.exp.svg | 4 ++-- .../stable/font_sizes_containers_large/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/giant_markdown_test/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/giant_markdown_test/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/hr/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/hr/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/icon-label/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/images/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/images/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/investigate/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/investigate/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/large_arch/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/latex/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/latex/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li1/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li1/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li2/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li2/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li3/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li3/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li4/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/li4/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/links/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/links/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/markdown/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/markdown/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/md_2space_newline/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/md_backslash_newline/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/md_backslash_newline/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/md_code_block_fenced/elk/sketch.exp.svg | 4 ++-- .../stable/md_code_block_indented/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/md_code_block_indented/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/near-alone/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/number_connections/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/number_connections/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/one_container_loop/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/one_container_loop/elk/sketch.exp.svg | 4 ++-- .../stable/one_three_one_container/dagre/sketch.exp.svg | 4 ++-- .../stable/one_three_one_container/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/ovals/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/ovals/elk/sketch.exp.svg | 4 ++-- .../overlapping_image_container_labels/dagre/sketch.exp.svg | 4 ++-- .../overlapping_image_container_labels/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/p/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/p/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/people/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/people/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/pre/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/pre/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/self-referencing/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg | 4 ++-- .../stable/sequence-inter-span-self/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence-inter-span-self/elk/sketch.exp.svg | 4 ++-- .../sequence_diagram_actor_distance/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_actor_distance/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_all_shapes/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_distance/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_distance/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_groups/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_groups/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_long_note/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_long_note/elk/sketch.exp.svg | 4 ++-- .../sequence_diagram_nested_groups/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_nested_groups/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_nested_span/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_nested_span/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_note/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/sequence_diagram_note/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/sequence_diagram_real/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_self_edges/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_self_edges/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_simple/dagre/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_simple/elk/sketch.exp.svg | 4 ++-- .../stable/sequence_diagram_span/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/sequence_diagram_span/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/sequence_diagrams/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg | 4 ++-- .../stable/sql_table_column_styles/dagre/sketch.exp.svg | 4 ++-- .../stable/sql_table_column_styles/elk/sketch.exp.svg | 4 ++-- .../stable/sql_table_tooltip_animated/dagre/sketch.exp.svg | 4 ++-- .../stable/sql_table_tooltip_animated/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/square_3d/elk/sketch.exp.svg | 4 ++-- .../stable/straight_hierarchy_container/dagre/sketch.exp.svg | 4 ++-- .../stable/straight_hierarchy_container/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/stylish/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/stylish/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/tooltips/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/tooltips/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/unnamed_only_height/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/unnamed_only_height/elk/sketch.exp.svg | 4 ++-- .../testdata/stable/unnamed_only_width/dagre/sketch.exp.svg | 4 ++-- .../testdata/stable/unnamed_only_width/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/us_map/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/stable/us_map/elk/sketch.exp.svg | 4 ++-- .../testdata/todo/child_parent_edges/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/todo/child_parent_edges/elk/sketch.exp.svg | 4 ++-- .../testdata/todo/container_child_edge/dagre/sketch.exp.svg | 4 ++-- .../testdata/todo/container_child_edge/elk/sketch.exp.svg | 4 ++-- .../testdata/todo/container_icon_label/dagre/sketch.exp.svg | 4 ++-- .../testdata/todo/container_icon_label/elk/sketch.exp.svg | 4 ++-- .../testdata/todo/container_label_loop/dagre/sketch.exp.svg | 4 ++-- .../testdata/todo/container_label_loop/elk/sketch.exp.svg | 4 ++-- .../dagre/sketch.exp.svg | 4 ++-- .../elk/sketch.exp.svg | 4 ++-- .../sequence_diagram_edge_group_span_field/elk/sketch.exp.svg | 4 ++-- .../testdata/todo/shape_set_width_height/dagre/sketch.exp.svg | 4 ++-- .../testdata/todo/shape_set_width_height/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/chinese/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/emojis/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/korean/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/korean/elk/sketch.exp.svg | 4 ++-- .../testdata/unicode/mixed-language-2/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg | 4 ++-- e2etests/testdata/unicode/with-style/elk/sketch.exp.svg | 4 ++-- 264 files changed, 528 insertions(+), 528 deletions(-) diff --git a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg index cf50b884e..884558064 100644 --- a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg @@ -39,8 +39,8 @@ width="1433" height="1589" viewBox="-146 -71 1433 1589"> \ No newline at end of file diff --git a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg index 914a423a0..659fb392c 100644 --- a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg @@ -39,7 +39,7 @@ width="304" height="304" viewBox="-102 -102 304 304"> \ No newline at end of file diff --git a/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg index 53a789b51..565c497b9 100644 --- a/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg @@ -39,7 +39,7 @@ width="254" height="216" viewBox="-102 -102 254 216"> \ No newline at end of file diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg index 15a7a2d4d..9b25cef7b 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg @@ -52,8 +52,8 @@ width="572" height="286" viewBox="-102 -118 572 286"> \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg index 18f97f6a3..1df0f1fd3 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg @@ -39,7 +39,7 @@ width="452" height="332" viewBox="-90 -90 452 332"> \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg index 636457be9..272e6397b 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg @@ -39,8 +39,8 @@ width="470" height="368" viewBox="-102 -100 470 368">x

linux: because a PC is a terrible thing to waste

-
a You don't have to know how the computer works,just how to work the computer. - +a You don't have to know how the computer works,just how to work the computer. + x

linux: because a PC is a terrible thing to waste

-
a You don't have to know how the computer works,just how to work the computer. - +a You don't have to know how the computer works,just how to work the computer. + aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 742b1557d..dc33a8744 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -796,8 +796,8 @@ width="898" height="2166" viewBox="-90 -90 898 2166">aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg index 0304d0331..8eb599547 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg @@ -39,8 +39,8 @@ width="379" height="457" viewBox="-102 -102 379 457">xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

If we can't fix it, it ain't broke.

Dieters live life in the fasting lane.

-
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right - +JoeDonaldi am top lefti am top righti am bottom lefti am bottom right + xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

If we can't fix it, it ain't broke.

Dieters live life in the fasting lane.

-
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right - +JoeDonaldi am top lefti am top righti am bottom lefti am bottom right + poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 - + + poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 - + + mixed togethersugarsolution we get - +mixed togethersugarsolution we get + mixed togethersugarsolution we get - +mixed togethersugarsolution we get +

Markdown: Syntax

-
ab - +ab +

Markdown: Syntax

-
ab - +ab + markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
 - + + markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
 - + + markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
 - + + markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
 - + +

code

-
ab - +ab +

code

-
ab - +ab + bearmama bearpapa bear - +bearmama bearpapa bear + bearmama bearpapa bear - +bearmama bearpapa bear + 有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

夏になると、とても暑くて、人々は汗を流しています。

여름에는 매우 더워서 사람들은 땀을 흘립니다.

-
 - + + 有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

夏になると、とても暑くて、人々は汗を流しています。

여름에는 매우 더워서 사람들은 땀을 흘립니다.

-
 - + +