diff --git a/e2etests/testdata/txtar/c4-person-label/dagre/board.exp.json b/e2etests/testdata/txtar/c4-person-label/dagre/board.exp.json new file mode 100644 index 000000000..cfb656f9b --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/dagre/board.exp.json @@ -0,0 +1,183 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "c4mdperson", + "type": "c4-person", + "pos": { + "x": 0, + "y": 0 + }, + "width": 422, + "height": 506, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson2", + "type": "c4-person", + "pos": { + "x": 482, + "y": 0 + }, + "width": 422, + "height": 506, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson3", + "type": "c4-person", + "pos": { + "x": 964, + "y": 0 + }, + "width": 422, + "height": 506, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-person-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-label/dagre/sketch.exp.svg new file mode 100644 index 000000000..0acadd4be --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/dagre/sketch.exp.svg @@ -0,0 +1,846 @@ +

Personal Banking Customer

+

[person]

+

A customer of the bank, with personal bank accounts

+

Personal Banking Customer

+

[person]

+

A customer of the bank, with personal bank accounts

+

Personal Banking Customer

+

[person]

+

A customer of the bank, with personal bank accounts

+
 + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-person-label/elk/board.exp.json b/e2etests/testdata/txtar/c4-person-label/elk/board.exp.json new file mode 100644 index 000000000..1767158d2 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/elk/board.exp.json @@ -0,0 +1,183 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "c4mdperson", + "type": "c4-person", + "pos": { + "x": 12, + "y": 12 + }, + "width": 422, + "height": 506, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson2", + "type": "c4-person", + "pos": { + "x": 454, + "y": 12 + }, + "width": 422, + "height": 506, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson3", + "type": "c4-person", + "pos": { + "x": 896, + "y": 12 + }, + "width": 422, + "height": 506, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-person-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-label/elk/sketch.exp.svg new file mode 100644 index 000000000..cef62e084 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/elk/sketch.exp.svg @@ -0,0 +1,846 @@ +

Personal Banking Customer

+

[person]

+

A customer of the bank, with personal bank accounts

+

Personal Banking Customer

+

[person]

+

A customer of the bank, with personal bank accounts

+

Personal Banking Customer

+

[person]

+

A customer of the bank, with personal bank accounts

