Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Some fixes to improve TTML 1.0/DFXP support (italic/bold in span + region) - thx Mampfi :)

Browse Source
This commit is contained in:
niksedk 2015-06-17 21:29:23 +02:00
parent f62f7a19eb
commit a0265bc415
1 changed files with 107 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/Logic/SubtitleFormats/TimedText10.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using System.Windows.Forms;
using System.Xml;
//http://www.w3.org/TR/ttaf1-dfxp/
@ -245,6 +246,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
int no = 0;
var headerStyles = GetStylesFromHeader(subtitle.Header);
var regions = GetRegionsFromHeader(subtitle.Header);
var languages = GetUsedLanguages(subtitle);
if (languages.Count > 0)
{
@ -259,7 +261,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
div = xml.CreateElement("div", "http://www.w3.org/ns/ttml");
divParentNode.AppendChild(div);
}
XmlNode paragraph = MakeParagraph(subtitle, xml, defaultStyle, no, headerStyles, p);
XmlNode paragraph = MakeParagraph(subtitle, xml, defaultStyle, no, headerStyles, regions, p);
div.AppendChild(paragraph);
no++;
}
@ -286,7 +288,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
divParentNode.AppendChild(div);
}
firstParagraph = false;
XmlNode paragraph = MakeParagraph(subtitle, xml, defaultStyle, no, headerStyles, p);
XmlNode paragraph = MakeParagraph(subtitle, xml, defaultStyle, no, headerStyles, regions, p);
div.AppendChild(paragraph);
no++;
}
@ -309,7 +311,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
div = xml.CreateElement("div", "http://www.w3.org/ns/ttml");
divParentNode.AppendChild(div);
}
XmlNode paragraph = MakeParagraph(subtitle, xml, defaultStyle, no, headerStyles, p);
XmlNode paragraph = MakeParagraph(subtitle, xml, defaultStyle, no, headerStyles, regions, p);
div.AppendChild(paragraph);
no++;
}
@ -323,11 +325,21 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
return ToUtf8XmlString(xml).Replace(" xmlns=\"\"", string.Empty).Replace(" xmlns:tts=\"http://www.w3.org/ns/10/ttml#style\">", ">");
}
private static XmlNode MakeParagraph(Subtitle subtitle, XmlDocument xml, string defaultStyle, int no, List<string> headerStyles, Paragraph p)
private static XmlNode MakeParagraph(Subtitle subtitle, XmlDocument xml, string defaultStyle, int no, List<string> headerStyles, List<string> regions, Paragraph p)
{
XmlNode paragraph = xml.CreateElement("p", "http://www.w3.org/ns/ttml");
string text = p.Text;
string region = null;
if (text.StartsWith("{\\an8}"))
{
if (regions.Contains("top"))
region = "top";
else if (regions.Contains("topCenter"))
region = "topCenter";
}
text = Utilities.RemoveSsaTags(text);
bool first = true;
foreach (string line in text.SplitToLines())
{
@ -426,6 +438,13 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
end.InnerText = ConvertToTimeString(p.EndTime);
paragraph.Attributes.Append(end);
if (region != null)
{
XmlAttribute regionAttribute = xml.CreateAttribute("region");
regionAttribute.InnerText = region;
paragraph.Attributes.Append(regionAttribute);
}
if (subtitle.Header != null && p.Style != null && headerStyles.Contains(p.Style))
{
if (p.Style != defaultStyle)
@ -483,6 +502,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
Configuration.Settings.SubtitleSettings.TimedText10TimeCodeFormatSource = null;
subtitle.Header = sb.ToString();
var styles = GetStylesFromHeader(subtitle.Header);
string defaultStyle = null;
if (body.Attributes["style"] != null)
defaultStyle = body.Attributes["style"].InnerText;
@ -500,9 +520,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
pText.AppendLine();
break;
case "span":
ReadSpan(pText, innerNode);
ReadSpan(pText, innerNode, styles, subtitle.Header);
break;
default:
pText.Append(innerNode.InnerText);
break;
@ -567,7 +586,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
if (node.Attributes["region"] != null)
{
string region = node.Attributes["region"].Value;
if (region == "top")
if (region == "top" || region == "topCenter")
p.Text = "{\\an8}" + p.Text;
}
@ -620,7 +639,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
return string.Format("{0} / {1}", style, lang);
}
private static void ReadSpan(StringBuilder pText, XmlNode innerNode)
private static void ReadSpan(StringBuilder pText, XmlNode innerNode, List<string> styles, string header)
{
bool italic = false;
bool font = false;
@ -642,11 +661,27 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
var fw = innerNode.Attributes.GetNamedItem("tts:fontWeight");
if (fw != null && fs.Value == "bold")
if (fw != null && fw.Value == "bold")
{
pText.Append("<b>");
bold = true;
}
var style = innerNode.Attributes.GetNamedItem("style");
if (fc == null && fw == null && fs == null && style != null && styles.Contains(style.Value)) // && styles.Contains(fs.Value))
{
if (IsStyleItalic(style.Value, header))
{
italic = true;
pText.Append("<i>");
}
else if (IsStyleBold(style.Value, header))
{
pText.Append("<b>");
bold = true;
}
}
}
if (innerNode.HasChildNodes)
{
@ -658,7 +693,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
else if (innerInnerNode.Name == "span")
{
ReadSpan(pText, innerInnerNode);
ReadSpan(pText, innerInnerNode, styles, header);
}
else
{
@ -751,6 +786,68 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
return list;
}
private static bool IsStyleItalic(string styleName, string xmlAsString)
{
var xml = new XmlDocument();
try
{
xml.LoadXml(xmlAsString);
var nsmgr = new XmlNamespaceManager(xml.NameTable);
nsmgr.AddNamespace("ttml", "http://www.w3.org/ns/ttml");
XmlNode head = xml.DocumentElement.SelectSingleNode("ttml:head", nsmgr);
foreach (XmlNode node in head.SelectNodes("//ttml:style", nsmgr))
{
string id = string.Empty;
if (node.Attributes["xml:id"] != null)
id = node.Attributes["xml:id"].Value;
else if (node.Attributes["id"] != null)
id = node.Attributes["id"].Value;
if (!string.IsNullOrEmpty(id) && id == styleName)
{
if (node.Attributes["tts:fontStyle"] != null && node.Attributes["tts:fontStyle"].Value == "italic")
return true;
if (node.Attributes["fontStyle"] != null && node.Attributes["fontStyle"].Value == "italic")
return true;
}
}
}
catch
{
}
return false;
}
private static bool IsStyleBold(string styleName, string xmlAsString)
{
var xml = new XmlDocument();
try
{
xml.LoadXml(xmlAsString);
var nsmgr = new XmlNamespaceManager(xml.NameTable);
nsmgr.AddNamespace("ttml", "http://www.w3.org/ns/ttml");
XmlNode head = xml.DocumentElement.SelectSingleNode("ttml:head", nsmgr);
foreach (XmlNode node in head.SelectNodes("//ttml:style", nsmgr))
{
string id = string.Empty;
if (node.Attributes["xml:id"] != null)
id = node.Attributes["xml:id"].Value;
else if (node.Attributes["id"] != null)
id = node.Attributes["id"].Value;
if (!string.IsNullOrEmpty(id) && id == styleName)
{
if (node.Attributes["tts:fontWeight"] != null && node.Attributes["tts:fontWeight"].Value == "bold")
return true;
if (node.Attributes["fontWeight"] != null && node.Attributes["fontWeight"].Value == "bold")
return true;
}
}
}
catch
{
}
return false;
}
public static List<string> GetRegionsFromHeader(string xmlAsString)
{
var list = new List<string>();