From c0c03812d08bc833b8a2477c594d762f43a0c95b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 20 Jun 2023 12:11:20 -0400
Subject: [PATCH] Move assets/data to library/assets (#1515)

So these assets lives inside the typst-library crate and doesn't break `cargo vendor`
---
 NOTICE                                              |   2 +-
 .../assets}/cj_linebreak_data.postcard              | Bin
 {assets/data => library/assets}/icudata.postcard    | Bin
 {assets/data => library/assets}/syntect.bin         | Bin
 library/src/layout/par.rs                           |   8 ++++----
 library/src/text/raw.rs                             |   5 ++---
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename {assets/data => library/assets}/cj_linebreak_data.postcard (100%)
 rename {assets/data => library/assets}/icudata.postcard (100%)
 rename {assets/data => library/assets}/syntect.bin (100%)

diff --git a/NOTICE b/NOTICE
index f1dc8950b..9fef0f4e0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ================================================================================
 
 ================================================================================
-Syntaxes in `assets/data/syntect.bin` are generated from syntax definitions
+Syntaxes in `library/assets/syntect.bin` are generated from syntax definitions
 which can be found here:
 https://github.com/sharkdp/bat/tree/master/assets/syntaxes
 
diff --git a/assets/data/cj_linebreak_data.postcard b/library/assets/cj_linebreak_data.postcard
similarity index 100%
rename from assets/data/cj_linebreak_data.postcard
rename to library/assets/cj_linebreak_data.postcard
diff --git a/assets/data/icudata.postcard b/library/assets/icudata.postcard
similarity index 100%
rename from assets/data/icudata.postcard
rename to library/assets/icudata.postcard
diff --git a/assets/data/syntect.bin b/library/assets/syntect.bin
similarity index 100%
rename from assets/data/syntect.bin
rename to library/assets/syntect.bin
diff --git a/library/src/layout/par.rs b/library/src/layout/par.rs
index 2d0944ceb..6170a34d8 100644
--- a/library/src/layout/par.rs
+++ b/library/src/layout/par.rs
@@ -1016,23 +1016,23 @@ fn linebreak_optimized<'a>(vt: &Vt, p: &'a Preparation<'a>, width: Abs) -> Vec<L
 ///
 /// ```sh
 /// icu4x-datagen  --locales full --keys-for-bin target/debug/typst \
-///                --format blob --out assets/data/icudata.postcard --overwrite
+///                --format blob --out library/assets/icudata.postcard --overwrite
 /// ```
 ///
 /// Install icu4x-datagen with `cargo install icu4x-datagen`.
-static ICU_DATA: &[u8] = include_bytes!("../../../assets/data/icudata.postcard");
+static ICU_DATA: &[u8] = include_bytes!("../../assets/icudata.postcard");
 
 /// Generated by the following command:
 ///
 /// ```sh
 /// icu4x-datagen --locales zh ja --keys segmenter/line@1 --format blob \
-///               --out assets/data/cj_linebreak_data.postcard --overwrite
+///               --out library/assets/cj_linebreak_data.postcard --overwrite
 /// ```
 ///
 /// The used icu4x-datagen should be patched by
 /// https://github.com/peng1999/icu4x/commit/b9beb6cbf633d61fc3d7983e5baf7f4449fbfae5
 static CJ_LINEBREAK_DATA: &[u8] =
-    include_bytes!("../../../assets/data/cj_linebreak_data.postcard");
+    include_bytes!("../../assets/cj_linebreak_data.postcard");
 
 /// The general line break segmenter.
 static SEGMENTER: Lazy<LineSegmenter> = Lazy::new(|| {
diff --git a/library/src/text/raw.rs b/library/src/text/raw.rs
index 747a75d18..1cb3cab1c 100644
--- a/library/src/text/raw.rs
+++ b/library/src/text/raw.rs
@@ -343,9 +343,8 @@ fn to_syn(RgbaColor { r, g, b, a }: RgbaColor) -> synt::Color {
 /// syntaxes/02_Extra/VimHelp.sublime-syntax
 /// syntaxes/02_Extra/cmd-help/syntaxes/cmd-help.sublime-syntax
 /// ```
-static SYNTAXES: Lazy<syntect::parsing::SyntaxSet> = Lazy::new(|| {
-    syntect::dumps::from_binary(include_bytes!("../../../assets/data/syntect.bin"))
-});
+static SYNTAXES: Lazy<syntect::parsing::SyntaxSet> =
+    Lazy::new(|| syntect::dumps::from_binary(include_bytes!("../../assets/syntect.bin")));
 
 /// The default theme used for syntax highlighting.
 pub static THEME: Lazy<synt::Theme> = Lazy::new(|| synt::Theme {