加上默认的字体

Author: lindexi

src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/EnhancedGraphicsMetafileOptimization.cs

@@ -152,8 +152,9 @@ private static ImageFileOptimizationResult ConvertWithSkiaWmfRenderer(ImageFileO
 
         var skiaWmfRenderConfiguration = new SkiaWmfRenderConfiguration()
         {
-            RequestWidth = requestWidth, 
-            RequestHeight = requestHeight
+            RequestWidth = requestWidth,
+            RequestHeight = requestHeight,
+            FontFolder = new DirectoryInfo(Path.Join(AppContext.BaseDirectory, "Assets", "Fonts"))
         };
         if (SkiaWmfRenderHelper.TryConvertToPng(file, outputPngFile, skiaWmfRenderConfiguration) && File.Exists(outputPngFile.FullName))
         {

src/MediaConverters/MediaConverters.Tool/Assets/Fonts/StandardSymbolsPS.ttf

@@ -16,6 +16,7 @@
   <ItemGroup>
     <None Include="Assets\$(RuntimeIdentifier)\**" CopyToOutputDirectory="PreserveNewest" />
     <None Include="Assets\gsfonts\**" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Assets\Fonts\**" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>

src/MediaConverters/MediaConverters.Tool/MediaConverters.Tool.csproj

@@ -110,36 +110,59 @@ public void UpdateSkiaTextStatus(string text)
         _harfBuzzFont = null;
         _harfBuzzFace = null;
 
-        SKTypeface? typeface;
+        SKTypeface? typeface = TryGetTypeface();
+       
+
+        RenderConfiguration.LogMessage($"CurrentFontName='{CurrentFontName}' get the SKTypeface {(typeface is null ? "is null" : "not null")}. SKTypeface={typeface?.FamilyName} GlyphCount={typeface?.GlyphCount}. Text={text}");
+
+        skFont.Typeface = typeface;
+
+        Paint.Style = SKPaintStyle.Fill;
+        Paint.Color = CurrentTextColor;
+
+        //Paint.Typeface = typeface;
+
+    }
+    private SKTypeface? TryGetTypeface()
+    {
         if (CurrentFontName == "Symbol")
         {
-            var symbolFontFile = Path.Join(AppContext.BaseDirectory, "StandardSymbolsPS.ttf");
-            //symbolFontFile = Path.Join(AppContext.BaseDirectory, "symbol.ttf");
-            typeface = SKTypeface.FromFile(symbolFontFile);
-        }
-        else
-        {
-            typeface = SKTypeface.FromFamilyName(CurrentFontName, (SKFontStyleWeight) FontWeight,
-           SKFontStyleWidth.Normal, IsItalic ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright);
+            if (RenderConfiguration.SymbolFontFile?.Exists is true)
+            {
+                return SKTypeface.FromFile(RenderConfiguration.SymbolFontFile.FullName);
+            }
 
-            if (typeface is null || typeface.GlyphCount == 0)
+            if (RenderConfiguration.FontFolder is { } fontFolder)
             {
-                var fontFile = Path.Join(AppContext.BaseDirectory, $"{CurrentFontName}.ttf");
-                if (File.Exists(fontFile))
+                var symbolFontFile = Path.Join(fontFolder.FullName, "symbol.ttf");
+
+                if (File.Exists(symbolFontFile))
+                {
+                    return SKTypeface.FromFile(symbolFontFile);
+                }
+
+                symbolFontFile = Path.Join(fontFolder.FullName, "StandardSymbolsPS.ttf");
+
+                if (File.Exists(symbolFontFile))
                 {
-                    typeface = SKTypeface.FromFile(fontFile);
+                    return SKTypeface.FromFile(symbolFontFile);
                 }
             }
         }
 
-        RenderConfiguration.LogMessage($"CurrentFontName='{CurrentFontName}' get the SKTypeface {(typeface is null ? "is null" : "not null")}. SKTypeface={typeface?.FamilyName} GlyphCount={typeface?.GlyphCount}. Text={text}");
-
-        skFont.Typeface = typeface;
+        var typeface = SKTypeface.FromFamilyName(CurrentFontName, (SKFontStyleWeight) FontWeight,
+            SKFontStyleWidth.Normal, IsItalic ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright);
 
-        Paint.Style = SKPaintStyle.Fill;
-        Paint.Color = CurrentTextColor;
+        if ((typeface is null || typeface.GlyphCount == 0) && RenderConfiguration.FontFolder is not null)
+        {
+            var fontFile = Path.Join(RenderConfiguration.FontFolder.FullName, $"{CurrentFontName}.ttf");
+            if (File.Exists(fontFile))
+            {
+                typeface = SKTypeface.FromFile(fontFile);
+            }
+        }
 
-        //Paint.Typeface = typeface;
+        return typeface;
     }
 
     public void UpdateSkiaStrokeStatus()