Merge branch 'main' of https://git.xpub.nl/XPUB/SI17 into main

main
km0 2 years ago
commit 4f0d78daa9

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 9.9 KiB

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 2834.6 5669.3" xmlns="http://www.w3.org/2000/svg">
<defs>
<style>.f,.g{fill:none;}.h{fill:currentColor;}.g{stroke:currentColor;stroke-width:19.3px;}.i{clip-path:url(#a);}.j{clip-path:url(#b);}</style>
<clipPath id="b">
<rect class="f" width="2834.6" height="5669.3"/>
</clipPath>
<clipPath id="a">
<rect class="f" width="2834.6" height="5669.3"/>
</clipPath>
</defs>
<line class="g" x1="1474.1" x2="1474.1" y1="992.5" y2="1577.4"/>
<g class="j">
<path class="g" d="m2025.6 1099.6c62.38-71.55 152.99-116.61 253.87-116.61s191.49 45.06 253.87 116.61"/>
</g>
<line class="g" x1="2532" x2="2532" y1="1105.9" y2="1710"/>
<g class="i">
<path class="g" d="m2025.7 1703.7c61.26-71.59 150.23-116.68 249.29-116.68s188.04 45.09 249.29 116.68"/>
<path class="g" d="m1761.8 1587c99.06 0 188.04 45.09 249.29 116.68"/>
<path class="g" d="m1484.4 1587c99.06 0 188.04 45.09 249.29 116.68"/>
<path class="g" d="m1760.8 982.96c99.45 0 188.77 45.08 250.26 116.67"/>
<path class="g" d="m1483.5 982.96c99.45 0 188.77 45.08 250.26 116.67"/>
<path class="h" d="m1844 1472v24.66c0 5.67 1.11 6.93 6.84 6.93h15.48v-2.52h-13.08c-3.16 0-4.28-0.27-4.28-3.06v-13.77h14.19v-2.34h-14.19v-11.34c0-2.79 1.11-2.97 4.28-2.97h13.42v-2.52h-15.82c-5.73 0-6.84 1.26-6.84 6.93m-5.13 24.39-1.8-1.53c-2.56 5.22-6.16 7.92-10.94 7.92-7.52 0-11.89-6.39-11.89-18.27s4.79-18.54 12.65-18.54c4.53 0 7.52 2.25 9.66 6.93l2.05-1.35c-2.48-5.22-6.41-7.65-12.14-7.65-10.43 0-17.61 8.19-17.61 21.06 0 12.15 6.67 19.89 16.33 19.89 5.99 0 10.26-2.61 13.68-8.46m-42.49-40.59c0 1.71 1.45 3.24 2.99 3.24 1.62 0 3.08-1.44 3.08-3.24s-1.37-3.24-3.08-3.24-2.99 1.53-2.99 3.24m0.6 9.27v38.52h4.96v-38.52h-4.96zm-18.64 38.52h4.96v-36h9.92v-2.52h-24.71v2.52h9.83v36zm-9.75-7.2-1.8-1.53c-2.57 5.22-6.16 7.92-10.94 7.92-7.52 0-11.88-6.39-11.88-18.27s4.79-18.54 12.65-18.54c4.53 0 7.52 2.25 9.66 6.93l2.05-1.35c-2.48-5.22-6.41-7.65-12.14-7.65-10.43 0-17.61 8.19-17.61 21.06 0 12.15 6.67 19.89 16.33 19.89 5.98 0 10.26-2.61 13.68-8.46m-59.08 7.2 3.16-10.71h15.65l3.68 10.71h5.47l-11.97-35.01c-1.11-3.15-2.22-4.68-4.28-4.68-1.88 0-3.25 1.26-3.93 3.69l-10.18 36h2.39zm3.93-13.23 4.79-18.09c0.43-1.62 0.6-2.52 1.54-2.52 0.68 0 1.03 0.72 1.62 2.52l6.16 18.09h-14.11zm-27.61 13.23v-36h4.45c6.75 0 9.92 1.89 9.92 7.56 0 5.22-2.57 7.92-7.78 7.92h-4.62l12.83 20.52h5.9l-11.97-18.81h0.26c6.84 0 10.69-3.42 10.69-9.09 0-6.3-4.87-10.62-13-10.62h-11.63v38.52h4.96zm-39.71-27.54h11.29c12.23 0 18.98-6.12 18.98-15.66s-7.52-15.57-20.86-15.57h-15.56v58.77h6.16v-27.54zm0-28.08h6.67c11.46 0 16.84 3.6 16.84 12.42s-5.22 12.6-15.9 12.6h-7.61v-25.02z"/>
<path class="h" d="M1890.96,1411.34l-1.8-1.53c-2.57,5.22-6.16,7.92-10.94,7.92-7.52,0-11.88-6.39-11.88-18.27s4.79-18.54,12.65-18.54c4.53,0,7.52,2.25,9.66,6.93l2.05-1.35c-2.48-5.22-6.41-7.65-12.14-7.65-10.43,0-17.61,8.19-17.61,21.06,0,12.15,6.67,19.89,16.33,19.89,5.99,0,10.26-2.61,13.68-8.46m-42.49-40.59c0,1.71,1.45,3.24,2.99,3.24,1.62,0,3.08-1.44,3.08-3.24s-1.37-3.24-3.08-3.24-2.99,1.53-2.99,3.24m.6,9.27v38.52h4.96v-38.52h-4.96Zm-18.64,38.52h4.96v-36h9.92v-2.52h-24.71v2.52h9.83v36Zm-32.06,0h8.72c8.46,0,13-3.96,13-10.98,0-5.58-2.82-8.64-8.98-10.71l-3.42-1.17c-3.85-1.26-5.56-3.24-5.56-6.93s2.31-6.21,6.33-6.21h8.46v-2.52h-8.12c-7.1,0-11.46,4.23-11.46,10.62,0,4.5,2.82,8.01,8.29,9.72l4.1,1.35c3.85,1.17,5.39,3.24,5.39,7.02,0,4.86-2.65,7.29-8.04,7.29h-8.72v2.52Zm-13.85-47.79c0,1.71,1.45,3.24,2.99,3.24,1.62,0,3.08-1.44,3.08-3.24s-1.37-3.24-3.08-3.24-2.99,1.53-2.99,3.24m.6,9.27v38.52h4.96v-38.52h-4.96Zm-18.64,38.52h4.96v-36h9.92v-2.52h-24.71v2.52h9.83v36Zm-29.15,0v-36h4.45c6.76,0,9.92,1.89,9.92,7.56,0,5.22-2.57,7.92-7.78,7.92h-4.62l12.82,20.52h5.9l-11.97-18.81h.26c6.84,0,10.69-3.42,10.69-9.09,0-6.3-4.87-10.62-13-10.62h-11.63v38.52h4.96Zm-41.72-20.88l10.26-27,9.92,27h-20.18Zm-1.03,2.7h22.06l7.01,18.18h6.16l-23-60.03-22.83,60.03h3.76l6.84-18.18Zm-50.04,18.18h8.72c8.46,0,13-3.96,13-10.98,0-5.58-2.82-8.64-8.98-10.71l-3.42-1.17c-3.85-1.26-5.56-3.24-5.56-6.93s2.31-6.21,6.33-6.21h8.46v-2.52h-8.12c-7.1,0-11.46,4.23-11.46,10.62,0,4.5,2.82,8.01,8.29,9.72l4.1,1.35c3.85,1.17,5.39,3.24,5.39,7.02,0,4.86-2.65,7.29-8.04,7.29h-8.72v2.52Zm-30.44,0l3.16-10.71h15.65l3.68,10.71h5.47l-11.97-35.01c-1.11-3.15-2.22-4.68-4.28-4.68-1.88,0-3.25,1.26-3.93,3.69l-10.17,36h2.39Zm3.93-13.23l4.79-18.09c.43-1.62,.6-2.52,1.54-2.52,.68,0,1.03,.72,1.62,2.52l6.16,18.09h-14.11Z"/>
<path class="h" d="M1893.23,1349.2h4.96v-33.12h-4.96v12.69c-2.74,2.61-5.22,3.96-8.21,3.96-7.52,0-12.65-7.47-12.65-20.97,0-10.26,4.19-15.84,11.29-15.84,4.45,0,8.21,2.34,11.37,6.93l2.05-1.62c-3.85-5.04-7.95-7.38-13-7.38-9.66,0-16.93,7.83-16.93,19.98s7.01,20.97,16.76,20.97c3.08,0,6.07-.81,9.32-2.52v16.92Zm-57.63-15.66v-31.77c0-1.44,.34-2.25,1.2-2.25,.77,0,1.2,.63,1.88,1.71l18.47,31.41c.85,1.35,1.45,2.16,2.05,2.16,.68,0,.85-.54,.85-1.53v-38.25h-2.14v29.07l-14.79-25.2c-1.88-3.15-3.68-4.77-6.16-4.77-2.14,0-3.51,1.8-3.51,4.95v34.47h2.14Zm-17.35-47.79c0,1.71,1.45,3.24,2.99,3.24,1.62,0,3.08-1.44,3.08-3.24s-1.37-3.24-3.08-3.24-2.99,1.53-2.99,3.24m.6,9.27v38.52h4.96v-38.52h-4.96Zm-33.6,38.52v-18.99h18.98v18.99h4.96v-38.52h-4.96v17.01h-18.98v-41.4h-4.96v62.91h4.96Zm-33.17,0h8.72c8.46,0,13-3.96,13-10.98,0-5.58-2.82-8.64-8.98-10.71l-3.42-1.17c-3.85-1.26-5.56-3.24-5.56-6.93s2.31-6.21,6.33-6.21h8.46v-2.52h-8.12c-7.1,0-11.46,4.23-11.46,10.62,0,4.5,2.82,8.01,8.29,9.72l4.1,1.35c3.85,1.17,5.39,3.24,5.39,7.02,0,4.86-2.65,7.29-8.04,7.29h-8.72v2.52Zm-13.85-47.79c0,1.71,1.45,3.24,2.99,3.24,1.62,0,3.08-1.44,3.08-3.24s-1.37-3.24-3.08-3.24-2.99,1.53-2.99,3.24m.6,9.27v38.52h4.96v-38.52h-4.96Zm-16.5-24.39v55.98c0,5.67,1.03,6.93,6.75,6.93h5.9v-2.52h-3.51c-3.16,0-4.19-.27-4.19-3.06v-57.33h-4.96Zm-32.66,60.39v-33.48h5.64c9.49,0,15.22,6.48,15.22,17.19s-5.56,16.29-15.73,16.29h-5.13Zm0,2.52h3.16c15.22,0,23-6.39,23-18.81,0-11.61-8.04-19.71-20.35-19.71h-5.81v-24.39h-5.13v62.91h5.13Zm-14.45-38.52h-2.39v24.57c0,8.19-3.25,12.42-9.06,12.42-5.3,0-8.81-3.96-8.81-10.62v-26.37h-4.96v24.84c0,9.72,4.87,14.94,13.17,14.94,7.52,0,12.06-5.04,12.06-13.86v-25.92Zm-59.55,10.98h11.29c12.23,0,18.98-6.12,18.98-15.66s-7.52-15.57-20.86-15.57h-15.56v58.77h6.16v-27.54Zm0-28.08h6.67c11.46,0,16.84,3.6,16.84,12.42s-5.22,12.6-15.9,12.6h-7.61v-25.02Z"/>
<path class="h" d="M1866.77,1248.54v-36h4.45c6.76,0,9.92,1.89,9.92,7.56,0,5.22-2.56,7.92-7.78,7.92h-4.62l12.83,20.52h5.9l-11.97-18.81h.26c6.84,0,10.69-3.42,10.69-9.09,0-6.3-4.87-10.62-13-10.62h-11.63v38.52h4.96Zm-29.24-.81c-7.27,0-12.48-7.02-12.48-18.36s5.21-18.45,12.48-18.45,12.4,7.11,12.4,18.45-5.13,18.36-12.4,18.36m1.03,2.07c10,0,16.76-8.01,16.76-19.98s-8.21-20.97-18.9-20.97c-9.92,0-16.67,8.1-16.67,19.98s8.12,20.97,18.81,20.97m-33.69-1.26h4.96v-36h6.84v-2.52h-6.84v-16.47c0-4.5,1.97-6.93,5.21-6.93,1.11,0,2.22,.45,3.59,1.26v-2.25c-1.28-.63-2.74-.99-4.36-.99-7.78,0-9.4,4.59-9.4,13.68v50.22Zm-47.56-31.59v24.66c0,5.67,1.11,6.93,6.84,6.93h15.47v-2.52h-13.08c-3.16,0-4.28-.27-4.28-3.06v-13.77h14.19v-2.34h-14.19v-11.34c0-2.79,1.11-2.97,4.28-2.97h13.42v-2.52h-15.82c-5.73,0-6.84,1.26-6.84,6.93m-5.13,24.39l-1.8-1.53c-2.56,5.22-6.16,7.92-10.94,7.92-7.52,0-11.88-6.39-11.88-18.27s4.79-18.54,12.65-18.54c4.53,0,7.52,2.25,9.66,6.93l2.05-1.35c-2.48-5.22-6.41-7.65-12.14-7.65-10.43,0-17.61,8.19-17.61,21.06,0,12.15,6.67,19.89,16.33,19.89,5.98,0,10.26-2.61,13.68-8.46m-59.08,7.2l3.16-10.71h15.65l3.68,10.71h5.47l-11.97-35.01c-1.11-3.15-2.22-4.68-4.28-4.68-1.88,0-3.25,1.26-3.93,3.69l-10.17,36h2.39Zm3.93-13.23l4.79-18.09c.43-1.62,.6-2.52,1.54-2.52,.68,0,1.03,.72,1.62,2.52l6.16,18.09h-14.11Zm-34.97,10.71v-33.48h5.64c9.49,0,15.22,6.48,15.22,17.19s-5.56,16.29-15.73,16.29h-5.13Zm0,2.52h3.16c15.22,0,23-6.39,23-18.81,0-11.61-8.04-19.71-20.35-19.71h-10.94v54.18h5.13v-15.66Zm-43.43-7.2c3.08,5.76,7.87,8.64,14.19,8.64,9.66,0,16.67-7.38,16.67-18.27,0-7.74-3.51-11.34-11.54-14.94l-3.59-1.62c-6.41-2.88-9.92-5.67-9.92-12.42s4.87-11.7,11.2-11.7c3.85,0,7.44,2.61,9.58,7.29l2.48-1.53c-3.16-5.58-7.27-8.28-12.74-8.28-8.98,0-16.07,7.38-16.07,17.1,0,7.74,4.1,11.25,12.23,15.12l3.51,1.62c6.24,2.97,8.81,5.67,8.81,12.33,0,7.92-4.28,12.87-10.43,12.87-4.79,0-9.15-2.97-11.54-8.01l-2.82,1.8Z"/>
<path class="h" d="m2424.2 1420.4h12.91c31.94 0 49.65 18.29 49.65 50.52s-17.05 51.05-47.17 51.05h-15.39v-101.57zm-11.92 107.67h34.26c16.72 0 30.62-5.92 39.56-16.38 9.1-10.63 13.74-23.69 13.74-38.68 0-35.71-23.67-58.71-64.88-58.71h-22.67v113.76zm-81.82-97.73 73.48 100.52v-116.55h-6.46v87.46l-63.55-87.46h-9.93v113.76h6.45v-97.73zm-14.18-16.03h-6.62v76.31c0 23.69-7.94 34.84-25.82 34.84-9.43 0-17.21-4.01-22.01-10.98-5.3-7.66-5.63-15.85-5.63-27.18v-73h-11.92v72.65c0 14.11 0.66 23.87 8.11 32.06 7.61 8.36 17.54 11.85 31.45 11.85 20.69 0 32.44-13.94 32.44-37.11v-79.44zm-90.83 57.14c0 33.62-16.72 54.53-38.89 54.53s-38.89-20.91-38.89-54.53 16.72-54.7 38.89-54.7 38.89 21.08 38.89 54.7m-39.06 59.41c13.9 0 26.48-5.75 36.41-16.72 9.93-11.15 15.23-25.78 15.23-42.68s-5.3-31.53-15.39-42.86c-9.6-10.8-22.51-16.72-36.25-16.72s-26.65 5.92-36.25 16.72c-10.1 11.32-15.39 25.96-15.39 42.86s5.3 31.53 15.23 42.68c9.93 10.97 22.51 16.72 36.41 16.72m-103.39-2.79v-54.88h45.84v-5.75h-45.84v-47.04h47.33v-6.1h-59.25v113.76h11.92z"/>
<path class="h" d="m2370.9 1383.5h11.92v-107.66h26.81v-6.1h-65.54v6.1h26.81v107.66zm-24.89-56.62c0 33.62-16.72 54.53-38.89 54.53s-38.89-20.91-38.89-54.53 16.72-54.7 38.89-54.7 38.89 21.08 38.89 54.7m-39.06 59.41c13.9 0 26.48-5.75 36.41-16.72 9.93-11.15 15.23-25.78 15.23-42.68s-5.3-31.53-15.39-42.86c-9.6-10.8-22.51-16.72-36.25-16.72s-26.65 5.92-36.25 16.72c-10.1 11.32-15.39 25.96-15.39 42.86s5.3 31.53 15.23 42.68c9.93 10.98 22.51 16.72 36.41 16.72m-129.84-100.52 73.48 100.52v-116.55h-6.46v87.46l-63.55-87.46h-9.93v113.76h6.46v-97.73z"/>
<path class="h" d="m2378 1232.9v-49.13h46.18v-5.75h-46.18v-46.69h49.16v-6.1h-61.07v113.76h62.73v-6.1h-50.81zm-17.51-40.07h-10.92v30.49c-5.79 8.54-15.89 13.76-27.31 13.76-24.49 0-41.87-22.3-41.87-56.79 0-32.23 16.88-52.61 41.38-52.61 14.73 0 25.49 7.67 31.94 22.65l5.3-2.96c-7.12-16.03-20.69-24.56-39.06-24.56-15.23 0-28.47 6.1-38.07 17.25-9.27 10.8-14.4 25.44-14.4 41.11 0 18.47 4.8 32.93 14.9 43.9 10.09 10.98 23.5 16.72 38.89 16.72 14.23 0 29.63-6.97 39.23-18.29v-30.66zm-149.45 5.75 19.86-52.26 19.2 52.26h-39.06zm-1.99 5.23h42.7l13.57 35.19h11.92l-44.52-116.2-44.19 116.2h7.28l13.24-35.19zm-55.36-18.12h21.85c23.67 0 36.74-11.85 36.74-30.31s-14.56-30.14-40.38-30.14h-30.12v113.76h11.92v-53.31zm0-54.35h12.91c22.18 0 32.6 6.97 32.6 24.04s-10.09 24.39-30.78 24.39h-14.73v-48.43z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 10 KiB

Loading…
Cancel
Save