|
@@ -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);
|