aboutsummaryrefslogtreecommitdiff
path: root/font
diff options
context:
space:
mode:
authorMartin Lindhe <martinlindhe@users.noreply.github.com>2017-07-28 18:00:55 +0200
committerJoe Wilm <jwilm@users.noreply.github.com>2017-07-28 09:00:55 -0700
commitf3e0c8609f13c09a2b3ac1d909cac31a8e285b14 (patch)
tree4094adb21c6060bde79e172133e84609217fc830 /font
parentb5f7cc315b3d1f9f75d2f19af3e7a3e694164de9 (diff)
downloadalacritty-f3e0c8609f13c09a2b3ac1d909cac31a8e285b14.tar.gz
alacritty-f3e0c8609f13c09a2b3ac1d909cac31a8e285b14.zip
font: update macOS core-text dependency to 6.1.0, fixes #685 (#692)
Diffstat (limited to 'font')
-rw-r--r--font/Cargo.lock6
-rw-r--r--font/Cargo.toml2
-rw-r--r--font/src/darwin/mod.rs4
3 files changed, 6 insertions, 6 deletions
diff --git a/font/Cargo.lock b/font/Cargo.lock
index 28434a2e..7cbf700b 100644
--- a/font/Cargo.lock
+++ b/font/Cargo.lock
@@ -5,7 +5,7 @@ dependencies = [
"core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-text 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-text 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype-rs 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -48,7 +48,7 @@ dependencies = [
[[package]]
name = "core-text"
-version = "5.0.1"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -203,7 +203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f51ce3b8ebe311c56de14231eb57572c15abebd2d32b3bcb99bcdb9c101f5ac3"
"checksum core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41115a6aa5d3e1e5ef98148373f25971d1fad53818553f216495f9e67e90a624"
"checksum core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a9f841e9637adec70838c537cae52cb4c751cc6514ad05669b51d107c2021c79"
-"checksum core-text 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7c42ae17408d6b881992268f638257e67303fc7c6c88723dbc0fe5889b22c0bc"
+"checksum core-text 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "16ce16d9ed00181016c11ff48e561314bec92bfbce9fe48f319366618d4e5de6"
"checksum euclid 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba6ab6f0e63a602978f4b8cf8a43f87a1a475ddf32407f087d579a13cf06b114"
"checksum expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccf6f838594c1571f176f0afdbeb9cfa9f83b478f269d3f0390939b1df4323e"
"checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
diff --git a/font/Cargo.toml b/font/Cargo.toml
index 98c7eaad..0aca1ae0 100644
--- a/font/Cargo.toml
+++ b/font/Cargo.toml
@@ -17,6 +17,6 @@ freetype-rs = "0.13.0"
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.3.0"
-core-text = "5.0.0"
+core-text = "6.1.0"
core-graphics = "0.8.1"
core-foundation-sys = "0.3.1"
diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs
index a972301a..45423123 100644
--- a/font/src/darwin/mod.rs
+++ b/font/src/darwin/mod.rs
@@ -582,13 +582,13 @@ mod tests {
// Check to_font
let fonts = list.iter()
- .map(|desc| desc.to_font(72.))
+ .map(|desc| desc.to_font(72., false))
.collect::<Vec<_>>();
for font in fonts {
// Get a glyph
for c in &['a', 'b', 'c', 'd'] {
- let glyph = font.get_glyph(*c, 72.).unwrap();
+ let glyph = font.get_glyph(*c, 72., false).unwrap();
// Debug the glyph.. sigh
for row in 0..glyph.height {