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

Auto merge of #7251 - nox:text-transform-length-change, r=SimonSapin

Browse source 
Correctly handle length-changing mappings in text-transform



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7251)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-20 06:40:33 -06:00
commit 39b7508aa2
5 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout/text.rs
View file

@ -503,8 +503,9 @@ impl RunMapping {
/// Accounts for `text-transform`. /// Accounts for `text-transform`.
/// ///
/// FIXME(#4311, pcwalton): Case mapping can change length of the string; case mapping should /// FIXME(#4311, pcwalton): Title-case mapping can change length of the string;
/// be language-specific; `full-width`; use graphemes instead of characters. /// case mapping should be language-specific; `full-width`;
/// use graphemes instead of characters.
fn apply_style_transform_if_necessary(string: &mut String, fn apply_style_transform_if_necessary(string: &mut String,
first_character_position: usize, first_character_position: usize,
text_transform: text_transform::T) text_transform: text_transform::T)
@ -515,8 +516,8 @@ fn apply_style_transform_if_necessary(string: &mut String,
let original = string[first_character_position..].to_owned(); let original = string[first_character_position..].to_owned();
string.truncate(first_character_position); string.truncate(first_character_position);
let mut count = 0; let mut count = 0;
for character in original.chars() { for ch in original.chars().flat_map(|ch| ch.to_uppercase()) {
string.push(character.to_uppercase().next().unwrap()); string.push(ch);
count += 1; count += 1;
} }
count count
@ -525,8 +526,8 @@ fn apply_style_transform_if_necessary(string: &mut String,
let original = string[first_character_position..].to_owned(); let original = string[first_character_position..].to_owned();
string.truncate(first_character_position); string.truncate(first_character_position);
let mut count = 0; let mut count = 0;
for character in original.chars() { for ch in original.chars().flat_map(|ch| ch.to_lowercase()) {
string.push(character.to_lowercase().next().unwrap()); string.push(ch);
count += 1; count += 1;
} }
count count

4
tests/wpt/css-tests/css21_dev/html4/reference/text-transform-lowercase-002-ref.htm Normal file
View file

@ -0,0 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head></head><body>
<span style="font-size:32px">i̇i</span>
</body></html>

6
tests/wpt/css-tests/css21_dev/html4/text-transform-lowercase-002.htm Normal file
View file

@ -0,0 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head><title>CSS Test: text-transform: LATIN CAPITAL LETTER I WITH DOT ABOVE</title>
<link rel="match" href="reference/text-transform-lowercase-002-ref.htm">
</head><body>
<span style="font-size:32px;text-transform:lowercase">İI</span>
</body></html>

10
tests/wpt/metadata-css/MANIFEST.json
View file

@ -180052,6 +180052,16 @@
], ],
"url": "/css21_dev/html4/text-transform-lowercase-001.htm" "url": "/css21_dev/html4/text-transform-lowercase-001.htm"
}, },
{
"path": "css21_dev/html4/text-transform-lowercase-002.htm",
"references": [
[
"/css21_dev/html4/reference/text-transform-lowercase-002-ref.htm",
"=="
]
],
"url": "/css21_dev/html4/text-transform-lowercase-002.htm"
},
{ {
"path": "css21_dev/html4/text-transform-uppercase-001.htm", "path": "css21_dev/html4/text-transform-uppercase-001.htm",
"references": [ "references": [

3
tests/wpt/metadata-css/css21_dev/html4/text-transform-uppercase-002.htm.ini
View file

@ -1,3 +0,0 @@
[text-transform-uppercase-002.htm]
type: reftest
expected: FAIL