+
 + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-person-shape/dagre/board.exp.json b/e2etests/testdata/txtar/c4-person-shape/dagre/board.exp.json index eb7cde4fb..7fa64364e 100644 --- a/e2etests/testdata/txtar/c4-person-shape/dagre/board.exp.json +++ b/e2etests/testdata/txtar/c4-person-shape/dagre/board.exp.json @@ -16,10 +16,10 @@ "type": "c4-person", "pos": { "x": 0, - "y": 612 + "y": 577 }, - "width": 390, - "height": 468, + "width": 347, + "height": 416, "opacity": 1, "strokeDash": 0, "strokeWidth": 1, @@ -57,11 +57,11 @@ "id": "c4person", "type": "c4-person", "pos": { - "x": 286, + "x": 263, "y": 0 }, - "width": 169, - "height": 203, + "width": 150, + "height": 180, "opacity": 1, "strokeDash": 0, "strokeWidth": 1, @@ -99,8 +99,8 @@ "id": "regular_person", "type": "person", "pos": { - "x": 128, - "y": 399 + "x": 107, + "y": 370 }, "width": 134, "height": 89, @@ -141,11 +141,11 @@ "id": "styling", "type": "rectangle", "pos": { - "x": 440, - "y": 344 + "x": 397, + "y": 321 }, "width": 210, - "height": 622, + "height": 584, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -183,11 +183,11 @@ "id": "styling.c4styled", "type": "c4-person", "pos": { - "x": 492, - "y": 374 + "x": 455, + "y": 351 }, - "width": 107, - "height": 138, + "width": 95, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 1, @@ -225,8 +225,8 @@ "id": "styling.c4sized", "type": "c4-person", "pos": { - "x": 470, - "y": 756 + "x": 427, + "y": 695 }, "width": 150, "height": 180, @@ -291,20 +291,20 @@ "link": "", "route": [ { - "x": 195, - "y": 514 + "x": 173.5, + "y": 485 }, { - "x": 195, - "y": 552.4000244140625 + "x": 173.5, + "y": 518.5999755859375 }, { - "x": 195, - "y": 571.5999755859375 + "x": 173.60000610351562, + "y": 536.7999877929688 }, { - "x": 195, - "y": 610 + "x": 174, + "y": 576 } ], "isCurve": true, @@ -339,20 +339,20 @@ "link": "", "route": [ { - "x": 287, - "y": 179 + "x": 264, + "y": 157 }, { - "x": 213.3990020751953, - "y": 246.60000610351562 + "x": 191.60000610351562, + "y": 223.8000030517578 }, { - "x": 195, - "y": 339 + "x": 173.60000610351562, + "y": 314.79998779296875 }, { - "x": 195, - "y": 399 + "x": 174, + "y": 370 } ], "isCurve": true, @@ -387,20 +387,20 @@ "link": "", "route": [ { - "x": 455, - "y": 180 + "x": 413, + "y": 158 }, { - "x": 527, - "y": 246.8000030517578 + "x": 484.20001220703125, + "y": 224 }, { - "x": 545, - "y": 334.20001220703125 + "x": 502, + "y": 311.3999938964844 }, { - "x": 545, - "y": 375 + "x": 502, + "y": 353 } ], "isCurve": true, @@ -435,20 +435,20 @@ "link": "", "route": [ { - "x": 545, - "y": 512 + "x": 502, + "y": 477 }, { - "x": 545, - "y": 552 + "x": 502, + "y": 517 }, { - "x": 545, - "y": 600.5999755859375 + "x": 502, + "y": 560.4000244140625 }, { - "x": 545, - "y": 755 + "x": 502, + "y": 694 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/c4-person-shape/dagre/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-shape/dagre/sketch.exp.svg index 4965fde2b..735587575 100644 --- a/e2etests/testdata/txtar/c4-person-shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/c4-person-shape/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

Personal Banking Customer

+

Personal Banking Customer

[person]

A customer of the bank, with
personal bank accounts

-
C4 Style PersonStandard Personstylingc4styledCustom Size Compare shapes - - - - - - - - +
C4 Style PersonStandard Personstylingc4styledCustom Size Compare shapes + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-person-shape/elk/board.exp.json b/e2etests/testdata/txtar/c4-person-shape/elk/board.exp.json index 7c12572db..9fea05c01 100644 --- a/e2etests/testdata/txtar/c4-person-shape/elk/board.exp.json +++ b/e2etests/testdata/txtar/c4-person-shape/elk/board.exp.json @@ -16,10 +16,10 @@ "type": "c4-person", "pos": { "x": 12, - "y": 1043 + "y": 1008 }, - "width": 390, - "height": 468, + "width": 347, + "height": 416, "opacity": 1, "strokeDash": 0, "strokeWidth": 1, @@ -57,11 +57,11 @@ "id": "c4person", "type": "c4-person", "pos": { - "x": 223, + "x": 211, "y": 12 }, - "width": 169, - "height": 203, + "width": 150, + "height": 180, "opacity": 1, "strokeDash": 0, "strokeWidth": 1, @@ -99,8 +99,8 @@ "id": "regular_person", "type": "person", "pos": { - "x": 140, - "y": 858 + "x": 118, + "y": 823 }, "width": 134, "height": 89, @@ -141,11 +141,11 @@ "id": "styling", "type": "rectangle", "pos": { - "x": 283, - "y": 300 + "x": 262, + "y": 277 }, "width": 250, - "height": 488, + "height": 476, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -183,11 +183,11 @@ "id": "styling.c4styled", "type": "c4-person", "pos": { - "x": 355, - "y": 350 + "x": 339, + "y": 327 }, - "width": 107, - "height": 138, + "width": 95, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 1, @@ -225,8 +225,8 @@ "id": "styling.c4sized", "type": "c4-person", "pos": { - "x": 333, - "y": 558 + "x": 312, + "y": 523 }, "width": 150, "height": 180, @@ -291,12 +291,12 @@ "link": "", "route": [ { - "x": 207, - "y": 973 + "x": 185.5, + "y": 938 }, { - "x": 207, - "y": 1041 + "x": 186, + "y": 1007 } ], "animated": false, @@ -330,20 +330,20 @@ "link": "", "route": [ { - "x": 280, - "y": 216 + "x": 261, + "y": 192 }, { - "x": 279.5830078125, - "y": 255 + "x": 261.25, + "y": 232 }, { - "x": 207, - "y": 255 + "x": 185.5, + "y": 232 }, { - "x": 207, - "y": 858 + "x": 186, + "y": 823 } ], "animated": false, @@ -377,20 +377,20 @@ "link": "", "route": [ { - "x": 336, - "y": 216 + "x": 311, + "y": 192 }, { - "x": 335.9159851074219, - "y": 255 + "x": 311.25, + "y": 232 }, { - "x": 408.5, - "y": 255 + "x": 387, + "y": 232 }, { - "x": 409, - "y": 351 + "x": 387, + "y": 329 } ], "animated": false, @@ -424,12 +424,12 @@ "link": "", "route": [ { - "x": 408, - "y": 488 + "x": 387, + "y": 453 }, { - "x": 409, - "y": 557 + "x": 387, + "y": 522 } ], "animated": false, diff --git a/e2etests/testdata/txtar/c4-person-shape/elk/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-shape/elk/sketch.exp.svg index 08e6f0148..7b2a78932 100644 --- a/e2etests/testdata/txtar/c4-person-shape/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/c4-person-shape/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

Personal Banking Customer

+

Personal Banking Customer

[person]

A customer of the bank, with
personal bank accounts

-
C4 Style PersonStandard Personstylingc4styledCustom Size Compare shapes - - - - - - - - +
C4 Style PersonStandard Personstylingc4styledCustom Size Compare shapes + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-theme/dagre/board.exp.json b/e2etests/testdata/txtar/c4-theme/dagre/board.exp.json index 372879a1c..afe425343 100644 --- a/e2etests/testdata/txtar/c4-theme/dagre/board.exp.json +++ b/e2etests/testdata/txtar/c4-theme/dagre/board.exp.json @@ -15,11 +15,11 @@ "id": "customer", "type": "c4-person", "pos": { - "x": 1057, + "x": 1083, "y": 0 }, - "width": 479, - "height": 575, + "width": 426, + "height": 511, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -58,7 +58,7 @@ "type": "rectangle", "pos": { "x": 147, - "y": 732 + "y": 668 }, "width": 2407, "height": 915, @@ -100,7 +100,7 @@ "type": "rectangle", "pos": { "x": 177, - "y": 762 + "y": 698 }, "width": 550, "height": 164, @@ -142,7 +142,7 @@ "type": "rectangle", "pos": { "x": 390, - "y": 1047 + "y": 983 }, "width": 609, "height": 164, @@ -184,7 +184,7 @@ "type": "rectangle", "pos": { "x": 1123, - "y": 1047 + "y": 983 }, "width": 707, "height": 164, @@ -226,7 +226,7 @@ "type": "rectangle", "pos": { "x": 1246, - "y": 1348 + "y": 1284 }, "width": 461, "height": 164, @@ -268,7 +268,7 @@ "type": "rectangle", "pos": { "x": 1890, - "y": 1047 + "y": 983 }, "width": 634, "height": 164, @@ -310,7 +310,7 @@ "type": "rectangle", "pos": { "x": 2410, - "y": 1784 + "y": 1720 }, "width": 360, "height": 164, @@ -352,7 +352,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 1784 + "y": 1720 }, "width": 629, "height": 164, @@ -417,20 +417,20 @@ "link": "", "route": [ { - "x": 1057, - "y": 388 + "x": 1083, + "y": 337 }, { - "x": 573, - "y": 592.4000244140625 + "x": 578.2000122070312, + "y": 531 }, { "x": 452, - "y": 722 + "y": 658 }, { "x": 452, - "y": 762 + "y": 698 } ], "isCurve": true, @@ -466,19 +466,19 @@ "route": [ { "x": 452, - "y": 925.5 + "y": 861.5 }, { "x": 452, - "y": 974.2999877929688 + "y": 910.2999877929688 }, { "x": 472.3999938964844, - "y": 998.7000122070312 + "y": 934.7000122070312 }, { "x": 554, - "y": 1047.5 + "y": 983.5 } ], "isCurve": true, @@ -513,44 +513,44 @@ "link": "", "route": [ { - "x": 1063, - "y": 519 + "x": 1084, + "y": 447 }, { - "x": 962.2000122070312, - "y": 618.5999755859375 + "x": 966.4000244140625, + "y": 553 }, { "x": 937, - "y": 657.2000122070312 + "y": 593.2000122070312 }, { "x": 937, - "y": 677.75 + "y": 613.75 }, { "x": 937, - "y": 698.2999877929688 + "y": 634.2999877929688 }, { "x": 937, - "y": 738.4000244140625 + "y": 674.4000244140625 }, { "x": 937, - "y": 778 + "y": 714 }, { "x": 937, - "y": 817.5999755859375 + "y": 753.5999755859375 }, { "x": 916.5999755859375, - "y": 998.7000122070312 + "y": 934.7000122070312 }, { "x": 835, - "y": 1047.5 + "y": 983.5 } ], "isCurve": true, @@ -585,44 +585,44 @@ "link": "", "route": [ { - "x": 1442, - "y": 576 + "x": 1439, + "y": 512 }, { - "x": 1469.199951171875, - "y": 630 + "x": 1468.5999755859375, + "y": 566 }, { "x": 1476, - "y": 657.2000122070312 + "y": 593.2000122070312 }, { "x": 1476, - "y": 677.75 + "y": 613.75 }, { "x": 1476, - "y": 698.2999877929688 + "y": 634.2999877929688 }, { "x": 1476, - "y": 738.4000244140625 + "y": 674.4000244140625 }, { "x": 1476, - "y": 778 + "y": 714 }, { "x": 1476, - "y": 817.5999755859375 + "y": 753.5999755859375 }, { "x": 1476, - "y": 998.7000122070312 + "y": 934.7000122070312 }, { "x": 1476, - "y": 1047.5 + "y": 983.5 } ], "isCurve": true, @@ -658,19 +658,19 @@ "route": [ { "x": 694.5, - "y": 1210.5 + "y": 1146.5 }, { "x": 694.5, - "y": 1265.699951171875 + "y": 1201.699951171875 }, { "x": 804.7000122070312, - "y": 1300.7220458984375 + "y": 1236.7220458984375 }, { "x": 1245.5, - "y": 1385.6099853515625 + "y": 1321.6099853515625 } ], "isCurve": true, @@ -706,19 +706,19 @@ "route": [ { "x": 1476, - "y": 1210.5 + "y": 1146.5 }, { "x": 1476, - "y": 1265.699951171875 + "y": 1201.699951171875 }, { "x": 1476, - "y": 1293.300048828125 + "y": 1229.300048828125 }, { "x": 1476, - "y": 1348.5 + "y": 1284.5 } ], "isCurve": true, @@ -754,19 +754,19 @@ "route": [ { "x": 1245.5, - "y": 1456.1949462890625 + "y": 1392.1949462890625 }, { "x": 500.6990051269531, - "y": 1608.8389892578125 + "y": 1544.8389892578125 }, { "x": 314.5, - "y": 1729.300048828125 + "y": 1665.300048828125 }, { "x": 314.5, - "y": 1784.5 + "y": 1720.5 } ], "isCurve": true, @@ -801,104 +801,104 @@ "link": "", "route": [ { - "x": 1536, - "y": 351 + "x": 1510, + "y": 307 }, { - "x": 2416.800048828125, - "y": 585 + "x": 2411.60009765625, + "y": 525 }, { "x": 2637, - "y": 657.2000122070312 + "y": 593.2000122070312 }, { "x": 2637, - "y": 677.75 + "y": 613.75 }, { "x": 2637, - "y": 698.2999877929688 + "y": 634.2999877929688 }, { "x": 2637, - "y": 738.4000244140625 + "y": 674.4000244140625 }, { "x": 2637, - "y": 778 + "y": 714 }, { "x": 2637, - "y": 817.5999755859375 + "y": 753.5999755859375 }, { "x": 2637, - "y": 872.5 + "y": 808.5 }, { "x": 2637, - "y": 915.25 + "y": 851.25 }, { "x": 2637, - "y": 958 + "y": 894 }, { "x": 2637, - "y": 1015 + "y": 951 }, { "x": 2637, - "y": 1057.75 + "y": 993.75 }, { "x": 2637, - "y": 1100.5 + "y": 1036.5 }, { "x": 2637, - "y": 1159.0999755859375 + "y": 1095.0999755859375 }, { "x": 2637, - "y": 1204.25 + "y": 1140.25 }, { "x": 2637, - "y": 1249.4000244140625 + "y": 1185.4000244140625 }, { "x": 2637, - "y": 1309.5999755859375 + "y": 1245.5999755859375 }, { "x": 2637, - "y": 1354.75 + "y": 1290.75 }, { "x": 2637, - "y": 1399.9000244140625 + "y": 1335.9000244140625 }, { "x": 2637, - "y": 1473.4000244140625 + "y": 1409.4000244140625 }, { "x": 2637, - "y": 1538.5 + "y": 1474.5 }, { "x": 2637, - "y": 1603.5999755859375 + "y": 1539.5999755859375 }, { "x": 2632.800048828125, - "y": 1729.300048828125 + "y": 1665.300048828125 }, { "x": 2616, - "y": 1784.5 + "y": 1720.5 } ], "isCurve": true, @@ -934,19 +934,19 @@ "route": [ { "x": 1707.5, - "y": 1463.843994140625 + "y": 1399.843994140625 }, { "x": 2241.5, - "y": 1610.3680419921875 + "y": 1546.3680419921875 }, { "x": 2394.39990234375, - "y": 1729.300048828125 + "y": 1665.300048828125 }, { "x": 2472, - "y": 1784.5 + "y": 1720.5 } ], "isCurve": true, @@ -982,19 +982,19 @@ "route": [ { "x": 2206.5, - "y": 1210.5 + "y": 1146.5 }, { "x": 2206.5, - "y": 1265.699951171875 + "y": 1201.699951171875 }, { "x": 2106.5, - "y": 1300.0999755859375 + "y": 1236.0999755859375 }, { "x": 1706.5, - "y": 1382.5 + "y": 1318.5 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/c4-theme/dagre/sketch.exp.svg b/e2etests/testdata/txtar/c4-theme/dagre/sketch.exp.svg index 48ce9e34b..7edf6d842 100644 --- a/e2etests/testdata/txtar/c4-theme/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/c4-theme/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

Personal Banking Customer

+

Personal Banking Customer

[person]

A customer of the bank, with personal bank accounts.

-

Internet Banking System

+

Internet Banking System

[Software System]

-

E-mail System

+

E-mail System

[Software System]

The internal Microsoft Exchange e-mail system.

-

Mainframe Banking System

+

Mainframe Banking System

[Software System]

Stores all of the core banking information about customers, accounts, transactions, etc.

-

Web Application

+

Web Application

[Container: Java and Spring MVC]

Delivers the static content and the Internet banking single page application.

-

Single-Page Application

+

Single-Page Application

[Container: JavaScript and Angular]

Provides all of the Internet banking functionality to customers via their web browser.

-

Mobile App

+

Mobile App

[Container: Xamarin]

Provides a limited subset of the Internet banking functionality to customers via their mobile device.

-

API Application

+

API Application

[Container: Java and Spring MVC]

Provides Internet banking functionality via a JSON/HTTPS API.

-

Database

+

Database

[Container: Oracle Database Schema]

Stores user registration information, hashed authentication credentials, access logs, etc.

-
 Visits bigbank.com/ib using[HTTPS]Delivers to the customer's web browserViews account balances, and makes payments usingViews account balances, and makes payments usingMakes API calls to[JSON/HTTPS]Makes API calls to[JSON/HTTPS]Makes API calls to[XML/HTTPS]Sends e-mails toSends e-mail using Reads from and writes to[SQL/TCP] - - - - - - - - - - - - - - - - - - - - +
 Visits bigbank.com/ib using[HTTPS]Delivers to the customer's web browserViews account balances, and makes payments usingViews account balances, and makes payments usingMakes API calls to[JSON/HTTPS]Makes API calls to[JSON/HTTPS]Makes API calls to[XML/HTTPS]Sends e-mails toSends e-mail using Reads from and writes to[SQL/TCP] + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-theme/elk/board.exp.json b/e2etests/testdata/txtar/c4-theme/elk/board.exp.json index 1753ba0a8..1e4e527d0 100644 --- a/e2etests/testdata/txtar/c4-theme/elk/board.exp.json +++ b/e2etests/testdata/txtar/c4-theme/elk/board.exp.json @@ -15,11 +15,11 @@ "id": "customer", "type": "c4-person", "pos": { - "x": 672, + "x": 699, "y": 12 }, - "width": 479, - "height": 575, + "width": 426, + "height": 511, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -58,7 +58,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 839 + "y": 775 }, "width": 2218, "height": 1035, @@ -100,7 +100,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 889 + "y": 825 }, "width": 550, "height": 164, @@ -142,7 +142,7 @@ "type": "rectangle", "pos": { "x": 190, - "y": 1224 + "y": 1160 }, "width": 609, "height": 164, @@ -184,7 +184,7 @@ "type": "rectangle", "pos": { "x": 819, - "y": 1224 + "y": 1160 }, "width": 707, "height": 164, @@ -226,7 +226,7 @@ "type": "rectangle", "pos": { "x": 942, - "y": 1575 + "y": 1511 }, "width": 461, "height": 164, @@ -268,7 +268,7 @@ "type": "rectangle", "pos": { "x": 1546, - "y": 1224 + "y": 1160 }, "width": 634, "height": 164, @@ -310,7 +310,7 @@ "type": "rectangle", "pos": { "x": 1746, - "y": 2076 + "y": 2012 }, "width": 360, "height": 164, @@ -352,7 +352,7 @@ "type": "rectangle", "pos": { "x": 781, - "y": 2076 + "y": 2012 }, "width": 629, "height": 164, @@ -417,20 +417,20 @@ "link": "", "route": [ { - "x": 769, - "y": 588 + "x": 784, + "y": 524 }, { - "x": 768.5499877929688, - "y": 627 + "x": 784.4500122070312, + "y": 563 }, { "x": 359.25, - "y": 627 + "y": 563 }, { "x": 359.25, - "y": 889 + "y": 825 } ], "animated": false, @@ -465,11 +465,11 @@ "route": [ { "x": 393, - "y": 1053 + "y": 989 }, { "x": 393, - "y": 1224 + "y": 1160 } ], "animated": false, @@ -503,20 +503,20 @@ "link": "", "route": [ { - "x": 864, - "y": 588 + "x": 870, + "y": 524 }, { - "x": 864.3499755859375, - "y": 677 + "x": 869.6500244140625, + "y": 613 }, { "x": 652, - "y": 677 + "y": 613 }, { "x": 652, - "y": 1224 + "y": 1160 } ], "animated": false, @@ -550,12 +550,12 @@ "link": "", "route": [ { - "x": 960, - "y": 588 + "x": 955, + "y": 524 }, { - "x": 960.1500244140625, - "y": 1224 + "x": 954.8499755859375, + "y": 1160 } ], "animated": false, @@ -590,19 +590,19 @@ "route": [ { "x": 494.5, - "y": 1388 + "y": 1324 }, { "x": 494.5, - "y": 1535 + "y": 1471 }, { "x": 1057.25, - "y": 1535 + "y": 1471 }, { "x": 1057.25, - "y": 1575 + "y": 1511 } ], "animated": false, @@ -637,11 +637,11 @@ "route": [ { "x": 1172.5, - "y": 1388 + "y": 1324 }, { "x": 1172.5, - "y": 1575 + "y": 1511 } ], "animated": false, @@ -676,11 +676,11 @@ "route": [ { "x": 1095.666015625, - "y": 1739 + "y": 1675 }, { "x": 1095.666015625, - "y": 2076 + "y": 2012 } ], "animated": false, @@ -714,28 +714,28 @@ "link": "", "route": [ { - "x": 1056, - "y": 588 + "x": 1040, + "y": 524 }, { - "x": 1055.948974609375, - "y": 627 + "x": 1040.050048828125, + "y": 563 }, { "x": 2303.5, - "y": 627 + "y": 563 }, { "x": 2303.5, - "y": 2036 + "y": 1972 }, { "x": 1986.8330078125, - "y": 2036 + "y": 1972 }, { "x": 1986.8330078125, - "y": 2076 + "y": 2012 } ], "animated": false, @@ -770,19 +770,19 @@ "route": [ { "x": 1249.3330078125, - "y": 1739 + "y": 1675 }, { "x": 1249.3330078125, - "y": 2036 + "y": 1972 }, { "x": 1866.8330078125, - "y": 2036 + "y": 1972 }, { "x": 1866.8330078125, - "y": 2076 + "y": 2012 } ], "animated": false, @@ -817,19 +817,19 @@ "route": [ { "x": 1863, - "y": 1388 + "y": 1324 }, { "x": 1863, - "y": 1535 + "y": 1471 }, { "x": 1287.75, - "y": 1535 + "y": 1471 }, { "x": 1287.75, - "y": 1575 + "y": 1511 } ], "animated": false, diff --git a/e2etests/testdata/txtar/c4-theme/elk/sketch.exp.svg b/e2etests/testdata/txtar/c4-theme/elk/sketch.exp.svg index 66502edd6..03b3ce096 100644 --- a/e2etests/testdata/txtar/c4-theme/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/c4-theme/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

Personal Banking Customer

+

Personal Banking Customer

[person]

A customer of the bank, with personal bank accounts.

-

Internet Banking System

+

Internet Banking System

[Software System]

-

E-mail System

+

E-mail System

[Software System]

The internal Microsoft Exchange e-mail system.

-

Mainframe Banking System

+

Mainframe Banking System

[Software System]

Stores all of the core banking information about customers, accounts, transactions, etc.

-

Web Application

+

Web Application

[Container: Java and Spring MVC]

Delivers the static content and the Internet banking single page application.

-

Single-Page Application

+

Single-Page Application

[Container: JavaScript and Angular]

Provides all of the Internet banking functionality to customers via their web browser.

-

Mobile App

+

Mobile App

[Container: Xamarin]

Provides a limited subset of the Internet banking functionality to customers via their mobile device.

-

API Application

+

API Application

[Container: Java and Spring MVC]

Provides Internet banking functionality via a JSON/HTTPS API.

-

Database

+

Database

[Container: Oracle Database Schema]

Stores user registration information, hashed authentication credentials, access logs, etc.

-
 Visits bigbank.com/ib using[HTTPS]Delivers to the customer's web browserViews account balances, and makes payments usingViews account balances, and makes payments usingMakes API calls to[JSON/HTTPS]Makes API calls to[JSON/HTTPS]Makes API calls to[XML/HTTPS]Sends e-mails toSends e-mail using Reads from and writes to[SQL/TCP] - - - - - - - - - - - - - - - - - - - - +
 Visits bigbank.com/ib using[HTTPS]Delivers to the customer's web browserViews account balances, and makes payments usingViews account balances, and makes payments usingMakes API calls to[JSON/HTTPS]Makes API calls to[JSON/HTTPS]Makes API calls to[XML/HTTPS]Sends e-mails toSends e-mail using Reads from and writes to[SQL/TCP] + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/small-c4-person/dagre/board.exp.json b/e2etests/testdata/txtar/small-c4-person/dagre/board.exp.json index 678575f50..be4ffa74e 100644 --- a/e2etests/testdata/txtar/small-c4-person/dagre/board.exp.json +++ b/e2etests/testdata/txtar/small-c4-person/dagre/board.exp.json @@ -19,7 +19,7 @@ "y": 0 }, "width": 180, - "height": 126, + "height": 114, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/txtar/small-c4-person/dagre/sketch.exp.svg b/e2etests/testdata/txtar/small-c4-person/dagre/sketch.exp.svg index 68df2d2e2..afeff911b 100644 --- a/e2etests/testdata/txtar/small-c4-person/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/small-c4-person/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -c4-person - - + .d2-1872684779 .fill-N1{fill:#0A0F25;} + .d2-1872684779 .fill-N2{fill:#676C7E;} + .d2-1872684779 .fill-N3{fill:#9499AB;} + .d2-1872684779 .fill-N4{fill:#CFD2DD;} + .d2-1872684779 .fill-N5{fill:#DEE1EB;} + .d2-1872684779 .fill-N6{fill:#EEF1F8;} + .d2-1872684779 .fill-N7{fill:#FFFFFF;} + .d2-1872684779 .fill-B1{fill:#0D32B2;} + .d2-1872684779 .fill-B2{fill:#0D32B2;} + .d2-1872684779 .fill-B3{fill:#E3E9FD;} + .d2-1872684779 .fill-B4{fill:#E3E9FD;} + .d2-1872684779 .fill-B5{fill:#EDF0FD;} + .d2-1872684779 .fill-B6{fill:#F7F8FE;} + .d2-1872684779 .fill-AA2{fill:#4A6FF3;} + .d2-1872684779 .fill-AA4{fill:#EDF0FD;} + .d2-1872684779 .fill-AA5{fill:#F7F8FE;} + .d2-1872684779 .fill-AB4{fill:#EDF0FD;} + .d2-1872684779 .fill-AB5{fill:#F7F8FE;} + .d2-1872684779 .stroke-N1{stroke:#0A0F25;} + .d2-1872684779 .stroke-N2{stroke:#676C7E;} + .d2-1872684779 .stroke-N3{stroke:#9499AB;} + .d2-1872684779 .stroke-N4{stroke:#CFD2DD;} + .d2-1872684779 .stroke-N5{stroke:#DEE1EB;} + .d2-1872684779 .stroke-N6{stroke:#EEF1F8;} + .d2-1872684779 .stroke-N7{stroke:#FFFFFF;} + .d2-1872684779 .stroke-B1{stroke:#0D32B2;} + .d2-1872684779 .stroke-B2{stroke:#0D32B2;} + .d2-1872684779 .stroke-B3{stroke:#E3E9FD;} + .d2-1872684779 .stroke-B4{stroke:#E3E9FD;} + .d2-1872684779 .stroke-B5{stroke:#EDF0FD;} + .d2-1872684779 .stroke-B6{stroke:#F7F8FE;} + .d2-1872684779 .stroke-AA2{stroke:#4A6FF3;} + .d2-1872684779 .stroke-AA4{stroke:#EDF0FD;} + .d2-1872684779 .stroke-AA5{stroke:#F7F8FE;} + .d2-1872684779 .stroke-AB4{stroke:#EDF0FD;} + .d2-1872684779 .stroke-AB5{stroke:#F7F8FE;} + .d2-1872684779 .background-color-N1{background-color:#0A0F25;} + .d2-1872684779 .background-color-N2{background-color:#676C7E;} + .d2-1872684779 .background-color-N3{background-color:#9499AB;} + .d2-1872684779 .background-color-N4{background-color:#CFD2DD;} + .d2-1872684779 .background-color-N5{background-color:#DEE1EB;} + .d2-1872684779 .background-color-N6{background-color:#EEF1F8;} + .d2-1872684779 .background-color-N7{background-color:#FFFFFF;} + .d2-1872684779 .background-color-B1{background-color:#0D32B2;} + .d2-1872684779 .background-color-B2{background-color:#0D32B2;} + .d2-1872684779 .background-color-B3{background-color:#E3E9FD;} + .d2-1872684779 .background-color-B4{background-color:#E3E9FD;} + .d2-1872684779 .background-color-B5{background-color:#EDF0FD;} + .d2-1872684779 .background-color-B6{background-color:#F7F8FE;} + .d2-1872684779 .background-color-AA2{background-color:#4A6FF3;} + .d2-1872684779 .background-color-AA4{background-color:#EDF0FD;} + .d2-1872684779 .background-color-AA5{background-color:#F7F8FE;} + .d2-1872684779 .background-color-AB4{background-color:#EDF0FD;} + .d2-1872684779 .background-color-AB5{background-color:#F7F8FE;} + .d2-1872684779 .color-N1{color:#0A0F25;} + .d2-1872684779 .color-N2{color:#676C7E;} + .d2-1872684779 .color-N3{color:#9499AB;} + .d2-1872684779 .color-N4{color:#CFD2DD;} + .d2-1872684779 .color-N5{color:#DEE1EB;} + .d2-1872684779 .color-N6{color:#EEF1F8;} + .d2-1872684779 .color-N7{color:#FFFFFF;} + .d2-1872684779 .color-B1{color:#0D32B2;} + .d2-1872684779 .color-B2{color:#0D32B2;} + .d2-1872684779 .color-B3{color:#E3E9FD;} + .d2-1872684779 .color-B4{color:#E3E9FD;} + .d2-1872684779 .color-B5{color:#EDF0FD;} + .d2-1872684779 .color-B6{color:#F7F8FE;} + .d2-1872684779 .color-AA2{color:#4A6FF3;} + .d2-1872684779 .color-AA4{color:#EDF0FD;} + .d2-1872684779 .color-AA5{color:#F7F8FE;} + .d2-1872684779 .color-AB4{color:#EDF0FD;} + .d2-1872684779 .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-d2-1872684779);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1872684779);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1872684779);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1872684779);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1872684779);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1872684779);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1872684779);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1872684779);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>c4-person + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/small-c4-person/elk/board.exp.json b/e2etests/testdata/txtar/small-c4-person/elk/board.exp.json index 90602f386..899afe63f 100644 --- a/e2etests/testdata/txtar/small-c4-person/elk/board.exp.json +++ b/e2etests/testdata/txtar/small-c4-person/elk/board.exp.json @@ -19,7 +19,7 @@ "y": 12 }, "width": 180, - "height": 126, + "height": 114, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/txtar/small-c4-person/elk/sketch.exp.svg b/e2etests/testdata/txtar/small-c4-person/elk/sketch.exp.svg index 3a19838ab..68477ef9d 100644 --- a/e2etests/testdata/txtar/small-c4-person/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/small-c4-person/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -c4-person - - + .d2-1815602595 .fill-N1{fill:#0A0F25;} + .d2-1815602595 .fill-N2{fill:#676C7E;} + .d2-1815602595 .fill-N3{fill:#9499AB;} + .d2-1815602595 .fill-N4{fill:#CFD2DD;} + .d2-1815602595 .fill-N5{fill:#DEE1EB;} + .d2-1815602595 .fill-N6{fill:#EEF1F8;} + .d2-1815602595 .fill-N7{fill:#FFFFFF;} + .d2-1815602595 .fill-B1{fill:#0D32B2;} + .d2-1815602595 .fill-B2{fill:#0D32B2;} + .d2-1815602595 .fill-B3{fill:#E3E9FD;} + .d2-1815602595 .fill-B4{fill:#E3E9FD;} + .d2-1815602595 .fill-B5{fill:#EDF0FD;} + .d2-1815602595 .fill-B6{fill:#F7F8FE;} + .d2-1815602595 .fill-AA2{fill:#4A6FF3;} + .d2-1815602595 .fill-AA4{fill:#EDF0FD;} + .d2-1815602595 .fill-AA5{fill:#F7F8FE;} + .d2-1815602595 .fill-AB4{fill:#EDF0FD;} + .d2-1815602595 .fill-AB5{fill:#F7F8FE;} + .d2-1815602595 .stroke-N1{stroke:#0A0F25;} + .d2-1815602595 .stroke-N2{stroke:#676C7E;} + .d2-1815602595 .stroke-N3{stroke:#9499AB;} + .d2-1815602595 .stroke-N4{stroke:#CFD2DD;} + .d2-1815602595 .stroke-N5{stroke:#DEE1EB;} + .d2-1815602595 .stroke-N6{stroke:#EEF1F8;} + .d2-1815602595 .stroke-N7{stroke:#FFFFFF;} + .d2-1815602595 .stroke-B1{stroke:#0D32B2;} + .d2-1815602595 .stroke-B2{stroke:#0D32B2;} + .d2-1815602595 .stroke-B3{stroke:#E3E9FD;} + .d2-1815602595 .stroke-B4{stroke:#E3E9FD;} + .d2-1815602595 .stroke-B5{stroke:#EDF0FD;} + .d2-1815602595 .stroke-B6{stroke:#F7F8FE;} + .d2-1815602595 .stroke-AA2{stroke:#4A6FF3;} + .d2-1815602595 .stroke-AA4{stroke:#EDF0FD;} + .d2-1815602595 .stroke-AA5{stroke:#F7F8FE;} + .d2-1815602595 .stroke-AB4{stroke:#EDF0FD;} + .d2-1815602595 .stroke-AB5{stroke:#F7F8FE;} + .d2-1815602595 .background-color-N1{background-color:#0A0F25;} + .d2-1815602595 .background-color-N2{background-color:#676C7E;} + .d2-1815602595 .background-color-N3{background-color:#9499AB;} + .d2-1815602595 .background-color-N4{background-color:#CFD2DD;} + .d2-1815602595 .background-color-N5{background-color:#DEE1EB;} + .d2-1815602595 .background-color-N6{background-color:#EEF1F8;} + .d2-1815602595 .background-color-N7{background-color:#FFFFFF;} + .d2-1815602595 .background-color-B1{background-color:#0D32B2;} + .d2-1815602595 .background-color-B2{background-color:#0D32B2;} + .d2-1815602595 .background-color-B3{background-color:#E3E9FD;} + .d2-1815602595 .background-color-B4{background-color:#E3E9FD;} + .d2-1815602595 .background-color-B5{background-color:#EDF0FD;} + .d2-1815602595 .background-color-B6{background-color:#F7F8FE;} + .d2-1815602595 .background-color-AA2{background-color:#4A6FF3;} + .d2-1815602595 .background-color-AA4{background-color:#EDF0FD;} + .d2-1815602595 .background-color-AA5{background-color:#F7F8FE;} + .d2-1815602595 .background-color-AB4{background-color:#EDF0FD;} + .d2-1815602595 .background-color-AB5{background-color:#F7F8FE;} + .d2-1815602595 .color-N1{color:#0A0F25;} + .d2-1815602595 .color-N2{color:#676C7E;} + .d2-1815602595 .color-N3{color:#9499AB;} + .d2-1815602595 .color-N4{color:#CFD2DD;} + .d2-1815602595 .color-N5{color:#DEE1EB;} + .d2-1815602595 .color-N6{color:#EEF1F8;} + .d2-1815602595 .color-N7{color:#FFFFFF;} + .d2-1815602595 .color-B1{color:#0D32B2;} + .d2-1815602595 .color-B2{color:#0D32B2;} + .d2-1815602595 .color-B3{color:#E3E9FD;} + .d2-1815602595 .color-B4{color:#E3E9FD;} + .d2-1815602595 .color-B5{color:#EDF0FD;} + .d2-1815602595 .color-B6{color:#F7F8FE;} + .d2-1815602595 .color-AA2{color:#4A6FF3;} + .d2-1815602595 .color-AA4{color:#EDF0FD;} + .d2-1815602595 .color-AA5{color:#F7F8FE;} + .d2-1815602595 .color-AB4{color:#EDF0FD;} + .d2-1815602595 .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-d2-1815602595);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1815602595);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1815602595);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1815602595);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1815602595);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1815602595);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1815602595);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1815602595);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>c4-person + + \ No newline at end of file diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt index d20dbb221..89d18ce17 100644 --- a/e2etests/txtar.txt +++ b/e2etests/txtar.txt @@ -1187,3 +1187,37 @@ a: |md a.shape: c4-person a: c4-person a.width: 180 + +-- c4-person-label -- +c4mdperson: |md +## Personal Banking Customer + +[person] + +A customer of the bank, with personal bank accounts + | { + shape: c4-person + label.near: center-center + } + +c4mdperson2: |md +## Personal Banking Customer + +[person] + +A customer of the bank, with personal bank accounts + | { + shape: c4-person + label.near: top-center + } + +c4mdperson3: |md +## Personal Banking Customer + +[person] + +A customer of the bank, with personal bank accounts + | { + shape: c4-person + label.near: bottom-center + } diff --git a/lib/shape/shape_c4_person.go b/lib/shape/shape_c4_person.go index 673afbf8f..9cf8fbea3 100644 --- a/lib/shape/shape_c4_person.go +++ b/lib/shape/shape_c4_person.go @@ -38,13 +38,20 @@ func (s shapeC4Person) GetInnerBox() *geo.Box { headCenterY := height * 0.18 bodyTop := headCenterY + headRadius*0.8 - tl := s.Box.TopLeft.Copy() - horizontalPadding := width * 0.1 - tl.X += horizontalPadding - tl.Y += bodyTop + height*0.05 + // Use a small fixed percentage instead of the full corner radius + horizontalPadding := width * 0.05 // 5% padding + tl := s.Box.TopLeft.Copy() + tl.X += horizontalPadding + + // Add vertical padding + tl.Y += bodyTop + height*0.03 + + // Width minus padding on both sides innerWidth := width - (horizontalPadding * 2) - innerHeight := height - tl.Y + s.Box.TopLeft.Y - (height * 0.05) + + // Add bottom padding + innerHeight := height - (tl.Y - s.Box.TopLeft.Y) - (height * 0.03) return geo.NewBox(tl, innerWidth, innerHeight) } @@ -140,17 +147,23 @@ func (s shapeC4Person) GetSVGPathData() []string { func (s shapeC4Person) GetDimensionsToFit(width, height, paddingX, paddingY float64) (float64, float64) { contentWidth := width + paddingX contentHeight := height + paddingY - totalWidth := contentWidth / 0.8 + + // Account for 10% total horizontal padding (5% on each side) + totalWidth := contentWidth / 0.9 headRadius := totalWidth * 0.22 - bodyTop := totalWidth*0.18 + headRadius*0.8 - verticalPaddingRatio := 0.1 // 5% top + 5% bottom - totalHeight := (contentHeight + bodyTop) / (1 - verticalPaddingRatio) + headCenterY := totalWidth * 0.18 + bodyTop := headCenterY + headRadius*0.8 + + // Include vertical padding from GetInnerBox + verticalPadding := totalWidth * 0.06 // 3% top + 3% bottom + totalHeight := contentHeight + bodyTop + verticalPadding + minHeight := totalWidth * 1.2 if totalHeight < minHeight { totalHeight = minHeight } - totalWidth, totalHeight = LimitAR(totalWidth, totalHeight, C4_PERSON_AR_LIMIT) + totalWidth, totalHeight = LimitAR(totalWidth, totalHeight, C4_PERSON_AR_LIMIT) return math.Ceil(totalWidth), math.Ceil(totalHeight) }