Bläddra i källkod

修复字体/

CrazyIter_Bin 3 år sedan
förälder
incheckning
be19e1e50b
2 ändrade filer med 11 tillägg och 4 borttagningar
  1. 3 3
      HTEXLib/HTEXLib.csproj
  2. 8 1
      HTEXLib/PPTX/Models/HTEX/HtexShape.cs

+ 3 - 3
HTEXLib/HTEXLib.csproj

@@ -4,9 +4,9 @@
     <Description>修改解析</Description>
     <PackageReleaseNotes></PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>5.2108.27</Version>
-    <AssemblyVersion>5.2108.27.1</AssemblyVersion>
-    <FileVersion>5.2108.27.1</FileVersion>
+    <Version>5.2109.7</Version>
+    <AssemblyVersion>5.2109.7.1</AssemblyVersion>
+    <FileVersion>5.2109.7.1</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />

+ 8 - 1
HTEXLib/PPTX/Models/HTEX/HtexShape.cs

@@ -193,7 +193,7 @@ namespace HTEXLib.Models.HTEX
                 if (par.RunPropList == null || par.RunPropList.Count == 0 && par.defaultRunProperties != null)  //Only paragraph!
                 {
                     float points = float.Parse(par.defaultRunProperties.FontSize.ToString()) * 72.0F / 96.0F;
-                    Font font = new System.Drawing.Font(par.defaultRunProperties.FontFamily.ToString(), points<=0?12:points );
+                    Font font = new System.Drawing.Font(par.defaultRunProperties.FontFamily.ToString(), points<=0?18:points );
                     newTop = font.Height;
                 }
                 List<HtexText> processedElements = new List<HtexText>();
@@ -207,6 +207,10 @@ namespace HTEXLib.Models.HTEX
                     if (text.FontSize!=0) {
                         points = float.Parse(text.FontSize.ToString()) * 72.0F / 96.0F;
                     }
+                    else
+                    {
+                        points = 18.0F * 72.0F / 96.0F;
+                    }
                     Font font = new System.Drawing.Font(text.FontFamily.ToString(), points);
                     if (text.Bold) font = new System.Drawing.Font(text.FontFamily.ToString(), points, System.Drawing.FontStyle.Bold);
                     else if (text.Italic)
@@ -461,6 +465,9 @@ namespace HTEXLib.Models.HTEX
                 {
                     points = float.Parse(text.FontSize.ToString()) * 72.0F / 96.0F;
                 }
+                else {
+                    points = 18.0F * 72.0F / 96.0F;
+                }
                 Font font = new System.Drawing.Font(text.FontFamily.ToString(), points);
                 if (text.Bold) font = new System.Drawing.Font(text.FontFamily.ToString(), points, System.Drawing.FontStyle.Bold);
                 else if (text.Italic) font = new System.Drawing.Font(text.FontFamily.ToString(), points, System.Drawing.FontStyle.Italic);