mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-01 13:49:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Use the correct locale when applying titlecase

Browse source 
Previously with lang="nl" and text-transform: capitalize, inner text
"ijsland" would turn to "Ijsland" instead of "IJsland", now it's as it
should be.

This fixes:
https://wpt.fyi/results/css/css-text/text-transform/text-transform-tailoring-001.html
This commit is contained in:
Grubre 2024-10-26 11:23:34 +02:00 • committed by Tim Flynn
commit 95c511a3f6
Notes: github-actions[bot] 2024-10-28 21:56:10 +00:00
3 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibWeb/Text/expected/DOM/Element-to_titlecase-lang.txt Normal file
View file

@ -0,0 +1,2 @@
IJsland
Ijsland

26
Tests/LibWeb/Text/input/DOM/Element-to_titlecase-lang.html Normal file
View file

@ -0,0 +1,26 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<style type='text/css'>
.test { text-transform: capitalize; }
</style>
</head>
<script src="../include.js"></script>
<body>
<div class="test" lang="nl">ijsland</div>
<div class="test" lang="en">ijsland</div>
<div>IJsland</div>
<script>
test(() => {
var elements = document.getElementsByClassName('test');
for (var i = 0; i < elements.length; i++) {
println(elements[i].innerText);
}
});
</script>
</body>
</html>

11
Userland/Libraries/LibWeb/Layout/TextNode.cpp
View file

@ -8,6 +8,7 @@
#include <AK/CharacterTypes.h> #include <AK/CharacterTypes.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibUnicode/CharacterTypes.h> #include <LibUnicode/CharacterTypes.h>
#include <LibUnicode/Locale.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/Layout/BlockContainer.h> #include <LibWeb/Layout/BlockContainer.h>
#include <LibWeb/Layout/InlineFormattingContext.h> #include <LibWeb/Layout/InlineFormattingContext.h>
@ -278,7 +279,7 @@ static String apply_math_auto_text_transform(String const& string)
return MUST(builder.to_string()); return MUST(builder.to_string());
} }
static ErrorOr<String> apply_text_transform(String const& string, CSS::TextTransform text_transform) static ErrorOr<String> apply_text_transform(String const& string, CSS::TextTransform text_transform, Optional<StringView> const& locale)
{ {
switch (text_transform) { switch (text_transform) {
case CSS::TextTransform::Uppercase: case CSS::TextTransform::Uppercase:
@ -290,7 +291,7 @@ static ErrorOr<String> apply_text_transform(String const& string, CSS::TextTrans
case CSS::TextTransform::MathAuto: case CSS::TextTransform::MathAuto:
return apply_math_auto_text_transform(string); return apply_math_auto_text_transform(string);
case CSS::TextTransform::Capitalize: { case CSS::TextTransform::Capitalize: {
return string.to_titlecase({}, TrailingCodePointTransformation::PreserveExisting); return string.to_titlecase(locale, TrailingCodePointTransformation::PreserveExisting);
} }
case CSS::TextTransform::FullSizeKana: case CSS::TextTransform::FullSizeKana:
case CSS::TextTransform::FullWidth: case CSS::TextTransform::FullWidth:
@ -333,7 +334,11 @@ void TextNode::compute_text_for_rendering()
if (dom_node().is_editable() && !dom_node().is_uninteresting_whitespace_node()) if (dom_node().is_editable() && !dom_node().is_uninteresting_whitespace_node())
collapse = false; collapse = false;
auto data = apply_text_transform(dom_node().data(), computed_values().text_transform()).release_value_but_fixme_should_propagate_errors(); auto const* parent_element = dom_node().parent_element();
auto const maybe_lang = parent_element ? parent_element->lang() : Optional<String> {};
auto const lang = maybe_lang.has_value() ? maybe_lang.value() : Optional<StringView> {};
auto data = apply_text_transform(dom_node().data(), computed_values().text_transform(), lang).release_value_but_fixme_should_propagate_errors();
auto data_view = data.bytes_as_string_view(); auto data_view = data.bytes_as_string_view();