修复图片转换失败

Author: lindexi

Workbench/Wmf/SkiaWmfRenderer/samples/sample/Program.cs

@@ -1,5 +1,9 @@
 // See https://aka.ms/new-console-template for more information
 
+using DocSharp.Markdown;
+
+using Markdig;
+
 using Oxage.Wmf;
 using Oxage.Wmf.Records;
 
@@ -11,23 +15,36 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Text;
+using DocSharp;
+using Markdig.Extensions.Figures;
+using Markdig.Syntax;
 
 var markdownText = new StringBuilder();
 var outputFolder = Path.Join(AppContext.BaseDirectory, $"Output_{Path.GetRandomFileName()}");
 Directory.CreateDirectory(outputFolder);
 
-var testFile = @"C:\lindexi\wmf公式\sample.wmf";
-ConvertImageFile(testFile);
+//var testFile = @"C:\lindexi\wmf公式\sample.wmf";
+//ConvertImageFile(testFile);
 
-//var folder = @"C:\lindexi\wmf公式\";
+var folder = @"C:\lindexi\wmf公式\";
 
-//foreach (var file in Directory.EnumerateFiles(folder, "*.wmf"))
-//{
-//    ConvertImageFile(file);
-//}
+foreach (var file in Directory.EnumerateFiles(folder, "*.wmf"))
+{
+    ConvertImageFile(file);
+}
 
 var markdownFile = Path.Join(outputFolder, "README.md");
-File.WriteAllText(markdownFile, markdownText.ToString());
+var markdown = markdownText.ToString();
+File.WriteAllText(markdownFile, markdown);
+
+var docxFile = Path.Join(outputFolder, "README.docx");
+var markdownConverter = new MarkdownConverter
+{
+    ImagesBaseUri = outputFolder
+};
+
+MarkdownSource markdownSource = MarkdownSource.FromMarkdownString(markdown);
+markdownConverter.ToDocx(markdownSource, docxFile);
 
 Console.WriteLine("Hello, World!");
 
@@ -71,4 +88,4 @@ void ConvertImageFile(string file)
     }
 
     markdownText.AppendLine("");
-}
+}

Workbench/Wmf/SkiaWmfRenderer/samples/sample/Sample.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="SkiaSharp" Version="3.119.0" />
     <PackageReference Include="System.Drawing.Common" Version="9.0.7" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.7" />
+    <PackageReference Include="DocSharp.Markdown" Version="0.8.5" />
   </ItemGroup>
 
 </Project>

Workbench/Wmf/SkiaWmfRenderer/src/SkiaWmfRenderer/Rendering/WmfRenderer.cs

@@ -163,7 +163,13 @@ private bool TryRenderInner(SKCanvas canvas, WmfRenderStatus renderStatus)
             }
         }
 
-        return true;
+        // 如果包含有文本，且此时有其他编码或带 DX 就表示可以转换，效果不会比 libwmf 更差
+        if (renderStatus.IsIncludeText && (renderStatus.IsIncludeOtherEncoding || renderStatus.IsIncludeTextWithDx))
+        {
+            return true;
+        }
+
+        return false;
     }
 
     private static bool RenderRecord(SKCanvas canvas, WmfRenderStatus renderStatus, IBinaryRecord wmfDocumentRecord)
@@ -480,12 +486,6 @@ private static bool RenderRecord(SKCanvas canvas, WmfRenderStatus renderStatus,
             }
         }
 
-        // 如果包含有文本，且此时有其他编码或带 DX 就表示可以转换，效果不会比 libwmf 更差
-        if (renderStatus.IsIncludeText && (renderStatus.IsIncludeOtherEncoding ||renderStatus.IsIncludeTextWithDx))
-        {
-            return true;
-        }
-
-        return false;
+        return true;
     }
 }