diff --git a/SubtitleEdit.sln.DotSettings b/SubtitleEdit.sln.DotSettings index ce7cd1d72..50eb52b41 100644 --- a/SubtitleEdit.sln.DotSettings +++ b/SubtitleEdit.sln.DotSettings @@ -22,12 +22,15 @@ True True True + True True True True True True + True True + True True True True diff --git a/src/libse/Common/NetflixImsc11JapaneseToAss.cs b/src/libse/Common/NetflixImsc11JapaneseToAss.cs index adb5c6112..2d00d914d 100644 --- a/src/libse/Common/NetflixImsc11JapaneseToAss.cs +++ b/src/libse/Common/NetflixImsc11JapaneseToAss.cs @@ -48,7 +48,7 @@ namespace Nikse.SubtitleEdit.Core.Common private static List MakeHorizontalParagraphs(Paragraph p, int width, int height) { var lines = p.Text.SplitToLines(); - var adjustment = 34; + const int adjustment = 34; var startY = height - lines.Count * 2 * adjustment + 30; if (p.Text.StartsWith("{\\an8", StringComparison.Ordinal)) { @@ -58,12 +58,12 @@ namespace Nikse.SubtitleEdit.Core.Common var list = new List(); var furiganaList = new List(); var rubyOn = false; - var italinOn = false; + var italicOn = false; int startX; using (var g = Graphics.FromHwnd(IntPtr.Zero)) { var actualText = NetflixImsc11Japanese.RemoveTags(HtmlUtil.RemoveHtmlTags(p.Text, true)); - var actualTextSize = g.MeasureString(actualText, new Font(SystemFonts.DefaultFont.FontFamily, 20)); + var actualTextSize = g.MeasureString(actualText, new Font("Arial", 13.8f)); // font size up, move text left startX = (int)(width / 2.0 - actualTextSize.Width / 2.0); if (p.Text.StartsWith("{\\an5", StringComparison.Ordinal)) { @@ -74,7 +74,7 @@ namespace Nikse.SubtitleEdit.Core.Common for (var index = 0; index < lines.Count; index++) { var line = lines[index]; - if (italinOn) + if (italicOn) { line = "" + line; } @@ -96,13 +96,13 @@ namespace Nikse.SubtitleEdit.Core.Common { actual.Append("{\\i1}"); i += 3; - italinOn = true; + italicOn = true; } else if (line.Substring(i).StartsWith("", StringComparison.Ordinal) || line.Substring(i).StartsWith("", StringComparison.Ordinal) || line.Substring(i).StartsWith("", StringComparison.Ordinal)) { actual.Append("{\\i0}"); i += 4; - italinOn = false; + italicOn = false; } else if (line.Substring(i).StartsWith("