Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TTML subtitles: Support for <br> inside a paragraph #572

Merged
merged 2 commits into from
Nov 3, 2016

Conversation

birme
Copy link
Contributor

@birme birme commented Nov 2, 2016

We currently have TTML subtitles that contains <br> elements inside a paragraph for linebreaking. This pull request replaces the <br> elements with a newline character. Having <br> inside a paragraph is valid in TTML as far as I have understood by looking at the examples in https://www.w3.org/TR/ttaf1-dfxp/

@shaka-bot
Copy link
Collaborator

Testing in progress...

@shaka-bot
Copy link
Collaborator

All tests passed!

Copy link
Contributor

@ismena ismena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Please add a test to test/media/ttml_text_parser_unit.js that will check this behavior and we'll be good to go.

@birme
Copy link
Contributor Author

birme commented Nov 2, 2016

No probs. Done!

@shaka-bot
Copy link
Collaborator

Testing in progress...

@shaka-bot
Copy link
Collaborator

All tests passed!

@ismena
Copy link
Contributor

ismena commented Nov 2, 2016

@birme Did you contribute to the project before?
(Before I merge, I have to make sure you've added yourself to CONTRIBUTORS and all that jazz)

@birme
Copy link
Contributor Author

birme commented Nov 3, 2016

Yes I have. My name is Jonas Birmé and I believe I am already in the CONTRIBUTORS list

@ismena ismena merged commit ca2081c into shaka-project:master Nov 3, 2016
@ismena
Copy link
Contributor

ismena commented Nov 3, 2016

Merged! Thanks for the contribution.

joeyparrish pushed a commit that referenced this pull request Nov 30, 2016
Replace <br> inside a paragraph with newlines.
joeyparrish pushed a commit that referenced this pull request Dec 6, 2016
This modifies the fix from #572.
Streams that also have <br> tags nested in <span> tags were getting missed by #572.
ismena pushed a commit that referenced this pull request Dec 15, 2016
This modifies the fix from #572.
Streams that also have <br> tags nested in <span> tags were getting missed by #572.
@github-actions github-actions bot added the status: archived Archived and locked; will not be updated label Jul 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status: archived Archived and locked; will not be updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants