b5b1c581c2
Issue #17321. Under Linux, using "font-family: sans-serif" previously caused Servo to select the "UltraLight" face (of DejaVu Sans). There were two reasons for this: 1. Font weight was only retrieved from the OS/2 table for bold faces. This neglected to retrieve the weight information for "lighter than normal" weight faces. This meant that the UltraLight face appeared as normal weight, and was selected. 2. Retrieval of font stretch information from the OS/2 table was not implemented at all. Source-Repo: https://github.com/servo/servo Source-Revision: 1ed60100695ec21fe6a023f967258fd018c7dafd
68 lines
2.2 KiB
Rust
68 lines
2.2 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#[cfg(not(target_os = "macos"))] extern crate gfx;
|
|
#[cfg(not(target_os = "macos"))] extern crate servo_atoms;
|
|
#[cfg(not(target_os = "macos"))] extern crate style;
|
|
|
|
// Test doesn't yet run on Mac, see https://github.com/servo/servo/pull/19928 for explanation.
|
|
#[cfg(not(target_os = "macos"))]
|
|
#[test]
|
|
fn test_font_template_descriptor() {
|
|
use gfx::font_context::FontContextHandle;
|
|
use gfx::font_template::{FontTemplate, FontTemplateDescriptor};
|
|
use servo_atoms::Atom;
|
|
use std::fs::File;
|
|
use std::io::prelude::*;
|
|
use std::path::PathBuf;
|
|
use style::computed_values::font_stretch::T as FontStretch;
|
|
use style::values::computed::font::FontWeight;
|
|
|
|
fn descriptor(filename: &str) -> FontTemplateDescriptor {
|
|
let mut path: PathBuf = [
|
|
env!("CARGO_MANIFEST_DIR"),
|
|
"tests",
|
|
"support",
|
|
"dejavu-fonts-ttf-2.37",
|
|
"ttf",
|
|
].iter().collect();
|
|
path.push(format!("{}.ttf", filename));
|
|
|
|
let file = File::open(path).unwrap();
|
|
|
|
let mut template = FontTemplate::new(
|
|
Atom::from(filename),
|
|
Some(file.bytes().map(|b| b.unwrap()).collect())
|
|
).unwrap();
|
|
|
|
let context = FontContextHandle::new();
|
|
|
|
template.descriptor(&context).unwrap()
|
|
}
|
|
|
|
assert_eq!(descriptor("DejaVuSans"), FontTemplateDescriptor {
|
|
weight: FontWeight::normal(),
|
|
stretch: FontStretch::Normal,
|
|
italic: false,
|
|
});
|
|
|
|
assert_eq!(descriptor("DejaVuSans-Bold"), FontTemplateDescriptor {
|
|
weight: FontWeight::bold(),
|
|
stretch: FontStretch::Normal,
|
|
italic: false,
|
|
});
|
|
|
|
assert_eq!(descriptor("DejaVuSans-Oblique"), FontTemplateDescriptor {
|
|
weight: FontWeight::normal(),
|
|
stretch: FontStretch::Normal,
|
|
italic: true,
|
|
});
|
|
|
|
assert_eq!(descriptor("DejaVuSansCondensed-BoldOblique"), FontTemplateDescriptor {
|
|
weight: FontWeight::bold(),
|
|
stretch: FontStretch::SemiCondensed,
|
|
italic: true,
|
|
});
|
|
}
|