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

Correctly handle length-changing mappings in text-transform

Browse source
This commit is contained in:
Anthony Ramine 2015-08-17 01:01:15 +02:00
parent e74825f9fd
commit bb3d3db333
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`.
///
/// FIXME(#4311, pcwalton): Case mapping can change length of the string; case mapping should
/// be language-specific; `full-width`; use graphemes instead of characters.
/// FIXME(#4311, pcwalton): Title-case mapping can change length of the string;
/// case mapping should be language-specific; `full-width`;
/// use graphemes instead of characters.
fn apply_style_transform_if_necessary(string: &mut String,
first_character_position: usize,
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();
string.truncate(first_character_position);
let mut count = 0;
for character in original.chars() {
string.push(character.to_uppercase().next().unwrap());
for ch in original.chars().flat_map(|ch| ch.to_uppercase()) {
string.push(ch);
count += 1;
}
count
@ -525,8 +526,8 @@ fn apply_style_transform_if_necessary(string: &mut String,
let original = string[first_character_position..].to_owned();
string.truncate(first_character_position);
let mut count = 0;
for character in original.chars() {
string.push(character.to_lowercase().next().unwrap());
for ch in original.chars().flat_map(|ch| ch.to_lowercase()) {
string.push(ch);
count += 1;
}
count