From bc3250240859b2a7a0f34edcb297e165495517d0 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 9 Nov 2022 19:35:02 -0800 Subject: [PATCH] cleanup --- d2renderers/d2svg/d2svg.go | 10 +++++----- e2etests/testdata/stable/all_shapes/sketch.exp.svg | 2 +- .../testdata/stable/all_shapes_multiple/sketch.exp.svg | 2 +- .../testdata/stable/all_shapes_shadow/sketch.exp.svg | 2 +- .../stable/arrowhead_adjustment/sketch.exp.svg | 2 +- e2etests/testdata/stable/binary_tree/sketch.exp.svg | 2 +- e2etests/testdata/stable/chaos1/sketch.exp.svg | 2 +- e2etests/testdata/stable/chaos2/sketch.exp.svg | 8 ++++---- .../testdata/stable/child_parent_edges/sketch.exp.svg | 2 +- .../testdata/stable/circular_dependency/sketch.exp.svg | 2 +- e2etests/testdata/stable/code_snippet/sketch.exp.svg | 2 +- .../testdata/stable/connected_container/sketch.exp.svg | 2 +- .../testdata/stable/container_edges/sketch.exp.svg | 2 +- e2etests/testdata/stable/dense/sketch.exp.svg | 2 +- .../testdata/stable/different_subgraphs/sketch.exp.svg | 2 +- .../testdata/stable/giant_markdown_test/sketch.exp.svg | 2 +- e2etests/testdata/stable/hr/sketch.exp.svg | 2 +- e2etests/testdata/stable/investigate/sketch.exp.svg | 2 +- e2etests/testdata/stable/large_arch/sketch.exp.svg | 2 +- e2etests/testdata/stable/li1/sketch.exp.svg | 2 +- e2etests/testdata/stable/li2/sketch.exp.svg | 2 +- e2etests/testdata/stable/li3/sketch.exp.svg | 2 +- e2etests/testdata/stable/li4/sketch.exp.svg | 2 +- e2etests/testdata/stable/lone_h1/sketch.exp.svg | 2 +- e2etests/testdata/stable/markdown/sketch.exp.svg | 2 +- .../stable/md_code_block_fenced/sketch.exp.svg | 2 +- .../stable/md_code_block_indented/sketch.exp.svg | 2 +- e2etests/testdata/stable/md_code_inline/sketch.exp.svg | 2 +- e2etests/testdata/stable/multiline_text/sketch.exp.svg | 2 +- e2etests/testdata/stable/multiple_trees/sketch.exp.svg | 2 +- e2etests/testdata/stable/n22_e32/sketch.exp.svg | 2 +- .../testdata/stable/one_container_loop/sketch.exp.svg | 2 +- .../stable/one_three_one_container/sketch.exp.svg | 2 +- e2etests/testdata/stable/p/sketch.exp.svg | 2 +- e2etests/testdata/stable/pre/sketch.exp.svg | 2 +- .../stable/straight_hierarchy_container/sketch.exp.svg | 2 +- e2etests/testdata/stable/us_map/sketch.exp.svg | 2 +- 37 files changed, 44 insertions(+), 44 deletions(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index d8ef126af..41447a5bc 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -506,17 +506,17 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { fmt.Fprint(writer, renderOval(tl, width, height)) case d2target.ShapeImage: - fmt.Fprintf(writer, ``, + fmt.Fprintf(writer, ``, targetShape.Icon.String(), targetShape.Pos.X, targetShape.Pos.Y, targetShape.Width, targetShape.Height) // TODO should standardize "" to rectangle case d2target.ShapeRectangle, "": if targetShape.Multiple { - fmt.Fprintf(writer, ``, + fmt.Fprintf(writer, ``, targetShape.Pos.X+10, targetShape.Pos.Y-10, targetShape.Width, targetShape.Height) } - fmt.Fprintf(writer, ``, + fmt.Fprintf(writer, ``, targetShape.Pos.X, targetShape.Pos.Y, targetShape.Width, targetShape.Height) case d2target.ShapeText, d2target.ShapeCode: @@ -524,12 +524,12 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error { if targetShape.Multiple { multiplePathData := shape.NewShape(shapeType, geo.NewBox(multipleTL, width, height)).GetSVGPathData() for _, pathData := range multiplePathData { - fmt.Fprintf(writer, ``, pathData) + fmt.Fprintf(writer, ``, pathData) } } for _, pathData := range s.GetSVGPathData() { - fmt.Fprintf(writer, ``, pathData) + fmt.Fprintf(writer, ``, pathData) } } diff --git a/e2etests/testdata/stable/all_shapes/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/sketch.exp.svg index a5c75da47..a13f8af56 100644 --- a/e2etests/testdata/stable/all_shapes/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/sketch.exp.svg @@ -12,7 +12,7 @@ width="1539" height="824" viewBox="-100 -100 1539 824">rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud cba cba abcdefghijklmno abcdefghijklmno aaadddeeebbbccc +aaadddeeebbbccc 111 diff --git a/e2etests/testdata/stable/chaos2/sketch.exp.svg b/e2etests/testdata/stable/chaos2/sketch.exp.svg index 909270b15..0af7dde11 100644 --- a/e2etests/testdata/stable/chaos2/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/sketch.exp.svg @@ -788,10 +788,10 @@ width="1317" height="1854" viewBox="-100 -100 1317 1854">aabbllmm

nn

-
oocciikkdd

gg

-
hhjj

ee

-
ff +aabbllmm

nn

+
oocciikkdd

gg

+
hhjj

ee

+
ff 11 diff --git a/e2etests/testdata/stable/child_parent_edges/sketch.exp.svg b/e2etests/testdata/stable/child_parent_edges/sketch.exp.svg index 557b9d8b4..5bcec0606 100644 --- a/e2etests/testdata/stable/child_parent_edges/sketch.exp.svg +++ b/e2etests/testdata/stable/child_parent_edges/sketch.exp.svg @@ -12,7 +12,7 @@ width="694" height="626" viewBox="-100 -100 694 626">abcd abcd abc abc acfbdhg acfbdhg agdfbhec agdfbhec abcdefghijklmnopq abcdefghijklmnopq finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot aabbccddllffwwyyadnniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac +aabbccddllffwwyyadnniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 1 diff --git a/e2etests/testdata/stable/large_arch/sketch.exp.svg b/e2etests/testdata/stable/large_arch/sketch.exp.svg index bd20bb27d..74ce868a3 100644 --- a/e2etests/testdata/stable/large_arch/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/sketch.exp.svg @@ -12,7 +12,7 @@ width="3244" height="1780" viewBox="-100 -100 3244 1780">abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghiqrjmnoszaabbeeffggklptuwxyccddv

Markdown: Syntax

-
ab

code

-
ab thisgoesmultiple linesthisgoesmultiple linesabcdefghijklmnopqrstuvw abcdefghijklmnopqrstuvw abcdefghijklmnopqrstu abcdefghijklmnopqrstu acdefgbh acdefgbh topabcbottomstartend topabcbottomstartend acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDAKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND