diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index 55bc62b14..24a0d0edd 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -648,11 +648,9 @@ group: { }, { name: "ampersand-escape", - script: `h&y: &∈ { + script: `hy: &∈ { tooltip: beans & rice } -&foo -&&bar `, }, { diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json index 924c38e6b..f5f27d395 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json +++ b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json @@ -4,7 +4,7 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "h&y", + "id": "hy", "type": "rectangle", "pos": { "x": 0, @@ -43,88 +43,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 - }, - { - "id": "foo", - "type": "rectangle", - "pos": { - "x": 158, - "y": 0 - }, - "width": 69, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "foo", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 24, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, - { - "id": "\"&bar\"", - "type": "rectangle", - "pos": { - "x": 287, - "y": 0 - }, - "width": 81, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "&bar", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 36, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 } ], "connections": [], diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg index 34b6f853f..8f189785c 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -&∈beans & ricefoo&barbeans & rice + .d2-1658760307 .fill-N1{fill:#0A0F25;} + .d2-1658760307 .fill-N2{fill:#676C7E;} + .d2-1658760307 .fill-N3{fill:#9499AB;} + .d2-1658760307 .fill-N4{fill:#CFD2DD;} + .d2-1658760307 .fill-N5{fill:#DEE1EB;} + .d2-1658760307 .fill-N6{fill:#EEF1F8;} + .d2-1658760307 .fill-N7{fill:#FFFFFF;} + .d2-1658760307 .fill-B1{fill:#0D32B2;} + .d2-1658760307 .fill-B2{fill:#0D32B2;} + .d2-1658760307 .fill-B3{fill:#E3E9FD;} + .d2-1658760307 .fill-B4{fill:#E3E9FD;} + .d2-1658760307 .fill-B5{fill:#EDF0FD;} + .d2-1658760307 .fill-B6{fill:#F7F8FE;} + .d2-1658760307 .fill-AA2{fill:#4A6FF3;} + .d2-1658760307 .fill-AA4{fill:#EDF0FD;} + .d2-1658760307 .fill-AA5{fill:#F7F8FE;} + .d2-1658760307 .fill-AB4{fill:#EDF0FD;} + .d2-1658760307 .fill-AB5{fill:#F7F8FE;} + .d2-1658760307 .stroke-N1{stroke:#0A0F25;} + .d2-1658760307 .stroke-N2{stroke:#676C7E;} + .d2-1658760307 .stroke-N3{stroke:#9499AB;} + .d2-1658760307 .stroke-N4{stroke:#CFD2DD;} + .d2-1658760307 .stroke-N5{stroke:#DEE1EB;} + .d2-1658760307 .stroke-N6{stroke:#EEF1F8;} + .d2-1658760307 .stroke-N7{stroke:#FFFFFF;} + .d2-1658760307 .stroke-B1{stroke:#0D32B2;} + .d2-1658760307 .stroke-B2{stroke:#0D32B2;} + .d2-1658760307 .stroke-B3{stroke:#E3E9FD;} + .d2-1658760307 .stroke-B4{stroke:#E3E9FD;} + .d2-1658760307 .stroke-B5{stroke:#EDF0FD;} + .d2-1658760307 .stroke-B6{stroke:#F7F8FE;} + .d2-1658760307 .stroke-AA2{stroke:#4A6FF3;} + .d2-1658760307 .stroke-AA4{stroke:#EDF0FD;} + .d2-1658760307 .stroke-AA5{stroke:#F7F8FE;} + .d2-1658760307 .stroke-AB4{stroke:#EDF0FD;} + .d2-1658760307 .stroke-AB5{stroke:#F7F8FE;} + .d2-1658760307 .background-color-N1{background-color:#0A0F25;} + .d2-1658760307 .background-color-N2{background-color:#676C7E;} + .d2-1658760307 .background-color-N3{background-color:#9499AB;} + .d2-1658760307 .background-color-N4{background-color:#CFD2DD;} + .d2-1658760307 .background-color-N5{background-color:#DEE1EB;} + .d2-1658760307 .background-color-N6{background-color:#EEF1F8;} + .d2-1658760307 .background-color-N7{background-color:#FFFFFF;} + .d2-1658760307 .background-color-B1{background-color:#0D32B2;} + .d2-1658760307 .background-color-B2{background-color:#0D32B2;} + .d2-1658760307 .background-color-B3{background-color:#E3E9FD;} + .d2-1658760307 .background-color-B4{background-color:#E3E9FD;} + .d2-1658760307 .background-color-B5{background-color:#EDF0FD;} + .d2-1658760307 .background-color-B6{background-color:#F7F8FE;} + .d2-1658760307 .background-color-AA2{background-color:#4A6FF3;} + .d2-1658760307 .background-color-AA4{background-color:#EDF0FD;} + .d2-1658760307 .background-color-AA5{background-color:#F7F8FE;} + .d2-1658760307 .background-color-AB4{background-color:#EDF0FD;} + .d2-1658760307 .background-color-AB5{background-color:#F7F8FE;} + .d2-1658760307 .color-N1{color:#0A0F25;} + .d2-1658760307 .color-N2{color:#676C7E;} + .d2-1658760307 .color-N3{color:#9499AB;} + .d2-1658760307 .color-N4{color:#CFD2DD;} + .d2-1658760307 .color-N5{color:#DEE1EB;} + .d2-1658760307 .color-N6{color:#EEF1F8;} + .d2-1658760307 .color-N7{color:#FFFFFF;} + .d2-1658760307 .color-B1{color:#0D32B2;} + .d2-1658760307 .color-B2{color:#0D32B2;} + .d2-1658760307 .color-B3{color:#E3E9FD;} + .d2-1658760307 .color-B4{color:#E3E9FD;} + .d2-1658760307 .color-B5{color:#EDF0FD;} + .d2-1658760307 .color-B6{color:#F7F8FE;} + .d2-1658760307 .color-AA2{color:#4A6FF3;} + .d2-1658760307 .color-AA4{color:#EDF0FD;} + .d2-1658760307 .color-AA5{color:#F7F8FE;} + .d2-1658760307 .color-AB4{color:#EDF0FD;} + .d2-1658760307 .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}]]>&∈beans & ricebeans & rice @@ -105,9 +105,7 @@ - - + + - - \ No newline at end of file diff --git a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json index 29afa3817..c135331d8 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json +++ b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json @@ -4,7 +4,7 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "h&y", + "id": "hy", "type": "rectangle", "pos": { "x": 12, @@ -43,88 +43,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 - }, - { - "id": "foo", - "type": "rectangle", - "pos": { - "x": 130, - "y": 12 - }, - "width": 69, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "foo", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 24, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, - { - "id": "\"&bar\"", - "type": "rectangle", - "pos": { - "x": 219, - "y": 12 - }, - "width": 81, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "stroke": "B1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "&bar", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 36, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 } ], "connections": [], diff --git a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg index 90424ee6b..eff889432 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -&∈beans & ricefoo&barbeans & rice + .d2-616571211 .fill-N1{fill:#0A0F25;} + .d2-616571211 .fill-N2{fill:#676C7E;} + .d2-616571211 .fill-N3{fill:#9499AB;} + .d2-616571211 .fill-N4{fill:#CFD2DD;} + .d2-616571211 .fill-N5{fill:#DEE1EB;} + .d2-616571211 .fill-N6{fill:#EEF1F8;} + .d2-616571211 .fill-N7{fill:#FFFFFF;} + .d2-616571211 .fill-B1{fill:#0D32B2;} + .d2-616571211 .fill-B2{fill:#0D32B2;} + .d2-616571211 .fill-B3{fill:#E3E9FD;} + .d2-616571211 .fill-B4{fill:#E3E9FD;} + .d2-616571211 .fill-B5{fill:#EDF0FD;} + .d2-616571211 .fill-B6{fill:#F7F8FE;} + .d2-616571211 .fill-AA2{fill:#4A6FF3;} + .d2-616571211 .fill-AA4{fill:#EDF0FD;} + .d2-616571211 .fill-AA5{fill:#F7F8FE;} + .d2-616571211 .fill-AB4{fill:#EDF0FD;} + .d2-616571211 .fill-AB5{fill:#F7F8FE;} + .d2-616571211 .stroke-N1{stroke:#0A0F25;} + .d2-616571211 .stroke-N2{stroke:#676C7E;} + .d2-616571211 .stroke-N3{stroke:#9499AB;} + .d2-616571211 .stroke-N4{stroke:#CFD2DD;} + .d2-616571211 .stroke-N5{stroke:#DEE1EB;} + .d2-616571211 .stroke-N6{stroke:#EEF1F8;} + .d2-616571211 .stroke-N7{stroke:#FFFFFF;} + .d2-616571211 .stroke-B1{stroke:#0D32B2;} + .d2-616571211 .stroke-B2{stroke:#0D32B2;} + .d2-616571211 .stroke-B3{stroke:#E3E9FD;} + .d2-616571211 .stroke-B4{stroke:#E3E9FD;} + .d2-616571211 .stroke-B5{stroke:#EDF0FD;} + .d2-616571211 .stroke-B6{stroke:#F7F8FE;} + .d2-616571211 .stroke-AA2{stroke:#4A6FF3;} + .d2-616571211 .stroke-AA4{stroke:#EDF0FD;} + .d2-616571211 .stroke-AA5{stroke:#F7F8FE;} + .d2-616571211 .stroke-AB4{stroke:#EDF0FD;} + .d2-616571211 .stroke-AB5{stroke:#F7F8FE;} + .d2-616571211 .background-color-N1{background-color:#0A0F25;} + .d2-616571211 .background-color-N2{background-color:#676C7E;} + .d2-616571211 .background-color-N3{background-color:#9499AB;} + .d2-616571211 .background-color-N4{background-color:#CFD2DD;} + .d2-616571211 .background-color-N5{background-color:#DEE1EB;} + .d2-616571211 .background-color-N6{background-color:#EEF1F8;} + .d2-616571211 .background-color-N7{background-color:#FFFFFF;} + .d2-616571211 .background-color-B1{background-color:#0D32B2;} + .d2-616571211 .background-color-B2{background-color:#0D32B2;} + .d2-616571211 .background-color-B3{background-color:#E3E9FD;} + .d2-616571211 .background-color-B4{background-color:#E3E9FD;} + .d2-616571211 .background-color-B5{background-color:#EDF0FD;} + .d2-616571211 .background-color-B6{background-color:#F7F8FE;} + .d2-616571211 .background-color-AA2{background-color:#4A6FF3;} + .d2-616571211 .background-color-AA4{background-color:#EDF0FD;} + .d2-616571211 .background-color-AA5{background-color:#F7F8FE;} + .d2-616571211 .background-color-AB4{background-color:#EDF0FD;} + .d2-616571211 .background-color-AB5{background-color:#F7F8FE;} + .d2-616571211 .color-N1{color:#0A0F25;} + .d2-616571211 .color-N2{color:#676C7E;} + .d2-616571211 .color-N3{color:#9499AB;} + .d2-616571211 .color-N4{color:#CFD2DD;} + .d2-616571211 .color-N5{color:#DEE1EB;} + .d2-616571211 .color-N6{color:#EEF1F8;} + .d2-616571211 .color-N7{color:#FFFFFF;} + .d2-616571211 .color-B1{color:#0D32B2;} + .d2-616571211 .color-B2{color:#0D32B2;} + .d2-616571211 .color-B3{color:#E3E9FD;} + .d2-616571211 .color-B4{color:#E3E9FD;} + .d2-616571211 .color-B5{color:#EDF0FD;} + .d2-616571211 .color-B6{color:#F7F8FE;} + .d2-616571211 .color-AA2{color:#4A6FF3;} + .d2-616571211 .color-AA4{color:#EDF0FD;} + .d2-616571211 .color-AA5{color:#F7F8FE;} + .d2-616571211 .color-AB4{color:#EDF0FD;} + .d2-616571211 .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}]]>&∈beans & ricebeans & rice @@ -105,9 +105,7 @@ - - + + - - \ No newline at end of file