diff --git a/demo/client/css/pathfinder.css b/demo/client/css/pathfinder.css
index 68b5c9d3..cbd624fd 100644
--- a/demo/client/css/pathfinder.css
+++ b/demo/client/css/pathfinder.css
@@ -1,7 +1,40 @@
+/*
+ * Fonts
+ */
+
+@font-face {
+ font-family: "Inter UI";
+ font-weight: 400;
+ src: url("/woff2/inter-ui/Inter-UI-Regular.woff2") format('woff2');
+}
+
+@font-face {
+ font-family: "Inter UI";
+ font-weight: 700;
+ src: url("/woff2/inter-ui/Inter-UI-Bold.woff2") format('woff2');
+}
+
+@font-face {
+ font-family: "Inter UI";
+ font-weight: 400;
+ font-style: italic;
+ src: url("/woff2/inter-ui/Inter-UI-RegularItalic.woff2") format('woff2');
+}
+
+@font-face {
+ font-family: "Inter UI";
+ font-weight: 700;
+ font-style: italic;
+ src: url("/woff2/inter-ui/Inter-UI-BoldItalic.woff2") format('woff2');
+}
+
/*
* Core
*/
+body {
+ font-family: "Inter UI", sans-serif;
+}
body.pf-unscrollable {
overflow: hidden;
}
diff --git a/demo/client/html/mesh-debugger.html.hbs b/demo/client/html/mesh-debugger.html.hbs
index 56f24a71..5fdb40d1 100644
--- a/demo/client/html/mesh-debugger.html.hbs
+++ b/demo/client/html/mesh-debugger.html.hbs
@@ -40,6 +40,7 @@
+
diff --git a/demo/client/html/text-demo.html.hbs b/demo/client/html/text-demo.html.hbs
index 2bc16265..ea9b5539 100644
--- a/demo/client/html/text-demo.html.hbs
+++ b/demo/client/html/text-demo.html.hbs
@@ -40,6 +40,7 @@
+
diff --git a/demo/client/src/text.ts b/demo/client/src/text.ts
index 78cac0a1..e631027a 100644
--- a/demo/client/src/text.ts
+++ b/demo/client/src/text.ts
@@ -218,7 +218,7 @@ export class GlyphStore {
}).then(response => response.text()).then(responseText => {
const response = JSON.parse(responseText);
if (!('Ok' in response))
- panic("Failed to partition the font!");
+ panic(`Failed to partition the font: ${response.Err}`);
return {
meshes: new PathfinderMeshData(response.Ok.pathData),
time: response.Ok.time,
diff --git a/demo/server/src/main.rs b/demo/server/src/main.rs
index db29a901..9f2d6b9c 100644
--- a/demo/server/src/main.rs
+++ b/demo/server/src/main.rs
@@ -57,15 +57,17 @@ static STATIC_JS_JQUERY_PATH: &'static str = "../client/node_modules/jquery/dist
static STATIC_JS_POPPER_JS_PATH: &'static str = "../client/node_modules/popper.js/dist/umd";
static STATIC_JS_PATHFINDER_PATH: &'static str = "../client";
static STATIC_SVG_OCTICONS_PATH: &'static str = "../client/node_modules/octicons/build/svg";
+static STATIC_WOFF2_INTER_UI_PATH: &'static str = "../../resources/fonts/inter-ui";
static STATIC_GLSL_PATH: &'static str = "../../shaders";
static STATIC_DATA_PATH: &'static str = "../../resources/data";
static STATIC_DOC_API_INDEX_URI: &'static str = "/doc/api/pathfinder_font_renderer/index.html";
-static BUILTIN_FONTS: [(&'static str, &'static str); 3] = [
+static BUILTIN_FONTS: [(&'static str, &'static str); 4] = [
("open-sans", "../../resources/fonts/open-sans/OpenSans-Regular.ttf"),
("nimbus-sans", "../../resources/fonts/nimbus-sans/NimbusSanL-Regu.ttf"),
("eb-garamond", "../../resources/fonts/eb-garamond/EBGaramond12-Regular.ttf"),
+ ("inter-ui", "../../resources/fonts/inter-ui/Inter-UI-Regular.ttf"),
];
static BUILTIN_SVGS: [(&'static str, &'static str); 1] = [
@@ -632,6 +634,10 @@ fn static_js_pathfinder(file: PathBuf) -> Option {
fn static_svg_octicons(file: PathBuf) -> Option {
NamedFile::open(Path::new(STATIC_SVG_OCTICONS_PATH).join(file)).ok()
}
+#[get("/woff2/inter-ui/")]
+fn static_woff2_inter_ui(file: PathBuf) -> Option {
+ NamedFile::open(Path::new(STATIC_WOFF2_INTER_UI_PATH).join(file)).ok()
+}
#[get("/glsl/")]
fn static_glsl(file: PathBuf) -> Option {
Shader::open(Path::new(STATIC_GLSL_PATH).join(file)).ok()
@@ -695,6 +701,7 @@ fn main() {
static_js_popper_js,
static_js_pathfinder,
static_svg_octicons,
+ static_woff2_inter_ui,
static_glsl,
static_otf_demo,
static_svg_demo,
diff --git a/resources/fonts/inter-ui/Inter-UI-Bold.woff2 b/resources/fonts/inter-ui/Inter-UI-Bold.woff2
new file mode 100644
index 00000000..9ec8fa31
Binary files /dev/null and b/resources/fonts/inter-ui/Inter-UI-Bold.woff2 differ
diff --git a/resources/fonts/inter-ui/Inter-UI-BoldItalic.woff2 b/resources/fonts/inter-ui/Inter-UI-BoldItalic.woff2
new file mode 100644
index 00000000..2ce87044
Binary files /dev/null and b/resources/fonts/inter-ui/Inter-UI-BoldItalic.woff2 differ
diff --git a/resources/fonts/inter-ui/Inter-UI-Regular.ttf b/resources/fonts/inter-ui/Inter-UI-Regular.ttf
new file mode 100644
index 00000000..7ca1785d
Binary files /dev/null and b/resources/fonts/inter-ui/Inter-UI-Regular.ttf differ
diff --git a/resources/fonts/inter-ui/Inter-UI-Regular.woff2 b/resources/fonts/inter-ui/Inter-UI-Regular.woff2
new file mode 100644
index 00000000..7e21bce9
Binary files /dev/null and b/resources/fonts/inter-ui/Inter-UI-Regular.woff2 differ
diff --git a/resources/fonts/inter-ui/Inter-UI-RegularItalic.woff2 b/resources/fonts/inter-ui/Inter-UI-RegularItalic.woff2
new file mode 100644
index 00000000..95367643
Binary files /dev/null and b/resources/fonts/inter-ui/Inter-UI-RegularItalic.woff2 differ
diff --git a/resources/fonts/inter-ui/LICENSE.txt b/resources/fonts/inter-ui/LICENSE.txt
new file mode 100644
index 00000000..ed29493e
--- /dev/null
+++ b/resources/fonts/inter-ui/LICENSE.txt
@@ -0,0 +1,92 @@
+Copyright (c) 2017 The Inter UI Project Authors (me@rsms.me)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.