mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-12 10:03:51 +00:00
* craft-captions: TTML cue text collapses only XML whitespace and keeps edge line breaks Ported from storytold/filmcraft#3145. char::is_whitespace also matched U+00A0, U+2009 and U+3000, so no-break spaces became ordinary spaces on import, and a leading or trailing <br/> was trimmed away. * craft-captions: TTML/DFXP export drops characters XML 1.0 forbids Ported from storytold/filmcraft#4467. A control character in cue text made the exported file unreadable. The filter also covers U+FFFE and U+FFFF, which the review of that pull request asked for. * craft-captions: WebVTT cue-text arrow escape is reversible Ported from storytold/filmcraft#4437. A literal --> in cue text came back as --> after a write and parse; the writer now adds one amp; level and the reader removes exactly one. * craft-captions: a WebVTT speaker name with > no longer spills into the cue text Ported from storytold/filmcraft#4470. The writer puts the lookalike U+203A in place of > inside the voice tag. Also from that pull request's review: a line break in a name is written as a space, and a name ending in - is kept apart from the tag's closing >. * craft-captions: an SRT text line that looks like a timing line survives a round trip Ported from storytold/filmcraft#4448. The writer marks such a line with a leading zero-width space and the reader removes it, so the cue is not split. * craft-captions: back-to-back SCC captions with the same text stay separate cues Ported from storytold/filmcraft#3808. Every End of Caption now closes the open cue. MCC's CEA-608 path uses the same decoder. * craft-captions: an SCC pop-on load may run across the previous caption's erase Ported from storytold/filmcraft#1837 (filmcraft#1791). A caption that closely follows another popped on about a second late, because its load had to be one unbroken run of free frames. Doubled codes stay adjacent; pauses are allowed between them. * craft-captions: CEA-708 export starts each caption at its window's top left Ported from storytold/filmcraft#4043 (filmcraft#4042). Each window load now sends DeleteWindows before DefineWindow in place of the ClearWindows after it: a window made anew is empty with the pen at its top left in any decoder, for the same number of bytes, so cue timing is unchanged. * craft-captions: TTML/DFXP export keeps literal < and > text Ported from storytold/filmcraft#2830. The writer treated every < with a later > as a tag and wrote nothing for unknown names, so "1 < 2 and 3 > 2" lost its middle. Only a well-formed tag is markup now; a > inside a quoted attribute value does not end the tag. * craft-captions: TTML/DFXP export keeps cue IDs unique and valid Unicode IDs as written Ported from the TTML commit of storytold/filmcraft#1839. A cue named s1 could collide with the style ID, and a generated c1 could take the ID of a later cue. Valid explicit IDs are reserved first; missing, invalid or repeated ones get a replacement that is in no one's way. IDs are checked as XML NCNames. * craft-captions: compare the craft-xml and roxmltree views of TTML documents The TTML reader moved from roxmltree to craft-xml. This dev-only test checks that both hand it the same elements, attributes and text, by namespace, on TTML documents and on the writer's output. roxmltree becomes a dev-dependency, which the cue ID tests use too. * craft-captions: use craft-timeline's exact time instead of a private copy craft-captions carried a 290-line subset of the tick, frame rate and timecode field code because craft-libs had none when it was added. craft-timeline now has the whole module with the same tick unit. craft_captions::time is a re-export of craft_timeline::time, so every public path still resolves and the types are now the same ones craft-timeline's callers hold. * craft-captions: SCC and MCC time codes count from the document's start timecode Ported from the caption-format part of storytold/filmcraft#4131 (filmcraft#4130). Document::start_timecode is the label of time zero; the SCC and MCC writers count from the 29.97 frame with the same label, so the label carries across rates. Readers note the rate and drop-frame mode of a file's labels in Document::labels, and Document::count_from counts cues back from a start time code. charset_warnings names the time codes the file has, which that pull request's review found missing. * craft-captions: MCC export can write a packet on every frame Ported from the caption-format part of storytold/filmcraft#4037 (filmcraft#4024). WriteOptions::every_frame_until fills every 29.97 fps frame before that time that has no caption data with a packet of CEA-608 nulls and CEA-708 padding, as SDI and frame-wrapped MXF carry one per frame. Off by default, at most 24 hours (mcc::MAX_PADDED_FRAMES), and write_to streams the file line by line. * craft-captions: README has its MCC writer section, with the every-frame option The section's text was cut off when the crate was added; only a stray heading marker was left. * craft-captions: export warnings name STL's ? and text cut to fit Ported from storytold/filmcraft#4157 (filmcraft#4155, filmcraft#4156). charset_warnings now names the characters EBU STL writes as ? (from the writer's own encoder, at the STL file's time code) and each caption that CEA-608's 15 rows or the CEA-708 window's 12 rows cut, with how much it lost. The CEA-708 writer loads only the 12 rows its window holds. The time codes count from the document's start time code, as the files do. * craft-captions: TTML import keeps inherited and reset text styles Ported from the TTML style part of storytold/filmcraft#1723 (filmcraft#1721). Italic, bold and underline set on <body> or on a timed <span> cue root now reach the cue text; normal, noUnderline and inherit reset or restore the parent value; styling is read from the TTML styling namespaces (modern and 2006 drafts) with unqualified attributes as a fallback, and foreign namespaces are ignored. The inline text collector is iterative. Line breaks at the start or end of a cue are kept, as #3145's port does, so this differs from the source pull request there. * craft-captions: literal < and & stay text beside cue style tags Ported from the literal-text part of storytold/filmcraft#1723. The TTML and EBU STL readers keep a literal < as < (and an & that would read as an entity as &), as a WebVTT import already keeps its entities, so text like "<b>" in a TTML file never becomes a bold tag. The TTML and STL writers decode those entities, so a cue read from WebVTT with "1 < 2" is no longer written as "1 &lt; 2". entity_at and decode_entities are shared with plain_text. --------- Co-authored-by: NetterSilver <133535268+Silvertree2010@users.noreply.github.com> Co-authored-by: SeeRay11 <searay112023@gmail.com> Co-authored-by: jnohclee-rgb <336857373+jnohclee-rgb@users.noreply.github.com> Co-authored-by: JonRC <jonarc06@gmail.com> Co-authored-by: sanyamsingh001 <314051937+sanyamsingh001@users.noreply.github.com> Co-authored-by: nuclearspike <liquidmonkey@gmail.com>
126 lines
6.3 KiB
Rust
126 lines
6.3 KiB
Rust
//! Timed spans emitted as cues must keep their own resolved text styles.
|
|
|
|
use craft_captions::{Format, WriteOptions, parse, write};
|
|
use craft_captions::{TICKS_PER_SECOND, Tick};
|
|
|
|
fn caption(xml: &str, format: Format) -> String {
|
|
let doc = parse(xml.as_bytes(), format).unwrap();
|
|
assert_eq!(doc.cues.len(), 1);
|
|
assert_eq!((doc.cues[0].start, doc.cues[0].end), (Tick(TICKS_PER_SECOND), Tick(TICKS_PER_SECOND * 2)));
|
|
assert!(doc.warnings.is_empty(), "{:?}", doc.warnings);
|
|
doc.cues[0].text.clone()
|
|
}
|
|
|
|
#[test]
|
|
fn timed_span_root_styles_match_timed_paragraph_styles() {
|
|
for format in [Format::Ttml, Format::Dfxp] {
|
|
for (attribute, expected) in [
|
|
(r#"tts:fontStyle="italic""#, "<i>Hello</i>"),
|
|
(r#"tts:fontWeight="bold""#, "<b>Hello</b>"),
|
|
(r#"tts:textDecoration="underline""#, "<u>Hello</u>"),
|
|
] {
|
|
let head = r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling"><body><div>"#;
|
|
let paragraph = format!(r#"{head}<p {attribute} begin="1s" end="2s">Hello</p></div></body></tt>"#);
|
|
let span = format!(r#"{head}<p><span {attribute} begin="1s" end="2s">Hello</span></p></div></body></tt>"#);
|
|
assert_eq!(caption(&span, format), expected, "{format:?}, timed span, {attribute}");
|
|
assert_eq!(caption(¶graph, format), expected, "{format:?}, paragraph, {attribute}");
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn timed_span_referenced_and_nested_styles_are_kept() {
|
|
let xml = r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling">
|
|
<head><styling><style xml:id="emphasis" tts:fontStyle="italic"/></styling></head>
|
|
<body><div><p><span style="emphasis" begin="1s" end="2s">Hello <span tts:fontWeight="bold">world</span></span></p></div></body></tt>"#;
|
|
for format in [Format::Ttml, Format::Dfxp] {
|
|
assert_eq!(caption(xml, format), "<i>Hello <b>world</b></i>");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn body_and_paragraph_styles_are_kept_on_timed_spans() {
|
|
let xml = r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling"><body tts:fontStyle="italic"><div><p tts:fontWeight="bold"><span tts:textDecoration="underline" begin="1s" end="2s">Hello</span></p></div></body></tt>"#;
|
|
for format in [Format::Ttml, Format::Dfxp] {
|
|
assert_eq!(caption(xml, format), "<i><b><u>Hello</u></b></i>");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn empty_styled_timed_spans_remain_empty() {
|
|
let xml = r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling"><body><div><p><span tts:fontStyle="italic" begin="1s" end="2s"> <br/> </span></p></div></body></tt>"#;
|
|
for format in [Format::Ttml, Format::Dfxp] {
|
|
let doc = parse(xml.as_bytes(), format).unwrap();
|
|
assert!(doc.cues.is_empty());
|
|
assert!(doc.warnings.is_empty());
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn timed_span_children_can_reset_root_styles() {
|
|
for format in [Format::Ttml, Format::Dfxp] {
|
|
for (attribute, reset, tag) in [
|
|
(r#"tts:fontStyle="italic""#, r#"tts:fontStyle="normal""#, "i"),
|
|
(r#"tts:fontWeight="bold""#, r#"tts:fontWeight="normal""#, "b"),
|
|
(r#"tts:textDecoration="underline""#, r#"tts:textDecoration="noUnderline""#, "u"),
|
|
] {
|
|
let xml = format!(
|
|
r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling"><body><div><p><span {attribute} begin="1s" end="2s">Before<span {reset}>plain</span>After</span></p></div></body></tt>"#
|
|
);
|
|
assert_eq!(caption(&xml, format), format!("<{tag}>Before</{tag}>plain<{tag}>After</{tag}>"), "{format:?}, {attribute}, {reset}");
|
|
let xml = format!(
|
|
r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling"><body><div><p><span {attribute} begin="1s" end="2s"><span {reset}>Hello</span></span></p></div></body></tt>"#
|
|
);
|
|
assert_eq!(caption(&xml, format), "Hello", "{format:?}, {attribute}, {reset}");
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
/// Line breaks are content: one at the start or end of a cue is kept (in its own style), as the
|
|
/// writer writes them, and only XML whitespace next to a break goes.
|
|
fn styled_roots_keep_edge_and_interior_lines() {
|
|
for format in [Format::Ttml, Format::Dfxp] {
|
|
for (text, expected) in [
|
|
("<br/>Hello<br/>", "<i>\nHello\n</i>"),
|
|
("Hello<br/><br/>world<br/>", "<i>Hello\n\nworld\n</i>"),
|
|
("Hello <br/>world", "<i>Hello\nworld</i>"),
|
|
(
|
|
r#"<span tts:fontStyle="normal"><span tts:fontStyle="italic">Hello</span><br/><span tts:fontWeight="bold">world</span></span>"#,
|
|
"<i>Hello</i>\n<b>world</b>",
|
|
),
|
|
("<br/> <br/>Hello<br/> <br/>", "<i>\n\nHello\n\n</i>"),
|
|
(r#"Hello<span tts:fontWeight="bold">world<br/></span>"#, "<i>Hello<b>world\n</b></i>"),
|
|
] {
|
|
for cue in [
|
|
format!(r#"<p tts:fontStyle="italic" begin="1s" end="2s">{text}</p>"#),
|
|
format!(r#"<p><span tts:fontStyle="italic" begin="1s" end="2s">{text}</span></p>"#),
|
|
] {
|
|
let xml = format!(
|
|
r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling"><body><div>{cue}</div></body></tt>"#
|
|
);
|
|
assert_eq!(caption(&xml, format), expected, "{format:?}, {cue}");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn styled_breaks_roundtrip_through_ttml_export() {
|
|
let xml = r#"<tt xmlns="http://www.w3.org/ns/ttml" xmlns:tts="http://www.w3.org/ns/ttml#styling"><body><div><p begin="1s" end="2s"><span tts:fontStyle="italic">Hello</span><br/><span tts:fontWeight="bold">world</span></p></div></body></tt>"#;
|
|
for format in [Format::Ttml, Format::Dfxp] {
|
|
let imported = parse(xml.as_bytes(), format).unwrap();
|
|
assert_eq!(imported.cues[0].text, "<i>Hello</i>\n<b>world</b>");
|
|
let exported = write(&imported, format, WriteOptions::default());
|
|
let reparsed = parse(&exported, format).unwrap();
|
|
assert_eq!(reparsed.cues.len(), 1);
|
|
assert_eq!(reparsed.cues[0].text, imported.cues[0].text, "{format:?}");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn unstyled_timed_span_remains_plain() {
|
|
let xml = r#"<tt xmlns="http://www.w3.org/ns/ttml"><body><div><p><span begin="1s" end="2s">Hello</span></p></div></body></tt>"#;
|
|
assert_eq!(caption(xml, Format::Ttml), "Hello");
|
|
}
|