ttconv: Also replace carriage return with spaces.#6526
Merged
jenshnielsen merged 1 commit intomatplotlib:masterfrom Jun 13, 2016
Merged
ttconv: Also replace carriage return with spaces.#6526jenshnielsen merged 1 commit intomatplotlib:masterfrom
jenshnielsen merged 1 commit intomatplotlib:masterfrom
Conversation
Multi-line strings will cause issues in comments since the secondary lines will not be comments. This replacement is already done for newline characters (\n), but not carriage return (\r) which is prevalent on Windows.
Member
|
👍 I was hoping this had a simple fix like this. @mdboom should probably review this before it is merged. |
jenshnielsen
added a commit
that referenced
this pull request
Jun 13, 2016
ttconv: Also replace carriage return with spaces.
Member
|
Backported to 2.x as 77caea0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Multi-line strings will cause issues in comments since the secondary lines will not be comments. This replacement is already done for newline characters (\n), but not carriage return (\r) which is prevalent on Windows.
I went with the simpler route of just replacing with a space instead of trying to compress
\r\nbecause that would require shifting the entire string and would be a more involved change.I assume that changing
ttconvis alright even though it's external since I can't find an upstream and there are already comments to the effect that it has already been modified.Fixes #5862.