Update handling of subtitle tags

Author: jacklul

Assets/USharpVideoSubtitles/Scripts/SubtitleManager.asset

@@ -509,12 +509,12 @@ MonoBehaviour:
       Data: 32|UnityEngine.TooltipAttribute, UnityEngine.CoreModule
     - Name: tooltip
       Entry: 1
-      Data: 'Removes unsupported HTML tags as well as {\anX} and {\aX} tags
+      Data: 'Removes "{\" tags, unsupported HTML tags and replaces "\n" with actual
+        new lines
 
-        Disabling
-        this will speed up processing of huge files - you should only disable this
-        if you''re building custom integration and not allowing people to load their
-        own subtitles'
+        Disabling this will speed up processing of huge files
+        - you should only disable this if you''re building custom integration and
+        not allowing people to load their own subtitles'
     - Name: 
       Entry: 8
       Data: 

Assets/USharpVideoSubtitles/Scripts/SubtitleManager.cs

@@ -50,7 +50,7 @@ public class SubtitleManager : UdonSharpBehaviour
         [SerializeField, Tooltip("When false then only the master can manage the subtitles\nThis setting does nothing when using USharpVideo as the lock state is inherited from it")]
         private bool defaultUnlocked = true;
 
-        [Tooltip("Removes unsupported HTML tags as well as {\\anX} and {\\aX} tags\nDisabling this will speed up processing of huge files - you should only disable this if you're building custom integration and not allowing people to load their own subtitles")]
+        [Tooltip("Removes \"{\\\" tags, unsupported HTML tags and replaces \"\\n\" with actual new lines\nDisabling this will speed up processing of huge files - you should only disable this if you're building custom integration and not allowing people to load their own subtitles")]
         public bool filterSubtitles = true;
 
         [UdonSynced]
@@ -478,12 +478,12 @@ private bool ParseSubtitles(string text)
                 }
                 else if (parserState == 1 && line != "")
                 {
-                    _dataText[currentIndex] = filterSubtitles ? FilterSubtitle(line) : line;
+                    _dataText[currentIndex] = HandleTextNewLine(filterSubtitles ? FilterSubtitle(line) : line);
                     parserState = 2;
                 }
                 else if (parserState == 2 && line != "")
                 {
-                    _dataText[currentIndex] += "\n" + (filterSubtitles ? FilterSubtitle(line) : line);
+                    _dataText[currentIndex] += "\n" + HandleTextNewLine(filterSubtitles ? FilterSubtitle(line) : line);
                 }
                 else if (parserState != 0 && line == "")
                 {
@@ -541,54 +541,61 @@ private float ParseTimestamp(string timestamp)
         }
 
         private string FilterSubtitle(string text)
-        {
-            if (text.Contains(@"{\an"))
-                text = text.Substring(text.IndexOf(@"{\an") + 6).TrimStart(' ');
-
-            if (text.Contains(@"{\a"))
-                text = text.Substring(text.IndexOf(@"{\a") + 5).TrimStart(' ');
-
-            text = FilterHTMLTags(text);
-
-            return text;
-        }
-
-        private string FilterHTMLTags(string text)
         {
             char[] textArray = text.ToCharArray();
             text = "";
 
-            char[] allowedShortTags = { 'b', 'i', 'u' };
+            char[] allowedShortHTMLTags = { 'b', 'i', 'u' };
 
             bool inHtmlTag = false;
+            bool inTag = false;
             for (int i = 0; i < textArray.Length; i++)
             {
-                if (textArray[i] == '<' && i + 2 < textArray.Length)
+                if (!inHtmlTag && textArray[i] == '{' && i + 1 < textArray.Length && textArray[i + 1] == '\\')
+                {
+                    inTag = true;
+                    continue;
+                }
+                else if (!inHtmlTag && inTag)
+                {
+                    if (textArray[i] == '}')
+                        inTag = false;
+
+                    continue;
+                }
+                else if (!inTag && textArray[i] == '<' && i + 1 < textArray.Length)
                 {
                     bool isEndingTag = textArray[i + 1] == '/';
                     bool isShortTag = isEndingTag ? textArray[i + 3] == '>' : textArray[i + 2] == '>';
                     char shortTagValue = isShortTag ? (isEndingTag ? textArray[i + 2] : textArray[i + 1]) : ' ';
 
-                    if (!isShortTag || Array.IndexOf(allowedShortTags, shortTagValue) == -1)
+                    if (!isShortTag || Array.IndexOf(allowedShortHTMLTags, shortTagValue) == -1)
                     {
                         inHtmlTag = true;
                         continue;
                     }
                 }
-                else if (inHtmlTag)
+                else if (!inTag && inHtmlTag)
                 {
                     if (textArray[i] == '>')
                         inHtmlTag = false;
 
                     continue;
-                }
+                } 
 
                 text += textArray[i];
             }
 
             return text;
         }
 
+        private string HandleTextNewLine(string text)
+        {
+            text = text.Replace("\\n", "\n").Replace("\\N", "\n");
+
+            return text;
+        }
+
         public void ProcessInput(string input)
         {
             if (!_isLocal && !CanControlSubtitles())