Skip to content

Fixed wrong character for decimal places #69

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
ptrkbmn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed wrong character for decimal places #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions RtfPipe/Html/CssString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using RtfPipe.Tokens;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;

Expand Down Expand Up @@ -33,7 +34,7 @@ public CssString(IEnumerable<IToken> tokens, ElementType elementType, IEnumerabl
if (token is Font font)
Append(font);
else if (token is FontSize fontSize)
Append("font-size", fontSize.Value.ToPt().ToString("0.#") + "pt");
Append("font-size", fontSize.Value.ToPt().ToString("0.#", CultureInfo.InvariantCulture) + "pt");
else if (token is BackgroundColor background)
Append("background", "#" + background.Value);
else if (token is ParagraphBackgroundColor backgroundPara)
Expand Down Expand Up @@ -104,8 +105,8 @@ public CssString(IEnumerable<IToken> tokens, ElementType elementType, IEnumerabl
{
if (tokens.OfType<LineSpacingMultiple>().Any(m => m.Value == 1))
{
if ((Math.Abs(lineSpace.Value) / 240.0).ToString("0.#") != "1")
Append("line-height", (Math.Abs(lineSpace.Value) * DefaultBrowserLineHeight / 240.0).ToString("0.#"));
if ((Math.Abs(lineSpace.Value) / 240.0).ToString("0.#", CultureInfo.InvariantCulture) != "1")
Append("line-height", (Math.Abs(lineSpace.Value) * DefaultBrowserLineHeight / 240.0).ToString("0.#", CultureInfo.InvariantCulture));
}
else if (lineSpace.Value < 0)
{
Expand Down Expand Up @@ -389,7 +390,7 @@ public CssString Append(string property, BorderToken border)
}
else
{
_builder.Append(width.ToString("0")).Append("px ");
_builder.Append(width.ToString("0", CultureInfo.InvariantCulture)).Append("px ");

switch (border.Style)
{
Expand Down Expand Up @@ -496,7 +497,7 @@ public CssString Append(string property, params UnitValue[] values)
{
if (i > 0)
_builder.Append(' ');
var px = values[i].ToPx().ToString("0.#");
var px = values[i].ToPx().ToString("0.#", CultureInfo.InvariantCulture);
_builder.Append(px);
if (px != "0")
_builder.Append("px");
Expand Down