Merge pull request ScottPlot#3841 from kebox7/features/fonts-improvement

Fonts: improve support for fonts loaded from true-type files

CHANGELOG.md

@@ -18,6 +18,7 @@
 * Axes: Added `SetTicks()` shortcut for quickly switching to a manual tick generator pre-loaded with the given tick positions and labels (#3831) @Giviruk
 * Legend: Clip the legend area so it does not flow outside the data area on extremely small plots (#3833) @drolevar
 * Controls: Made axis locking methods `virtual` inside `InputBindings` to facilitate custom behavior (#3838) @JinjieZhao
+* Fonts: Improved support for true-type font files and custom typefaces (#3841) @kebox7 @bclehmann
 
 ## ScottPlot 5.0.34
 _Published on [NuGet](https://www.nuget.org/profiles/ScottPlot) on 2024-05-05_

src/ScottPlot5/ScottPlot5 Demos/ScottPlot5 WinForms Demo/Demos/CustomFonts.cs

@@ -13,25 +13,42 @@ public CustomFonts()
     {
         InitializeComponent();
 
+        // load custom font files, giving unique names to fonts with special styling (beyond bold and italic)
+        Fonts.AddFontFile("Alumni Sans", "Fonts/AlumniSans/AlumniSans-Regular.ttf", bold: false, italic: false);
+        Fonts.AddFontFile("Alumni Sans", "Fonts/AlumniSans/AlumniSans-Bold.ttf", bold: true, italic: false);
+        Fonts.AddFontFile("Alumni Sans", "Fonts/AlumniSans/AlumniSans-BoldItalic.ttf", bold: true, italic: true);
+        Fonts.AddFontFile("Alumni Sans", "Fonts/AlumniSans/AlumniSans-Italic.ttf", bold: false, italic: true);
+        Fonts.AddFontFile("Noto Serif Display", "Fonts/NotoSerifDisplay/NotoSerifDisplay-Regular.ttf", bold: true, italic: false);
+        Fonts.AddFontFile("Noto Serif Display", "Fonts/NotoSerifDisplay/NotoSerifDisplay-Bold.ttf", bold: true, italic: false);
+        Fonts.AddFontFile("Noto Serif Display", "Fonts/NotoSerifDisplay/NotoSerifDisplay-BoldItalic.ttf", bold: true, italic: false);
+        Fonts.AddFontFile("Noto Serif Display", "Fonts/NotoSerifDisplay/NotoSerifDisplay-BoldItalic.ttf", bold: true, italic: false);
+        Fonts.AddFontFile("Noto Serif Display", "Fonts/NotoSerifDisplay/NotoSerifDisplay-Italic.ttf", bold: true, italic: false);
+        Fonts.AddFontFile("Noto Serif Display Light", "Fonts/NotoSerifDisplay/NotoSerifDisplay-Light.ttf", bold: false, italic: false);
+
+        // plot sample data
         formsPlot1.Plot.Add.Signal(Generate.Sin());
         formsPlot1.Plot.Add.Signal(Generate.Cos());
 
-        string fontPath = "Fonts/ShadowsIntoLight/ShadowsIntoLight-Regular.ttf";
-
-        formsPlot1.Plot.Title("Plot Using Custom Fonts");
-        formsPlot1.Plot.Axes.Title.Label.FontFile = fontPath;
-        formsPlot1.Plot.Axes.Title.Label.FontSize = 36;
-
-        formsPlot1.Plot.XLabel("Horizontal Axis");
-        formsPlot1.Plot.Axes.Bottom.Label.FontFile = fontPath;
+        // Demonstrate how to customize label fonts
+        formsPlot1.Plot.Axes.Title.IsVisible = true;
+        formsPlot1.Plot.Axes.Title.Label.Text = "Alumni Sans (Bold Italic)";
+        formsPlot1.Plot.Axes.Title.Label.FontName = "Alumni Sans";
+        formsPlot1.Plot.Axes.Title.Label.Bold = true;
+        formsPlot1.Plot.Axes.Title.Label.Italic = true;
+        formsPlot1.Plot.Axes.Title.Label.FontSize = 36;
+
+        formsPlot1.Plot.Axes.Bottom.Label.Text = "Noto Serif Display (Light)";
+        formsPlot1.Plot.Axes.Bottom.Label.FontName = "Noto Serif Display Light";
+        formsPlot1.Plot.Axes.Bottom.Label.Bold = false;
+        formsPlot1.Plot.Axes.Bottom.Label.Italic = false;
         formsPlot1.Plot.Axes.Bottom.Label.FontSize = 24;
-        formsPlot1.Plot.Axes.Bottom.TickLabelStyle.FontFile = fontPath;
-        formsPlot1.Plot.Axes.Bottom.TickLabelStyle.FontSize = 18;
-
-        formsPlot1.Plot.YLabel("Vertical Axis");
-        formsPlot1.Plot.Axes.Left.Label.FontFile = fontPath;
+        formsPlot1.Plot.Axes.Bottom.TickLabelStyle.FontSize = 18;
+
+        formsPlot1.Plot.Axes.Left.Label.Text = "Alumni Sans (Regular)";
+        formsPlot1.Plot.Axes.Left.Label.FontName = "Alumni Sans";
+        formsPlot1.Plot.Axes.Left.Label.Bold = false;
+        formsPlot1.Plot.Axes.Left.Label.Italic = false;
         formsPlot1.Plot.Axes.Left.Label.FontSize = 24;
-        formsPlot1.Plot.Axes.Left.TickLabelStyle.FontFile = fontPath;
         formsPlot1.Plot.Axes.Left.TickLabelStyle.FontSize = 18;
     }
 }

src/ScottPlot5/ScottPlot5 Demos/ScottPlot5 WinForms Demo/Fonts/AlumniSans/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2015 The Alumni Sans Project Authors (https://github.com/googlefonts/alumni)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

src/ScottPlot5/ScottPlot5 Demos/ScottPlot5 WinForms Demo/Fonts/ShadowsIntoLight/OFL.txt → src/ScottPlot5/ScottPlot5 Demos/ScottPlot5 WinForms Demo/Fonts/NotoSerifDisplay/OFL.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010, Kimberly Geswein (kimberlygeswein.com)
+Copyright 2023 The Danfo Project Authors (https://github.com/Afrotype/danfo)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:

src/ScottPlot5/ScottPlot5 Demos/ScottPlot5 WinForms Demo/Program.cs

@@ -11,7 +11,7 @@ static void Main()
         Application.EnableVisualStyles();
 
         // CTRL+D opens this window (useful for testing in development)
-        Type testingFormType = typeof(Demos.CustomAxis);
+        Type testingFormType = typeof(Demos.CustomFonts);
 
         Application.Run(new MainMenuForm(testingFormType));
     }

src/ScottPlot5/ScottPlot5 Demos/ScottPlot5 WinForms Demo/WinForms Demo.csproj

@@ -1,64 +1,91 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0-windows</TargetFramework>
-        <Nullable>enable</Nullable>
-        <UseWindowsForms>true</UseWindowsForms>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <IsPackable>false</IsPackable>
-        <EnableWindowsTargeting>true</EnableWindowsTargeting>
-
-        <!-- package restored using non-identical framework -->
-        <NoWarn>NU1701</NoWarn>
-        <ApplicationIcon>scottplot-icon-rounded-border.ico</ApplicationIcon>
-
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Content Include="scottplot-icon-rounded-border.ico" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\..\ScottPlot5 Controls\ScottPlot.OpenGL\ScottPlot.OpenGL.csproj" />
-        <ProjectReference Include="..\..\ScottPlot5 Controls\ScottPlot.WinForms\ScottPlot.WinForms.csproj" />
-        <ProjectReference Include="..\..\ScottPlot5 Cookbook\ScottPlot Cookbook.csproj" />
-        <ProjectReference Include="..\..\ScottPlot5\ScottPlot.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net6.0-windows</TargetFramework>
+        <Nullable>enable</Nullable>
+        <UseWindowsForms>true</UseWindowsForms>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <IsPackable>false</IsPackable>
+        <EnableWindowsTargeting>true</EnableWindowsTargeting>
+
+        <!-- package restored using non-identical framework -->
+        <NoWarn>NU1701</NoWarn>
+        <ApplicationIcon>scottplot-icon-rounded-border.ico</ApplicationIcon>
+
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Content Include="scottplot-icon-rounded-border.ico" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\ScottPlot5 Controls\ScottPlot.OpenGL\ScottPlot.OpenGL.csproj" />
+        <ProjectReference Include="..\..\ScottPlot5 Controls\ScottPlot.WinForms\ScottPlot.WinForms.csproj" />
+        <ProjectReference Include="..\..\ScottPlot5 Cookbook\ScottPlot Cookbook.csproj" />
+        <ProjectReference Include="..\..\ScottPlot5\ScottPlot.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
         <Compile Update="Demos\ShowValueOnHoverMultiple.cs">
-          <SubType>Form</SubType>
-        </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Update="Properties\Resources.resx">
-            <Generator>PublicResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-        </EmbeddedResource>
-    </ItemGroup>
-
+            <SubType>Form</SubType>
+        </Compile>
+        <Compile Update="Properties\Resources.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>PublicResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
+
     <ItemGroup>
-      <Folder Include="Fonts\" />
-    </ItemGroup>
-
+        <Folder Include="Fonts\" />
+    </ItemGroup>
+
     <ItemGroup>
-      <PackageReference Include="eto.platform.wpf" Version="2.8.2" />
-    </ItemGroup>
-
+        <PackageReference Include="eto.platform.wpf" Version="2.8.2" />
+    </ItemGroup>
+
     <ItemGroup>
-      <None Update="Fonts\ShadowsIntoLight\OFL.txt">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-      <None Update="Fonts\ShadowsIntoLight\ShadowsIntoLight-Regular.ttf">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-
+        <None Update="Fonts\AlumniSans\AlumniSans-Bold.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\AlumniSans\AlumniSans-BoldItalic.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\AlumniSans\AlumniSans-Italic.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\AlumniSans\AlumniSans-Regular.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\AlumniSans\OFL.txt">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\NotoSerifDisplay\NotoSerifDisplay-Bold.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\NotoSerifDisplay\NotoSerifDisplay-BoldItalic.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\NotoSerifDisplay\NotoSerifDisplay-Italic.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\NotoSerifDisplay\NotoSerifDisplay-Light.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\NotoSerifDisplay\NotoSerifDisplay-Regular.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Fonts\NotoSerifDisplay\OFL.txt">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
 </Project>

src/ScottPlot5/ScottPlot5 Sandbox/Sandbox.WinForms3D/Form1.cs

@@ -1,4 +1,4 @@
-using Sandbox.WinForms3D.Primitives3D;
+using Sandbox.WinForms3D.Primitives3D;
 
 namespace Sandbox.WinForms3D;
 

src/ScottPlot5/ScottPlot5 Sandbox/Sandbox.WinForms3D/Plottables3D/Rectangle3D.cs

@@ -28,9 +28,9 @@ private Surface3D GetBottom()
         Point3D[] points =
         [
             Location,
-            Location.WithPan(Size.Width,0,0),
-            Location.WithPan(Size.Width,Size.Length,0),
-            Location.WithPan(0,Size.Length,0),
+            Location.WithPan(Size.Width, 0, 0),
+            Location.WithPan(Size.Width, Size.Length, 0),
+            Location.WithPan(0, Size.Length, 0),
             Location,
         ];
 
@@ -97,11 +97,11 @@ private Surface3D GetTop()
     {
         Point3D[] points =
         [
-            Location.WithPan(0,0,Size.Height),
-            Location.WithPan(Size.Width,0,Size.Height),
-            Location.WithPan(Size.Width,Size.Length,Size.Height),
-            Location.WithPan(0,Size.Length,Size.Height),
-            Location.WithPan(0,0,Size.Height),
+            Location.WithPan(0, 0, Size.Height),
+            Location.WithPan(Size.Width, 0, Size.Height),
+            Location.WithPan(Size.Width, Size.Length, Size.Height),
+            Location.WithPan(0, Size.Length, Size.Height),
+            Location.WithPan(0, 0, Size.Height),
         ];
 
         return new Surface3D(points);

src/ScottPlot5/ScottPlot5 Sandbox/Sandbox.WinForms3D/Program.cs

@@ -1,4 +1,4 @@
-namespace Sandbox.WinForms3D;
+namespace Sandbox.WinForms3D;
 
 static class Program
 {
@@ -12,5 +12,5 @@ static void Main()
         // see https://aka.ms/applicationconfiguration.
         ApplicationConfiguration.Initialize();
         Application.Run(new Form1());
-    }    
-}
+    }
+}

src/ScottPlot5/ScottPlot5 Tests/Unit Tests/RenderTests/LabelTests.cs

@@ -159,7 +159,7 @@ public void Test_String_Measurement()
         canvas.Clear(SKColors.Navy);
 
         using SKPaint paint = new();
-        string[] fonts = { "Times New Roman", "Consolas", "Impact", "Arial Narrow" };
+        string[] fonts = ["Times New Roman", "Consolas", "Impact", "Arial Narrow", "MiSsInG fOnT"];
 
         float yOffset = 20;
         foreach (string font in fonts)