diff --git a/resources/font/PixelMplus10-Regular-edited.ttf b/resources/font/PixelMplus10-Regular-edited.ttf index ce354134..70191975 100644 Binary files a/resources/font/PixelMplus10-Regular-edited.ttf and b/resources/font/PixelMplus10-Regular-edited.ttf differ diff --git a/resources/font/PixelMplus10-Regular.sfd b/resources/font/PixelMplus10-Regular.sfd index f0f45106..c0a0a79e 100644 --- a/resources/font/PixelMplus10-Regular.sfd +++ b/resources/font/PixelMplus10-Regular.sfd @@ -22,7 +22,7 @@ OS2Version: 1 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1370142052 -ModificationTime: 1593281683 +ModificationTime: 1598891831 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -87,8 +87,8 @@ NameList: AGL For New Fonts DisplaySize: -48 AntiAlias: 1 FitToEm: 0 -WinInfo: 117 39 14 -BeginChars: 65538 7273 +WinInfo: 39 39 14 +BeginChars: 65538 7287 StartChar: .notdef Encoding: 65536 -1 0 @@ -6702,21 +6702,21 @@ SplineSet 400 100 l 1,8,-1 400 0 l 1,9,-1 100 0 l 1,0,-1 -0 700 m 1,10,-1 - 0 800 l 1,11,-1 - 100 800 l 1,12,-1 - 100 700 l 1,13,-1 - 0 700 l 1,10,-1 -300 800 m 1,14,-1 - 400 800 l 1,15,-1 - 400 700 l 1,16,-1 - 300 700 l 1,17,-1 - 300 800 l 1,14,-1 -300 800 m 1,18,-1 - 100 800 l 1,19,-1 - 100 900 l 1,20,-1 - 300 900 l 1,21,-1 - 300 800 l 1,18,-1 +0 700 m 5,10,-1 + 0 800 l 5,11,-1 + 100 800 l 5,12,-1 + 100 700 l 5,13,-1 + 0 700 l 5,10,-1 +300 800 m 5,14,-1 + 400 800 l 5,15,-1 + 400 700 l 5,16,-1 + 300 700 l 5,17,-1 + 300 800 l 5,14,-1 +300 800 m 5,18,-1 + 100 800 l 5,19,-1 + 100 900 l 5,20,-1 + 300 900 l 5,21,-1 + 300 800 l 5,18,-1 EndSplineSet EndChar @@ -497173,20 +497173,522 @@ EndChar StartChar: uni01C3 Encoding: 451 451 7272 Width: 500 +Flags: WO +LayerCount: 2 +Fore +SplineSet +100 0 m 1,0,-1 + 100 103 l 1,1,-1 + 300 103 l 1,2,-1 + 300 0 l 1,3,-1 + 100 0 l 1,0,-1 +300 700 m 1,4,-1 + 300 201 l 5,5,-1 + 100 201 l 5,6,-1 + 100 700 l 1,7,-1 + 300 700 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: Amacron +Encoding: 256 256 7273 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +400 500 m 1,0,-1 + 400 0 l 1,1,-1 + 300 0 l 1,2,-1 + 300 200 l 1,3,-1 + 100 200 l 1,4,-1 + 100 0 l 1,5,-1 + 0 0 l 1,6,-1 + 0 500 l 1,7,-1 + 100 500 l 1,8,-1 + 100 300 l 1,9,-1 + 300 300 l 1,10,-1 + 300 500 l 1,11,-1 + 400 500 l 1,0,-1 +300 500 m 1,12,-1 + 100 500 l 1,13,-1 + 100 600 l 1,14,-1 + 300 600 l 1,15,-1 + 300 500 l 1,12,-1 +400 799 m 5,16,-1 + 400 699 l 5,17,-1 + -2 700 l 1,18,-1 + -2 800 l 1,19,-1 + 400 799 l 5,16,-1 +EndSplineSet +EndChar + +StartChar: amacron +Encoding: 257 257 7274 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +0 100 m 1,0,-1 + 0 200 l 1,1,-1 + 100 200 l 1,2,-1 + 100 100 l 1,3,-1 + 300 100 l 1,4,-1 + 300 200 l 1,5,-1 + 100 200 l 1,6,-1 + 100 300 l 1,7,-1 + 300 300 l 1,8,-1 + 300 400 l 1,9,-1 + 400 400 l 1,10,-1 + 400 0 l 1,11,-1 + 100 0 l 1,12,-1 + 100 100 l 1,13,-1 + 0 100 l 1,0,-1 +100 400 m 1,14,-1 + 100 500 l 1,15,-1 + 300 500 l 1,16,-1 + 300 400 l 1,17,-1 + 100 400 l 1,14,-1 +402 800 m 5,18,-1 + 402 700 l 5,19,-1 + -2 700 l 1,20,-1 + -2 800 l 1,21,-1 + 402 800 l 5,18,-1 +EndSplineSet +EndChar + +StartChar: Emacron +Encoding: 274 274 7275 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +400 0 m 1,0,-1 + 0 0 l 1,1,-1 + 0 600 l 1,2,-1 + 400 600 l 1,3,-1 + 400 500 l 1,4,-1 + 100 500 l 1,5,-1 + 100 400 l 1,6,-1 + 300 400 l 1,7,-1 + 300 300 l 1,8,-1 + 100 300 l 1,9,-1 + 100 100 l 1,10,-1 + 400 100 l 1,11,-1 + 400 0 l 1,0,-1 +402 800 m 5,12,-1 + 402 700 l 5,13,-1 + 0 700 l 1,14,-1 + 0 800 l 1,15,-1 + 402 800 l 5,12,-1 +EndSplineSet +EndChar + +StartChar: emacron +Encoding: 275 275 7276 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +400 0 m 1,0,-1 + 100 0 l 1,1,-1 + 100 100 l 1,2,-1 + 400 100 l 1,3,-1 + 400 0 l 1,0,-1 +100 100 m 1,4,-1 + 0 100 l 1,5,-1 + 0 400 l 1,6,-1 + 100 400 l 1,7,-1 + 100 300 l 1,8,-1 + 300 300 l 1,9,-1 + 300 400 l 1,10,-1 + 400 400 l 1,11,-1 + 400 200 l 1,12,-1 + 100 200 l 1,13,-1 + 100 100 l 1,4,-1 +300 400 m 1,14,-1 + 100 400 l 1,15,-1 + 100 500 l 1,16,-1 + 300 500 l 1,17,-1 + 300 400 l 1,14,-1 +400 800 m 5,18,-1 + 400 700 l 5,19,-1 + 2 700 l 5,20,-1 + 2 800 l 5,21,-1 + 400 800 l 5,18,-1 +EndSplineSet +EndChar + +StartChar: imacron +Encoding: 299 299 7277 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +398 800 m 5,0,-1 + 398 700 l 5,1,-1 + 100 700 l 5,2,-1 + 100 800 l 5,3,-1 + 398 800 l 5,0,-1 +100 0 m 1,4,-1 + 100 100 l 1,5,-1 + 200 100 l 1,6,-1 + 200 400 l 1,7,-1 + 100 400 l 1,8,-1 + 100 500 l 1,9,-1 + 300 500 l 1,10,-1 + 300 100 l 1,11,-1 + 400 100 l 1,12,-1 + 400 0 l 1,13,-1 + 100 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: Imacron +Encoding: 298 298 7278 +Width: 500 Flags: W LayerCount: 2 Fore SplineSet 100 0 m 1,0,-1 - 100 200 l 1,1,-1 - 300 200 l 1,2,-1 - 300 0 l 1,3,-1 + 100 100 l 1,1,-1 + 200 100 l 1,2,-1 + 200 500 l 1,3,-1 + 100 500 l 1,4,-1 + 100 600 l 1,5,-1 + 400 600 l 1,6,-1 + 400 500 l 1,7,-1 + 300 500 l 1,8,-1 + 300 100 l 1,9,-1 + 400 100 l 1,10,-1 + 400 0 l 1,11,-1 100 0 l 1,0,-1 -300 700 m 1,4,-1 - 300 300 l 1,5,-1 - 100 300 l 1,6,-1 - 100 700 l 1,7,-1 - 300 700 l 1,4,-1 +398 800 m 5,12,-1 + 398 700 l 5,13,-1 + 100 700 l 5,14,-1 + 100 800 l 5,15,-1 + 398 800 l 5,12,-1 +EndSplineSet +EndChar + +StartChar: Omacron +Encoding: 332 332 7279 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +400 800 m 5,0,-1 + 400 700 l 5,1,-1 + 2 700 l 5,2,-1 + 2 800 l 5,3,-1 + 400 800 l 5,0,-1 +300 0 m 1,4,-1 + 100 0 l 1,5,-1 + 100 100 l 1,6,-1 + 300 100 l 1,7,-1 + 300 0 l 1,4,-1 +300 100 m 1,8,-1 + 300 500 l 1,9,-1 + 400 500 l 1,10,-1 + 400 100 l 1,11,-1 + 300 100 l 1,8,-1 +100 100 m 1,12,-1 + 0 100 l 1,13,-1 + 0 500 l 1,14,-1 + 100 500 l 1,15,-1 + 100 100 l 1,12,-1 +300 500 m 1,16,-1 + 100 500 l 1,17,-1 + 100 600 l 1,18,-1 + 300 600 l 1,19,-1 + 300 500 l 1,16,-1 +EndSplineSet +EndChar + +StartChar: omacron +Encoding: 333 333 7280 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +400 800 m 5,0,-1 + 400 700 l 5,1,-1 + 2 700 l 5,2,-1 + 2 800 l 5,3,-1 + 400 800 l 5,0,-1 +300 0 m 1,4,-1 + 100 0 l 1,5,-1 + 100 100 l 1,6,-1 + 300 100 l 1,7,-1 + 300 0 l 1,4,-1 +300 100 m 1,8,-1 + 300 400 l 1,9,-1 + 400 400 l 1,10,-1 + 400 100 l 1,11,-1 + 300 100 l 1,8,-1 +100 100 m 1,12,-1 + 0 100 l 1,13,-1 + 0 400 l 1,14,-1 + 100 400 l 1,15,-1 + 100 100 l 1,12,-1 +300 400 m 1,16,-1 + 100 400 l 1,17,-1 + 100 500 l 1,18,-1 + 300 500 l 1,19,-1 + 300 400 l 1,16,-1 +EndSplineSet +EndChar + +StartChar: umacron +Encoding: 363 363 7281 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +400 800 m 5,0,-1 + 400 700 l 5,1,-1 + 2 700 l 5,2,-1 + 2 800 l 5,3,-1 + 400 800 l 5,0,-1 +400 0 m 1,4,-1 + 100 0 l 1,5,-1 + 100 100 l 1,6,-1 + 300 100 l 1,7,-1 + 300 500 l 1,8,-1 + 400 500 l 1,9,-1 + 400 0 l 1,4,-1 +100 100 m 1,10,-1 + 0 100 l 1,11,-1 + 0 500 l 1,12,-1 + 100 500 l 1,13,-1 + 100 100 l 1,10,-1 +EndSplineSet +EndChar + +StartChar: Umacron +Encoding: 362 362 7282 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +400 800 m 5,0,-1 + 400 700 l 5,1,-1 + 2 700 l 5,2,-1 + 2 800 l 5,3,-1 + 400 800 l 5,0,-1 +300 0 m 1,4,-1 + 100 0 l 1,5,-1 + 100 100 l 1,6,-1 + 300 100 l 1,7,-1 + 300 0 l 1,4,-1 +300 100 m 1,8,-1 + 300 600 l 1,9,-1 + 400 600 l 1,10,-1 + 400 100 l 1,11,-1 + 300 100 l 1,8,-1 +100 100 m 1,12,-1 + 0 100 l 1,13,-1 + 0 600 l 1,14,-1 + 100 600 l 1,15,-1 + 100 100 l 1,12,-1 +EndSplineSet +EndChar + +StartChar: Wcircumflex +Encoding: 372 372 7283 +Width: 600 +Flags: W +LayerCount: 2 +Fore +SplineSet +0 700 m 5,0,-1 + 0 800 l 5,1,-1 + 100 800 l 5,2,-1 + 100 700 l 5,3,-1 + 0 700 l 5,0,-1 +300 800 m 5,4,-1 + 400 800 l 5,5,-1 + 400 700 l 5,6,-1 + 300 700 l 5,7,-1 + 300 800 l 5,4,-1 +300 800 m 5,8,-1 + 100 800 l 5,9,-1 + 100 900 l 5,10,-1 + 300 900 l 5,11,-1 + 300 800 l 5,8,-1 +400 300 m 1,12,-1 + 400 0 l 1,13,-1 + 300 0 l 1,14,-1 + 300 300 l 1,15,-1 + 400 300 l 1,12,-1 +200 300 m 1,16,-1 + 200 0 l 1,17,-1 + 100 0 l 1,18,-1 + 100 300 l 1,19,-1 + 200 300 l 1,16,-1 +400 300 m 1,20,-1 + 400 601 l 1,21,-1 + 500 601 l 1,22,-1 + 500 300 l 1,23,-1 + 400 300 l 1,20,-1 +300 300 m 1,24,-1 + 200 300 l 1,25,-1 + 200 601 l 1,26,-1 + 300 601 l 1,27,-1 + 300 300 l 1,24,-1 +100 300 m 1,28,-1 + 0 300 l 1,29,-1 + 0 601 l 1,30,-1 + 100 601 l 1,31,-1 + 100 300 l 1,28,-1 +EndSplineSet +EndChar + +StartChar: wcircumflex +Encoding: 373 373 7284 +Width: 600 +Flags: W +LayerCount: 2 +Fore +SplineSet +0 700 m 5,0,-1 + 0 800 l 5,1,-1 + 100 800 l 5,2,-1 + 100 700 l 5,3,-1 + 0 700 l 5,0,-1 +300 800 m 5,4,-1 + 400 800 l 5,5,-1 + 400 700 l 5,6,-1 + 300 700 l 5,7,-1 + 300 800 l 5,4,-1 +300 800 m 5,8,-1 + 100 800 l 5,9,-1 + 100 900 l 5,10,-1 + 300 900 l 5,11,-1 + 300 800 l 5,8,-1 +400 200 m 1,12,-1 + 400 0 l 1,13,-1 + 300 0 l 1,14,-1 + 300 200 l 1,15,-1 + 400 200 l 1,12,-1 +200 200 m 1,16,-1 + 200 0 l 1,17,-1 + 100 0 l 1,18,-1 + 100 200 l 1,19,-1 + 200 200 l 1,16,-1 +400 200 m 1,20,-1 + 400 500 l 1,21,-1 + 500 500 l 1,22,-1 + 500 200 l 1,23,-1 + 400 200 l 1,20,-1 +300 200 m 1,24,-1 + 200 200 l 1,25,-1 + 200 500 l 1,26,-1 + 300 500 l 1,27,-1 + 300 200 l 1,24,-1 +100 200 m 1,28,-1 + 0 200 l 1,29,-1 + 0 500 l 1,30,-1 + 100 500 l 1,31,-1 + 100 200 l 1,28,-1 +EndSplineSet +EndChar + +StartChar: Ycircumflex +Encoding: 374 374 7285 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +0 700 m 5,0,-1 + 0 800 l 5,1,-1 + 100 800 l 5,2,-1 + 100 700 l 5,3,-1 + 0 700 l 5,0,-1 +300 800 m 5,4,-1 + 400 800 l 5,5,-1 + 400 700 l 5,6,-1 + 300 700 l 5,7,-1 + 300 800 l 5,4,-1 +300 800 m 5,8,-1 + 100 800 l 5,9,-1 + 100 900 l 5,10,-1 + 300 900 l 5,11,-1 + 300 800 l 5,8,-1 +200 300 m 1,12,-1 + 200 0 l 1,13,-1 + 100 0 l 1,14,-1 + 100 300 l 1,15,-1 + 200 300 l 1,12,-1 +200 300 m 1,16,-1 + 200 400 l 1,17,-1 + 300 400 l 1,18,-1 + 300 300 l 1,19,-1 + 200 300 l 1,16,-1 +100 300 m 1,20,-1 + 0 300 l 1,21,-1 + 0 601 l 1,22,-1 + 100 601 l 1,23,-1 + 100 300 l 1,20,-1 +300 400 m 1,24,-1 + 300 601 l 1,25,-1 + 400 601 l 1,26,-1 + 400 400 l 1,27,-1 + 300 400 l 1,24,-1 +EndSplineSet +EndChar + +StartChar: ycircumflex +Encoding: 375 375 7286 +Width: 500 +Flags: W +LayerCount: 2 +Fore +SplineSet +0 700 m 5,0,-1 + 0 800 l 5,1,-1 + 100 800 l 5,2,-1 + 100 700 l 5,3,-1 + 0 700 l 5,0,-1 +300 800 m 5,4,-1 + 400 800 l 5,5,-1 + 400 700 l 5,6,-1 + 300 700 l 5,7,-1 + 300 800 l 5,4,-1 +300 800 m 5,8,-1 + 100 800 l 5,9,-1 + 100 900 l 5,10,-1 + 300 900 l 5,11,-1 + 300 800 l 5,8,-1 +100 -200 m 1,12,-1 + 100 -100 l 1,13,-1 + 300 -100 l 1,14,-1 + 300 -200 l 1,15,-1 + 100 -200 l 1,12,-1 +300 -100 m 1,16,-1 + 300 0 l 1,17,-1 + 100 0 l 1,18,-1 + 100 100 l 1,19,-1 + 300 100 l 1,20,-1 + 300 500 l 1,21,-1 + 400 500 l 1,22,-1 + 400 -100 l 1,23,-1 + 300 -100 l 1,16,-1 +100 100 m 1,24,-1 + 0 100 l 1,25,-1 + 0 500 l 1,26,-1 + 100 500 l 1,27,-1 + 100 100 l 1,24,-1 EndSplineSet EndChar EndChars diff --git a/resources/font/default.fnt b/resources/font/default.fnt index 2ff717b0..165ce0df 100644 Binary files a/resources/font/default.fnt and b/resources/font/default.fnt differ diff --git a/resources/font/default_0.png b/resources/font/default_0.png index 3a0ef8c3..e9e69860 100644 Binary files a/resources/font/default_0.png and b/resources/font/default_0.png differ diff --git a/resources/font/default_1.png b/resources/font/default_1.png index 5485c027..ab9e586c 100644 Binary files a/resources/font/default_1.png and b/resources/font/default_1.png differ