diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 18dd392f7..6dd37f828 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -9,7 +9,6 @@ import ( _ "embed" "encoding/json" "fmt" - "math" "strings" "github.com/dop251/goja" @@ -257,7 +256,7 @@ func Layout(ctx context.Context, g *d2graph.Graph) (err error) { parentX = parent.TopLeft.X parentY = parent.TopLeft.Y } - obj.TopLeft = geo.NewPoint(math.Round(parentX+n.X), math.Round(parentY+n.Y)) + obj.TopLeft = geo.NewPoint(parentX+n.X, parentY+n.Y) obj.Width = n.Width obj.Height = n.Height diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json index d74b1feb5..30a954424 100644 --- a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json @@ -166,7 +166,7 @@ "id": "there", "type": "", "pos": { - "x": 716, + "x": 715, "y": 254 }, "width": 143, diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg index 985f6ad4e..3ca808db4 100644 --- a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg @@ -18,7 +18,7 @@ width="1227" height="568" viewBox="-88 -88 1227 568">ninetynineeighty eightseventy sevena\yodetherea\"odea\node +ninetynineeighty eightseventy sevena\yodetherea\"odea\node lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest +lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json index 10c667ae8..e17d4ca0f 100644 --- a/e2etests/testdata/regression/elk_order/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json @@ -325,7 +325,7 @@ "id": "m0_desc", "type": "text", "pos": { - "x": 97, + "x": 96, "y": 36 }, "width": 106, @@ -403,7 +403,7 @@ "id": "m5_desc", "type": "text", "pos": { - "x": 831, + "x": 830, "y": 36 }, "width": 90, @@ -442,7 +442,7 @@ "id": "m6_desc", "type": "text", "pos": { - "x": 951, + "x": 950, "y": 12 }, "width": 140, diff --git a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg index 63a3b016e..1088ee5a3 100644 --- a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg @@ -774,12 +774,12 @@ width="1346" height="629" viewBox="-88 -88 1346 629">

Oldest message

+

Oldest message

Offset

-

Last message

-

Next message will be
+

Last message

+

Next message will be
inserted here

-
M0M1M2M3M4M5M6 +
M0M1M2M3M4M5M6 abc +abc acbd +acbd rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud cba * +cba * abcdefghijklmno +abcdefghijklmno aabbllmm

nn

-
oocciikkdd

gg

-
hhjj

ee

-
ff1122 334455667788 +oocciikkdd

gg

+
hhjj

ee

+
ff1122 334455667788 - + diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json index 8eac03000..290b783e6 100644 --- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json @@ -85,7 +85,7 @@ "id": "y", "type": "", "pos": { - "x": 333, + "x": 332, "y": 504 }, "width": 114, diff --git a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg index aa93f0515..db6a4f592 100644 --- a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg @@ -26,7 +26,7 @@ width="955" height="818" viewBox="-88 -88 955 818">acfbdhg +acfbdhg abcdefghijklmnopq +abcdefghijklmnopq finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot - +finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot + bacde21345abcde +bacde21345abcde alphabeta gamma +alphabeta gamma size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - +size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json index 81bb926e0..b2afa8a49 100644 --- a/e2etests/testdata/stable/hr/elk/board.exp.json +++ b/e2etests/testdata/stable/hr/elk/board.exp.json @@ -45,7 +45,7 @@ "id": "a", "type": "", "pos": { - "x": 325, + "x": 324, "y": 12 }, "width": 113, @@ -85,7 +85,7 @@ "id": "b", "type": "", "pos": { - "x": 325, + "x": 324, "y": 472 }, "width": 113, diff --git a/e2etests/testdata/stable/hr/elk/sketch.exp.svg b/e2etests/testdata/stable/hr/elk/sketch.exp.svg index d4f060f54..d7373ac08 100644 --- a/e2etests/testdata/stable/hr/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/hr/elk/sketch.exp.svg @@ -778,7 +778,7 @@ width="938" height="786" viewBox="-88 -88 938 786">aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 - +aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456 + - + diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index d8dcaec74..ca38024d5 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -166,7 +166,7 @@ "id": "e", "type": "", "pos": { - "x": 856, + "x": 855, "y": 2394 }, "width": 113, @@ -326,7 +326,7 @@ "id": "i", "type": "", "pos": { - "x": 665, + "x": 664, "y": 1301 }, "width": 683, @@ -366,7 +366,7 @@ "id": "i.j", "type": "", "pos": { - "x": 879, + "x": 878, "y": 1376 }, "width": 392, @@ -406,7 +406,7 @@ "id": "i.j.k", "type": "", "pos": { - "x": 954, + "x": 953, "y": 1451 }, "width": 113, @@ -446,7 +446,7 @@ "id": "i.j.l", "type": "", "pos": { - "x": 1087, + "x": 1086, "y": 1451 }, "width": 109, @@ -486,8 +486,8 @@ "id": "i.m", "type": "", "pos": { - "x": 740, - "y": 1774 + "x": 739, + "y": 1773 }, "width": 117, "height": 126, @@ -526,7 +526,7 @@ "id": "i.n", "type": "", "pos": { - "x": 877, + "x": 876, "y": 1832 }, "width": 113, @@ -566,7 +566,7 @@ "id": "i.o", "type": "", "pos": { - "x": 1010, + "x": 1009, "y": 1682 }, "width": 263, @@ -606,7 +606,7 @@ "id": "i.o.p", "type": "", "pos": { - "x": 1085, + "x": 1084, "y": 1757 }, "width": 113, @@ -887,7 +887,7 @@ "type": "", "pos": { "x": 710, - "y": 687 + "y": 686 }, "width": 118, "height": 126, @@ -926,7 +926,7 @@ "id": "r.s.x", "type": "", "pos": { - "x": 694, + "x": 693, "y": 463 }, "width": 113, @@ -966,7 +966,7 @@ "id": "r.s.y", "type": "", "pos": { - "x": 827, + "x": 826, "y": 463 }, "width": 114, @@ -1046,7 +1046,7 @@ "id": "r.aa", "type": "", "pos": { - "x": 262, + "x": 261, "y": 237 }, "width": 122, @@ -1086,7 +1086,7 @@ "id": "r.bb", "type": "", "pos": { - "x": 404, + "x": 403, "y": 87 }, "width": 415, @@ -1126,7 +1126,7 @@ "id": "r.bb.cc", "type": "", "pos": { - "x": 479, + "x": 478, "y": 162 }, "width": 121, @@ -1166,7 +1166,7 @@ "id": "r.bb.dd", "type": "", "pos": { - "x": 620, + "x": 619, "y": 162 }, "width": 124, @@ -1246,7 +1246,7 @@ "id": "r.ff", "type": "", "pos": { - "x": 1036, + "x": 1035, "y": 388 }, "width": 117, @@ -1350,19 +1350,19 @@ "labelPercentage": 0, "route": [ { - "x": 1010.5, + "x": 1010.25, "y": 1577 }, { - "x": 1010.5, + "x": 1010.25, "y": 1667 }, { - "x": 827.75, + "x": 827.5, "y": 1667 }, { - "x": 827.75, + "x": 827.5, "y": 1773.875 } ], @@ -1397,11 +1397,11 @@ "labelPercentage": 0, "route": [ { - "x": 1141.5, + "x": 1141.25, "y": 1577 }, { - "x": 1141.5, + "x": 1141.25, "y": 1757 } ], diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index c8f91e3ba..f1dae3dd3 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -18,7 +18,7 @@ width="1694" height="2708" viewBox="-88 -88 1694 2708">abcdefghiqrjmnoszaabbeeffggklptuwxyccddv +abcdefghiqrjmnoszaabbeeffggklptuwxyccddv mixed togethersugarsolution we get +mixed togethersugarsolution we get

Markdown: Syntax

-
ab +ab

code

-
ab +

code

+
ab abcdefghijklmnopqrstuvw - +abcdefghijklmnopqrstuvw + abcdefghijklmnopqrstu +abcdefghijklmnopqrstu Foo Baz12hello - +Foo Baz12hello + acdefgbh +acdefgbh topabcbottomstartend - +topabcbottomstartend + rootcontainerrootleftrightrootinnerrootinnerleftrightleftright to inner leftto inner rightto inner leftto inner rightto left container rootto right container root +rootcontainerrootleftrightrootinnerrootinnerleftrightleftright to inner leftto inner rightto inner leftto inner rightto left container rootto right container root diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json index df945bd32..f04cb489d 100644 --- a/e2etests/testdata/stable/pre/elk/board.exp.json +++ b/e2etests/testdata/stable/pre/elk/board.exp.json @@ -45,7 +45,7 @@ "id": "a", "type": "", "pos": { - "x": 257, + "x": 256, "y": 12 }, "width": 113, @@ -85,7 +85,7 @@ "id": "b", "type": "", "pos": { - "x": 257, + "x": 256, "y": 508 }, "width": 113, diff --git a/e2etests/testdata/stable/pre/elk/sketch.exp.svg b/e2etests/testdata/stable/pre/elk/sketch.exp.svg index 440472676..2d38f4dc0 100644 --- a/e2etests/testdata/stable/pre/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/pre/elk/sketch.exp.svg @@ -781,7 +781,7 @@ end tell

A code block continues until it reaches a line that is not indented (or the end of the article).

-ab +ab xyz hello +xyz hello a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) +a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json index e1679a64f..dbcd20694 100644 --- a/e2etests/testdata/stable/square_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json @@ -46,7 +46,7 @@ "id": "square", "type": "rectangle", "pos": { - "x": 21, + "x": 20, "y": 238 }, "width": 154, diff --git a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg index 6c9a95e26..c052bafe0 100644 --- a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg @@ -20,9 +20,9 @@ width="371" height="580" viewBox="-88 -88 371 580"> -rectangle - -square +rectangle + +square AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND +AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one +eightsixteenthirty twosixty fourninety nine twelvetwenty fourforty eighteighty one