diff --git a/3rdparty/include/IconsPromptFont.h b/3rdparty/include/IconsPromptFont.h index 706ba748dd..9aa3bc6d2d 100644 --- a/3rdparty/include/IconsPromptFont.h +++ b/3rdparty/include/IconsPromptFont.h @@ -185,7 +185,24 @@ #define ICON_PF_KEYBOARD "\xE2\x90\xBD" #define ICON_PF_MOUSE "\xE2\x90\xBE" #define ICON_PF_MOUSE_AND_KEYBOARD "\xE2\x90\xBF" +#define ICON_PF_DUALSHOCK2 "\xE2\x91\x81" +#define ICON_PF_DUALSHOCK2_SLASH "\xE2\x91\x82" #define ICON_PF_GUITAR "\xE2\x91\x83" +#define ICON_PF_STEERING_WHEEL_ALT "\xE2\x91\x84" +#define ICON_PF_SEGA_SEAMIC "\xE2\x91\x85" +#define ICON_PF_JOGCON "\xE2\x91\x86" +#define ICON_PF_BUZZ_CONTROLLER "\xE2\x91\x87" +#define ICON_PF_GAMETRAK_DEVICE "\xE2\x91\x88" +#define ICON_PF_DJ_HERO_TURNTABLE "\xE2\x91\x89" +#define ICON_PF_REALPLAY_BOWLING "\xE2\x91\x8A" +#define ICON_PF_NEGCON "\xE2\x91\x8B" +#define ICON_PF_REZ_VIBRATOR "\xE2\x91\x8C" +#define ICON_PF_EYETOY_WEBCAM "\xE2\x91\x8D" +#define ICON_PF_SINGSTAR_MIC "\xE2\x91\x8E" +#define ICON_PF_GUNCON2 "\xE2\x91\x8F" +#define ICON_PF_HEADSET "\xE2\x91\x90" +#define ICON_PF_KEYBOARDMANIA "\xE2\x91\x91" +#define ICON_PF_PRINTER "\xE2\x91\x92" #define ICON_PF_F1 "\xE2\x91\xA0" #define ICON_PF_F2 "\xE2\x91\xA1" #define ICON_PF_F3 "\xE2\x91\xA2" @@ -362,6 +379,7 @@ #define ICON_PF_HEARTBEAT_MAG "\xE2\x8D\xBE" #define ICON_PF_MONITOR_CODE "\xE2\x8D\xBF" #define ICON_PF_SIXTY_CIRCLE "\xE2\x8E\x80" +#define ICON_PF_VIDEO_CAMERA "\xE2\x8E\x81" #define ICON_PF_SPEAKER_ALT "\xE2\x8D\xA7" #define ICON_PF_THUNDERBOLT "\xE2\x8D\x9C" #define ICON_PF_BACKWARD "\xE2\x8F\x8C" diff --git a/3rdparty/promptfont/promptfont.sfd b/3rdparty/promptfont/promptfont.sfd index 03ec48c0c4..dec3810a29 100644 --- a/3rdparty/promptfont/promptfont.sfd +++ b/3rdparty/promptfont/promptfont.sfd @@ -23,7 +23,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1544355305 -ModificationTime: 1736751870 +ModificationTime: 1756310163 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -65,7 +65,7 @@ NameList: AGL For New Fonts DisplaySize: -48 AntiAlias: 1 FitToEm: 0 -WinInfo: 8360 38 14 +WinInfo: 9120 38 13 BeginPrivate: 8 BlueValues 29 [0 0 380 380 490 490 660 660] OtherBlues 39 [-210 -210 -180 -180 -160 -160 280 280] @@ -77,7 +77,7 @@ StemSnapV 13 [140 180 200] ForceBold 4 true EndPrivate TeXData: 1 0 0 335544 167772 111848 513802 1048576 111848 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 1114112 733 +BeginChars: 1114112 748 StartChar: exclam Encoding: 33 33 0 @@ -32852,7 +32852,7 @@ SplineSet 784 709.333 l 1 902.667 686 l 1 EndSplineSet -Validated: 33 +Validated: 524321 EndChar StartChar: uni2444 @@ -32916,33 +32916,106 @@ EndChar StartChar: uni2445 Encoding: 9285 9285 690 Width: 1000 +HStem: 77.4004 80.0664<402.4 612.934> 174.2 114.533<311.356 401.444> 196.333 68.9336<597.857 662.01> 233.533 68.9336<678.191 742.343> 270.733 68.9336<758.524 822.676> 278.733 68.9336<559.657 623.809> 315.934 68.9326<640.058 704.209> 345.533 42.5332<206.934 347.934> 353.134 68.9326<720.391 784.543> 407.267 36<429.267 570.733> 484 80<272.608 736.718> +VStem: 255.066 44.7334<296.267 437.267> 299.134 114.533<186.423 276.511> 557.267 68.9336<281.124 345.276> 595.467 68.9336<198.724 262.876> 637.667 68.9326<318.324 382.476> 675.8 68.9336<235.924 300.076> 718 68.9336<355.524 419.676> 756.134 68.9326<273.124 337.276> LayerCount: 2 Fore SplineSet -324 10.667 m 0 - 320 10.667 316 11.333 312.667 12 c 2 - 140 43.333 l 2 - 118.667 47.333 101.333 61.333 92.667 81.333 c 2 - 31.333 229.333 l 2 - 24.667 245.333 24.667 263.333 32 279.333 c 2 - 126.667 492.667 l 2 - 134.667 510.667 150 524 169.333 528.667 c 0 - 278.667 556 391.333 570 504.667 570 c 2 - 506 570 l 2 - 618 570 730 556 839.333 529.333 c 0 - 858.667 524.667 875.333 510.667 882.667 491.333 c 2 - 968.667 278.667 l 2 - 974.667 263.333 974.667 245.333 968 230 c 2 - 910.667 96.667 l 2 - 903.333 79.333 888 66 870 60.667 c 2 - 709.333 14.667 l 2 - 684 7.33301 656 16.667 640.667 38.667 c 2 - 615.333 74 l 1 - 400.667 74 l 1 - 376.667 39.333 l 2 - 364.667 20.667 345.333 10.667 324 10.667 c 0 +327.733398438 16.06640625 m 2x8020 + 324 16.06640625 320.266601562 16.400390625 316.466796875 17.06640625 c 2 + 147.400390625 48.2001953125 l 2 + 126.599609375 52.06640625 109.400390625 65.93359375 101.266601562 85.466796875 c 2 + 41 230.466796875 l 2 + 34.466796875 246.133789062 34.6669921875 264.06640625 41.599609375 279.533203125 c 2 + 134.599609375 488.733398438 l 2 + 142.466796875 506.400390625 157.666992188 519.133789062 176.266601562 523.799804688 c 0 + 283.599609375 550.466796875 394.06640625 564 504.599609375 564 c 2 + 506.133789062 564 l 2 + 616 563.866210938 725.799804688 550.400390625 832.466796875 523.93359375 c 0 + 851.666992188 519.133789062 867.599609375 505.333007812 875.06640625 486.866210938 c 2 + 959.266601562 278.133789062 l 2 + 965.400390625 262.93359375 965.200195312 245.533203125 958.799804688 230.400390625 c 2 + 902.866210938 99.93359375 l 2 + 895.466796875 82.6669921875 880.866210938 69.7998046875 862.866210938 64.6669921875 c 2 + 705.133789062 19.599609375 l 2 + 680 12.400390625 652.866210938 21.8662109375 637.599609375 43.06640625 c 2 + 612.93359375 77.400390625 l 1 + 402.400390625 77.400390625 l 1 + 379.133789062 43.2001953125 l 2 + 367.466796875 26 348.06640625 16 327.733398438 16 c 2 + 327.733398438 16.06640625 l 2x8020 +171.466796875 125.133789062 m 1 + 319.533203125 97.8662109375 l 1 + 341.533203125 130.266601562 l 2 + 353.133789062 147.333007812 372.333007812 157.466796875 392.93359375 157.466796875 c 2 + 622.06640625 157.466796875 l 2 + 642.06640625 157.466796875 660.93359375 147.799804688 672.533203125 131.533203125 c 2 + 695.200195312 100 l 1 + 832.666992188 139.266601562 l 1 + 882.266601562 255.06640625 l 1 + 804.200195312 448.466796875 l 1 + 706.599609375 471.93359375 606.333007812 483.866210938 505.93359375 484 c 2 + 504.533203125 484 l 2 + 403.400390625 484 302.333007812 472 204 448.266601562 c 1 + 117.733398438 254.133789062 l 1 + 171.333007812 125.200195312 l 1 + 171.466796875 125.133789062 l 1 +356.400390625 288.733398438 m 0xc028 + 388 288.733398438 413.666992188 263.06640625 413.666992188 231.466796875 c 0 + 413.666992188 199.866210938 388 174.200195312 356.400390625 174.200195312 c 0 + 324.799804688 174.200195312 299.133789062 199.866210938 299.133789062 231.466796875 c 0 + 299.133789062 263.06640625 324.733398438 288.733398438 356.400390625 288.733398438 c 0xc028 +347.93359375 388.06640625 m 1x8120 + 347.93359375 345.533203125 l 1 + 206.93359375 345.533203125 l 1 + 206.93359375 388.06640625 l 1 + 347.93359375 388.06640625 l 1x8120 +299.799804688 296.266601562 m 1x8030 + 255.06640625 296.266601562 l 1 + 255.06640625 437.266601562 l 1 + 299.799804688 437.266601562 l 1 + 299.799804688 296.266601562 l 1x8030 +675.799804688 268 m 0x902080 + 675.799804688 287.03515625 691.231445312 302.466796875 710.266601562 302.466796875 c 0 + 729.301757812 302.466796875 744.733398438 287.03515625 744.733398438 268 c 0 + 744.733398438 248.96484375 729.301757812 233.533203125 710.266601562 233.533203125 c 0 + 691.231445312 233.533203125 675.799804688 248.96484375 675.799804688 268 c 0x902080 +595.466796875 230.799804688 m 0xa022 + 595.466796875 249.834960938 610.897460938 265.266601562 629.93359375 265.266601562 c 0 + 648.96875 265.266601562 664.400390625 249.834960938 664.400390625 230.799804688 c 0 + 664.400390625 211.764648438 648.96875 196.333007812 629.93359375 196.333007812 c 0 + 610.897460938 196.333007812 595.466796875 211.764648438 595.466796875 230.799804688 c 0xa022 +756.133789062 305.200195312 m 0x882020 + 756.133789062 324.235351562 771.564453125 339.666992188 790.599609375 339.666992188 c 0 + 809.635742188 339.666992188 825.06640625 324.235351562 825.06640625 305.200195312 c 0 + 825.06640625 286.165039062 809.635742188 270.733398438 790.599609375 270.733398438 c 0 + 771.564453125 270.733398438 756.133789062 286.165039062 756.133789062 305.200195312 c 0x882020 +637.666992188 350.400390625 m 0x8221 + 637.666992188 369.435546875 653.09765625 384.866210938 672.133789062 384.866210938 c 0 + 691.168945312 384.866210938 706.599609375 369.435546875 706.599609375 350.400390625 c 0 + 706.599609375 331.364257812 691.168945312 315.93359375 672.133789062 315.93359375 c 0 + 653.09765625 315.93359375 637.666992188 331.364257812 637.666992188 350.400390625 c 0x8221 +557.266601562 313.200195312 m 0x8424 + 557.266601562 332.235351562 572.698242188 347.666992188 591.733398438 347.666992188 c 0 + 610.768554688 347.666992188 626.200195312 332.235351562 626.200195312 313.200195312 c 0 + 626.200195312 294.165039062 610.768554688 278.733398438 591.733398438 278.733398438 c 0 + 572.698242188 278.733398438 557.266601562 294.165039062 557.266601562 313.200195312 c 0x8424 +718 387.599609375 m 0x80a040 + 718 406.635742188 733.431640625 422.06640625 752.466796875 422.06640625 c 0 + 771.501953125 422.06640625 786.93359375 406.635742188 786.93359375 387.599609375 c 0 + 786.93359375 368.564453125 771.501953125 353.133789062 752.466796875 353.133789062 c 0 + 733.431640625 353.133789062 718 368.564453125 718 387.599609375 c 0x80a040 +429.266601562 427.799804688 m 2 + 429.266601562 443.266601562 429.266601562 443.266601562 444.733398438 443.266601562 c 2 + 555.266601562 443.266601562 l 2 + 570.733398438 443.266601562 570.733398438 443.266601562 570.733398438 427.799804688 c 2 + 570.733398438 422.733398438 l 2 + 570.733398438 407.266601562 570.733398438 407.266601562 555.266601562 407.266601562 c 2 + 444.733398438 407.266601562 l 2x8060 + 429.266601562 407.266601562 429.266601562 407.266601562 429.266601562 422.733398438 c 2 + 429.266601562 427.799804688 l 2 EndSplineSet -Validated: 33 +Validated: 37 EndChar StartChar: uniFF1B @@ -35357,7 +35430,7 @@ SplineSet 784 20.6669921875 801.333007812 26 810.666992188 39.3330078125 c 0 822 56 835.333007812 82.6669921875 840.666992188 123.333007812 c 0 EndSplineSet -Validated: 524321 +Validated: 33 EndChar StartChar: uni221B @@ -35482,6 +35555,1091 @@ SplineSet 699.697265625 -188.733398438 616.124023438 -105.161132812 616.124023438 -2.427734375 c 0 616.124023438 100.305664062 699.703125 183.87890625 802.430664062 183.87890625 c 0 EndSplineSet +Validated: 37 +EndChar + +StartChar: uni2447 +Encoding: 9287 9287 733 +Width: 1000 +HStem: -163.467 80<400.013 603.625> 34.5332 87.667<378.336 621.664> 157.333 87.667<378.336 621.664> 280.134 87.666<378.336 621.664> 402.934 87.666<378.336 621.664> 549.531 193.867<422.253 581.179> 589.934 80<338.467 410.104 589.879 661.533> +VStem: 242.333 80.0674<-19.9292 587.102> 378.333 243.334<34.5358 122.198 157.336 244.997 280.136 367.797 402.936 490.597> 677.533 80<-23.7989 587.102> +LayerCount: 2 +Fore +SplineSet +500 743.3984375 m 0xfdc0 + 597.311523438 743.3984375 674.133789062 699.521484375 674.133789062 636.46484375 c 0 + 674.133789062 621.279296875 669.03515625 606.314453125 660.268554688 594.623046875 c 0 + 634.694335938 560.514648438 581.178710938 549.53125 500 549.53125 c 0 + 422.252929688 549.53125 386.223632812 560.071289062 363.713867188 573.515625 c 0 + 330.263671875 593.494140625 325.866210938 622.561523438 325.866210938 636.46484375 c 0 + 325.866210938 699.516601562 402.680664062 743.3984375 500 743.3984375 c 0xfdc0 +410.104492188 639.752929688 m 1 + 447.95703125 625.310546875 556.333984375 626.485351562 589.87890625 639.666992188 c 1 + 550.811523438 672.228515625 445.0078125 669.734375 410.104492188 639.752929688 c 1 +378.333007812 465.200195312 m 2 + 378.333007812 490.599609375 378.333007812 490.599609375 403.733398438 490.599609375 c 2 + 596.266601562 490.599609375 l 2 + 621.666992188 490.599609375 621.666992188 490.599609375 621.666992188 465.200195312 c 2 + 621.666992188 428.333007812 l 2 + 621.666992188 402.93359375 621.666992188 402.93359375 596.266601562 402.93359375 c 2 + 403.733398438 402.93359375 l 2 + 378.333007812 402.93359375 378.333007812 402.93359375 378.333007812 428.333007812 c 2 + 378.333007812 465.200195312 l 2 +378.333007812 342.400390625 m 2 + 378.333007812 367.799804688 378.333007812 367.799804688 403.733398438 367.799804688 c 2 + 596.266601562 367.799804688 l 2 + 621.666992188 367.799804688 621.666992188 367.799804688 621.666992188 342.400390625 c 2 + 621.666992188 305.533203125 l 2 + 621.666992188 280.133789062 621.666992188 280.133789062 596.266601562 280.133789062 c 2 + 403.733398438 280.133789062 l 2 + 378.333007812 280.133789062 378.333007812 280.133789062 378.333007812 305.533203125 c 2 + 378.333007812 342.400390625 l 2 +378.333007812 219.599609375 m 2 + 378.333007812 245 378.333007812 245 403.733398438 245 c 2 + 596.266601562 245 l 2 + 621.666992188 245 621.666992188 245 621.666992188 219.599609375 c 2 + 621.666992188 182.733398438 l 2 + 621.666992188 157.333007812 621.666992188 157.333007812 596.266601562 157.333007812 c 2 + 403.733398438 157.333007812 l 2 + 378.333007812 157.333007812 378.333007812 157.333007812 378.333007812 182.733398438 c 2 + 378.333007812 219.599609375 l 2 +378.333007812 96.7998046875 m 2 + 378.333007812 122.200195312 378.333007812 122.200195312 403.733398438 122.200195312 c 2 + 596.266601562 122.200195312 l 2 + 621.666992188 122.200195312 621.666992188 122.200195312 621.666992188 96.7998046875 c 2 + 621.666992188 59.93359375 l 2 + 621.666992188 34.533203125 621.666992188 34.533203125 596.266601562 34.533203125 c 2 + 403.733398438 34.533203125 l 2 + 378.333007812 34.533203125 378.333007812 34.533203125 378.333007812 59.93359375 c 2 + 378.333007812 96.7998046875 l 2 +480.733398438 -163.466796875 m 1 + 479.333007812 -163.466796875 l 2 + 354.200195312 -159.06640625 282 -75.2001953125 256.733398438 -39.400390625 c 0 + 247.333007812 -26.06640625 242.333007812 -10.2666015625 242.333007812 6.1337890625 c 2 + 242.333007812 553.93359375 l 2 + 242.333007812 617.93359375 294.333007812 669.93359375 358.200195312 669.93359375 c 2 + 641.666992188 669.93359375 l 2xfbc0 + 705.533203125 669.93359375 757.533203125 617.866210938 757.533203125 553.93359375 c 2 + 757.533203125 4.400390625 l 2 + 757.533203125 -11.06640625 753 -26.2666015625 744.333007812 -39.400390625 c 0 + 687.266601562 -126.333007812 608.466796875 -163.466796875 480.666992188 -163.466796875 c 1 + 480.733398438 -163.466796875 l 1 +322.400390625 6.400390625 m 2 + 340.866210938 -19.7333984375 392.93359375 -80.06640625 481.466796875 -83.466796875 c 0 + 596.733398438 -83.3330078125 642 -49.7333984375 677.533203125 4.400390625 c 1 + 677.533203125 553.93359375 l 2 + 677.599609375 573.799804688 661.533203125 589.93359375 641.733398438 589.93359375 c 2 + 358.266601562 589.93359375 l 2 + 338.466796875 589.93359375 322.400390625 573.799804688 322.400390625 553.93359375 c 2 + 322.400390625 6.400390625 l 2 +EndSplineSet +Validated: 8912933 +EndChar + +StartChar: uni2448 +Encoding: 9288 9288 734 +Width: 1000 +HStem: -41.333 80<397.227 589.893> -12 70<229.498 264.002 739.498 772.502> 233.333 140<439.731 563.285> 484.667 78.666<423.605 579.197> 525.333 79.334<250 343.333 658.667 752.667> +VStem: 416 171.333<257.521 349.146> +LayerCount: 2 +Fore +SplineSet +492 -41.3330078125 m 0xa4 + 440 -41.3330078125 393.333007812 -29.3330078125 346.666992188 -3.3330078125 c 0 + 330 -17.3330078125 308.666992188 -24 285.333007812 -21.3330078125 c 2 + 200 -12 l 1 + 199.333007812 -12 l 2 + 159.333007812 -6.6669921875 123.333007812 15.3330078125 100.666992188 48.6669921875 c 0 + 78 82 70.6669921875 123.333007812 80 162.666992188 c 2 + 173.333007812 543.333007812 l 2 + 182 578 212.666992188 603.333007812 248.666992188 604.666992188 c 2x6c + 350 608 l 2 + 371.333007812 608.666992188 392 600 406.666992188 584 c 0 + 414 576 419.333007812 566 422.666992188 556 c 0 + 442.666992188 560 463.333007812 562.666992188 484 563.333007812 c 0x34 + 516.666992188 564.666992188 549.333007812 560.666992188 580.666992188 553.333007812 c 0 + 583.333007812 564.666992188 589.333007812 575.333007812 597.333007812 584 c 0 + 612 600 632.666992188 608.666992188 654 608 c 2 + 755.333007812 604.666992188 l 2 + 791.333007812 603.333007812 822 578 830.666992188 543.333007812 c 2 + 924 162.666992188 l 2 + 924 162 924.666992188 161.333007812 924.666992188 160.666992188 c 0 + 933.333007812 122 926 81.3330078125 903.333007812 48.6669921875 c 0 + 880.666992188 15.3330078125 844.666992188 -6.6669921875 804.666992188 -12 c 2 + 804 -12 l 1x6c + 718 -21.3330078125 l 2 + 692 -24.6669921875 667.333007812 -15.3330078125 650.666992188 2.6669921875 c 0 + 604.666992188 -25.3330078125 559.333007812 -38.6669921875 505.333007812 -40.6669921875 c 0 + 500 -41.3330078125 496 -41.3330078125 492 -41.3330078125 c 0xa4 +334.666992188 90.6669921875 m 0 + 342.666992188 90.6669921875 350.666992188 88 357.333007812 83.3330078125 c 0 + 406.666992188 49.3330078125 448 36.6669921875 501.333007812 38.6669921875 c 0xa4 + 553.333007812 40.6669921875 594 56.6669921875 641.333007812 94 c 0 + 652.666992188 102.666992188 668 105.333007812 681.333007812 100 c 0 + 694.666992188 94.6669921875 704 82.6669921875 706 68 c 2 + 707.333007812 58 l 1 + 708 58 l 1 + 794 67.3330078125 l 2 + 811.333007812 70 826.666992188 79.3330078125 836.666992188 94 c 0 + 846.666992188 108.666992188 850 126.666992188 846 144 c 0 + 846 144.666992188 846 145.333007812 845.333007812 146 c 2 + 752.666992188 524.666992188 l 1 + 752.666992188 524.666992188 752.666992188 525.333007812 752 525.333007812 c 2x6c + 658.666992188 528.666992188 l 1 + 662 502.666992188 l 2 + 664 488 658 474 646 465.333007812 c 0 + 634 456.666992188 618.666992188 455.333007812 605.333007812 461.333007812 c 0 + 568.666992188 478 527.333007812 486 485.333007812 484.666992188 c 0x34 + 454 483.333007812 424 477.333007812 395.333007812 466 c 0 + 382 460.666992188 367.333007812 462.666992188 356 471.333007812 c 0 + 344.666992188 480 339.333007812 494 340.666992188 508 c 2 + 343.333007812 528.666992188 l 1 + 250 525.333007812 l 1 + 250 525.333007812 249.333007812 525.333007812 249.333007812 524.666992188 c 2 + 156 144 l 2 + 152 126.666992188 154.666992188 108.666992188 165.333007812 94 c 0 + 175.333007812 79.3330078125 190.666992188 70 208 67.3330078125 c 2 + 294 58 l 1 + 294.666992188 58 l 2 + 297.333007812 71.3330078125 306 82.6669921875 318.666992188 88 c 0 + 324.666992188 89.3330078125 330 90.6669921875 334.666992188 90.6669921875 c 0 +501.333007812 233.333007812 m 0 + 454 233.333007812 416 264.666992188 416 303.333007812 c 0 + 416 342 454.666992188 373.333007812 501.333007812 373.333007812 c 0 + 548 373.333007812 587.333007812 342 587.333007812 303.333007812 c 0 + 587.333007812 264.666992188 548.666992188 233.333007812 501.333007812 233.333007812 c 0 +754.666992188 270 m 0 + 710 270 674 299.333007812 674 336 c 0 + 674 372 710 402 754.666992188 402 c 0 + 798.666992188 402 835.333007812 372.666992188 835.333007812 336 c 0 + 835.333007812 299.333007812 799.333007812 270 754.666992188 270 c 0 +244 270 m 0 + 200 270 163.333007812 299.333007812 163.333007812 336 c 0 + 163.333007812 372 199.333007812 402 244 402 c 0 + 288.666992188 402 324.666992188 372.666992188 324.666992188 336 c 0 + 324.666992188 299.333007812 288.666992188 270 244 270 c 0 +278.666992188 352 m 1 + 246 328 l 1 + 54 538.666992188 l 2 + 42.6669921875 551.333007812 44.6669921875 570.666992188 58 580.666992188 c 2 + 108 617.333007812 l 2 + 120 626 137.333007812 622 144 608.666992188 c 2 + 278.666992188 352 l 1 +725.333007812 352 m 1 + 860.666992188 608 l 2 + 867.333007812 621.333007812 884.666992188 625.333007812 896.666992188 616.666992188 c 2 + 946.666992188 580 l 2 + 960 570 962 550.666992188 950.666992188 538 c 2 + 758 328 l 1 + 725.333007812 352 l 1 +EndSplineSet +Validated: 37 +EndChar + +StartChar: uni2449 +Encoding: 9289 9289 735 +Width: 1000 +HStem: -142.669 80<134.723 865.247> -23 86.9336<169.731 246.535 282.865 359.668> 87.0635 80<340.328 505.404> 266.066 144.4<371.475 474.258> 509.336 80<340.328 505.404> 562.402 14.3311<755.703 800.7> 642.598 80.0713<134.753 868.38> +VStem: 34.0693 80<-43.6401 623.581> 163.866 88.5342<-16.7071 57.6407 250.67 425.732> 277 88.5332<-16.7071 57.6407> 350.134 145.466<287.242 389.292> 597.669 80<257.158 419.244> 702.066 36.1367<454.354 549.513> 818.203 36.1299<454.354 549.513> 885.931 80<-43.6492 623.64> +LayerCount: 2 +Fore +SplineSet +248.06640625 338.203125 m 0xfb9e + 248.06640625 244.249023438 325.715820312 167.063476562 422.864257812 167.063476562 c 0 + 520.020507812 167.063476562 597.668945312 244.25 597.668945312 338.203125 c 0 + 597.668945312 432.1484375 520.020507812 509.3359375 422.864257812 509.3359375 c 0 + 325.715820312 509.3359375 248.06640625 432.149414062 248.06640625 338.203125 c 0xfb9e +168.06640625 338.203125 m 0 + 168.06640625 477.459960938 282.760742188 589.3359375 422.864257812 589.3359375 c 0 + 562.973632812 589.3359375 677.668945312 477.4609375 677.668945312 338.203125 c 0 + 677.668945312 198.940429688 562.974609375 87.0634765625 422.864257812 87.0634765625 c 0 + 282.760742188 87.0634765625 168.06640625 198.940429688 168.06640625 338.203125 c 0 +422.866210938 266.06640625 m 0 + 382.733398438 266.06640625 350.133789062 298.466796875 350.133789062 338.266601562 c 0 + 350.133789062 378.06640625 382.799804688 410.466796875 422.866210938 410.466796875 c 0 + 462.93359375 410.466796875 495.599609375 378.06640625 495.599609375 338.266601562 c 0xf3be + 495.599609375 298.466796875 462.93359375 266.06640625 422.866210938 266.06640625 c 0 +702.06640625 501.93359375 m 0 + 702.06640625 460.622070312 736.15234375 427.133789062 778.200195312 427.133789062 c 0 + 820.247070312 427.133789062 854.333007812 460.622070312 854.333007812 501.93359375 c 0 + 854.333007812 543.244140625 820.247070312 576.733398438 778.200195312 576.733398438 c 0xf79e + 736.15234375 576.733398438 702.06640625 543.244140625 702.06640625 501.93359375 c 0 +818.203125 522.40234375 m 2 + 818.203125 126.399414062 l 1 + 804.736328125 96.4765625 l 1 + 698.069335938 1.80859375 l 2 + 691.006835938 -4.4599609375 681.712890625 -8.2685546875 671.536132812 -8.2685546875 c 0 + 634.998046875 -8.2685546875 617.565429688 37.3037109375 645.002929688 61.6552734375 c 2 + 738.203125 144.37109375 l 1 + 738.203125 522.40234375 l 2 + 738.203125 544.478515625 756.126953125 562.40234375 778.203125 562.40234375 c 0 + 800.279296875 562.40234375 818.203125 544.478515625 818.203125 522.40234375 c 2 +163.866210938 20.466796875 m 0 + 163.866210938 44.47265625 183.685546875 63.93359375 208.133789062 63.93359375 c 0 + 232.581054688 63.93359375 252.400390625 44.47265625 252.400390625 20.466796875 c 0 + 252.400390625 -3.5390625 232.581054688 -23 208.133789062 -23 c 0 + 183.685546875 -23 163.866210938 -3.5390625 163.866210938 20.466796875 c 0 +277 20.466796875 m 0xf3de + 277 44.47265625 296.819335938 63.93359375 321.266601562 63.93359375 c 0 + 345.71484375 63.93359375 365.533203125 44.47265625 365.533203125 20.466796875 c 0 + 365.533203125 -3.5390625 345.71484375 -23 321.266601562 -23 c 0 + 296.819335938 -23 277 -3.5390625 277 20.466796875 c 0xf3de +885.930664062 576.6015625 m 2 + 885.930664062 611.495117188 857.819335938 640.9609375 821.2734375 642.59765625 c 2 + 181.93359375 642.59765625 l 2 + 143.904296875 642.59765625 114.069335938 612.412109375 114.069335938 576.536132812 c 2 + 114.069335938 3.3984375 l 2 + 114.069335938 -32.5087890625 143.838867188 -62.6689453125 181.93359375 -62.6689453125 c 2 + 818.06640625 -62.6689453125 l 2 + 856.094726562 -62.6689453125 885.930664062 -32.4853515625 885.930664062 3.3984375 c 2 + 885.930664062 576.6015625 l 2 +181.93359375 722.59765625 m 0 + 583.41796875 722.59765625 811.705078125 722.668945312 818.06640625 722.668945312 c 0 + 899.176757812 722.668945312 965.930664062 657.764648438 965.930664062 576.6015625 c 2 + 965.930664062 3.3984375 l 2 + 965.930664062 -77.7880859375 899.100585938 -142.668945312 818.06640625 -142.668945312 c 2 + 181.93359375 -142.668945312 l 2 + 100.823242188 -142.668945312 34.0693359375 -77.7646484375 34.0693359375 3.3984375 c 2 + 34.0693359375 576.536132812 l 2 + 34.0693359375 657.717773438 100.900390625 722.59765625 181.93359375 722.59765625 c 0 +EndSplineSet +Validated: 8912933 +EndChar + +StartChar: uni244A +Encoding: 9290 9290 736 +Width: 1000 +HStem: 327.134 111.399<503.599 571.334> 549.866 111.334<397.496 587.412> +VStem: 128.8 167.066<187.496 412.578> +LayerCount: 2 +Fore +SplineSet +351.533203125 438.466796875 m 0 + 320.799804688 438.466796875 295.866210938 413.533203125 295.866210938 382.799804688 c 0 + 295.866210938 352.06640625 320.799804688 327.133789062 351.533203125 327.133789062 c 0 + 382.266601562 327.133789062 407.200195312 352.06640625 407.200195312 382.799804688 c 0 + 407.200195312 413.533203125 382.266601562 438.466796875 351.533203125 438.466796875 c 0 +472.06640625 271.466796875 m 0 + 472.06640625 240.72265625 496.989257812 215.799804688 527.733398438 215.799804688 c 0 + 558.477539062 215.799804688 583.400390625 240.72265625 583.400390625 271.466796875 c 0 + 583.400390625 302.2109375 558.477539062 327.133789062 527.733398438 327.133789062 c 0 + 496.989257812 327.133789062 472.06640625 302.2109375 472.06640625 271.466796875 c 0 +491.533203125 494.200195312 m 0 + 491.533203125 463.456054688 516.456054688 438.533203125 547.200195312 438.533203125 c 0 + 577.944335938 438.533203125 602.866210938 463.456054688 602.866210938 494.200195312 c 0 + 602.866210938 524.944335938 577.944335938 549.866210938 547.200195312 549.866210938 c 0 + 516.456054688 549.866210938 491.533203125 524.944335938 491.533203125 494.200195312 c 0 +128.799804688 290 m 0 + 128.799804688 495.0078125 294.9921875 661.200195312 500 661.200195312 c 0 + 705.0078125 661.200195312 871.200195312 495.0078125 871.200195312 290 c 0 + 871.200195312 84.9921875 705.0078125 -81.2001953125 500 -81.2001953125 c 0 + 294.9921875 -81.2001953125 128.799804688 84.9921875 128.799804688 290 c 0 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni244B +Encoding: 9291 9291 737 +Width: 1000 +HStem: 414.668 107.331<208.655 253.333 320.664 342.74 655.254 677.331 746.667 786.516> 441.999 52.6689<231.345 253.333 320.664 342.74 655.254 677.331 746.667 766.655> +LayerCount: 2 +Fore +SplineSet +320.6640625 441.999023438 m 2x40 + 342.740234375 441.999023438 360.6640625 459.921875 360.6640625 481.999023438 c 0 + 360.6640625 504.075195312 342.740234375 521.999023438 320.6640625 521.999023438 c 0 + 208.655273438 521.999023438 208.655273438 521.999023438 208.655273438 521.999023438 c 1x80 + 136.370117188 477.400390625 l 2 + 102.228515625 456.3359375 117.36328125 403.333007812 157.331054688 403.333007812 c 0 + 165.014648438 403.333007812 172.194335938 405.50390625 178.291015625 409.265625 c 2 + 231.344726562 441.999023438 l 1 + 320.6640625 441.999023438 l 2x40 +481.998046875 522.807617188 m 1 + 401.999023438 522.536132812 l 1 + 403.333984375 129.197265625 l 1 + 483.333007812 129.46875 l 1 + 481.998046875 522.807617188 l 1 +427.331054688 164.66796875 m 1 + 427.331054688 494.66796875 l 1 + 253.333007812 494.66796875 l 2x40 + 163.436523438 494.66796875 96.763671875 422.258789062 89.3525390625 333.041015625 c 0 + 69.466796875 93.62109375 63.3232421875 93.9990234375 63.3232421875 93.7890625 c 0 + 63.3232421875 32.375 132.3046875 -3.4638671875 182.110351562 31.1181640625 c 0 + 184.452148438 32.5595703125 186.487304688 34.306640625 188.229492188 36.34765625 c 2 + 311.068359375 164.66796875 l 1 + 427.331054688 164.66796875 l 1 +347.331054688 414.66796875 m 1x80 + 347.331054688 244.66796875 l 1 + 276.92578125 244.66796875 l 1 + 144.911132812 106.76171875 l 1 + 152.979492188 181.469726562 161.635742188 255.588867188 169.3359375 330.6640625 c 0 + 169.3359375 377.313476562 206.693359375 414.66796875 253.333007812 414.66796875 c 2 + 347.331054688 414.66796875 l 1x80 +677.331054688 521.999023438 m 2 + 655.25390625 521.999023438 637.331054688 504.075195312 637.331054688 481.999023438 c 0 + 637.331054688 459.921875 655.25390625 441.999023438 677.331054688 441.999023438 c 2 + 766.655273438 441.999023438 l 1x40 + 819.702148438 409.266601562 l 2 + 846.17578125 392.931640625 880.6640625 412.080078125 880.6640625 443.333007812 c 0 + 880.6640625 457.725585938 873.045898438 470.353515625 861.625976562 477.399414062 c 0 + 789.34765625 521.999023438 789.34765625 521.999023438 789.34765625 521.999023438 c 1 + 677.331054688 521.999023438 l 2 +598.000976562 522.53125 m 1 + 518.001953125 522.807617188 l 1 + 516.666992188 129.474609375 l 1 + 596.666015625 129.197265625 l 1 + 598.000976562 522.53125 l 1 +723.07421875 244.66796875 m 1 + 652.668945312 244.66796875 l 1 + 652.668945312 414.66796875 l 1 + 746.666992188 414.66796875 l 2x80 + 786.515625 414.66796875 830.6640625 384.997070312 830.6640625 328.439453125 c 2 + 855.088867188 106.76171875 l 1 + 723.07421875 244.66796875 l 1 +746.666992188 494.66796875 m 0x40 + 572.668945312 494.66796875 572.668945312 494.66796875 572.668945312 494.66796875 c 1 + 572.668945312 164.66796875 l 1 + 688.931640625 164.66796875 l 1 + 814.569335938 33.423828125 l 2 + 822.494140625 27.9208984375 837.334960938 17.6171875 860.697265625 17.6171875 c 0 + 895.516601562 17.6171875 942.409179688 44.77734375 936.616210938 97.3486328125 c 0 + 910.647460938 333.041015625 910.647460938 333.041015625 910.647460938 333.041015625 c 1 + 909.379882812 422.635742188 836.563476562 494.66796875 746.666992188 494.66796875 c 0x40 +EndSplineSet +Validated: 524325 +EndChar + +StartChar: uni2381 +Encoding: 9089 9089 738 +Width: 1000 +HStem: 13.2666 553.467<67.2232 664.444> +VStem: 62.667 606.333<17.8229 562.177> 670.8 266.467<189.733 390.2> +LayerCount: 2 +Fore +SplineSet +922.866210938 89.400390625 m 1 + 670.799804688 189.733398438 l 1 + 670.799804688 390.200195312 l 1 + 922.866210938 490.533203125 l 2 + 929.733398438 493.266601562 937.266601562 488.533203125 937.266601562 481.533203125 c 2 + 937.266601562 98.3330078125 l 2 + 937.266601562 91.3330078125 929.666992188 86.599609375 922.866210938 89.3330078125 c 2 + 922.866210938 89.400390625 l 1 +62.6669921875 480.333007812 m 2 + 62.6669921875 566.733398438 62.6669921875 566.733398438 149.06640625 566.733398438 c 2 + 582.599609375 566.733398438 l 2 + 669 566.733398438 669 566.733398438 669 480.333007812 c 2 + 669 99.6669921875 l 2 + 669 13.2666015625 669 13.2666015625 582.599609375 13.2666015625 c 2 + 149.06640625 13.2666015625 l 2 + 62.6669921875 13.2666015625 62.6669921875 13.2666015625 62.6669921875 99.6669921875 c 2 + 62.6669921875 480.333007812 l 2 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni244C +Encoding: 9292 9292 739 +Width: 1000 +HStem: -112.734 80<541.337 720.289> 27.5322 80<387.715 615.217> 27.5322 46.667<477.924 522.076> 612.734 80<384.896 612.219> +VStem: 303.933 80<111.215 612.007> 460 80<-31.3969 56.2754> 616.003 80<110.87 611.908> +LayerCount: 2 +Fore +SplineSet +132.734375 606.666992188 m 0x9e + 148.115234375 606.666992188 161.48046875 597.966796875 168.172851562 585.22265625 c 2 + 255.907226562 418.15234375 l 2 + 263.55859375 403.58203125 261.569335938 385.387695312 250.106445312 372.745117188 c 2 + 169.68359375 284.04296875 l 1 + 241.20703125 172.016601562 l 2 + 249.266601562 159.392578125 249.53125 143.348632812 242.106445312 130.528320312 c 2 + 162.639648438 -6.671875 l 2 + 155.71875 -18.62109375 142.791992188 -26.6669921875 128.000976562 -26.6669921875 c 0 + 97.2265625 -26.6669921875 78.0244140625 6.8564453125 93.3623046875 33.3388671875 c 2 + 160.657226562 149.524414062 l 1 + 85.7919921875 266.78515625 l 2 + 76.1943359375 281.817382812 77.673828125 301.642578125 89.8935546875 315.120117188 c 2 + 172.05859375 405.743164062 l 1 + 97.2958984375 548.110351562 l 2 + 83.4111328125 574.55078125 102.666992188 606.666992188 132.734375 606.666992188 c 0x9e +902.704101562 548.110351562 m 2 + 827.94140625 405.743164062 l 1 + 910.106445312 315.120117188 l 2 + 922.326171875 301.642578125 923.805664062 281.817382812 914.208007812 266.78515625 c 2 + 839.342773438 149.524414062 l 1 + 906.637695312 33.3388671875 l 2 + 921.975585938 6.8564453125 902.7734375 -26.6669921875 871.999023438 -26.6669921875 c 0 + 857.208007812 -26.6669921875 844.28125 -18.62109375 837.360351562 -6.671875 c 2 + 757.893554688 130.528320312 l 2 + 746.282226562 150.576171875 756.6796875 168.706054688 758.79296875 172.016601562 c 2 + 830.31640625 284.04296875 l 1 + 749.893554688 372.745117188 l 2 + 738.4296875 385.388671875 736.442382812 403.583007812 744.092773438 418.15234375 c 2 + 831.827148438 585.22265625 l 2 + 838.51953125 597.966796875 851.884765625 606.666992188 867.265625 606.666992188 c 0 + 897.333007812 606.666992188 916.588867188 574.55078125 902.704101562 548.110351562 c 2 +540 34.19921875 m 2 + 540 -13.9326171875 l 2 + 540 -24.13671875 548.59765625 -32.734375 558.801757812 -32.734375 c 2 + 684.66796875 -32.734375 l 2 + 706.744140625 -32.734375 724.66796875 -50.658203125 724.66796875 -72.734375 c 0 + 724.66796875 -94.810546875 706.744140625 -112.734375 684.66796875 -112.734375 c 2 + 558.801757812 -112.734375 l 2 + 504.33203125 -112.734375 460 -68.40234375 460 -13.9326171875 c 2 + 460 34.19921875 l 2 + 460 56.275390625 477.923828125 74.19921875 500 74.19921875 c 0xbe + 522.076171875 74.19921875 540 56.275390625 540 34.19921875 c 2 +383.932617188 182.135742188 m 0 + 383.932617188 139.203125 384.420898438 120.98046875 387.130859375 110.728515625 c 0 + 399.438476562 107.637695312 422.180664062 107.532226562 458.53515625 107.532226562 c 0xde + 600.708007812 107.532226562 600.734375 107.5390625 612.806640625 110.731445312 c 0 + 613.5390625 113.6484375 614.537109375 119.348632812 615.094726562 127.6640625 c 0 + 616.002929688 141.186523438 616.002929688 141.186523438 616.002929688 538.131835938 c 0 + 616.002929688 581.063476562 615.514648438 599.287109375 612.803710938 609.538085938 c 0 + 600.49609375 612.62890625 577.754882812 612.734375 541.399414062 612.734375 c 0 + 399.2265625 612.734375 399.200195312 612.727539062 387.127929688 609.53515625 c 0 + 386.395507812 606.618164062 385.3984375 600.91796875 384.83984375 592.603515625 c 0 + 383.932617188 579.080078125 383.932617188 579.080078125 383.932617188 182.135742188 c 0 +303.932617188 538.131835938 m 2 + 303.932617188 573.544921875 303.325195312 598.888671875 308.073242188 622.712890625 c 0 + 320.172851562 683.426757812 370.985351562 688.888671875 388.563476562 690.778320312 c 0 + 406.756835938 692.734375 406.756835938 692.734375 541.399414062 692.734375 c 0 + 601.65625 692.734375 632.33203125 692.734375 657.872070312 676.388671875 c 0 + 678.2890625 663.322265625 688.096679688 641.604492188 691.862304688 622.712890625 c 0 + 696.610351562 598.888671875 696.002929688 573.544921875 696.002929688 538.131835938 c 2 + 696.002929688 182.135742188 l 2 + 696.002929688 121.87890625 696.002929688 91.203125 679.657226562 65.6630859375 c 0 + 666.590820312 45.24609375 644.873046875 35.4384765625 625.981445312 31.6728515625 c 0 + 602.157226562 26.9248046875 576.8125 27.5322265625 541.399414062 27.5322265625 c 0 + 394.73046875 27.5322265625 394.73046875 27.5322265625 373.954101562 31.6728515625 c 0 + 355.061523438 35.4384765625 333.344726562 45.24609375 320.27734375 65.6630859375 c 0 + 303.932617188 91.203125 303.932617188 121.87890625 303.932617188 182.135742188 c 2 + 303.932617188 538.131835938 l 2 +EndSplineSet +Validated: 524325 +EndChar + +StartChar: uni244D +Encoding: 9293 9293 740 +Width: 1000 +HStem: -49.2666 80<227.667 772.866> 122.066 20.1992<419.584 580.416> 536.067 93.1973<440.994 559.006> 549.265 66.8027<396.857 603.143> +VStem: 313.203 80<365.201 493.329> 606.797 80<365.201 493.329> +LayerCount: 2 +Fore +SplineSet +568.463867188 453.203125 m 1xcc + 532.467773438 417.200195312 l 1 + 496.46484375 453.203125 l 1 + 532.467773438 489.19921875 l 1 + 568.463867188 453.203125 l 1xcc +488.463867188 453.203125 m 0 + 488.463867188 428.881835938 508.221679688 409.19921875 532.467773438 409.19921875 c 0 + 556.775390625 409.19921875 576.46484375 428.96875 576.46484375 453.203125 c 0 + 576.46484375 477.481445312 556.745117188 497.200195312 532.467773438 497.200195312 c 0 + 508.251953125 497.200195312 488.463867188 477.568359375 488.463867188 453.203125 c 0 +393.203125 429.264648438 m 0 + 393.203125 488.274414062 440.994140625 536.067382812 500 536.067382812 c 0xec + 559.005859375 536.067382812 606.796875 488.274414062 606.796875 429.264648438 c 0 + 606.796875 370.255859375 559.0078125 322.467773438 500 322.467773438 c 0 + 440.9921875 322.467773438 393.203125 370.255859375 393.203125 429.264648438 c 0 +313.203125 429.264648438 m 0 + 313.203125 326.124023438 396.859375 242.467773438 500 242.467773438 c 0 + 603.140625 242.467773438 686.796875 326.124023438 686.796875 429.264648438 c 0 + 686.796875 532.403320312 603.142578125 616.067382812 500 616.067382812 c 0xdc + 396.857421875 616.067382812 313.203125 532.403320312 313.203125 429.264648438 c 0 +120.598632812 629.264648438 m 1xec + 120.598632812 241.26953125 l 1 + 879.3359375 241.26953125 l 1 + 879.3359375 629.264648438 l 1 + 120.598632812 629.264648438 l 1xec +200.598632812 321.26953125 m 1 + 200.598632812 549.264648438 l 1 + 799.3359375 549.264648438 l 1xdc + 799.3359375 321.26953125 l 1 + 200.598632812 321.26953125 l 1 +172.265625 425.80078125 m 1 + 172.265625 505.80078125 l 1 + 63.8671875 505.80078125 l 1 + 63.8671875 425.80078125 l 1 + 172.265625 425.80078125 l 1 +172.265625 549.264648438 m 1 + 172.265625 629.264648438 l 1 + 63.8671875 629.264648438 l 1xec + 63.8671875 549.264648438 l 1 + 172.265625 549.264648438 l 1 +172.265625 302.331054688 m 1 + 172.265625 382.331054688 l 1 + 63.8671875 382.331054688 l 1 + 63.8671875 302.331054688 l 1 + 172.265625 302.331054688 l 1 +936.1328125 425.80078125 m 1 + 936.1328125 505.80078125 l 1 + 827.734375 505.80078125 l 1 + 827.734375 425.80078125 l 1 + 936.1328125 425.80078125 l 1 +936.1328125 549.264648438 m 1xdc + 936.1328125 629.264648438 l 1 + 827.734375 629.264648438 l 1xec + 827.734375 549.264648438 l 1 + 936.1328125 549.264648438 l 1xdc +936.1328125 302.331054688 m 1 + 936.1328125 382.331054688 l 1 + 827.734375 382.331054688 l 1 + 827.734375 302.331054688 l 1 + 936.1328125 302.331054688 l 1 +635.07421875 292.40234375 m 1 + 364.92578125 292.40234375 l 1 + 419.583984375 142.265625 l 1 + 580.416015625 142.265625 l 1 + 635.07421875 292.40234375 l 1 +858.599609375 -49.2666015625 m 1 + 141.400390625 -49.2666015625 l 2 + 124.400390625 -49.2666015625 108.799804688 -39.3330078125 101.599609375 -23.93359375 c 0 + 94.400390625 -8.533203125 96.7998046875 9.7998046875 107.666992188 22.8662109375 c 2 + 109.93359375 25.400390625 l 1 + 270.866210938 188.200195312 l 2 + 279.133789062 197.06640625 290.733398438 202.133789062 302.93359375 202.133789062 c 2 + 698.533203125 202.133789062 l 2 + 710.533203125 202.133789062 722 197.200195312 730.266601562 188.599609375 c 2 + 891.333007812 24.2666015625 l 2 + 903 11.400390625 905.93359375 -7.2001953125 898.866210938 -23.06640625 c 0 + 891.799804688 -38.93359375 876.06640625 -49.2001953125 858.666992188 -49.2001953125 c 2 + 858.599609375 -49.2666015625 l 1 +227.666992188 30.7333984375 m 1 + 772.866210938 30.7333984375 l 1 + 683.333007812 122.06640625 l 1 + 317.93359375 122.06640625 l 1 + 227.666992188 30.7333984375 l 1 +EndSplineSet +Validated: 524325 +EndChar + +StartChar: uni244E +Encoding: 9294 9294 741 +Width: 1000 +HStem: -122.669 46.334<453.333 461.797 538.132 546.667> 380.534 70.4688<404.636 448.665 601.482 613.118> 665.263 80.8701<551.335 590.045> +VStem: 328.665 80.7617<461.403 500.534 626.133 665.371> 383.806 79.7881<-42.6689 105.702> 411.536 39.6201<238.601 298.601> 536.341 79.7881<-42.6689 107.866> 548.779 39.6846<238.601 298.601> 590.465 80.8701<461.295 500.534 626.133 665.263> +LayerCount: 2 +Fore +SplineSet +533.8671875 593.333007812 m 1xe0 + 533.8671875 533.333007812 l 1 + 631.334960938 533.333007812 l 1 + 631.334960938 593.333007812 l 1 + 533.8671875 593.333007812 l 1xe0 +368.665039062 593.333007812 m 1 + 368.665039062 533.333007812 l 1 + 466.1328125 533.333007812 l 1 + 466.1328125 593.333007812 l 1 + 368.665039062 593.333007812 l 1 +328.665039062 626.1328125 m 2xf080 + 328.665039062 500.534179688 l 2 + 328.665039062 475.80078125 328.057617188 457.840820312 331.7890625 439.12109375 c 0 + 334.740234375 424.3125 343.083007812 405.220703125 360.862304688 393.841796875 c 0 + 381.655273438 380.534179688 404.635742188 380.534179688 448.665039062 380.534179688 c 0 + 588.134765625 380.534179688 588.134765625 380.534179688 601.482421875 381.96875 c 0 + 613.118164062 383.219726562 625.9921875 385.428710938 639.137695312 393.841796875 c 0 + 656.916992188 405.220703125 665.259765625 424.3125 668.2109375 439.12109375 c 0 + 671.942382812 457.840820312 671.334960938 475.80078125 671.334960938 500.534179688 c 2 + 671.334960938 626.1328125 l 2 + 671.334960938 650.866210938 671.942382812 668.826171875 668.2109375 687.545898438 c 0 + 665.259765625 702.354492188 656.916992188 721.446289062 639.137695312 732.825195312 c 0 + 618.344726562 746.1328125 595.364257812 746.1328125 551.334960938 746.1328125 c 0 + 411.865234375 746.1328125 411.865234375 746.1328125 398.517578125 744.698242188 c 0 + 386.881835938 743.447265625 374.0078125 741.23828125 360.862304688 732.825195312 c 0 + 343.083007812 721.446289062 334.740234375 702.354492188 331.7890625 687.545898438 c 0 + 328.057617188 668.826171875 328.665039062 650.866210938 328.665039062 626.1328125 c 2xf080 +409.426757812 461.403320312 m 0 + 408.370117188 473.418945312 408.077148438 644.431640625 409.53515625 665.37109375 c 0 + 421.587890625 666.431640625 569.833007812 666.70703125 590.573242188 665.262695312 c 0 + 591.629882812 653.248046875 591.922851562 482.234375 590.46484375 461.294921875 c 0 + 578.412109375 460.235351562 430.166992188 459.958984375 409.426757812 461.403320312 c 0 +546.666992188 -76.3349609375 m 1 + 453.333007812 -76.3349609375 l 1 + 453.333007812 -168.333007812 l 1 + 546.666992188 -168.333007812 l 1 + 546.666992188 -76.3349609375 l 1 +411.536132812 298.600585938 m 1xe5 + 411.536132812 238.600585938 l 1 + 588.463867188 238.600585938 l 1 + 588.463867188 298.600585938 l 1 + 411.536132812 298.600585938 l 1xe5 +548.779296875 371.002929688 m 1 + 536.340820312 -42.6689453125 l 1 + 463.59375 -42.6689453125 l 1xea + 451.15625 371.002929688 l 1 + 548.779296875 371.002929688 l 1 +461.796875 -122.668945312 m 2 + 538.131835938 -122.668945312 l 2 + 575.607421875 -122.668945312 615.701171875 -95.8173828125 616.12890625 -50.9287109375 c 2 + 631.220703125 451.002929688 l 1 + 368.713867188 451.002929688 l 1 + 383.805664062 -50.9287109375 l 2 + 384.234375 -95.814453125 424.322265625 -122.668945312 461.796875 -122.668945312 c 2 +EndSplineSet +Validated: 524325 +EndChar + +StartChar: uni244F +Encoding: 9295 9295 742 +Width: 1000 +HStem: -87.8643 60<389.17 610.83> 61.0029 60<420.354 579.646> 260 60<61.5423 90.4033 384.733 413.594 464.273 535.727 586.406 615.267 909.597 938.458> 458.997 60<420.354 579.646> 607.864 60<389.17 610.83> +VStem: 122.136 60<179.17 400.83> 271.003 60<210.354 369.646> 470 60<-147.858 -118.997 175.267 204.128 254.273 325.727 375.872 404.733 698.997 727.858> 668.997 60<210.354 369.646> 817.864 60<179.17 400.83> +LayerCount: 2 +Fore +SplineSet +523.333007812 290 m 1 + 500 266.666992188 l 1 + 476.666992188 290 l 1 + 500 313.333007812 l 1 + 523.333007812 290 l 1 +463.333007812 290 m 0 + 463.333007812 269.775390625 479.775390625 253.333007812 500 253.333007812 c 0 + 520.224609375 253.333007812 536.666992188 269.775390625 536.666992188 290 c 0 + 536.666992188 310.224609375 520.224609375 326.666992188 500 326.666992188 c 0 + 479.775390625 326.666992188 463.333007812 310.224609375 463.333007812 290 c 0 +909.596679688 260 m 2 + 926.153320312 260 939.596679688 273.442382812 939.596679688 290 c 0 + 939.596679688 306.557617188 926.153320312 320 909.596679688 320 c 2 + 615.266601562 320 l 2 + 598.709960938 320 585.266601562 306.557617188 585.266601562 290 c 0 + 585.266601562 273.442382812 598.709960938 260 615.266601562 260 c 2 + 909.596679688 260 l 2 +384.733398438 260 m 2 + 401.290039062 260 414.733398438 273.442382812 414.733398438 290 c 0 + 414.733398438 306.557617188 401.290039062 320 384.733398438 320 c 2 + 90.4033203125 320 l 2 + 73.8466796875 320 60.4033203125 306.557617188 60.4033203125 290 c 0 + 60.4033203125 273.442382812 73.8466796875 260 90.4033203125 260 c 2 + 384.733398438 260 l 2 +530 175.266601562 m 2 + 530 191.82421875 516.557617188 205.266601562 500 205.266601562 c 0 + 483.442382812 205.266601562 470 191.82421875 470 175.266601562 c 2 + 470 -118.997070312 l 2 + 470 -135.5546875 483.442382812 -148.997070312 500 -148.997070312 c 0 + 516.557617188 -148.997070312 530 -135.5546875 530 -118.997070312 c 2 + 530 175.266601562 l 2 +530 698.997070312 m 2 + 530 715.5546875 516.557617188 728.997070312 500 728.997070312 c 0 + 483.442382812 728.997070312 470 715.5546875 470 698.997070312 c 2 + 470 404.733398438 l 2 + 470 388.17578125 483.442382812 374.733398438 500 374.733398438 c 0 + 516.557617188 374.733398438 530 388.17578125 530 404.733398438 c 2 + 530 698.997070312 l 2 +331.002929688 290 m 0 + 331.002929688 383.352539062 406.647460938 458.997070312 500 458.997070312 c 0 + 593.352539062 458.997070312 668.997070312 383.352539062 668.997070312 290 c 0 + 668.997070312 196.647460938 593.352539062 121.002929688 500 121.002929688 c 0 + 406.647460938 121.002929688 331.002929688 196.647460938 331.002929688 290 c 0 +271.002929688 290 m 0 + 271.002929688 163.547851562 373.547851562 61.0029296875 500 61.0029296875 c 0 + 626.452148438 61.0029296875 728.997070312 163.547851562 728.997070312 290 c 0 + 728.997070312 416.452148438 626.452148438 518.997070312 500 518.997070312 c 0 + 373.547851562 518.997070312 271.002929688 416.452148438 271.002929688 290 c 0 +182.135742188 290 m 0 + 182.135742188 465.573242188 324.426757812 607.864257812 500 607.864257812 c 0 + 675.573242188 607.864257812 817.864257812 465.573242188 817.864257812 290 c 0 + 817.864257812 114.426757812 675.573242188 -27.8642578125 500 -27.8642578125 c 0 + 324.426757812 -27.8642578125 182.135742188 114.426757812 182.135742188 290 c 0 +122.135742188 290 m 0 + 122.135742188 81.328125 291.328125 -87.8642578125 500 -87.8642578125 c 0 + 708.671875 -87.8642578125 877.864257812 81.328125 877.864257812 290 c 0 + 877.864257812 498.671875 708.671875 667.864257812 500 667.864257812 c 0 + 291.328125 667.864257812 122.135742188 498.671875 122.135742188 290 c 0 +EndSplineSet +Validated: 524293 +EndChar + +StartChar: uni2450 +Encoding: 9296 9296 743 +Width: 1000 +HStem: -77.5977 60<244.066 440.528> 27.2656 80<170.73 204.668 795.331 831.628> 309.935 5.53418<199.455 204.668> 310.067 80<180.953 198.802 795.331 819.046> 583.398 100.866<362.722 654.01> 624.265 39.1338<362.722 654.01> +VStem: 86.3994 198.269<77.6465 339.554> 157.2 9.19922<140.845 295.381> 181.797 60<-15.3375 107.266 127.402 302.026> 204.668 12.5322<139.458 309.935> 715.331 80<107.398 310.067> 795.534 118.065<140.845 339.687> 795.534 60<137.774 157.402 310.067 488.141> 833.6 21.9346<140.845 295.514> +LayerCount: 2 +Fore +SplineSet +460.266601562 684.264648438 m 2xc968 + 552.467773438 684.264648438 l 2 + 707.124023438 684.264648438 855.534179688 558.240234375 855.534179688 405.866210938 c 2 + 855.534179688 157.40234375 l 2xc968 + 855.534179688 140.844726562 842.090820312 127.40234375 825.534179688 127.40234375 c 0 + 808.9765625 127.40234375 795.534179688 140.844726562 795.534179688 157.40234375 c 2xc830 + 795.534179688 405.866210938 l 2 + 795.534179688 526.442382812 671.198242188 624.264648438 552.467773438 624.264648438 c 2 + 460.266601562 624.264648438 l 2xc428 + 341.537109375 624.264648438 217.200195312 526.443359375 217.200195312 405.866210938 c 2 + 217.200195312 157.40234375 l 2 + 217.200195312 140.844726562 203.7578125 127.40234375 187.200195312 127.40234375 c 0 + 170.643554688 127.40234375 157.200195312 140.844726562 157.200195312 157.40234375 c 2 + 157.200195312 405.866210938 l 2 + 157.200195312 558.247070312 305.618164062 684.264648438 460.266601562 684.264648438 c 2xc968 +384.797851562 663.3984375 m 2xc420 + 631.93359375 663.3984375 l 2xc420 + 654.009765625 663.3984375 671.93359375 645.474609375 671.93359375 623.3984375 c 0 + 671.93359375 601.322265625 654.009765625 583.3984375 631.93359375 583.3984375 c 2 + 384.797851562 583.3984375 l 2xc820 + 362.721679688 583.3984375 344.797851562 601.322265625 344.797851562 623.3984375 c 0 + 344.797851562 645.474609375 362.721679688 663.3984375 384.797851562 663.3984375 c 2xc420 +241.796875 285.46875 m 2xe0a0 + 241.796875 8.1318359375 l 2 + 241.796875 -6.123046875 253.26953125 -17.59765625 267.532226562 -17.59765625 c 2 + 411.666992188 -17.59765625 l 2 + 428.223632812 -17.59765625 441.666992188 -31.0400390625 441.666992188 -47.59765625 c 0 + 441.666992188 -64.1552734375 428.223632812 -77.59765625 411.666992188 -77.59765625 c 2 + 267.532226562 -77.59765625 l 2 + 220.194335938 -77.59765625 181.796875 -39.21484375 181.796875 8.1318359375 c 2 + 181.796875 285.46875 l 2 + 181.796875 302.026367188 195.239257812 315.46875 211.796875 315.46875 c 0 + 228.354492188 315.46875 241.796875 302.026367188 241.796875 285.46875 c 2xe0a0 +198.801757812 389.934570312 m 2 + 223.203125 389.934570312 l 2 + 257.126953125 389.934570312 284.66796875 362.37890625 284.66796875 328.463867188 c 2 + 284.66796875 88.73046875 l 2 + 284.66796875 54.8115234375 257.122070312 27.265625 223.203125 27.265625 c 2 + 198.801757812 27.265625 l 2 + 136.78125 27.265625 86.3994140625 77.646484375 86.3994140625 139.66796875 c 2 + 86.3994140625 277.532226562 l 2xc220 + 86.3994140625 339.553710938 136.78125 389.934570312 198.801757812 389.934570312 c 2 +204.66796875 107.265625 m 1xe160 + 204.66796875 309.934570312 l 1 + 198.801757812 309.934570312 l 2 + 180.953125 309.934570312 166.399414062 295.380859375 166.399414062 277.532226562 c 2 + 166.399414062 139.66796875 l 2 + 166.399414062 121.819335938 180.953125 107.265625 198.801757812 107.265625 c 2 + 204.66796875 107.265625 l 1xe160 +801.197265625 27.3984375 m 2 + 776.802734375 27.3984375 l 2 + 742.887695312 27.3984375 715.331054688 54.939453125 715.331054688 88.86328125 c 2 + 715.331054688 328.602539062 l 2 + 715.331054688 362.52734375 742.887695312 390.067382812 776.802734375 390.067382812 c 2 + 801.197265625 390.067382812 l 2 + 863.21875 390.067382812 913.599609375 339.686523438 913.599609375 277.665039062 c 2 + 913.599609375 139.80078125 l 2xd030 + 913.599609375 77.779296875 863.21875 27.3984375 801.197265625 27.3984375 c 2 +795.331054688 310.067382812 m 1 + 795.331054688 107.3984375 l 1 + 801.197265625 107.3984375 l 2 + 819.045898438 107.3984375 833.599609375 121.952148438 833.599609375 139.80078125 c 2 + 833.599609375 277.665039062 l 2xd024 + 833.599609375 295.513671875 819.045898438 310.067382812 801.197265625 310.067382812 c 2 + 795.331054688 310.067382812 l 1 +EndSplineSet +Validated: 524293 +EndChar + +StartChar: uni2451 +Encoding: 9297 9297 744 +Width: 1000 +LayerCount: 2 +Fore +SplineSet +89.9345703125 457.59765625 m 1 + 89.9345703125 377.59765625 l 1 + 910.13671875 377.59765625 l 1 + 910.13671875 457.59765625 l 1 + 89.9345703125 457.59765625 l 1 +36.92578125 560.479492188 m 0 + 36.3994140625 555.588867188 36.3994140625 555.588867188 36.3994140625 35.0654296875 c 0 + 36.3994140625 20.90625 36.3994140625 9.8125 44.408203125 -2.6962890625 c 0 + 52.84375 -15.873046875 67.353515625 -21.654296875 75.03125 -23.1845703125 c 0 + 84.837890625 -25.138671875 89.91015625 -24.53125 96.0029296875 -24.53125 c 2 + 903.932617188 -24.53125 l 2 + 910.024414062 -24.53125 915.096679688 -25.138671875 924.904296875 -23.1845703125 c 0 + 930.80078125 -22.009765625 959.341796875 -14.587890625 963.008789062 19.5205078125 c 0 + 963.53515625 24.4111328125 963.53515625 24.4111328125 963.53515625 544.934570312 c 0 + 963.53515625 559.09375 963.53515625 570.1875 955.526367188 582.696289062 c 0 + 947.090820312 595.873046875 932.58203125 601.654296875 924.904296875 603.184570312 c 0 + 915.096679688 605.138671875 910.024414062 604.53125 903.932617188 604.53125 c 2 + 96.0029296875 604.53125 l 2 + 89.91015625 604.53125 84.837890625 605.138671875 75.03125 603.184570312 c 0 + 69.1337890625 602.009765625 40.59375 594.587890625 36.92578125 560.479492188 c 0 +116.399414062 55.46875 m 1 + 116.399414062 524.53125 l 1 + 883.53515625 524.53125 l 1 + 883.53515625 55.46875 l 1 + 116.399414062 55.46875 l 1 +293.53515625 404.19921875 m 1 + 186.868164062 404.19921875 l 1 + 186.868164062 176.198242188 l 1 + 293.53515625 176.198242188 l 1 + 293.53515625 404.19921875 l 1 +466.796875 410.735351562 m 1 + 360.129882812 410.735351562 l 1 + 360.129882812 182.734375 l 1 + 466.796875 182.734375 l 1 + 466.796875 410.735351562 l 1 +640 410.735351562 m 1 + 533.333007812 410.735351562 l 1 + 533.333007812 182.734375 l 1 + 640 182.734375 l 1 + 640 410.735351562 l 1 +813.268554688 410.735351562 m 1 + 706.6015625 410.735351562 l 1 + 706.6015625 182.734375 l 1 + 813.268554688 182.734375 l 1 + 813.268554688 410.735351562 l 1 +270.202148438 221.198242188 m 1 + 210.202148438 221.198242188 l 1 + 210.202148438 35.13671875 l 1 + 270.202148438 35.13671875 l 1 + 270.202148438 221.198242188 l 1 +443.463867188 221.198242188 m 1 + 383.463867188 221.198242188 l 1 + 383.463867188 35.13671875 l 1 + 443.463867188 35.13671875 l 1 + 443.463867188 221.198242188 l 1 +616.666992188 221.198242188 m 1 + 556.666992188 221.198242188 l 1 + 556.666992188 35.13671875 l 1 + 616.666992188 35.13671875 l 1 + 616.666992188 221.198242188 l 1 +789.934570312 221.198242188 m 1 + 729.934570312 221.198242188 l 1 + 729.934570312 35.13671875 l 1 + 789.934570312 35.13671875 l 1 + 789.934570312 221.198242188 l 1 +EndSplineSet +Validated: 524293 +EndChar + +StartChar: uni2452 +Encoding: 9298 9298 745 +Width: 1000 +HStem: -20.7354 80<136.291 167.331 832.669 863.709> 127.598 80<161.911 197.532 802.468 838.089> 445.403 80<136.29 167.331 832.669 863.71> 460.065 65.3379<185.147 203.867 796.133 814.787> +VStem: 53.8018 80<61.7588 92.7998 411.868 442.907> 866.198 80<61.7588 92.7998 411.868 442.907> +LayerCount: 2 +Fore +SplineSet +225.80078125 704.264648438 m 1xcc + 225.80078125 457.135742188 l 1 + 774.264648438 457.135742188 l 1 + 774.264648438 704.264648438 l 1 + 225.80078125 704.264648438 l 1xcc +285.80078125 517.135742188 m 1 + 285.80078125 644.264648438 l 1 + 714.264648438 644.264648438 l 1 + 714.264648438 517.135742188 l 1 + 285.80078125 517.135742188 l 1 +838.131835938 395.13671875 m 1 + 810.065429688 367.063476562 l 1 + 781.999023438 395.13671875 l 1 + 810.065429688 423.203125 l 1 + 838.131835938 395.13671875 l 1 +778.131835938 395.13671875 m 0 + 778.131835938 377.493164062 792.53515625 363.203125 810.065429688 363.203125 c 0 + 827.594726562 363.203125 841.999023438 377.493164062 841.999023438 395.13671875 c 0 + 841.999023438 412.828125 827.637695312 427.063476562 810.065429688 427.063476562 c 0 + 792.4921875 427.063476562 778.131835938 412.828125 778.131835938 395.13671875 c 0 +796.1328125 590.80078125 m 0 + 795.321289062 590.80078125 736.944335938 590.735351562 715 590.735351562 c 1 + 715 460.13671875 l 1 + 796.1328125 460.13671875 l 2 + 814.787109375 460.13671875 830.202148438 475.43359375 830.202148438 494.19921875 c 2 + 830.202148438 556.731445312 l 2 + 830.202148438 575.451171875 814.852539062 590.80078125 796.1328125 590.80078125 c 0 +203.8671875 590.735351562 m 0 + 185.147460938 590.735351562 169.797851562 575.385742188 169.797851562 556.666992188 c 2 + 169.797851562 494.133789062 l 2 + 169.797851562 475.415039062 185.147460938 460.065429688 203.8671875 460.065429688 c 0 + 280.403320312 460.065429688 280.403320312 460.065429688 280.403320312 460.065429688 c 1xdc + 280.403320312 590.6640625 l 1 + 263.1015625 590.6640625 204.6328125 590.735351562 203.8671875 590.735351562 c 0 +745.266601562 59.2646484375 m 1 + 745.266601562 -20.7353515625 l 1 + 832.668945312 -20.7353515625 l 2 + 895.255859375 -20.7353515625 946.198242188 30.2109375 946.198242188 92.7998046875 c 2 + 946.198242188 411.868164062 l 2 + 946.198242188 474.450195312 895.258789062 525.403320312 832.668945312 525.403320312 c 2 + 167.331054688 525.403320312 l 2 + 104.741210938 525.403320312 53.8017578125 474.450195312 53.8017578125 411.868164062 c 2 + 53.8017578125 92.7998046875 l 2 + 53.8017578125 30.2109375 104.744140625 -20.7353515625 167.331054688 -20.7353515625 c 2 + 256.796875 -20.7353515625 l 1 + 256.796875 59.2646484375 l 1 + 167.331054688 59.2646484375 l 2 + 148.9921875 59.2646484375 133.801757812 74.4501953125 133.801757812 92.7998046875 c 2 + 133.801757812 411.868164062 l 2 + 133.801757812 430.211914062 148.99609375 445.403320312 167.331054688 445.403320312 c 2 + 832.668945312 445.403320312 l 2xec + 851.00390625 445.403320312 866.198242188 430.211914062 866.198242188 411.868164062 c 2 + 866.198242188 92.7998046875 l 2 + 866.198242188 74.4501953125 851.0078125 59.2646484375 832.668945312 59.2646484375 c 2 + 745.266601562 59.2646484375 l 1 +115.598632812 348.73046875 m 1 + 115.598632812 288.73046875 l 1 + 892.40234375 288.73046875 l 1 + 892.40234375 348.73046875 l 1 + 115.598632812 348.73046875 l 1 +197.532226562 207.59765625 m 2 + 175.456054688 207.59765625 157.532226562 189.673828125 157.532226562 167.59765625 c 0 + 157.532226562 145.521484375 175.456054688 127.59765625 197.532226562 127.59765625 c 2 + 802.467773438 127.59765625 l 2 + 824.543945312 127.59765625 842.467773438 145.521484375 842.467773438 167.59765625 c 0 + 842.467773438 189.673828125 824.543945312 207.59765625 802.467773438 207.59765625 c 2 + 197.532226562 207.59765625 l 2 +225.80078125 179.3359375 m 1 + 225.80078125 -124.3359375 l 1 + 774.264648438 -124.3359375 l 1 + 774.264648438 179.3359375 l 1 + 225.80078125 179.3359375 l 1 +285.80078125 -64.3359375 m 1 + 285.80078125 119.3359375 l 1 + 714.264648438 119.3359375 l 1 + 714.264648438 -64.3359375 l 1 + 285.80078125 -64.3359375 l 1 +339.19921875 60 m 1 + 339.19921875 6.6669921875 l 1 + 538.000976562 6.6669921875 l 1 + 538.000976562 60 l 1 + 339.19921875 60 l 1 +EndSplineSet +Validated: 524293 +EndChar + +StartChar: uni2441 +Encoding: 9281 9281 746 +Width: 1000 +HStem: -63.1777 78.4434<817.503 901.981> 109.459 77.7061<470.907 486.802 505.713 524.529> +LayerCount: 2 +Fore +SplineSet +919.983398438 79.853515625 m 1 + 914.041992188 49.1103515625 900.076171875 15.265625 849.853515625 15.265625 c 0 + 839.66015625 15.265625 831.495117188 16.3955078125 825.841796875 17.5390625 c 1 + 698.923828125 159.23828125 l 1 + 670.991210938 141.798828125 l 2 + 622.779296875 111.698242188 597.529296875 126.221679688 582.438476562 140.375 c 0 + 571.1953125 150.919921875 564.137695312 164.375 563.559570312 165.5703125 c 2 + 553.080078125 188.9296875 l 1 + 438.239257812 187.165039062 l 1 + 427.795898438 165.015625 l 2 + 407.140625 121.208007812 383.633789062 118.7578125 371.698242188 118.7578125 c 0 + 346.25390625 118.7578125 323.384765625 134.513671875 323.384765625 134.513671875 c 1 + 293.663085938 155.58203125 l 1 + 177.396484375 14.4384765625 l 1 + 161.823242188 9.0908203125 149.44140625 7.2548828125 139.967773438 7.2548828125 c 0 + 121.932617188 7.2548828125 111.697265625 13.01171875 103.173828125 21.0849609375 c 0 + 89.3037109375 34.2236328125 82.669921875 53.3388671875 80.0498046875 62.97265625 c 1 + 131.037109375 299.221679688 l 1 + 129.576171875 318.083007812 126.48828125 357.950195312 147.5703125 392.686523438 c 0 + 156.635742188 407.623046875 165.73046875 414.193359375 167.19140625 415.190429688 c 2 + 178.154296875 421.752929688 l 1 + 203.6796875 486.15625 l 1 + 235.322265625 501.004882812 267.885742188 499.235351562 295.260742188 488.776367188 c 1 + 313.622070312 419.377929688 l 1 + 672.844726562 422.09375 l 1 + 694.94921875 486.594726562 l 1 + 714.361328125 496.263671875 748.95703125 506.63671875 783.84375 483.458984375 c 1 + 806.750976562 423.43359375 l 1 + 823.108398438 417.146484375 l 2 + 850.396484375 406.65625 862.139648438 351.859375 861.830078125 313.455078125 c 1 + 919.983398438 79.853515625 l 1 +505.712890625 109.749023438 m 1 + 522.390625 86.03125 582.28515625 15.8837890625 682.911132812 59.564453125 c 1 + 782.102539062 -51.1796875 l 1 + 798.021484375 -56.5341796875 817.7734375 -63.177734375 849.853515625 -63.177734375 c 0 + 872.765625 -63.177734375 901.196289062 -59.1455078125 928.418945312 -42.7236328125 c 0 + 963.349609375 -21.65234375 990.004882812 17.8037109375 998.80859375 75.3740234375 c 2 + 1000.00488281 83.193359375 l 1 + 940.260742188 323.18359375 l 1 + 939.734375 346.533203125 933.569335938 443.096679688 868.349609375 482.071289062 c 1 + 850.134765625 529.801757812 l 1 + 843.752929688 535.922851562 l 2 + 813.030273438 565.391601562 733.26171875 603.25 642.084960938 546.82421875 c 2 + 630.114257812 539.416015625 l 1 + 616.645507812 500.114257812 l 1 + 373.904296875 498.279296875 l 1 + 362.481445312 541.454101562 l 1 + 349.201171875 549.708007812 l 2 + 318.674804688 568.681640625 236.342773438 597.435546875 152.536132812 547.72265625 c 2 + 140.966796875 540.860351562 l 1 + 114.16796875 473.243164062 l 1 + 94.185546875 456.431640625 46.1884765625 405.228515625 51.9814453125 304.813476562 c 1 + -0.0048828125 63.9384765625 l 1 + 4.998046875 32.353515625 17.90234375 -6.171875 49.25390625 -35.8662109375 c 0 + 75.2861328125 -60.5234375 128.030273438 -90.078125 215.509765625 -55.0654296875 c 2 + 224.829101562 -51.3349609375 l 1 + 310.806640625 53.0380859375 l 1 + 370.1796875 28.6484375 440.939453125 35.42578125 486.801757812 109.458984375 c 1 + 505.712890625 109.749023438 l 1 +EndSplineSet +Validated: 524329 +EndChar + +StartChar: uni2442 +Encoding: 9282 9282 747 +Width: 1000 +HStem: -63.1777 78.4434<817.503 901.981> 109.459 77.7061<470.907 486.802 505.713 524.529> +LayerCount: 2 +Fore +SplineSet +919.983398438 79.853515625 m 1 + 914.041992188 49.1103515625 900.076171875 15.265625 849.853515625 15.265625 c 0 + 839.66015625 15.265625 831.495117188 16.3955078125 825.841796875 17.5390625 c 1 + 698.923828125 159.23828125 l 1 + 670.991210938 141.798828125 l 2 + 622.779296875 111.698242188 597.529296875 126.221679688 582.438476562 140.375 c 0 + 571.1953125 150.919921875 564.137695312 164.375 563.559570312 165.5703125 c 2 + 553.080078125 188.9296875 l 1 + 438.239257812 187.165039062 l 1 + 427.795898438 165.015625 l 2 + 407.140625 121.208007812 383.633789062 118.7578125 371.698242188 118.7578125 c 0 + 346.25390625 118.7578125 323.384765625 134.513671875 323.384765625 134.513671875 c 1 + 293.663085938 155.58203125 l 1 + 177.396484375 14.4384765625 l 1 + 161.823242188 9.0908203125 149.44140625 7.2548828125 139.967773438 7.2548828125 c 0 + 121.932617188 7.2548828125 111.697265625 13.01171875 103.173828125 21.0849609375 c 0 + 89.3037109375 34.2236328125 82.669921875 53.3388671875 80.0498046875 62.97265625 c 1 + 131.037109375 299.221679688 l 1 + 129.576171875 318.083007812 126.48828125 357.950195312 147.5703125 392.686523438 c 0 + 156.635742188 407.623046875 165.73046875 414.193359375 167.19140625 415.190429688 c 2 + 178.154296875 421.752929688 l 1 + 203.6796875 486.15625 l 1 + 235.322265625 501.004882812 267.885742188 499.235351562 295.260742188 488.776367188 c 1 + 313.622070312 419.377929688 l 1 + 672.844726562 422.09375 l 1 + 694.94921875 486.594726562 l 1 + 714.361328125 496.263671875 748.95703125 506.63671875 783.84375 483.458984375 c 1 + 806.750976562 423.43359375 l 1 + 823.108398438 417.146484375 l 2 + 850.396484375 406.65625 862.139648438 351.859375 861.830078125 313.455078125 c 1 + 919.983398438 79.853515625 l 1 +505.712890625 109.749023438 m 1 + 522.390625 86.03125 582.28515625 15.8837890625 682.911132812 59.564453125 c 1 + 782.102539062 -51.1796875 l 1 + 798.021484375 -56.5341796875 817.7734375 -63.177734375 849.853515625 -63.177734375 c 0 + 872.765625 -63.177734375 901.196289062 -59.1455078125 928.418945312 -42.7236328125 c 0 + 963.349609375 -21.65234375 990.004882812 17.8037109375 998.80859375 75.3740234375 c 2 + 1000.00488281 83.193359375 l 1 + 940.260742188 323.18359375 l 1 + 939.734375 346.533203125 933.569335938 443.096679688 868.349609375 482.071289062 c 1 + 850.134765625 529.801757812 l 1 + 843.752929688 535.922851562 l 2 + 813.030273438 565.391601562 733.26171875 603.25 642.084960938 546.82421875 c 2 + 630.114257812 539.416015625 l 1 + 616.645507812 500.114257812 l 1 + 373.904296875 498.279296875 l 1 + 362.481445312 541.454101562 l 1 + 349.201171875 549.708007812 l 2 + 318.674804688 568.681640625 236.342773438 597.435546875 152.536132812 547.72265625 c 2 + 140.966796875 540.860351562 l 1 + 114.16796875 473.243164062 l 1 + 94.185546875 456.431640625 46.1884765625 405.228515625 51.9814453125 304.813476562 c 1 + -0.0048828125 63.9384765625 l 1 + 4.998046875 32.353515625 17.90234375 -6.171875 49.25390625 -35.8662109375 c 0 + 75.2861328125 -60.5234375 128.030273438 -90.078125 215.509765625 -55.0654296875 c 2 + 224.829101562 -51.3349609375 l 1 + 310.806640625 53.0380859375 l 1 + 370.1796875 28.6484375 440.939453125 35.42578125 486.801757812 109.458984375 c 1 + 505.712890625 109.749023438 l 1 +886.326171875 621.546875 m 2 + 910.65234375 645.873046875 893.236328125 687.678710938 858.936523438 687.678710938 c 0 + 848.245117188 687.678710938 838.559570312 683.338867188 831.546875 676.326171875 c 2 + 38.099609375 -117.12109375 l 2 + 13.7724609375 -141.448242188 31.1884765625 -183.25390625 65.4892578125 -183.25390625 c 0 + 76.1796875 -183.25390625 85.865234375 -178.9140625 92.87890625 -171.900390625 c 2 + 886.326171875 621.546875 l 2 +EndSplineSet Validated: 524325 EndChar EndChars diff --git a/bin/resources/fonts/promptfont.otf b/bin/resources/fonts/promptfont.otf index 3b5f18b95e..77f8d39a6d 100644 Binary files a/bin/resources/fonts/promptfont.otf and b/bin/resources/fonts/promptfont.otf differ diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index 46c73a2ead..3f8061009b 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -467,7 +467,7 @@ ImFont* ImGuiManager::AddTextFont() { // Exclude FA and PF ranges // clang-format off - static constexpr ImWchar range_exclude_icons[] = { 0x2198,0x2199,0x219e,0x21a7,0x21b0,0x21b3,0x21ba,0x21c3,0x21ce,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21e6,0x21e8,0x21f3,0x21f3,0x21f7,0x21fb,0x2206,0x2208,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x2361,0x2364,0x2367,0x237a,0x237f,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x243d,0x243d,0x2443,0x2443,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xff21,0xff3a,0x0,0x0 }; + static constexpr ImWchar range_exclude_icons[] = { 0x2198,0x2199,0x219e,0x21a7,0x21b0,0x21b3,0x21ba,0x21c3,0x21ce,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21e6,0x21e8,0x21f3,0x21f3,0x21f7,0x21fb,0x2206,0x2208,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x2361,0x2364,0x2367,0x237a,0x237f,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x243d,0x243e,0x2443,0x2452,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xff21,0xff3a,0x0,0x0 }; // clang-format on ImFontConfig cfg; diff --git a/pcsx2/ImGui/ImGuiOverlays.cpp b/pcsx2/ImGui/ImGuiOverlays.cpp index ff9c4ebd1b..614f212cd0 100644 --- a/pcsx2/ImGui/ImGuiOverlays.cpp +++ b/pcsx2/ImGui/ImGuiOverlays.cpp @@ -670,7 +670,7 @@ __ri void ImGuiManager::DrawInputsOverlay(float scale, float margin, float spaci for (u32 port = 0; port < USB::NUM_PORTS; port++) { - if (EmuConfig.USB.Ports[port].DeviceType >= 0 && !USB::GetDeviceBindings(port).empty()) + if (EmuConfig.USB.Ports[port].DeviceType >= 0) num_ports++; } @@ -688,10 +688,7 @@ __ri void ImGuiManager::DrawInputsOverlay(float scale, float margin, float spaci continue; const Pad::ControllerInfo& cinfo = pad->GetInfo(); - if (cinfo.icon_name) - text.format("{} {}", cinfo.icon_name, slot + 1u); - else - text.format("{} |", slot + 1u); + text.format("{} {} • {} |", ICON_FA_GAMEPAD, slot + 1u, cinfo.icon_name ? cinfo.icon_name : ICON_FA_TRIANGLE_EXCLAMATION); for (u32 bind = 0; bind < static_cast(cinfo.bindings.size()); bind++) { @@ -744,10 +741,9 @@ __ri void ImGuiManager::DrawInputsOverlay(float scale, float margin, float spaci continue; const std::span bindings(USB::GetDeviceBindings(port)); - if (bindings.empty()) - continue; - text.format("{} {} ", ICON_PF_USB, port + 1u); + const char* icon = USB::GetDeviceIconName(port); + text.format("{} {} • {} | ", ICON_PF_USB, port + 1u, icon ? icon : ICON_FA_TRIANGLE_EXCLAMATION); for (const InputBindingInfo& bi : bindings) { diff --git a/pcsx2/SIO/Pad/PadDualshock2.cpp b/pcsx2/SIO/Pad/PadDualshock2.cpp index 32fb453bd3..440979c40c 100644 --- a/pcsx2/SIO/Pad/PadDualshock2.cpp +++ b/pcsx2/SIO/Pad/PadDualshock2.cpp @@ -81,7 +81,7 @@ static const SettingInfo s_settings[] = { }; const Pad::ControllerInfo PadDualshock2::ControllerInfo = {Pad::ControllerType::DualShock2, "DualShock2", - TRANSLATE_NOOP("Pad", "DualShock 2"), ICON_PF_GAMEPAD_ALT, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors}; + TRANSLATE_NOOP("Pad", "DualShock 2"), ICON_PF_DUALSHOCK2, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors}; void PadDualshock2::ConfigLog() { diff --git a/pcsx2/SIO/Pad/PadJogcon.cpp b/pcsx2/SIO/Pad/PadJogcon.cpp index b7ef9456b4..386d9c3c12 100644 --- a/pcsx2/SIO/Pad/PadJogcon.cpp +++ b/pcsx2/SIO/Pad/PadJogcon.cpp @@ -45,7 +45,7 @@ static const SettingInfo s_settings[] = { }; const Pad::ControllerInfo PadJogcon::ControllerInfo = {Pad::ControllerType::Jogcon, "Jogcon", - TRANSLATE_NOOP("Pad", "Jogcon"), ICON_PF_GAMEPAD_ALT, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors}; + TRANSLATE_NOOP("Pad", "Jogcon"), ICON_PF_JOGCON, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors}; void PadJogcon::ConfigLog() { diff --git a/pcsx2/SIO/Pad/PadNegcon.cpp b/pcsx2/SIO/Pad/PadNegcon.cpp index c189febe05..41e0276f1e 100644 --- a/pcsx2/SIO/Pad/PadNegcon.cpp +++ b/pcsx2/SIO/Pad/PadNegcon.cpp @@ -42,7 +42,7 @@ static const SettingInfo s_settings[] = { }; const Pad::ControllerInfo PadNegcon::ControllerInfo = {Pad::ControllerType::Negcon, "NeGcon", - TRANSLATE_NOOP("Pad", "NeGcon"), ICON_PF_GAMEPAD_ALT, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors}; + TRANSLATE_NOOP("Pad", "NeGcon"), ICON_PF_NEGCON, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors}; void PadNegcon::ConfigLog() { diff --git a/pcsx2/USB/USB.cpp b/pcsx2/USB/USB.cpp index 681e7fb751..a155c75313 100644 --- a/pcsx2/USB/USB.cpp +++ b/pcsx2/USB/USB.cpp @@ -561,6 +561,15 @@ const char* USB::GetDeviceName(const std::string_view device) return dev ? dev->Name() : TRANSLATE_NOOP("USB", "Not Connected"); } +const char* USB::GetDeviceIconName(u32 port) +{ + pxAssert(port < NUM_PORTS); + if (s_usb_device_proxy[port]) + return s_usb_device_proxy[port]->IconName(); + else + return nullptr; +} + const char* USB::GetDeviceSubtypeName(const std::string_view device, u32 subtype) { const DeviceProxy* dev = RegisterDevice::instance().Device(device); diff --git a/pcsx2/USB/USB.h b/pcsx2/USB/USB.h index 5b8de046f8..48a870022f 100644 --- a/pcsx2/USB/USB.h +++ b/pcsx2/USB/USB.h @@ -27,6 +27,7 @@ namespace USB std::vector> GetDeviceTypes(); const char* GetDeviceName(const std::string_view device); + const char* GetDeviceIconName(u32 port); const char* GetDeviceSubtypeName(const std::string_view device, u32 subtype); std::span GetDeviceSubtypes(const std::string_view device); std::span GetDeviceBindings(const std::string_view device, u32 subtype); diff --git a/pcsx2/USB/deviceproxy.h b/pcsx2/USB/deviceproxy.h index dc7b65811d..214e4e9740 100644 --- a/pcsx2/USB/deviceproxy.h +++ b/pcsx2/USB/deviceproxy.h @@ -51,6 +51,7 @@ public: virtual const char* Name() const = 0; virtual const char* TypeName() const = 0; + virtual const char* IconName() const = 0; virtual std::span SubTypes() const; virtual std::span Bindings(u32 subtype) const; virtual std::span Settings(u32 subtype) const; diff --git a/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp b/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp index 7c483487e0..acbf04f2c8 100644 --- a/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp +++ b/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" +#include "IconsPromptFont.h" #include "videodev.h" #include "usb-eyetoy-webcam.h" #include "ov519.h" @@ -491,6 +492,11 @@ namespace usb_eyetoy return "webcam"; } + const char* EyeToyWebCamDevice::IconName() const + { + return ICON_PF_EYETOY_WEBCAM; + } + bool EyeToyWebCamDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { EYETOYState* s = USB_CONTAINER_OF(dev, EYETOYState, dev); diff --git a/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.h b/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.h index 2aa599daa7..2e30f63a8b 100644 --- a/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.h +++ b/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.h @@ -461,6 +461,7 @@ namespace usb_eyetoy USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; void UpdateSettings(USBDevice* dev, SettingsInterface& si) const override; std::span SubTypes() const override; diff --git a/pcsx2/USB/usb-hid/usb-hid.cpp b/pcsx2/USB/usb-hid/usb-hid.cpp index cd00a3422d..3c23d76c68 100644 --- a/pcsx2/USB/usb-hid/usb-hid.cpp +++ b/pcsx2/USB/usb-hid/usb-hid.cpp @@ -32,6 +32,7 @@ #include "USB/qemu-usb/desc.h" #include "USB/usb-hid/usb-hid.h" +#include "IconsPromptFont.h" #include "common/Console.h" namespace usb_hid @@ -826,6 +827,11 @@ namespace usb_hid return "hidkbd"; } + const char* HIDKbdDevice::IconName() const + { + return ICON_PF_KEYBOARD_ALT; + } + std::span HIDKbdDevice::Bindings(u32 subtype) const { static constexpr const InputBindingInfo info[] = { @@ -899,6 +905,11 @@ namespace usb_hid return "hidmouse"; } + const char* HIDMouseDevice::IconName() const + { + return ICON_PF_MOUSE; + } + bool HIDMouseDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { UsbHIDState* s = USB_CONTAINER_OF(dev, UsbHIDState, dev); diff --git a/pcsx2/USB/usb-hid/usb-hid.h b/pcsx2/USB/usb-hid/usb-hid.h index ae3c00adc1..e29e02a22c 100644 --- a/pcsx2/USB/usb-hid/usb-hid.h +++ b/pcsx2/USB/usb-hid/usb-hid.h @@ -14,6 +14,7 @@ namespace usb_hid public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; std::span Bindings(u32 subtype) const override; USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; void SetBindingValue(USBDevice* dev, u32 bind, float value) const override; @@ -25,6 +26,7 @@ namespace usb_hid public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; std::span Bindings(u32 subtype) const override; float GetBindingValue(const USBDevice* dev, u32 bind) const override; void SetBindingValue(USBDevice* dev, u32 bind, float value) const override; diff --git a/pcsx2/USB/usb-lightgun/guncon2.cpp b/pcsx2/USB/usb-lightgun/guncon2.cpp index ad66a0612d..87ab27eef7 100644 --- a/pcsx2/USB/usb-lightgun/guncon2.cpp +++ b/pcsx2/USB/usb-lightgun/guncon2.cpp @@ -3,6 +3,7 @@ #include "GS/GS.h" #include "Host.h" +#include "IconsPromptFont.h" #include "ImGui/ImGuiManager.h" #include "Input/InputManager.h" #include "StateWrapper.h" @@ -444,6 +445,11 @@ namespace usb_lightgun return "guncon2"; } + const char* GunCon2Device::IconName() const + { + return ICON_PF_GUNCON2; + } + USBDevice* GunCon2Device::CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const { GunCon2State* s = new GunCon2State(port); diff --git a/pcsx2/USB/usb-lightgun/guncon2.h b/pcsx2/USB/usb-lightgun/guncon2.h index 8f7e1db179..0afabbb648 100644 --- a/pcsx2/USB/usb-lightgun/guncon2.h +++ b/pcsx2/USB/usb-lightgun/guncon2.h @@ -12,6 +12,7 @@ namespace usb_lightgun USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; void UpdateSettings(USBDevice* dev, SettingsInterface& si) const override; float GetBindingValue(const USBDevice* dev, u32 bind_index) const override; diff --git a/pcsx2/USB/usb-mic/usb-headset.cpp b/pcsx2/USB/usb-mic/usb-headset.cpp index 53090bc644..669b078d12 100644 --- a/pcsx2/USB/usb-mic/usb-headset.cpp +++ b/pcsx2/USB/usb-mic/usb-headset.cpp @@ -34,6 +34,7 @@ #include "USB/USB.h" #include "StateWrapper.h" +#include "IconsPromptFont.h" #include "common/Console.h" #define BUFFER_FRAMES 200 @@ -962,6 +963,11 @@ namespace usb_mic return TRANSLATE_NOOP("USB", "Logitech USB Headset"); } + const char* HeadsetDevice::IconName() const + { + return ICON_PF_HEADSET; + } + bool HeadsetDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { HeadsetState* s = USB_CONTAINER_OF(dev, HeadsetState, dev); diff --git a/pcsx2/USB/usb-mic/usb-headset.h b/pcsx2/USB/usb-mic/usb-headset.h index 7959409978..f48def2232 100644 --- a/pcsx2/USB/usb-mic/usb-headset.h +++ b/pcsx2/USB/usb-mic/usb-headset.h @@ -11,6 +11,7 @@ namespace usb_mic USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* TypeName() const override; const char* Name() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; void UpdateSettings(USBDevice* dev, SettingsInterface& si) const override; diff --git a/pcsx2/USB/usb-mic/usb-mic.cpp b/pcsx2/USB/usb-mic/usb-mic.cpp index af59ae8e42..337046a35b 100644 --- a/pcsx2/USB/usb-mic/usb-mic.cpp +++ b/pcsx2/USB/usb-mic/usb-mic.cpp @@ -24,6 +24,7 @@ // Most stuff is based on Qemu 1.7 USB soundcard passthrough code. +#include "IconsPromptFont.h" #include "USB/qemu-usb/qusb.h" #include "USB/qemu-usb/desc.h" #include "USB/qemu-usb/USBinternal.h" @@ -1204,6 +1205,11 @@ namespace usb_mic return "singstar"; } + const char* MicrophoneDevice::IconName() const + { + return ICON_PF_SINGSTAR_MIC; + } + bool MicrophoneDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { SINGSTARMICState* s = USB_CONTAINER_OF(dev, SINGSTARMICState, dev); diff --git a/pcsx2/USB/usb-mic/usb-mic.h b/pcsx2/USB/usb-mic/usb-mic.h index fd8b14f27f..378cf6ae44 100644 --- a/pcsx2/USB/usb-mic/usb-mic.h +++ b/pcsx2/USB/usb-mic/usb-mic.h @@ -22,6 +22,7 @@ namespace usb_mic USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; void UpdateSettings(USBDevice* dev, SettingsInterface& si) const override; std::span SubTypes() const override; diff --git a/pcsx2/USB/usb-msd/usb-msd.cpp b/pcsx2/USB/usb-msd/usb-msd.cpp index 7d7c8c6488..f093699297 100644 --- a/pcsx2/USB/usb-msd/usb-msd.cpp +++ b/pcsx2/USB/usb-msd/usb-msd.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team // SPDX-License-Identifier: GPL-3.0+ +#include "IconsFontAwesome6.h" #include "USB/qemu-usb/qusb.h" #include "USB/qemu-usb/desc.h" #include "USB/qemu-usb/USBinternal.h" @@ -1189,6 +1190,11 @@ namespace usb_msd return TRANSLATE_NOOP("USB", "Mass Storage Device"); } + const char* MsdDevice::IconName() const + { + return ICON_FA_HARD_DRIVE; + } + bool MsdDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { MSDState* s = USB_CONTAINER_OF(dev, MSDState, dev); diff --git a/pcsx2/USB/usb-msd/usb-msd.h b/pcsx2/USB/usb-msd/usb-msd.h index 9a4cebdecc..d9228aa0d1 100644 --- a/pcsx2/USB/usb-msd/usb-msd.h +++ b/pcsx2/USB/usb-msd/usb-msd.h @@ -19,6 +19,7 @@ namespace usb_msd USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* TypeName() const override; const char* Name() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; void UpdateSettings(USBDevice* dev, SettingsInterface& si) const override; std::span SubTypes() const override; diff --git a/pcsx2/USB/usb-pad/usb-buzz.cpp b/pcsx2/USB/usb-pad/usb-buzz.cpp index e748e9768a..a739db7bbc 100644 --- a/pcsx2/USB/usb-pad/usb-buzz.cpp +++ b/pcsx2/USB/usb-pad/usb-buzz.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" +#include "IconsPromptFont.h" #include "Input/InputManager.h" #include "StateWrapper.h" #include "USB/USB.h" @@ -205,6 +206,11 @@ namespace usb_pad return "BuzzDevice"; } + const char* BuzzDevice::IconName() const + { + return ICON_PF_BUZZ_CONTROLLER; + } + bool BuzzDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { return true; diff --git a/pcsx2/USB/usb-pad/usb-buzz.h b/pcsx2/USB/usb-pad/usb-buzz.h index d3dc97e0a2..f98914ff80 100644 --- a/pcsx2/USB/usb-pad/usb-buzz.h +++ b/pcsx2/USB/usb-pad/usb-buzz.h @@ -84,6 +84,7 @@ namespace usb_pad public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; float GetBindingValue(const USBDevice* dev, u32 bind_index) const override; void SetBindingValue(USBDevice* dev, u32 bind_index, float value) const override; diff --git a/pcsx2/USB/usb-pad/usb-gametrak.cpp b/pcsx2/USB/usb-pad/usb-gametrak.cpp index 1fe279914a..4090e5db9c 100644 --- a/pcsx2/USB/usb-pad/usb-gametrak.cpp +++ b/pcsx2/USB/usb-pad/usb-gametrak.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" +#include "IconsPromptFont.h" #include "Input/InputManager.h" #include "StateWrapper.h" #include "USB/USB.h" @@ -282,6 +283,11 @@ namespace usb_pad return "Gametrak"; } + const char* GametrakDevice::IconName() const + { + return ICON_PF_GAMETRAK_DEVICE; + } + USBDevice* GametrakDevice::CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const { GametrakState* s = new GametrakState(port); diff --git a/pcsx2/USB/usb-pad/usb-gametrak.h b/pcsx2/USB/usb-pad/usb-gametrak.h index a1df862223..75112c2adc 100644 --- a/pcsx2/USB/usb-pad/usb-gametrak.h +++ b/pcsx2/USB/usb-pad/usb-gametrak.h @@ -74,6 +74,7 @@ namespace usb_pad public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; float GetBindingValue(const USBDevice* dev, u32 bind_index) const override; void SetBindingValue(USBDevice* dev, u32 bind_index, float value) const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; diff --git a/pcsx2/USB/usb-pad/usb-pad.cpp b/pcsx2/USB/usb-pad/usb-pad.cpp index a738c7a0c9..27a6c0b060 100644 --- a/pcsx2/USB/usb-pad/usb-pad.cpp +++ b/pcsx2/USB/usb-pad/usb-pad.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: GPL-3.0+ #include "usb-pad.h" +#include "IconsFontAwesome6.h" +#include "IconsPromptFont.h" #include "USB/qemu-usb/USBinternal.h" #include "USB/usb-pad/usb-pad-sdl-ff.h" #include "USB/USB.h" @@ -814,6 +816,11 @@ namespace usb_pad return "Pad"; } + const char* PadDevice::IconName() const + { + return ICON_PF_STEERING_WHEEL_ALT; + } + bool PadDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { PadState* s = USB_CONTAINER_OF(dev, PadState, dev); @@ -887,6 +894,11 @@ namespace usb_pad return "RBDrumKit"; } + const char* RBDrumKitDevice::IconName() const + { + return ICON_FA_DRUM; + } + USBDevice* RBDrumKitDevice::CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const { PadState* s = new PadState(port, WT_ROCKBAND1_DRUMKIT); @@ -949,6 +961,11 @@ namespace usb_pad return "Keyboardmania"; } + const char* KeyboardmaniaDevice::IconName() const + { + return ICON_PF_KEYBOARDMANIA; + } + std::span KeyboardmaniaDevice::SubTypes() const { return {}; diff --git a/pcsx2/USB/usb-pad/usb-pad.h b/pcsx2/USB/usb-pad/usb-pad.h index 6f1f7133fe..61488582ce 100644 --- a/pcsx2/USB/usb-pad/usb-pad.h +++ b/pcsx2/USB/usb-pad/usb-pad.h @@ -72,6 +72,7 @@ namespace usb_pad USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; void UpdateSettings(USBDevice* dev, SettingsInterface& si) const override; float GetBindingValue(const USBDevice* dev, u32 bind_index) const override; @@ -88,6 +89,7 @@ namespace usb_pad public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; std::span SubTypes() const override; std::span Bindings(u32 subtype) const override; std::span Settings(u32 subtype) const override; @@ -99,6 +101,7 @@ namespace usb_pad public: const char* Name() const; const char* TypeName() const; + const char* IconName() const; std::span SubTypes() const; std::span Bindings(u32 subtype) const; std::span Settings(u32 subtype) const; @@ -111,6 +114,7 @@ namespace usb_pad public: const char* Name() const; const char* TypeName() const; + const char* IconName() const; std::span SubTypes() const; std::span Bindings(u32 subtype) const; std::span Settings(u32 subtype) const; diff --git a/pcsx2/USB/usb-pad/usb-realplay.cpp b/pcsx2/USB/usb-pad/usb-realplay.cpp index 5b605c36f8..03c37d26fc 100644 --- a/pcsx2/USB/usb-pad/usb-realplay.cpp +++ b/pcsx2/USB/usb-pad/usb-realplay.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" +#include "IconsPromptFont.h" #include "Input/InputManager.h" #include "StateWrapper.h" #include "USB/USB.h" @@ -285,6 +286,11 @@ namespace usb_pad return "RealPlay"; } + const char* RealPlayDevice::IconName() const + { + return ICON_PF_REALPLAY_BOWLING; + } + USBDevice* RealPlayDevice::CreateDevice(SettingsInterface& si, u32 port, u32 type) const { RealPlayState* s = new RealPlayState(port, type); diff --git a/pcsx2/USB/usb-pad/usb-realplay.h b/pcsx2/USB/usb-pad/usb-realplay.h index fd12c093cc..8654b76b3f 100644 --- a/pcsx2/USB/usb-pad/usb-realplay.h +++ b/pcsx2/USB/usb-pad/usb-realplay.h @@ -80,6 +80,7 @@ namespace usb_pad public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; float GetBindingValue(const USBDevice* dev, u32 bind_index) const override; void SetBindingValue(USBDevice* dev, u32 bind_index, float value) const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; diff --git a/pcsx2/USB/usb-pad/usb-seamic.cpp b/pcsx2/USB/usb-pad/usb-seamic.cpp index 09dcba1ce5..1f05b4570b 100644 --- a/pcsx2/USB/usb-pad/usb-seamic.cpp +++ b/pcsx2/USB/usb-pad/usb-seamic.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" +#include "IconsPromptFont.h" #include "USB/usb-pad/usb-pad.h" #include "USB/qemu-usb/desc.h" #include "USB/usb-mic/usb-mic.h" @@ -341,6 +342,11 @@ namespace usb_pad return "seamic"; } + const char* SeamicDevice::IconName() const + { + return ICON_PF_SEGA_SEAMIC; + } + std::span SeamicDevice::SubTypes() const { return {}; diff --git a/pcsx2/USB/usb-pad/usb-train.cpp b/pcsx2/USB/usb-pad/usb-train.cpp index 7b2be5e1db..a0f9fe3d58 100644 --- a/pcsx2/USB/usb-pad/usb-train.cpp +++ b/pcsx2/USB/usb-pad/usb-train.cpp @@ -26,6 +26,11 @@ namespace usb_pad return "TrainController"; } + const char* TrainDevice::IconName() const + { + return ICON_FA_TRAIN; + } + std::span TrainDevice::SubTypes() const { static const char* subtypes[] = { diff --git a/pcsx2/USB/usb-pad/usb-train.h b/pcsx2/USB/usb-pad/usb-train.h index 5d6f44a09e..4bff34ed03 100644 --- a/pcsx2/USB/usb-pad/usb-train.h +++ b/pcsx2/USB/usb-pad/usb-train.h @@ -23,6 +23,7 @@ namespace usb_pad USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; std::span SubTypes() const override; void UpdateSettings(USBDevice* dev, SettingsInterface& si) const override; std::span Settings(u32 subtype) const override; diff --git a/pcsx2/USB/usb-pad/usb-trance-vibrator.cpp b/pcsx2/USB/usb-pad/usb-trance-vibrator.cpp index 3fd4948008..1407fc66d4 100644 --- a/pcsx2/USB/usb-pad/usb-trance-vibrator.cpp +++ b/pcsx2/USB/usb-pad/usb-trance-vibrator.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" +#include "IconsPromptFont.h" #include "Input/InputManager.h" #include "StateWrapper.h" #include "USB/USB.h" @@ -129,6 +130,11 @@ namespace usb_pad return "TranceVibrator"; } + const char* TranceVibratorDevice::IconName() const + { + return ICON_PF_REZ_VIBRATOR; + } + bool TranceVibratorDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { return true; diff --git a/pcsx2/USB/usb-pad/usb-trance-vibrator.h b/pcsx2/USB/usb-pad/usb-trance-vibrator.h index 69eba425f4..84abc4e163 100644 --- a/pcsx2/USB/usb-pad/usb-trance-vibrator.h +++ b/pcsx2/USB/usb-pad/usb-trance-vibrator.h @@ -26,6 +26,7 @@ namespace usb_pad public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; float GetBindingValue(const USBDevice* dev, u32 bind_index) const override; void SetBindingValue(USBDevice* dev, u32 bind_index, float value) const override; diff --git a/pcsx2/USB/usb-pad/usb-turntable.cpp b/pcsx2/USB/usb-pad/usb-turntable.cpp index 8702e48ad7..d13f8b6c2e 100644 --- a/pcsx2/USB/usb-pad/usb-turntable.cpp +++ b/pcsx2/USB/usb-pad/usb-turntable.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: GPL-3.0+ #include "Host.h" +#include "IconsFontAwesome6.h" +#include "IconsPromptFont.h" #include "Input/InputManager.h" #include "StateWrapper.h" #include "USB/USB.h" @@ -235,6 +237,11 @@ namespace usb_pad return "DJTurntable"; } + const char* DJTurntableDevice::IconName() const + { + return ICON_PF_DJ_HERO_TURNTABLE; + } + USBDevice* DJTurntableDevice::CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const { TurntableState* s = new TurntableState(port); diff --git a/pcsx2/USB/usb-pad/usb-turntable.h b/pcsx2/USB/usb-pad/usb-turntable.h index 87ce0375f6..3e8ec6607f 100644 --- a/pcsx2/USB/usb-pad/usb-turntable.h +++ b/pcsx2/USB/usb-pad/usb-turntable.h @@ -86,6 +86,7 @@ namespace usb_pad public: const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; float GetBindingValue(const USBDevice* dev, u32 bind_index) const override; void SetBindingValue(USBDevice* dev, u32 bind_index, float value) const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; diff --git a/pcsx2/USB/usb-printer/usb-printer.cpp b/pcsx2/USB/usb-printer/usb-printer.cpp index c14d0b6d8e..bbd4bfe495 100644 --- a/pcsx2/USB/usb-printer/usb-printer.cpp +++ b/pcsx2/USB/usb-printer/usb-printer.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team // SPDX-License-Identifier: GPL-3.0+ +#include "IconsPromptFont.h" #include "USB/qemu-usb/qusb.h" #include "USB/qemu-usb/USBinternal.h" #include "USB/usb-printer/usb-printer.h" @@ -331,6 +332,11 @@ namespace usb_printer return "printer"; } + const char* PrinterDevice::IconName() const + { + return ICON_PF_PRINTER; + } + bool PrinterDevice::Freeze(USBDevice* dev, StateWrapper& sw) const { PrinterState* s = USB_CONTAINER_OF(dev, PrinterState, dev); diff --git a/pcsx2/USB/usb-printer/usb-printer.h b/pcsx2/USB/usb-printer/usb-printer.h index 437a697a57..65efcb4dfe 100644 --- a/pcsx2/USB/usb-printer/usb-printer.h +++ b/pcsx2/USB/usb-printer/usb-printer.h @@ -114,6 +114,7 @@ namespace usb_printer USBDevice* CreateDevice(SettingsInterface& si, u32 port, u32 subtype) const override; const char* Name() const override; const char* TypeName() const override; + const char* IconName() const override; bool Freeze(USBDevice* dev, StateWrapper& sw) const override; std::span SubTypes() const override;