diff --git a/NOTICE b/NOTICE index 4444cccd0..6b035ef34 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 baca91489..7ad0535cb 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 similarity index 100% rename from fonts/IBMPlexMono-Bold.ttf rename to tests/fonts/IBMPlexMono-Bold.ttf diff --git a/fonts/IBMPlexMono-Regular.ttf b/tests/fonts/IBMPlexMono-Regular.ttf similarity index 100% rename from fonts/IBMPlexMono-Regular.ttf rename to tests/fonts/IBMPlexMono-Regular.ttf diff --git a/fonts/IBMPlexSans-Bold.ttf b/tests/fonts/IBMPlexSans-Bold.ttf similarity index 100% rename from fonts/IBMPlexSans-Bold.ttf rename to tests/fonts/IBMPlexSans-Bold.ttf diff --git a/fonts/IBMPlexSans-BoldItalic.ttf b/tests/fonts/IBMPlexSans-BoldItalic.ttf similarity index 100% rename from fonts/IBMPlexSans-BoldItalic.ttf rename to tests/fonts/IBMPlexSans-BoldItalic.ttf diff --git a/fonts/IBMPlexSans-Italic.ttf b/tests/fonts/IBMPlexSans-Italic.ttf similarity index 100% rename from fonts/IBMPlexSans-Italic.ttf rename to tests/fonts/IBMPlexSans-Italic.ttf diff --git a/fonts/IBMPlexSans-Regular.ttf b/tests/fonts/IBMPlexSans-Regular.ttf similarity index 100% rename from fonts/IBMPlexSans-Regular.ttf rename to tests/fonts/IBMPlexSans-Regular.ttf diff --git a/fonts/IBMPlexSansDevanagari-Regular.ttf b/tests/fonts/IBMPlexSansDevanagari-Regular.ttf similarity index 100% rename from fonts/IBMPlexSansDevanagari-Regular.ttf rename to tests/fonts/IBMPlexSansDevanagari-Regular.ttf diff --git a/fonts/IBMPlexSerif-Regular.ttf b/tests/fonts/IBMPlexSerif-Regular.ttf similarity index 100% rename from fonts/IBMPlexSerif-Regular.ttf rename to tests/fonts/IBMPlexSerif-Regular.ttf diff --git a/fonts/LatinModernRoman-Bold.otf b/tests/fonts/LatinModernRoman-Bold.otf similarity index 100% rename from fonts/LatinModernRoman-Bold.otf rename to tests/fonts/LatinModernRoman-Bold.otf diff --git a/fonts/LatinModernRoman-Regular.otf b/tests/fonts/LatinModernRoman-Regular.otf similarity index 100% rename from fonts/LatinModernRoman-Regular.otf rename to tests/fonts/LatinModernRoman-Regular.otf diff --git a/fonts/NewCMMath-Regular.otf b/tests/fonts/NewCMMath-Regular.otf similarity index 100% rename from fonts/NewCMMath-Regular.otf rename to tests/fonts/NewCMMath-Regular.otf diff --git a/fonts/NotoColorEmoji.ttf b/tests/fonts/NotoColorEmoji.ttf similarity index 100% rename from fonts/NotoColorEmoji.ttf rename to tests/fonts/NotoColorEmoji.ttf diff --git a/fonts/NotoSansArabic-Regular.ttf b/tests/fonts/NotoSansArabic-Regular.ttf similarity index 100% rename from fonts/NotoSansArabic-Regular.ttf rename to tests/fonts/NotoSansArabic-Regular.ttf diff --git a/fonts/NotoSerifCJKsc-Regular.otf b/tests/fonts/NotoSerifCJKsc-Regular.otf similarity index 100% rename from fonts/NotoSerifCJKsc-Regular.otf rename to tests/fonts/NotoSerifCJKsc-Regular.otf diff --git a/fonts/NotoSerifHebrew-Bold.ttf b/tests/fonts/NotoSerifHebrew-Bold.ttf similarity index 100% rename from fonts/NotoSerifHebrew-Bold.ttf rename to tests/fonts/NotoSerifHebrew-Bold.ttf diff --git a/fonts/NotoSerifHebrew-Regular.ttf b/tests/fonts/NotoSerifHebrew-Regular.ttf similarity index 100% rename from fonts/NotoSerifHebrew-Regular.ttf rename to tests/fonts/NotoSerifHebrew-Regular.ttf diff --git a/fonts/PTSans-Regular.ttf b/tests/fonts/PTSans-Regular.ttf similarity index 100% rename from fonts/PTSans-Regular.ttf rename to tests/fonts/PTSans-Regular.ttf diff --git a/fonts/Roboto-Regular.ttf b/tests/fonts/Roboto-Regular.ttf similarity index 100% rename from fonts/Roboto-Regular.ttf rename to tests/fonts/Roboto-Regular.ttf diff --git a/fonts/TwitterColorEmoji.ttf b/tests/fonts/TwitterColorEmoji.ttf similarity index 100% rename from fonts/TwitterColorEmoji.ttf rename to tests/fonts/TwitterColorEmoji.ttf diff --git a/fonts/Ubuntu-Regular.ttf b/tests/fonts/Ubuntu-Regular.ttf similarity index 100% rename from fonts/Ubuntu-Regular.ttf rename to tests/fonts/Ubuntu-Regular.ttf diff --git a/tests/src/benches.rs b/tests/src/benches.rs index 844f3bf04..5c9b54336 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 237eaf22c..cdd82117a 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));