Merge pull request #161 from SixLabors/js/update-fonts

Update Fonts to use new API

Author: JimBobSquarePants

samples/DrawShapesWithImageSharp/Program.cs

@@ -63,7 +63,7 @@ private static void OutputStars()
 
         private static void DrawText(string text)
         {
-            FontFamily fam = SystemFonts.Find("Arial");
+            FontFamily fam = SystemFonts.Get("Arial");
             var font = new Font(fam, 30);
             var style = new RendererOptions(font, 72);
             IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, style);
@@ -73,7 +73,7 @@ private static void DrawText(string text)
 
         private static void DrawText(string text, IPath path)
         {
-            FontFamily fam = SystemFonts.Find("Arial");
+            FontFamily fam = SystemFonts.Get("Arial");
             var font = new Font(fam, 30);
             var style = new RendererOptions(font, 72)
             {

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.10" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
   </ItemGroup>
 

tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawText.cs

@@ -24,7 +24,7 @@ public class DrawText : BaseImageOperationsExtensionTest
         public DrawText()
         {
             this.fontCollection = new FontCollection();
-            this.font = this.fontCollection.Install(TestFontUtilities.GetPath("SixLaborsSampleAB.woff")).CreateFont(12);
+            this.font = this.fontCollection.Add(TestFontUtilities.GetPath("SixLaborsSampleAB.woff")).CreateFont(12);
         }
 
         [Fact]

tests/ImageSharp.Drawing.Tests/Issues/Issue_46.cs

@@ -41,7 +41,7 @@ private static Font CreateFont(string fontName, int size)
         {
             var fontCollection = new FontCollection();
             string fontPath = TestFontUtilities.GetPath(fontName);
-            return fontCollection.Install(fontPath).CreateFont(size);
+            return fontCollection.Add(fontPath).CreateFont(size);
         }
     }
 }

tests/ImageSharp.Drawing.Tests/Issues/Issue_54.cs

@@ -23,7 +23,7 @@ public void CanDrawWithoutMemoryException()
             // Creates a new image with empty pixel data.
             using (var image = new Image<Rgba32>(width, height))
             {
-                FontFamily family = SystemFonts.Find("verdana");
+                FontFamily family = SystemFonts.Get("verdana");
                 Font font = family.CreateFont(48, FontStyle.Bold);
 
                 // The options are optional

tests/ImageSharp.Drawing.Tests/TestFontUtilities.cs

@@ -32,7 +32,7 @@ public static Font GetFont(string name, float size)
         /// <param name="size">The font size.</param>
         /// <returns>The <see cref="Font"/></returns>
         public static Font GetFont(FontCollection collection, string name, float size)
-            => collection.Install(GetPath(name)).CreateFont(size);
+            => collection.Add(GetPath(name)).CreateFont(size);
 
         /// <summary>
         /// The formats directory.