shaka-player 4.4.3 → 4.5.0

package/lib/text/vtt_text_parser.js

@@ -333,6 +333,10 @@ shaka.text.VttTextParser = class {
               validStyle = true;
               cue.opacity = parseFloat(value);
               break;
+            case 'text-combine-upright':
+              validStyle = true;
+              cue.textCombineUpright = value;
+              break;
             case 'text-shadow':
               validStyle = true;
               cue.textShadow = value;
@@ -456,8 +460,6 @@ shaka.text.VttTextParser = class {
     const xmlPayload = '<span>' + payload + '</span>';
     const element = shaka.util.XmlUtils.parseXmlString(xmlPayload, 'span');
     if (element) {
-      /** @type {!Array.<!shaka.text.Cue>} */
-      const cues = [];
       const childNodes = element.childNodes;
       if (childNodes.length == 1) {
         const childNode = childNodes[0];
@@ -468,10 +470,8 @@ shaka.text.VttTextParser = class {
         }
       }
       for (const childNode of childNodes) {
-        VttTextParser.generateCueFromElement_(
-            childNode, rootCue, cues, styles);
+        VttTextParser.generateCueFromElement_(childNode, rootCue, styles);
       }
-      rootCue.nestedCues = cues;
     } else {
       shaka.log.warning('The cue\'s markup could not be parsed: ', payload);
       rootCue.payload = VttTextParser.htmlUnescape_(payload);
@@ -688,6 +688,8 @@ shaka.text.VttTextParser = class {
     cue.fontWeight = refCue.fontWeight;
     cue.fontStyle = refCue.fontStyle;
     cue.opacity = refCue.opacity;
+    cue.rubyTag = refCue.rubyTag;
+    cue.textCombineUpright = refCue.textCombineUpright;
     cue.textShadow = refCue.textShadow;
     cue.wrapLine = refCue.wrapLine;
   }
@@ -695,13 +697,16 @@ shaka.text.VttTextParser = class {
   /**
    * @param {!Node} element
    * @param {!shaka.text.Cue} rootCue
-   * @param {Array.<!shaka.text.Cue>} cues
    * @param {!Map.<string, shaka.text.Cue>} styles
    * @private
    */
-  static generateCueFromElement_(element, rootCue, cues, styles) {
+  static generateCueFromElement_(element, rootCue, styles) {
     const VttTextParser = shaka.text.VttTextParser;
     const nestedCue = rootCue.clone();
+    // We don't want propagate some properties.
+    nestedCue.nestedCues = [];
+    nestedCue.payload = '';
+    nestedCue.rubyTag = '';
     if (element.nodeType === Node.ELEMENT_NODE && element.nodeName) {
       const bold = shaka.text.Cue.fontWeight.BOLD;
       const italic = shaka.text.Cue.fontStyle.ITALIC;
@@ -724,10 +729,10 @@ shaka.text.VttTextParser = class {
         }
         switch (tag) {
           case 'br': {
-            const lineBreakCue = rootCue.clone();
-            lineBreakCue.lineBreak = true;
-            cues.push(lineBreakCue);
-            break;
+            const lineBreakCue = shaka.text.Cue.lineBreak(
+                nestedCue.startTime, nestedCue.endTime);
+            rootCue.nestedCues.push(lineBreakCue);
+            return;
           }
           case 'b':
             nestedCue.fontWeight = bold;
@@ -758,34 +763,42 @@ shaka.text.VttTextParser = class {
             }
             break;
           }
+          case 'ruby':
+          case 'rp':
+          case 'rt':
+            nestedCue.rubyTag = tag;
+            break;
           default:
             break;
         }
       }
     }
-    const isTextNode = shaka.util.XmlUtils.isText(element);
-    if (isTextNode) {
+
+    const isTextNode = (item) => shaka.util.XmlUtils.isText(item);
+    const childNodes = element.childNodes;
+    if (isTextNode(element) ||
+        (childNodes.length == 1 && isTextNode(childNodes[0]))) {
       // Trailing line breaks may lost when convert cue to HTML tag
       // Need to insert line break cue to preserve line breaks
       const textArr = element.textContent.split('\n');
       let isFirst = true;
       for (const text of textArr) {
         if (!isFirst) {
-          const lineBreakCue = rootCue.clone();
-          lineBreakCue.lineBreak = true;
-          cues.push(lineBreakCue);
+          const lineBreakCue = shaka.text.Cue.lineBreak(
+              nestedCue.startTime, nestedCue.endTime);
+          rootCue.nestedCues.push(lineBreakCue);
         }
         if (text.length > 0) {
           const textCue = nestedCue.clone();
           textCue.payload = VttTextParser.htmlUnescape_(text);
-          cues.push(textCue);
+          rootCue.nestedCues.push(textCue);
         }
         isFirst = false;
       }
     } else {
-      for (const childNode of element.childNodes) {
-        VttTextParser.generateCueFromElement_(
-            childNode, nestedCue, cues, styles);
+      rootCue.nestedCues.push(nestedCue);
+      for (const childNode of childNodes) {
+        VttTextParser.generateCueFromElement_(childNode, nestedCue, styles);
       }
     }
   }