Skip to content

Commit ff4e60d

Browse files
authored
Align tts:textCombine permitted values with TTML (#179)
1 parent 6adae57 commit ff4e60d

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/main/js/html.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
}
384384

385385
if (imscStyles.byName.textCombine.qname in isd_element.styleAttrs &&
386-
isd_element.styleAttrs[imscStyles.byName.textCombine.qname][0] === "all") {
386+
isd_element.styleAttrs[imscStyles.byName.textCombine.qname] === "all") {
387387

388388
/* ignore tate-chu-yoku since line break cannot happen within */
389389
e.textContent = isd_element.text;
@@ -1600,7 +1600,7 @@
16001600
"http://www.w3.org/ns/ttml#styling textCombine",
16011601
function (context, dom_element, isd_element, attr) {
16021602

1603-
dom_element.style.textCombineUpright = attr.join(" ");
1603+
dom_element.style.textCombineUpright = attr;
16041604

16051605
}
16061606
),

src/main/js/styles.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -801,16 +801,9 @@
801801
true,
802802
true,
803803
function (str) {
804-
var s = str.split(" ");
805-
806-
if (s.length === 1) {
807-
808-
if (s[0] === "none" || s[0] === "all") {
809-
810-
return [s[0]];
811-
812-
}
804+
if (str === "none" || str === "all") {
813805

806+
return str;
814807
}
815808

816809
return null;

0 commit comments

Comments
 (0)