Preserve whitespace in elements containing text #1220
Merged
Conversation
This file contains 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
chromakode
commented
Feb 17, 2020
| src: local("Some Font"), | ||
| local("SomeFont"), | ||
| url(SomeFont.ttf); | ||
| src: local("Some Font"), local("SomeFont"), url(SomeFont.ttf); |
There was a problem hiding this comment.
csso preserves the newlines in this src value, which were previously being turned into spaces by the sax normalization.
chromakode
force-pushed
the
preserve-whitespace
branch
from
959ac4c
to
d318337
Compare
|
@GreLI It would be really great to see this merged 🙇 |
|
Please rebase |
chromakode
force-pushed
the
preserve-whitespace
branch
from
d318337
to
5e21313
Compare
chromakode
force-pushed
the
preserve-whitespace
branch
from
5e21313
to
a6ae757
Compare
|
@TrySound rebased 👍 |
TrySound
reviewed
Feb 22, 2021
lib/svgo/svg2js.js
Outdated
| // Save info about <text> tag to prevent trimming of meaningful whitespace | ||
| if (data.name == 'text' && !data.prefix) { | ||
| // Save info about tags containing text to prevent trimming of meaningful whitespace | ||
| if (textElems.indexOf(data.name) !== -1 && !data.prefix) { |
There was a problem hiding this comment.
Use includes array method please
lib/svgo/svg2js.js
Outdated
| @@ -4,12 +4,13 @@ var SAX = require('sax'), | |||
| JSAPI = require('./jsAPI.js'), | |||
| CSSClassList = require('./css-class-list'), | |||
| CSSStyleDeclaration = require('./css-style-declaration'), | |||
| entityDeclaration = /<!ENTITY\s+(\S+)\s+(?:'([^']+)'|"([^"]+)")\s*>/g; | |||
| entityDeclaration = /<!ENTITY\s+(\S+)\s+(?:'([^']+)'|"([^"]+)")\s*>/g, | |||
| textElems = require('../../plugins/_collections.js').textElems; | |||
|
Thanks! |
This was referenced May 21, 2021
chore(deps): update dependency svgo to v2 - autoclosed
fisker/serve-directory-theme-city-lights#1346
Closed
This was referenced Jun 6, 2021
1 task
This was referenced Jul 1, 2021
This was referenced Jul 28, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Problem
SVGO configures its SAX parser to normalize whitespace, collapsing multiple space characters into one.
This can change the semantic meaning of SVG content:
<text>and<tspan>nodes when whitespace is being preserved (e.g.xml:space="preserve"orstyle="white-space: pre").<text>and<tspan>nodes where glyphs are spaced explicitly using multiplexvalues. Changing the number of characters in the node changes the indexes of characters (see SVGO improperly alters text spacing #1044).Solution
This patch disables space normalization in
sax. It removes trimming for node names classified as "textContent" in_collections.js. In addition, it changes the pretty printing logic to not add indents or whitespace when outputting such nodes.I needed to update a few text fixtures which captured the previous space normalizing behavior. Existing plugin tests have a mixture of text nodes containing and not containing extra whitespace, so they cover the change in functionality. I've also added a test to
svg2jsto verify that the whitespace is preserved when parsing SVGs.Related issues