mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Fixed bold tag for SSA (and related stuff) - thx John :)
This commit is contained in:
parent
3a1b13f741
commit
d555d82853
@ -21,7 +21,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
|
|||||||
|
|
||||||
string boldStyle = "0"; // 0=regular
|
string boldStyle = "0"; // 0=regular
|
||||||
if (Configuration.Settings.SubtitleSettings.SsaFontBold)
|
if (Configuration.Settings.SubtitleSettings.SsaFontBold)
|
||||||
boldStyle = "1";
|
boldStyle = "-1";
|
||||||
|
|
||||||
var ssa = Configuration.Settings.SubtitleSettings;
|
var ssa = Configuration.Settings.SubtitleSettings;
|
||||||
return "Style: Default," + ssa.SsaFontName + "," +
|
return "Style: Default," + ssa.SsaFontName + "," +
|
||||||
@ -216,13 +216,13 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text
|
|||||||
{
|
{
|
||||||
string bold = "0";
|
string bold = "0";
|
||||||
if (ssaStyle.Bold)
|
if (ssaStyle.Bold)
|
||||||
bold = "1";
|
bold = "-1";
|
||||||
string italic = "0";
|
string italic = "0";
|
||||||
if (ssaStyle.Italic)
|
if (ssaStyle.Italic)
|
||||||
italic = "1";
|
italic = "-1";
|
||||||
string underline = "0";
|
string underline = "0";
|
||||||
if (ssaStyle.Underline)
|
if (ssaStyle.Underline)
|
||||||
underline = "1";
|
underline = "-1";
|
||||||
|
|
||||||
string newAlignment = "2";
|
string newAlignment = "2";
|
||||||
switch (ssaStyle.Alignment)
|
switch (ssaStyle.Alignment)
|
||||||
@ -355,11 +355,11 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text
|
|||||||
|
|
||||||
string italic = "0";
|
string italic = "0";
|
||||||
if (fontStyle == "italic")
|
if (fontStyle == "italic")
|
||||||
italic = "1";
|
italic = "-1";
|
||||||
|
|
||||||
string bold = "0";
|
string bold = "0";
|
||||||
if (fontWeight == "bold")
|
if (fontWeight == "bold")
|
||||||
bold = "1";
|
bold = "-1";
|
||||||
|
|
||||||
const string styleFormat = "Style: {0},{1},{2},{3},&H0300FFFF,&H00000000,&H02000000,{4},{5},0,0,100,100,0,0,1,2,2,2,10,10,10,1";
|
const string styleFormat = "Style: {0},{1},{2},{3},&H0300FFFF,&H00000000,&H02000000,{4},{5},0,0,100,100,0,0,1,2,2,2,10,10,10,1";
|
||||||
ttStyles.AppendLine(string.Format(styleFormat, name, fontFamily, fSize, GetSsaColorString(c), bold, italic));
|
ttStyles.AppendLine(string.Format(styleFormat, name, fontFamily, fSize, GetSsaColorString(c), bold, italic));
|
||||||
@ -1534,15 +1534,15 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text
|
|||||||
}
|
}
|
||||||
else if (i == boldIndex)
|
else if (i == boldIndex)
|
||||||
{
|
{
|
||||||
style.Bold = f == "1";
|
style.Bold = f == "-1" || f == "1";
|
||||||
}
|
}
|
||||||
else if (i == italicIndex)
|
else if (i == italicIndex)
|
||||||
{
|
{
|
||||||
style.Italic = f == "1";
|
style.Italic = f == "-1" || f == "1";
|
||||||
}
|
}
|
||||||
else if (i == underlineIndex)
|
else if (i == underlineIndex)
|
||||||
{
|
{
|
||||||
style.Underline = f == "1";
|
style.Underline = f == "-1"|| f == "1";
|
||||||
}
|
}
|
||||||
else if (i == outlineIndex)
|
else if (i == outlineIndex)
|
||||||
{
|
{
|
||||||
|
@ -47,7 +47,7 @@ PlayDepth: 0
|
|||||||
|
|
||||||
[V4 Styles]
|
[V4 Styles]
|
||||||
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding
|
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding
|
||||||
Style: Default,{1},{2},{3},65535,65535,-2147483640,-1,{9},1,{4},{5},2,{6},{7},{8},0,1
|
Style: Default,{1},{2},{3},65535,65535,-2147483640,{9},0,1,{4},{5},2,{6},{7},{8},0,1
|
||||||
|
|
||||||
[Events]
|
[Events]
|
||||||
Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text";
|
Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text";
|
||||||
@ -96,7 +96,7 @@ Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
|||||||
var ssa = Configuration.Settings.SubtitleSettings;
|
var ssa = Configuration.Settings.SubtitleSettings;
|
||||||
string boldStyle = "0"; // 0=regular
|
string boldStyle = "0"; // 0=regular
|
||||||
if (ssa.SsaFontBold)
|
if (ssa.SsaFontBold)
|
||||||
boldStyle = "1";
|
boldStyle = "-1"; // -1 = true, 0 is false
|
||||||
sb.AppendLine(string.Format(header,
|
sb.AppendLine(string.Format(header,
|
||||||
title,
|
title,
|
||||||
ssa.SsaFontName,
|
ssa.SsaFontName,
|
||||||
@ -159,12 +159,12 @@ Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
|||||||
var ssaStyle = AdvancedSubStationAlpha.GetSsaStyle(styleName, subtitle.Header);
|
var ssaStyle = AdvancedSubStationAlpha.GetSsaStyle(styleName, subtitle.Header);
|
||||||
if (ssaStyle != null)
|
if (ssaStyle != null)
|
||||||
{
|
{
|
||||||
string bold = "-1";
|
string bold = "0";
|
||||||
if (ssaStyle.Bold)
|
if (ssaStyle.Bold)
|
||||||
bold = "1";
|
bold = "-1";
|
||||||
string italic = "0";
|
string italic = "0";
|
||||||
if (ssaStyle.Italic)
|
if (ssaStyle.Italic)
|
||||||
italic = "1";
|
italic = "-1";
|
||||||
|
|
||||||
string newAlignment = "2";
|
string newAlignment = "2";
|
||||||
switch (ssaStyle.Alignment)
|
switch (ssaStyle.Alignment)
|
||||||
|
@ -891,7 +891,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
|
|||||||
{
|
{
|
||||||
string name = listViewStyles.SelectedItems[0].Text;
|
string name = listViewStyles.SelectedItems[0].Text;
|
||||||
if (checkBoxFontBold.Checked)
|
if (checkBoxFontBold.Checked)
|
||||||
SetSsaStyle(name, "bold", "1");
|
SetSsaStyle(name, "bold", "-1");
|
||||||
else
|
else
|
||||||
SetSsaStyle(name, "bold", "0");
|
SetSsaStyle(name, "bold", "0");
|
||||||
GeneratePreview();
|
GeneratePreview();
|
||||||
@ -904,7 +904,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
|
|||||||
{
|
{
|
||||||
string name = listViewStyles.SelectedItems[0].Text;
|
string name = listViewStyles.SelectedItems[0].Text;
|
||||||
if (checkBoxFontItalic.Checked)
|
if (checkBoxFontItalic.Checked)
|
||||||
SetSsaStyle(name, "italic", "1");
|
SetSsaStyle(name, "italic", "-1");
|
||||||
else
|
else
|
||||||
SetSsaStyle(name, "italic", "0");
|
SetSsaStyle(name, "italic", "0");
|
||||||
GeneratePreview();
|
GeneratePreview();
|
||||||
@ -917,7 +917,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
|
|||||||
{
|
{
|
||||||
string name = listViewStyles.SelectedItems[0].Text;
|
string name = listViewStyles.SelectedItems[0].Text;
|
||||||
if (checkBoxFontUnderline.Checked)
|
if (checkBoxFontUnderline.Checked)
|
||||||
SetSsaStyle(name, "underline", "1");
|
SetSsaStyle(name, "underline", "-1");
|
||||||
else
|
else
|
||||||
SetSsaStyle(name, "underline", "0");
|
SetSsaStyle(name, "underline", "0");
|
||||||
GeneratePreview();
|
GeneratePreview();
|
||||||
|
@ -402,7 +402,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
|
|||||||
{
|
{
|
||||||
string name = CurrentStyleName;
|
string name = CurrentStyleName;
|
||||||
if (checkBoxFontBold.Checked)
|
if (checkBoxFontBold.Checked)
|
||||||
SetSsaStyle(name, "bold", "1");
|
SetSsaStyle(name, "bold", "-1");
|
||||||
else
|
else
|
||||||
SetSsaStyle(name, "bold", "0");
|
SetSsaStyle(name, "bold", "0");
|
||||||
GeneratePreviewAndUpdateRawHeader();
|
GeneratePreviewAndUpdateRawHeader();
|
||||||
@ -415,7 +415,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
|
|||||||
{
|
{
|
||||||
string name = CurrentStyleName;
|
string name = CurrentStyleName;
|
||||||
if (checkBoxFontItalic.Checked)
|
if (checkBoxFontItalic.Checked)
|
||||||
SetSsaStyle(name, "italic", "1");
|
SetSsaStyle(name, "italic", "-1");
|
||||||
else
|
else
|
||||||
SetSsaStyle(name, "italic", "0");
|
SetSsaStyle(name, "italic", "0");
|
||||||
GeneratePreviewAndUpdateRawHeader();
|
GeneratePreviewAndUpdateRawHeader();
|
||||||
@ -428,7 +428,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
|
|||||||
{
|
{
|
||||||
string name = CurrentStyleName;
|
string name = CurrentStyleName;
|
||||||
if (checkBoxFontUnderline.Checked)
|
if (checkBoxFontUnderline.Checked)
|
||||||
SetSsaStyle(name, "underline", "1");
|
SetSsaStyle(name, "underline", "-1");
|
||||||
else
|
else
|
||||||
SetSsaStyle(name, "underline", "0");
|
SetSsaStyle(name, "underline", "0");
|
||||||
GeneratePreviewAndUpdateRawHeader();
|
GeneratePreviewAndUpdateRawHeader();
|
||||||
|
Loading…
Reference in New Issue
Block a user