Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Turn white-space into a shorthand (#32146)

Browse source 
Bumps Stylo to servo/stylo#37

`white-space` is split into `white-space-collapse` and `text-wrap-mode`:

| white-space | white-space-collapse | text-wrap-mode |
| ----------- | -------------------- | -------------- |
| normal      | collapse             | wrap           |
| nowrap      | collapse             | nowrap         |
| pre-wrap    | preserve             | wrap           |
| pre         | preserve             | nowrap         |
| pre-line    | preserve-breaks      | wrap           |
| -           | preserve-breaks      | nowrap         |

Note this introduces a combination that wasn't previously possible,
but I think the existing logic can handle it well enough.

The old `allow_wrap()` is replaced by checking whether `text-wrap-mode`
is set to `wrap`.

The old `preserve_newlines()` is replaced by checking whether
`white-space-collapse` is *not* set to `collapse`.

The old `preserve_spaces()` is replaced by checking whether
`white-space-collapse` is set to `preserve`.
This commit is contained in:
Oriol Brufau 2024-04-29 12:40:44 +02:00 • committed by GitHub
parent a1f8c19355
commit d490fdf83c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 141 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

42
components/layout_2020/tests/text.rs
View file

@ -4,52 +4,60 @@
mod text {
use layout_2020::flow::text_run::WhitespaceCollapse;
use style::computed_values::white_space::T as WhiteSpace;
use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
#[test]
fn test_collapse_whitespace() {
let collapse = |input: &str, white_space, trim_beginning_white_space| {
WhitespaceCollapse::new(input.chars(), white_space, trim_beginning_white_space)
.collect::<String>()
let collapse = |input: &str, white_space_collapse, trim_beginning_white_space| {
WhitespaceCollapse::new(
input.chars(),
white_space_collapse,
trim_beginning_white_space,
)
.collect::<String>()
};
let output = collapse("H ", WhiteSpace::Normal, false);
let output = collapse("H ", WhiteSpaceCollapse::Collapse, false);
assert_eq!(output, "H ");
let output = collapse(" W", WhiteSpace::Normal, true);
let output = collapse(" W", WhiteSpaceCollapse::Collapse, true);
assert_eq!(output, "W");
let output = collapse(" W", WhiteSpace::Normal, false);
let output = collapse(" W", WhiteSpaceCollapse::Collapse, false);
assert_eq!(output, " W");
let output = collapse(" H W", WhiteSpace::Normal, false);
let output = collapse(" H W", WhiteSpaceCollapse::Collapse, false);
assert_eq!(output, " H W");
let output = collapse("\n H \n \t W", WhiteSpace::Normal, false);
let output = collapse("\n H \n \t W", WhiteSpaceCollapse::Collapse, false);
assert_eq!(output, " H W");
let output = collapse("\n H \n \t W \n", WhiteSpace::Pre, false);
let output = collapse("\n H \n \t W \n", WhiteSpaceCollapse::Preserve, false);
assert_eq!(output, "\n H \n \t W \n");
let output = collapse("\n H \n \t W \n ", WhiteSpace::PreLine, false);
let output = collapse(
"\n H \n \t W \n ",
WhiteSpaceCollapse::PreserveBreaks,
false,
);
assert_eq!(output, "\nH\nW\n");
let output = collapse("Hello \n World", WhiteSpace::PreLine, true);
let output = collapse("Hello \n World", WhiteSpaceCollapse::PreserveBreaks, true);
assert_eq!(output, "Hello\nWorld");
let output = collapse(" \n World", WhiteSpace::PreLine, true);
let output = collapse(" \n World", WhiteSpaceCollapse::PreserveBreaks, true);
assert_eq!(output, "\nWorld");
let output = collapse(" ", WhiteSpace::Normal, true);
let output = collapse(" ", WhiteSpaceCollapse::Collapse, true);
assert_eq!(output, "");
let output = collapse(" ", WhiteSpace::Normal, false);
let output = collapse(" ", WhiteSpaceCollapse::Collapse, false);
assert_eq!(output, " ");
let output = collapse("\n ", WhiteSpace::Normal, true);
let output = collapse("\n ", WhiteSpaceCollapse::Collapse, true);
assert_eq!(output, "");
let output = collapse("\n ", WhiteSpace::Normal, false);
let output = collapse("\n ", WhiteSpaceCollapse::Collapse, false);
assert_eq!(output, " ");
}
}