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

auto merge of #5470 : bjwbell/servo/tab-in-pre, r=mbrubeck

Browse source 
Display tab characters as 4 spaces for pre and other elements that don't
compress whitespace.

Fixes https://github.com/servo/servo/issues/4651

@pcwalton r?
This commit is contained in:
bors-servo 2015-04-03 04:18:42 -06:00
commit 40fab8e362
4 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/gfx/text/shaping/harfbuzz.rs
View file

@ -521,6 +521,9 @@ impl Shaper {
// We elect to only space the two required code points.
if character == ' ' || character == '\u{a0}' {
advance = advance + options.word_spacing
} else if character == '\t' {
let tab_size = 8f64;
advance = Au::from_frac_px(tab_size * glyph_space_advance(self.font_and_shaping_options.font));
}
advance
@ -563,6 +566,19 @@ extern fn glyph_h_advance_func(_: *mut hb_font_t,
}
}
fn glyph_space_advance(font: *mut Font) -> f64 {
let space_unicode = ' ';
let space_glyph: hb_codepoint_t;
match unsafe {(*font).glyph_index(space_unicode)} {
Some(g) => {
space_glyph = g as hb_codepoint_t;
}
None => panic!("No space info")
}
let space_advance = unsafe {(*font).glyph_h_advance(space_glyph as GlyphId)};
space_advance
}
extern fn glyph_h_kerning_func(_: *mut hb_font_t,
font_data: *mut c_void,
first_glyph: hb_codepoint_t,

1
tests/ref/basic.list
View file

@ -246,6 +246,7 @@ experimental != overconstrained_block.html overconstrained_block_ref.html
== position_relative_a.html position_relative_b.html
== position_relative_top_percentage_a.html position_relative_top_percentage_b.html
== pre_ignorable_whitespace_a.html pre_ignorable_whitespace_ref.html
== pre_with_tab.html pre_with_tab_ref.html
== pseudo_element_a.html pseudo_element_b.html
== pseudo_inherit.html pseudo_inherit_ref.html
== quotes_simple_a.html quotes_simple_ref.html

1
tests/ref/pre_with_tab.html Normal file
View file

@ -0,0 +1 @@
<html><body><pre> tab</pre></body></html>

1
tests/ref/pre_with_tab_ref.html Normal file
View file

@ -0,0 +1 @@
<html><body><pre> tab</pre></body></html>