Skip to content

fix html font-family render #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix html font-family render #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2860659
fix html font-family render
mundotv789123 Nov 1, 2024
859cd25
fix "'"
mundotv789123 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FastReport.Base/Export/Html/HTMLExportDraw.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ private void HTMLFontStyle(FastString FFontDesc, Font font, float LineHeight)
FFontDesc.Append("text-decoration:underline;");
else if ((font.Style & FontStyle.Strikeout) > 0)
FFontDesc.Append("text-decoration:line-through;");
FFontDesc.Append("font-family:").Append(font.Name).Append(";");
FFontDesc.Append("font-family:").Append($"\'{font.Name}\'").Append(";");
FFontDesc.Append("font-size:").Append(Px(font.Size * 96 / 72));

if (LineHeight > 0)
Expand Down
2 changes: 1 addition & 1 deletion FastReport.Base/Export/Html/HTMLExportTemplates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public HtmlTemplates()
Part("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" \"http://www.w3.org/TR/html4/frameset.dtd\"");
Part("<html><head>");
Part("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">");
Part("<meta name=Generator content=\"FastReport http://www.fast-report.com\">");
Part("<meta name=\"Generator\" content=\"FastReport http://www.fast-report.com\">");
Part("<title>{0}</title>");
Part("<frameset rows=\"36,*\" cols=\"*\">");
Part("<frame name=\"topFrame\" src=\"{1}\" noresize frameborder=\"0\" scrolling=\"no\">");
Expand Down
2 changes: 1 addition & 1 deletion FastReport.Base/Utils/HtmlTextRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3094,7 +3094,7 @@ public void ToHtml(FastString sb, bool close)
sb.Append("<span style=\"");
if (backgroundColor.A > 0) sb.Append(String.Format(CultureInfo, "background-color:rgba({0},{1},{2},{3});", backgroundColor.R, backgroundColor.G, backgroundColor.B, ((float)backgroundColor.A) / 255f));
if (color.A > 0) sb.Append(String.Format(CultureInfo, "color:rgba({0},{1},{2},{3});", color.R, color.G, color.B, ((float)color.A) / 255f));
if (font != null) { sb.Append("font-family:"); sb.Append(font.Name); sb.Append(";"); }
if (font != null) { sb.Append("font-family:"); sb.Append($"\'{font.Name}\'"); sb.Append(";"); }
if (fontsize > 0) { sb.Append("font-size:"); sb.Append(fontsize.ToString(CultureInfo)); sb.Append("pt;"); }

//if ((fontStyle & FontStyle.Italic) == FontStyle.Italic) { sb.Append("font-style:italic;"); }
Expand Down