From 23cca0000b6d1fb38e8f620024e66929da9c1f3c Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Tue, 28 Mar 2023 15:18:28 -0700 Subject: [PATCH] fix tests, remove italic style --- d2renderers/d2sketch/sketch_test.go | 4 +- .../testdata/arrowheads/sketch.exp.svg | 1 - .../testdata/arrowheads_dark/sketch.exp.svg | 1 - .../d2sketch/testdata/class/sketch.exp.svg | 2 +- .../sketch.exp.svg | 4 +- .../testdata/class_dark/sketch.exp.svg | 2 +- .../testdata/connection_label/sketch.exp.svg | 1 - .../connection_label_dark/sketch.exp.svg | 1 - .../testdata/dots-real/sketch.exp.svg | 4 +- .../d2sketch/testdata/opacity/sketch.exp.svg | 1 - .../testdata/opacity_dark/sketch.exp.svg | 1 - .../d2sketch/testdata/twitter/sketch.exp.svg | 1 - .../testdata/twitter_dark/sketch.exp.svg | 1 - d2renderers/d2svg/appendix/appendix_test.go | 4 +- .../diagram_wider_than_tooltip/sketch.exp.svg | 5 +- .../appendix/testdata/links/sketch.exp.svg | 2 +- .../testdata/links_dark/sketch.exp.svg | 2 +- .../testdata/tooltip_fill/sketch.exp.svg | 2 +- .../tooltip_wider_than_diagram/sketch.exp.svg | 2 +- d2renderers/d2svg/d2svg.go | 3 +- .../d2svg/dark_theme/dark_theme_test.go | 4 +- .../testdata/arrowheads/dark_theme.exp.svg | 1 - .../testdata/class/dark_theme.exp.svg | 2 +- .../connection_label/dark_theme.exp.svg | 1 - .../testdata/opacity/dark_theme.exp.svg | 1 - .../testdata/twitter/dark_theme.exp.svg | 1 - docs/examples/lib/1-d2lib/d2lib.go | 4 +- docs/examples/lib/3-lowlevel/lowlevel.go | 2 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 81770 -> 82037 bytes .../multiboard/life/layers/broker.exp.svg | 2 +- .../multiboard/life/layers/core.exp.svg | 2 +- .../multiboard/life/layers/stocks.exp.svg | 2 +- .../life_index_d2/layers/broker.exp.svg | 2 +- .../life_index_d2/layers/core.exp.svg | 2 +- .../life_index_d2/layers/stocks.exp.svg | 2 +- e2etests/e2e_test.go | 2 +- .../ampersand-escape/dagre/sketch.exp.svg | 2 +- .../ampersand-escape/elk/sketch.exp.svg | 2 +- .../dagre-disconnect/dagre/sketch.exp.svg | 1 - .../dagre-disconnect/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../dagre_broken_arrowhead/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../elk_alignment/dagre/sketch.exp.svg | 1 - .../elk_alignment/elk/sketch.exp.svg | 1 - .../link_with_ampersand/dagre/sketch.exp.svg | 2 +- .../link_with_ampersand/elk/sketch.exp.svg | 2 +- .../opacity-on-label/dagre/sketch.exp.svg | 1 - .../opacity-on-label/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../overlapping-edge-label/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../connection_label/dagre/sketch.exp.svg | 1 - .../connection_label/elk/sketch.exp.svg | 1 - .../stable/animated/dagre/sketch.exp.svg | 1 - .../stable/animated/elk/sketch.exp.svg | 1 - .../arrowhead_adjustment/dagre/sketch.exp.svg | 5 +- .../arrowhead_adjustment/elk/sketch.exp.svg | 5 +- .../arrowhead_labels/dagre/sketch.exp.svg | 5 +- .../arrowhead_labels/elk/sketch.exp.svg | 5 +- .../stable/chaos2/dagre/sketch.exp.svg | 1 - .../testdata/stable/chaos2/elk/sketch.exp.svg | 1 - .../circle_arrowhead/dagre/sketch.exp.svg | 1 - .../circle_arrowhead/elk/sketch.exp.svg | 1 - .../stable/class/dagre/sketch.exp.svg | 2 +- .../testdata/stable/class/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../stable/elk_shim/dagre/sketch.exp.svg | 1 - .../stable/elk_shim/elk/sketch.exp.svg | 1 - .../stable/font_colors/dagre/sketch.exp.svg | 1 - .../stable/font_colors/elk/sketch.exp.svg | 1 - .../stable/font_sizes/dagre/sketch.exp.svg | 1 - .../stable/font_sizes/elk/sketch.exp.svg | 1 - .../giant_markdown_test/dagre/sketch.exp.svg | 1 - .../giant_markdown_test/elk/sketch.exp.svg | 1 - .../stable/investigate/dagre/sketch.exp.svg | 1 - .../stable/investigate/elk/sketch.exp.svg | 1 - .../stable/latex/dagre/sketch.exp.svg | 1 - .../testdata/stable/latex/elk/sketch.exp.svg | 1 - .../testdata/stable/li2/dagre/sketch.exp.svg | 1 - .../testdata/stable/li2/elk/sketch.exp.svg | 1 - .../stable/links/dagre/sketch.exp.svg | 2 +- .../testdata/stable/links/elk/sketch.exp.svg | 2 +- .../stable/markdown/dagre/sketch.exp.svg | 1 - .../stable/markdown/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../self-referencing/dagre/sketch.exp.svg | 1 - .../self-referencing/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 9 +- .../elk/sketch.exp.svg | 9 +- .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../sequence_diagram_note/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../sequence_diagram_real/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 1 - .../sequence_diagram_span/elk/sketch.exp.svg | 1 - .../sequence_diagrams/dagre/sketch.exp.svg | 1 - .../sequence_diagrams/elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/stylish/dagre/sketch.exp.svg | 1 - .../stable/stylish/elk/sketch.exp.svg | 1 - .../text_font_sizes/dagre/sketch.exp.svg | 1 - .../stable/text_font_sizes/elk/sketch.exp.svg | 1 - .../stable/tooltips/dagre/sketch.exp.svg | 2 +- .../stable/tooltips/elk/sketch.exp.svg | 2 +- .../unnamed_only_height/dagre/sketch.exp.svg | 6 +- .../unnamed_only_height/elk/sketch.exp.svg | 6 +- .../unnamed_only_width/dagre/sketch.exp.svg | 6 +- .../unnamed_only_width/elk/sketch.exp.svg | 6 +- .../themes/terminal/dagre/board.exp.json | 28 +-- .../themes/terminal/dagre/sketch.exp.svg | 200 +++++++++--------- .../themes/terminal/elk/board.exp.json | 10 +- .../themes/terminal/elk/sketch.exp.svg | 198 ++++++++--------- .../dagre/sketch.exp.svg | 7 +- .../elk/sketch.exp.svg | 7 +- .../dagre/sketch.exp.svg | 1 - .../elk/sketch.exp.svg | 1 - .../dagre/sketch.exp.svg | 8 +- .../shape_set_width_height/elk/sketch.exp.svg | 8 +- .../japanese-full/dagre/sketch.exp.svg | 1 - .../unicode/japanese-full/elk/sketch.exp.svg | 1 - go.mod | 2 +- 141 files changed, 318 insertions(+), 406 deletions(-) diff --git a/d2renderers/d2sketch/sketch_test.go b/d2renderers/d2sketch/sketch_test.go index 5ed75626e..126987099 100644 --- a/d2renderers/d2sketch/sketch_test.go +++ b/d2renderers/d2sketch/sketch_test.go @@ -1335,7 +1335,7 @@ func run(t *testing.T, tc testCase) { if strings.EqualFold(tc.engine, "elk") { layout = d2elklayout.DefaultLayout } - diagram, _, err := d2lib.Compile(ctx, tc.script, &d2lib.CompileOptions{ + diagram, g, err := d2lib.Compile(ctx, tc.script, &d2lib.CompileOptions{ Ruler: ruler, Layout: layout, FontFamily: go2.Pointer(d2fonts.HandDrawn), @@ -1348,7 +1348,7 @@ func run(t *testing.T, tc testCase) { dataPath := filepath.Join("testdata", strings.TrimPrefix(t.Name(), "TestSketch/")) pathGotSVG := filepath.Join(dataPath, "sketch.got.svg") - svgBytes, err := d2svg.Render(diagram, &d2svg.RenderOpts{ + svgBytes, err := d2svg.Render(diagram, g, &d2svg.RenderOpts{ Pad: d2svg.DEFAULT_PADDING, Sketch: true, ThemeID: tc.themeID, diff --git a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg index fef2ccbf9..6fdb7b8ce 100644 --- a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg @@ -8,7 +8,6 @@ } .d2-981471403 .text-italic { font-family: "d2-981471403-font-italic"; - font-style: italic; } @font-face { font-family: d2-981471403-font-italic; diff --git a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg index 1ad1b1978..ec524f107 100644 --- a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg @@ -8,7 +8,6 @@ } .d2-981471403 .text-italic { font-family: "d2-981471403-font-italic"; - font-style: italic; } @font-face { font-family: d2-981471403-font-italic; diff --git a/d2renderers/d2sketch/testdata/class/sketch.exp.svg b/d2renderers/d2sketch/testdata/class/sketch.exp.svg index 12b9d3ce1..220189005 100644 --- a/d2renderers/d2sketch/testdata/class/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-3945613123-font-mono; - src: url("data:application/font-woff;base64,d09GRgABAAAAABHwAAoAAAAAHpwAAgm6AAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgld/X+GNtYXAAAAFUAAAApwAAAOYEOgSZZ2x5ZgAAAfwAAAfiAAAKYAdQlNdoZWFkAAAJ4AAAADYAAAA2GanOOmhoZWEAAAoYAAAAJAAAACQGMwCraG10eAAACjwAAABtAAAAkFRgDNVsb2NhAAAKrAAAAEoAAABKNf4zjG1heHAAAAr4AAAAIAAAACAAWAJhbmFtZQAACxgAAAa4AAAQztydAx9wb3N0AAAR0AAAACAAAAAg/7gAMwADAlgBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFCQMEAwICBCAAAvcCADgDAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBEWAAAZ8AAAAAAeYClAAAACAAA3ichM27KkABAIfx37m4H/f7/cRC8hLKokxsMhgkZZDBCxEPYJEivIkHMMmm/upsJt/8qw+FSoFG7RlrWrVSa92mLdt27Nqz79CRY6fOXbpO6MzGH3PQmRNnLlwl+chPvvKdz7zmJU95zEPe85b73OU2N935vwqrFi1pLShVaj169Vm2ot+AQUMaw0aMGjNuwqQp02bMmjPPLwAAAP//AQAA///Fnyy4AHicZFZbTBvZGf7PGeNJghMY7PFgYmzPHDw2vmDweGYMGIMv2BBIAINDLkBIAsFBzSoh3aSssmm6Si+7vYisonYfoqpSI/Wh2mqjSkkvUh82fUgkdlU1arUP26q7jeiq7XYrC0WquoyrGZsQurKOzzzM+f//+/7/+85AHSQBcAu+DRTsBQs0AQsgMTzj5X0+QtOqj5NUlbgxk0QfamsIDcdMyss3bvzU1JX+R/r0V/HtrS/13FxaGt/45JdzV69+dwO9DxScBcAEr0EjOEDQ40lRu521mWnW2AglRRU5JhLCbD+c/VVmsTveOzT++ktXjk8NHx6dXZ6aPXl0Ga95cj1dYw2m+iPZ06fQNUWVQ1uf92b6ZAAEKwC4Ca9BvVEzu/1bQd/XfoMatX+jUbyWez//rzwgmKhsok/xLWgCqBNEn2q367kZXuYZm9mMbOqyEHOOiPmU9ik61z5nkeNSKDgygVZyWqpvMQF6viEA3IjX4KCBycpJqlViCBNTFJXQFKF8xIVZZujcjMfknj03XkdjyjuXmBExZa7Da9ony8uoeesiGvJMF503NA3hG87itEf7hR47U9nEDnwHwrvqi4miz9eB5ZiiSFE7R4siEcyszW7nOBdm9cK7hl4JRb1n49kRtyzM8amQero/WWoLeY5I3TmiOGfaU754ySKHerzhng4ScB5o3x9Id0bHwuE2pZWPhdz+Fou/MZzqihWjgCAAgDvwGtAAPENkniUMwh9g0wf4UC63dR8AsM4lplAZnOAD4ARR1OtTOzARzLTPqJRliI+Yzb6oosoHMGuzPwuPhPN3XkWOeCRyXPB4Lw8snM7QlH/B1T7ZXrralbLwyaA6HNrHq4KXjTd3XDip/THtjqRF4cYevsvT7gUMs5VN7MSPwAZ8lSVCE0Ziaama02Yk1OdJMEYNDZAJQtHpAkXx08EzpeRCfmBqYNgzLJK8hbgV/OjdOcH/jUuTV5KDSyfGzxKx7G7RezFe2cQHURlajSzibvYN+qWoonJmMzox+pXcoWvDvcdc7a6UGC92Rqbi4RGX13/WklgZL6wkAq1yiytSjKtTkTaH3OY3+EtUNtF/X8CxnUDyydI2car8PBtqOPXl/sXuUM5NmQpZmnJNOodSfL8nMNg+avn66tjlJO868eut+IA7PDhcdrdEJuPTugQhW9nELagMZnADIMFM86JI7QDSFcnvYEkm5uqRUnckOnw1l7uUOv8yxtrX9pwfDeV5V9ssund4aOSQlklcnhhb6Xt16UDLvsKUg1WaBQAACoYqHqygMnRCAkZrqHQMckypbYoU5SSWGBZgJoLoM8BJtc5R251jbXZrzRW230H+5SvjVrfL6SDytNTufnydaY4WZWvQ1mSTOy/MnUyvHoukUpGOdLq7eEaNn2K9jYJz4i/5gWSHqV50c11Wk3UgKB8JWjJMrDU24t+7t97JOJ2xZPhIBN3rj0n9/VKsX/t2wkuaTSZrOyuGAcEsAK7Hj6qeuDNnuuSNGWNmC3WUON19tFCIJYLZIH707uV2ZWFe+z0ig5lQSHsbACoVOAGAfojXsaj3G8wgdILhJ4cMzT+CxipfDJElxmaXokY7fnB48u2KHAx2skLccvwo+jiz9Qe50953oME426PrFJX1iBIjcUZp3E59RnnP6+xJ09gaDeRZVgpI3YWYg7eNcgcd3ia0MSAEpnzhw8PaXXS06BW1H6GjgaC+b+NHZbC9kGMX/CxtEo89h482Jv8fvTHr2InK0KC75gtq2i1XvcmhgQuZzIWB6n+uWMzlisWaihIrhfGVRHZpcqpUmppcAsMLJCOuoSFup7rabBGOtb7oBbNZmhKOh88sJRd6hTEPZXotVaxaQe49/POkJ/DNS4UrSd41cxeZd3nBmwDYgcr6vbHDQc0KaObNLE2JFzMHI3aro61VXQyhjcu92b31+b17+ke1vwKCfGUTH0Bl8H/B1w0qdrn6tqcr+WshMXAuk+xjU+m5+XML8VKbXyhEktHMoYlpPjpvCbsVV1vYbXU599syau+Y1yFzzoDTLTQyAcXrS/uNGRmsbGIBvwbNNeZlIquqxEos0YVXk/0b+QJ5/Tv12c8+k3Mk3tLED1ukE4mNZN2dO5m/pbKWfQkLAwgOVzbRf9CGPgucPqvVSVVUpuZYz6YLk1JfYNBfyNAm7zHLwjzq0P40mAlG0ITWUgwqgEACwF60AfsBeEqy2u06napVohC8N3mx4eB+035Hw8Wxx2hD+6c3T0jei2xaS1VDRRTEFDqPzUAMbL+rjKM/4w/1WHVVl+EMr+DQvdLqaim8MD+/8M7E01u3nk4Eio+vX39crGrulco4+lb1HOdT9E7oPWFt5p+EF0+dWgyXVlffqR0IGMcBwUeVEnqGf6vfiRyj34gS+xFinzx5i5qJbOGIEfdMpYSu1t7RXVzmmTNPniD2rQjWIp/fNXx/GgDT+A2gdD+2SiqhVCJLxpJoY7HEWEQl9NObTTdLjvHppuIMJ9tvcrLdeHYojpsOVHdbW1rvvt3z4MGDBz23u9fX1/UailDCFA7p30NemciSXO01qr9/P33/fulh8uHD5ENAhh99D21AXe2OZ1DiYxRDP84YZCP4Ox5FL+F1PQ4SalPK2swo5BRFp1MU8ShpbSX6qnJa6w1QAFaZZ4voZyiYTALA/wAAAP//AQAA//9OPzM9AAAAAQAAAAIJulTzElFfDzz1AAMD6AAAAADcHQ33AAAAANwcc0v/P/46AxkEJAAAAAMAAgAAAAAAAAABAAAD2P7vAAACWP8//z8DGQABAAAAAAAAAAAAAAAAAAAAJHicLIyxiUJRAASHKefSy47PJSqKIGggDoKJdmBoGVZmC6ZWIR9etDuzsMa/gXEz7sbB2BgL42fwxdgbk7Ec++zOxtb4GzyNfBprY2XsjF/jaLyMh/E2rsZp+PnnM/cvAAAA//8BAAD//69bGX4AAAAAAAAqACoAXgB0AJYAxAEIARoBVgGKAboB7gIkAo4CsgK+AtwDDgMwA1wDkAOwA+4EFAQ2BFQEXAR4BJIEpAS2BOYE+gUKBSIFMAAAAAEAAAAkAfgAKgBlAAYAAQAAAAAAAAAAAAAAAAADAAN4nJyWS2yT2RXHf865Ab94GVQNCFVXI4SmCIydScBNIOCQAcIgQklm2gpR1STGsUjsyHZg6GIWXVZddV11M120ErQKJWomgUIgpGoFqtRFNauuuqi66KqaRVfVd77jxHESOoOQyO8+zv+e173+gItyCyHiohFIgnGEJEnjDg7xjrGQ5JSxI8lF406SjBpvI8kPjbeTYtI4ymE+NY5xmF8axznCn40TnOA/xkkGI0eMd9IbqRjv4mDkV8a76YosG+9p8TPFwciXxntXdWLASkfKOMI3O74w7mBnx5fGwmVxxq5lTyfjctV4G0fkkfF2nsnfjaN0u18Yx+h2fzVO0NW5zXiH+M6c8U66o98LOQK7oz81jrA7+nPjDg5E7xsLyeiKsSMVNf1IJ6noP4y3kYpaLEH+Y1HjKIdiB4xj+Fi/cZyjsR8YJ8jEfmKcJB1bMN5BV+yfxjvJxZs6uzgcv2a8m1PxT4z3tPic4t245Sqyt0Vz36rm/gik4n8zjpCKN+c7eDf+X2NhX+KgseNAImPcyYHEJeNtHEiMG29nX+JT4yiZxM+MY7yXeG4c52jiX8YJupPfME6SSzY1d3Iq+WPjXWSSfzDezcXkv433tPiZomvHCeO9gY7MyjNZlFd4Ci1cooznMJ5JvDyWObzMyoIsyZw8llfyRObkuXwm9+Wx/B4fuSRL8kD+JE/w8rCF51t4RT6TB7IkD+VzWZCneJeVBXkpS/K5LMqizr4y+1n5o7zGc73jC24EZ8gjeaAqoS8Lcl/mZU6WAx2uk+GGLMtLeSZP5Xdqv6J6v8HLM5mV17Ios7rz2BY7n8pzjfGFLMucLMlv5UVzlusc4Ya8kNfyWB7KU1kMTg3Olpd4eaQzs2oTzmzu46EtTr6Plzl5IrOahSDLy8159feont6SX46qp2t1a8l321pJxxvz3lIV27FaSX6Np4sMWTJ4jtmoS0d5xqlykyKeEe5Rp0GRKep4hqgwRpUa0/p/QdfG8bzHBA0aTNPLcY5zV/+lKayqpdVyiuN8K/CHu5RpMIHnGkXqFKlxx9TOU6VCA88VCkwFvvh3GKHKDDXGKPr9pFvHeM5RZVzpKjWqqlpihkkK1OgiTYb3ydFHnkEGGKZvnULTPrQ+1mYfWg0zwAd8rL7WKauXfp32BFUaGmmFO3iyupYmS5YT9DFFgdsUddctinyiHgcKPaQ5QQ8ntC5f3bP1WShrnQp4Glqfca1dsO82niq33rrCZY01qFhg9xEVrV+4NkLDdoanVxjnuNp7jXRCM+ZVeUYrW6Osu9Nv5c1VChq/Z5A0noumGvTVqGY3+Duj/Rb4XaTyNfqzwT2mKTLKhOVzrR9HNIcN7mpO1zI+SVkrUNFODnIyo1kI425mbYQhLuMZVv3KOuXL6xSCSNr7LKt9lNbYJjY9d63+dyhQ1g65yaSurN23gp6b5zvKDXrxbdmpM6YVmqahNaqrVlprUOI4w5zncpsn/z9H4/o3rP1NZla7J4wu6JrglucZ0cqP+P14BnQ8xIhm5LsMMcpFhvmIUR3nucY18lxhlCE+UNthrul7MMwVBtViSDlcO6834Arfx/MhQ7on0C5afsKKBTdzWr2vq+9hL5eZYlpzHnie1liLGuHXr7Dnlqk2betqM0aZW7rTa/0qetcLlKwrptXDKc1lszfWbl3YEVMaS1DbtfUSVX1fa3pzA1XPPXs7gm4NfQpfiMZXqGr6rXqmvprDovq8flyy34Gyvo3hq9P8RhnRX4Ky/n6NqdeBbRBR8HvZPjO/YWZFa1XjJuWw12SFc9zT0ybtHnluamxqEX6ZUNcq1LVGgUc/UpVq85vEXosqJX2fpjVzY3qj7uko7AL9Ktlyb8FevZpm/Xbze2TD2cFbNWnvvtfYSqZ+iBsUmDSVir2Ungoz+vtZ09XwrmlsZN/oT7tSvfVLZUMVj+rb3l6T9tputku/Ztor47Lrqr2Z3Yo74866fpd3A67ffRvvMu0zlNzHeJfDu7/gXR7vTrqMy7sed8H1uow75XIu7zJKedfrcoFV5JJyv2qd0R2n3YfBijzccmV+y5UVPe+sy66d4LJKZ13O9bk+l3MXXI+uZtww3vW6sy7jBoJxswfV7wuq0+tOu3NuIFR3p12/63OXm73oBlzOnXH97n3VGGw5s9v1uMHAs2Yvbro39OCk63I97qTrdv1hppr9uKUfJ91pl3G9ek6/RpUJVJuduYVfPVaRUxp/sGfA9QQZae21jXUO+uGNNdqQb7XY0B1v1JnfrDPeaLHyPwAAAP//AQAA//+blbgHAAMAAAAAAAD/tQAyAAAAAQAAAAAAAAAAAAAAAAAAAAA="); + src: url("data:application/font-woff;base64,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"); }]]>