summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NOTICE16
-rw-r--r--tests/README.md3
-rw-r--r--tests/fonts/IBMPlexMono-Bold.ttf (renamed from fonts/IBMPlexMono-Bold.ttf)bin111944 -> 111944 bytes
-rw-r--r--tests/fonts/IBMPlexMono-Regular.ttf (renamed from fonts/IBMPlexMono-Regular.ttf)bin109272 -> 109272 bytes
-rw-r--r--tests/fonts/IBMPlexSans-Bold.ttf (renamed from fonts/IBMPlexSans-Bold.ttf)bin175212 -> 175212 bytes
-rw-r--r--tests/fonts/IBMPlexSans-BoldItalic.ttf (renamed from fonts/IBMPlexSans-BoldItalic.ttf)bin184200 -> 184200 bytes
-rw-r--r--tests/fonts/IBMPlexSans-Italic.ttf (renamed from fonts/IBMPlexSans-Italic.ttf)bin183496 -> 183496 bytes
-rw-r--r--tests/fonts/IBMPlexSans-Regular.ttf (renamed from fonts/IBMPlexSans-Regular.ttf)bin175232 -> 175232 bytes
-rw-r--r--tests/fonts/IBMPlexSansDevanagari-Regular.ttf (renamed from fonts/IBMPlexSansDevanagari-Regular.ttf)bin350804 -> 350804 bytes
-rw-r--r--tests/fonts/IBMPlexSerif-Regular.ttf (renamed from fonts/IBMPlexSerif-Regular.ttf)bin159828 -> 159828 bytes
-rw-r--r--tests/fonts/LatinModernRoman-Bold.otf (renamed from fonts/LatinModernRoman-Bold.otf)bin111240 -> 111240 bytes
-rw-r--r--tests/fonts/LatinModernRoman-Regular.otf (renamed from fonts/LatinModernRoman-Regular.otf)bin111536 -> 111536 bytes
-rw-r--r--tests/fonts/NewCMMath-Regular.otf (renamed from fonts/NewCMMath-Regular.otf)bin1229208 -> 1229208 bytes
-rw-r--r--tests/fonts/NotoColorEmoji.ttf (renamed from fonts/NotoColorEmoji.ttf)bin9867108 -> 9867108 bytes
-rw-r--r--tests/fonts/NotoSansArabic-Regular.ttf (renamed from fonts/NotoSansArabic-Regular.ttf)bin140400 -> 140400 bytes
-rw-r--r--tests/fonts/NotoSerifCJKsc-Regular.otf (renamed from fonts/NotoSerifCJKsc-Regular.otf)bin23613224 -> 23613224 bytes
-rw-r--r--tests/fonts/NotoSerifHebrew-Bold.ttf (renamed from fonts/NotoSerifHebrew-Bold.ttf)bin21376 -> 21376 bytes
-rw-r--r--tests/fonts/NotoSerifHebrew-Regular.ttf (renamed from fonts/NotoSerifHebrew-Regular.ttf)bin21488 -> 21488 bytes
-rw-r--r--tests/fonts/PTSans-Regular.ttf (renamed from fonts/PTSans-Regular.ttf)bin278168 -> 278168 bytes
-rw-r--r--tests/fonts/Roboto-Regular.ttf (renamed from fonts/Roboto-Regular.ttf)bin305608 -> 305608 bytes
-rw-r--r--tests/fonts/TwitterColorEmoji.ttf (renamed from fonts/TwitterColorEmoji.ttf)bin13356392 -> 13356392 bytes
-rw-r--r--tests/fonts/Ubuntu-Regular.ttf (renamed from fonts/Ubuntu-Regular.ttf)bin299684 -> 299684 bytes
-rw-r--r--tests/src/benches.rs2
-rw-r--r--tests/src/tests.rs2
24 files changed, 12 insertions, 11 deletions
diff --git a/NOTICE b/NOTICE
index 4444cccd..6b035ef3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -65,15 +65,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
================================================================================
The SIL Open Font License Version 1.1 applies to:
-* IBM Plex fonts in fonts/IBMPlex*.ttf
+* IBM Plex fonts in tests/fonts/IBMPlex*.ttf
Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
(https://github.com/IBM/plex)
-* Noto fonts in fonts/Noto*.ttf
+* Noto fonts in tests/fonts/Noto*.ttf
Copyright 2018 The Noto Project Authors
(github.com/googlei18n/noto-fonts)
-* PT Sans fonts in fonts/PTSans*.ttf
+* PT Sans fonts in tests/fonts/PTSans*.ttf
Copyright (c) 2010, ParaType Ltd. (http://www.paratype.com/public),
with Reserved Font Names "PT Sans" and "ParaType".
@@ -168,7 +168,7 @@ OTHER DEALINGS IN THE FONT SOFTWARE.
================================================================================
The Apache License Version 2.0 applies to:
-* Roboto fonts in fonts/Roboto*.ttf
+* Roboto fonts in tests/fonts/Roboto*.ttf
(https://github.com/googlefonts/roboto)
Apache License
@@ -352,7 +352,7 @@ The Apache License Version 2.0 applies to:
================================================================================
The Ubuntu Font License Version 1.0 applies to:
-* Ubuntu fonts in fonts/Ubuntu*.ttf
+* Ubuntu fonts in tests/fonts/Ubuntu*.ttf
(https://design.ubuntu.com/font/)
-------------------------------
@@ -457,10 +457,10 @@ DEALINGS IN THE FONT SOFTWARE.
================================================================================
The GUST Font License Version 1.0 applies to:
-* Latin Modern fonts in fonts/LatinModern*.otf
+* Latin Modern fonts in tests/fonts/LatinModern*.otf
(http://www.gust.org.pl/projects/e-foundry/lm-math)
-* NewComputerModern fonts in fonts/NewCM*.otf
+* NewComputerModern fonts in tests/fonts/NewCM*.otf
% This is version 1.0, dated 22 June 2009, of the GUST Font License.
% (GUST is the Polish TeX Users Group, http://www.gust.org.pl)
@@ -495,7 +495,7 @@ The GUST Font License Version 1.0 applies to:
================================================================================
The Creative Commons Attribution 4.0 International License applies to:
-* Twitter Color Emoji font in fonts/TwitterColorEmoji.ttf
+* Twitter Color Emoji font in tests/fonts/TwitterColorEmoji.ttf
Copyright 2016 Brad Erickson
Copyright 2016 Twitter, Inc.
(https://github.com/eosrei/twemoji-color-font)
diff --git a/tests/README.md b/tests/README.md
index baca9148..7ad0535c 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -4,11 +4,12 @@
Top level directory structure:
- `src`: Testing code.
- `typ`: Input files.
-- `res`: Resource files used by tests.
- `ref`: Reference images which the output is compared with to determine whether
a test passed or failed.
- `png`: PNG files produced by tests.
- `pdf`: PDF files produced by tests.
+- `res`: Resource files used by tests.
+- `fonts`: Font files used for tests.
## Running the tests
Running all tests (including unit tests):
diff --git a/fonts/IBMPlexMono-Bold.ttf b/tests/fonts/IBMPlexMono-Bold.ttf
index 2ad2fa1d..2ad2fa1d 100644
--- a/fonts/IBMPlexMono-Bold.ttf
+++ b/tests/fonts/IBMPlexMono-Bold.ttf
Binary files differ
diff --git a/fonts/IBMPlexMono-Regular.ttf b/tests/fonts/IBMPlexMono-Regular.ttf
index ef3bc4b3..ef3bc4b3 100644
--- a/fonts/IBMPlexMono-Regular.ttf
+++ b/tests/fonts/IBMPlexMono-Regular.ttf
Binary files differ
diff --git a/fonts/IBMPlexSans-Bold.ttf b/tests/fonts/IBMPlexSans-Bold.ttf
index 0e9eb07b..0e9eb07b 100644
--- a/fonts/IBMPlexSans-Bold.ttf
+++ b/tests/fonts/IBMPlexSans-Bold.ttf
Binary files differ
diff --git a/fonts/IBMPlexSans-BoldItalic.ttf b/tests/fonts/IBMPlexSans-BoldItalic.ttf
index 07f8bc87..07f8bc87 100644
--- a/fonts/IBMPlexSans-BoldItalic.ttf
+++ b/tests/fonts/IBMPlexSans-BoldItalic.ttf
Binary files differ
diff --git a/fonts/IBMPlexSans-Italic.ttf b/tests/fonts/IBMPlexSans-Italic.ttf
index 9ef096fe..9ef096fe 100644
--- a/fonts/IBMPlexSans-Italic.ttf
+++ b/tests/fonts/IBMPlexSans-Italic.ttf
Binary files differ
diff --git a/fonts/IBMPlexSans-Regular.ttf b/tests/fonts/IBMPlexSans-Regular.ttf
index f1c3da2f..f1c3da2f 100644
--- a/fonts/IBMPlexSans-Regular.ttf
+++ b/tests/fonts/IBMPlexSans-Regular.ttf
Binary files differ
diff --git a/fonts/IBMPlexSansDevanagari-Regular.ttf b/tests/fonts/IBMPlexSansDevanagari-Regular.ttf
index 5d7c8f0f..5d7c8f0f 100644
--- a/fonts/IBMPlexSansDevanagari-Regular.ttf
+++ b/tests/fonts/IBMPlexSansDevanagari-Regular.ttf
Binary files differ
diff --git a/fonts/IBMPlexSerif-Regular.ttf b/tests/fonts/IBMPlexSerif-Regular.ttf
index 7d6dc5c1..7d6dc5c1 100644
--- a/fonts/IBMPlexSerif-Regular.ttf
+++ b/tests/fonts/IBMPlexSerif-Regular.ttf
Binary files differ
diff --git a/fonts/LatinModernRoman-Bold.otf b/tests/fonts/LatinModernRoman-Bold.otf
index 7d6afa73..7d6afa73 100644
--- a/fonts/LatinModernRoman-Bold.otf
+++ b/tests/fonts/LatinModernRoman-Bold.otf
Binary files differ
diff --git a/fonts/LatinModernRoman-Regular.otf b/tests/fonts/LatinModernRoman-Regular.otf
index 6a96b468..6a96b468 100644
--- a/fonts/LatinModernRoman-Regular.otf
+++ b/tests/fonts/LatinModernRoman-Regular.otf
Binary files differ
diff --git a/fonts/NewCMMath-Regular.otf b/tests/fonts/NewCMMath-Regular.otf
index 82221fb8..82221fb8 100644
--- a/fonts/NewCMMath-Regular.otf
+++ b/tests/fonts/NewCMMath-Regular.otf
Binary files differ
diff --git a/fonts/NotoColorEmoji.ttf b/tests/fonts/NotoColorEmoji.ttf
index 2c1f1043..2c1f1043 100644
--- a/fonts/NotoColorEmoji.ttf
+++ b/tests/fonts/NotoColorEmoji.ttf
Binary files differ
diff --git a/fonts/NotoSansArabic-Regular.ttf b/tests/fonts/NotoSansArabic-Regular.ttf
index 94eead4c..94eead4c 100644
--- a/fonts/NotoSansArabic-Regular.ttf
+++ b/tests/fonts/NotoSansArabic-Regular.ttf
Binary files differ
diff --git a/fonts/NotoSerifCJKsc-Regular.otf b/tests/fonts/NotoSerifCJKsc-Regular.otf
index 4c5f715b..4c5f715b 100644
--- a/fonts/NotoSerifCJKsc-Regular.otf
+++ b/tests/fonts/NotoSerifCJKsc-Regular.otf
Binary files differ
diff --git a/fonts/NotoSerifHebrew-Bold.ttf b/tests/fonts/NotoSerifHebrew-Bold.ttf
index e7cbd93a..e7cbd93a 100644
--- a/fonts/NotoSerifHebrew-Bold.ttf
+++ b/tests/fonts/NotoSerifHebrew-Bold.ttf
Binary files differ
diff --git a/fonts/NotoSerifHebrew-Regular.ttf b/tests/fonts/NotoSerifHebrew-Regular.ttf
index 27893f10..27893f10 100644
--- a/fonts/NotoSerifHebrew-Regular.ttf
+++ b/tests/fonts/NotoSerifHebrew-Regular.ttf
Binary files differ
diff --git a/fonts/PTSans-Regular.ttf b/tests/fonts/PTSans-Regular.ttf
index 5222968f..5222968f 100644
--- a/fonts/PTSans-Regular.ttf
+++ b/tests/fonts/PTSans-Regular.ttf
Binary files differ
diff --git a/fonts/Roboto-Regular.ttf b/tests/fonts/Roboto-Regular.ttf
index 500b1045..500b1045 100644
--- a/fonts/Roboto-Regular.ttf
+++ b/tests/fonts/Roboto-Regular.ttf
Binary files differ
diff --git a/fonts/TwitterColorEmoji.ttf b/tests/fonts/TwitterColorEmoji.ttf
index a8f829ac..a8f829ac 100644
--- a/fonts/TwitterColorEmoji.ttf
+++ b/tests/fonts/TwitterColorEmoji.ttf
Binary files differ
diff --git a/fonts/Ubuntu-Regular.ttf b/tests/fonts/Ubuntu-Regular.ttf
index f98a2dab..f98a2dab 100644
--- a/fonts/Ubuntu-Regular.ttf
+++ b/tests/fonts/Ubuntu-Regular.ttf
Binary files differ
diff --git a/tests/src/benches.rs b/tests/src/benches.rs
index 844f3bf0..5c9b5433 100644
--- a/tests/src/benches.rs
+++ b/tests/src/benches.rs
@@ -10,7 +10,7 @@ use typst::{Config, World};
use unscanny::Scanner;
const TEXT: &str = include_str!("../typ/benches/bench.typ");
-const FONT: &[u8] = include_bytes!("../../fonts/IBMPlexSans-Regular.ttf");
+const FONT: &[u8] = include_bytes!("../fonts/IBMPlexSans-Regular.ttf");
main!(
bench_decode,
diff --git a/tests/src/tests.rs b/tests/src/tests.rs
index 237eaf22..cdd82117 100644
--- a/tests/src/tests.rs
+++ b/tests/src/tests.rs
@@ -28,7 +28,7 @@ const TYP_DIR: &str = "typ";
const REF_DIR: &str = "ref";
const PNG_DIR: &str = "png";
const PDF_DIR: &str = "pdf";
-const FONT_DIR: &str = "../fonts";
+const FONT_DIR: &str = "fonts";
fn main() {
let args = Args::new(env::args().skip(1));