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.

Sign up for GitHub

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

Jump to bottom

Desktop: Fixes #8530: Rich text editor: Use fewer  s in markdown while still preserving initial paragraph indentation #8529

Merged
merged 7 commits into from Jul 23, 2023
Merged

Desktop: Fixes #8530: Rich text editor: Use fewer  s in markdown while still preserving initial paragraph indentation #8529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eaa9b2e
Turndown: Revert to using unicode nonbreaking spaces
personalizedrefrigerator Jul 21, 2023
fff937b
Update tests
personalizedrefrigerator Jul 21, 2023
78dcf6e
Completely remove now-unused function added to turndown when merging …
personalizedrefrigerator Jul 21, 2023
e0fc40d
Restore deleted function -- it will be necessary for leading spaces
personalizedrefrigerator Jul 21, 2023
eec9296
Only replace first nonbreaking space in a paragraph.
personalizedrefrigerator Jul 21, 2023
ca0f02e
Remove invalid import
personalizedrefrigerator Jul 21, 2023
c5eb407
Remove usage of invalid import
personalizedrefrigerator Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/app-cli/tests/html_to_md/bold_italic_with_spaces.md
View file
Open in desktop
@@ -1 +1 @@
   **A test...** Test
   **A test...** Test
9 changes: 8 additions & 1 deletion packages/turndown/src/commonmark-rules.js
View file
Open in desktop
@@ -1,4 +1,4 @@
import { repeat, isCodeBlockSpecialCase1, isCodeBlockSpecialCase2, isCodeBlock, getStyleProp } from './utilities'
import { repeat, isCodeBlockSpecialCase1, isCodeBlockSpecialCase2, isCodeBlock, getStyleProp, htmlEscapeLeadingNonbreakingSpace } from './utilities'
const Entities = require('html-entities').AllHtmlEntities;
const htmlentities = (new Entities()).encode;

Expand All @@ -25,6 +25,13 @@ rules.paragraph = {
filter: 'p',

replacement: function (content) {
// If the line starts with a nonbreaking space, replace it. By default, the
// markdown renderer removes leading non-HTML-escaped nonbreaking spaces. However,
// because the space is nonbreaking, we want to keep it.
// \u00A0 is a nonbreaking space.
const leadingNonbreakingSpace = /^\u{00A0}/ug;
content = content.replace(leadingNonbreakingSpace, ' ');

return '\n\n' + content + '\n\n'
}
}
Expand Down
12 changes: 3 additions & 9 deletions packages/turndown/src/turndown.js
View file
Open in desktop
Expand Up @@ -36,7 +36,6 @@ export default function TurndownService (options) {
linkReferenceStyle: 'full',
anchorNames: [],
br: ' ',
nonbreakingSpace: ' ',
disableEscapeContent: false,
preformattedCode: false,
blankReplacement: function (content, node) {
Expand Down Expand Up @@ -216,15 +215,10 @@ function replacementForNode (node) {
var whitespace = node.flankingWhitespace
if (whitespace.leading || whitespace.trailing) content = content.trim()

const replaceNonbreakingSpaces = space => {
// \u{00A0} is a nonbreaking space
return space.replace(/\u{00A0}/ug, this.options.nonbreakingSpace);
};

return (
replaceNonbreakingSpaces(whitespace.leading) +
replaceNonbreakingSpaces(rule.replacement(content, node, this.options)) +
replaceNonbreakingSpaces(whitespace.trailing)
Comment on lines -225 to -227
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

replaceNonbreakingSpaces was not present in upstream turndown and was added by #8468. It is no longer used and has thus been removed.

whitespace.leading +
rule.replacement(content, node, this.options) +
whitespace.trailing
)
}

Expand Down