From b3561380fe0bdb8d9dbcdc1c98e6934f370483d7 Mon Sep 17 00:00:00 2001 From: tangmanger Date: Sun, 24 May 2026 01:33:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E4=BB=B6=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs`：更新了`CreateFontInt`方法中的`style`参数处理，将`XFontStyle`改为`XFontStyleEx`。 - `HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj`：将`PDFsharp`包版本更新为`6.2.4`。 ```plaintext 修改了HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs中的CreateFontInt方法，将style参数处理改为XFontStyleEx。 修改了HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj文件，将PDFsharp包版本更新为6.2.4。 ``` --- .../Adapters/PdfSharpAdapter.cs | 6 +++--- .../HtmlRenderer.PdfSharp.csproj | 2 +- .../HtmlRenderer/Core/Handlers/FontsHandler.cs | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs b/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs index e5fa309c0..cf1a9b7db 100644 --- a/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs +++ b/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs @@ -1,4 +1,4 @@ -// "Therefore those skilled at the unorthodox +// "Therefore those skilled at the unorthodox // are infinite as heaven and earth, // inexhaustible as the great rivers. // When they come to an end, @@ -119,14 +119,14 @@ protected override RImage ImageFromStreamInt(Stream memoryStream) protected override RFont CreateFontInt(string family, double size, RFontStyle style) { - var fontStyle = (XFontStyle)((int)style); + var fontStyle = (XFontStyleEx)((int)style); var xFont = new XFont(family, size, fontStyle, new XPdfFontOptions(PdfFontEncoding.Unicode)); return new FontAdapter(xFont); } protected override RFont CreateFontInt(RFontFamily family, double size, RFontStyle style) { - var fontStyle = (XFontStyle)((int)style); + var fontStyle = (XFontStyleEx)((int)style); var xFont = new XFont(((FontFamilyAdapter)family).FontFamily.Name, size, fontStyle, new XPdfFontOptions(PdfFontEncoding.Unicode)); return new FontAdapter(xFont); } diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj index 2ff483a96..69de3d3a2 100644 --- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj +++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj @@ -32,7 +32,7 @@ Features and Benefits: - + \ No newline at end of file diff --git a/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs b/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs index 83c037eac..0f56567a3 100644 --- a/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs +++ b/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs @@ -113,19 +113,19 @@ public RFont GetCachedFont(string family, double size, RFontStyle style) var font = TryGetFont(family, size, style); if (font == null) { - if (!_existingFontFamilies.ContainsKey(family)) + //if (!_existingFontFamilies.ContainsKey(family)) + //{ + string mappedFamily; + if (_fontsMapping.TryGetValue(family, out mappedFamily)) { - string mappedFamily; - if (_fontsMapping.TryGetValue(family, out mappedFamily)) + font = TryGetFont(mappedFamily, size, style); + if (font == null) { - font = TryGetFont(mappedFamily, size, style); - if (font == null) - { - font = CreateFont(mappedFamily, size, style); - _fontsCache[mappedFamily][size][style] = font; - } + font = CreateFont(mappedFamily, size, style); + _fontsCache[mappedFamily][size][style] = font; } } + //} if (font == null) { From 7380137d51202a05b44bd5ec962e97a6e18b2666 Mon Sep 17 00:00:00 2001 From: tangmanger Date: Sun, 24 May 2026 18:58:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9HtmlRenderer.csproj?= =?UTF-8?q?=E5=92=8CHtmlRenderer.PdfSharp.csproj=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0AnyCPU;x64?= =?UTF-8?q?=E5=88=B0=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj | 1 + Source/HtmlRenderer/HtmlRenderer.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj index 69de3d3a2..37879c6e4 100644 --- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj +++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj @@ -6,6 +6,7 @@ true true true + AnyCPU;x64 diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj index 273dcccf8..da700a2e5 100644 --- a/Source/HtmlRenderer/HtmlRenderer.csproj +++ b/Source/HtmlRenderer/HtmlRenderer.csproj @@ -5,6 +5,7 @@ TheArtOfDev.HtmlRenderer true true + AnyCPU;x64