18 files changed, 95 insertions, 3 deletions

diff --git a/fonts/Archivo-Regular.ttf b/fonts/Archivo-Regular.ttf
new file mode 100644
index 00000000..78cfe525
--- /dev/null
+++ b/fonts/Archivo-Regular.ttf
diff --git a/fonts/CMU-Serif-Bold-Italic.ttf b/fonts/CMU-Serif-Bold-Italic.ttf
new file mode 100644
index 00000000..3b529ed8
--- /dev/null
+++ b/fonts/CMU-Serif-Bold-Italic.ttf
diff --git a/fonts/CMU-Serif-Bold.ttf b/fonts/CMU-Serif-Bold.ttf
new file mode 100644
index 00000000..2c7198e5
--- /dev/null
+++ b/fonts/CMU-Serif-Bold.ttf
diff --git a/fonts/CMU-Serif-Italic.ttf b/fonts/CMU-Serif-Italic.ttf
new file mode 100644
index 00000000..993d5c02
--- /dev/null
+++ b/fonts/CMU-Serif-Italic.ttf
diff --git a/fonts/CMU-Serif-Regular.ttf b/fonts/CMU-Serif-Regular.ttf
new file mode 100644
index 00000000..1c3fff0a
--- /dev/null
+++ b/fonts/CMU-Serif-Regular.ttf
diff --git a/fonts/Latin-Modern-Math.otf b/fonts/Latin-Modern-Math.otf
new file mode 100644
index 00000000..0e4642e9
--- /dev/null
+++ b/fonts/Latin-Modern-Math.otf
diff --git a/fonts/NotoEmoji-Regular.ttf b/fonts/NotoEmoji-Regular.ttf
new file mode 100644
index 00000000..19b7badf
--- /dev/null
+++ b/fonts/NotoEmoji-Regular.ttf
diff --git a/fonts/OFL.txt b/fonts/OFL.txt
new file mode 100644
index 00000000..0f6fdb15
--- /dev/null
+++ b/fonts/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2011 The Lora Project Authors (https://github.com/cyrealtype/Lora-Cyrillic), with Reserved Font Name "Lora".

+

+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 & 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.

diff --git a/fonts/PTSans-Regular.ttf b/fonts/PTSans-Regular.ttf
new file mode 100644
index 00000000..5222968f
--- /dev/null
+++ b/fonts/PTSans-Regular.ttf
diff --git a/fonts/PTSansNarrow-Regular.ttf b/fonts/PTSansNarrow-Regular.ttf
new file mode 100644
index 00000000..252af134
--- /dev/null
+++ b/fonts/PTSansNarrow-Regular.ttf
diff --git a/fonts/SourceCodePro-Regular.ttf b/fonts/SourceCodePro-Regular.ttf
new file mode 100644
index 00000000..c5830033
--- /dev/null
+++ b/fonts/SourceCodePro-Regular.ttf
diff --git a/fonts/SourceSansPro-Bold.ttf b/fonts/SourceSansPro-Bold.ttf
new file mode 100644
index 00000000..f6986468
--- /dev/null
+++ b/fonts/SourceSansPro-Bold.ttf
diff --git a/fonts/SourceSansPro-BoldItalic.ttf b/fonts/SourceSansPro-BoldItalic.ttf
new file mode 100644
index 00000000..5c00b64f
--- /dev/null
+++ b/fonts/SourceSansPro-BoldItalic.ttf
diff --git a/fonts/SourceSansPro-Italic.ttf b/fonts/SourceSansPro-Italic.ttf
new file mode 100644
index 00000000..82e87620
--- /dev/null
+++ b/fonts/SourceSansPro-Italic.ttf
diff --git a/fonts/SourceSansPro-Regular.ttf b/fonts/SourceSansPro-Regular.ttf
new file mode 100644
index 00000000..a8eae164
--- /dev/null
+++ b/fonts/SourceSansPro-Regular.ttf
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 57411cdb..6d115c1e 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -44,7 +44,6 @@ fn run() -> Result<(), Box<dyn Error>> {
 
     let mut index = FsIndex::new();
     index.search_dir("fonts");
-    index.search_dir("../fonts");
     index.search_os();
 
     let (descriptors, files) = index.into_vecs();
diff --git a/tests/src/render.py b/tests/src/render.py
index 0ef8ae2b..3b6c96f8 100644
--- a/tests/src/render.py
+++ b/tests/src/render.py
@@ -32,7 +32,7 @@ class MultiboxRenderer:
         self.faces = {}
         for entry in data["faces"]:
             face_id = int(entry[0]["index"]), int(entry[0]["variant"])
-            self.faces[face_id] = os.path.join(BASE, '../../../fonts', entry[1])
+            self.faces[face_id] = os.path.join(BASE, '../../', entry[1])
 
         self.layouts = data["layouts"]
 
diff --git a/tests/src/typeset.rs b/tests/src/typeset.rs
index f6ad0811..af73bd02 100644
--- a/tests/src/typeset.rs
+++ b/tests/src/typeset.rs
@@ -59,7 +59,7 @@ fn main() -> DynResult<()> {
     }
 
     let mut index = FsIndex::new();
-    index.search_dir("../fonts");
+    index.search_dir("fonts");
 
     for (name, src) in filtered {
         panic::catch_unwind(|| {