summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-06-20 12:11:20 -0400
committerGitHub <noreply@github.com>2023-06-20 18:11:20 +0200
commitc0c03812d08bc833b8a2477c594d762f43a0c95b (patch)
tree7ecf451953b39779b2580dfcb7b2e8def108ff47
parent57d4b8b75175c2fb169ab24ae683f580bcd42c99 (diff)
Move assets/data to library/assets (#1515)
So these assets lives inside the typst-library crate and doesn't break `cargo vendor`
-rw-r--r--NOTICE2
-rw-r--r--library/assets/cj_linebreak_data.postcard (renamed from assets/data/cj_linebreak_data.postcard)bin18848 -> 18848 bytes
-rw-r--r--library/assets/icudata.postcard (renamed from assets/data/icudata.postcard)bin352005 -> 352005 bytes
-rw-r--r--library/assets/syntect.bin (renamed from assets/data/syntect.bin)bin596384 -> 596384 bytes
-rw-r--r--library/src/layout/par.rs8
-rw-r--r--library/src/text/raw.rs5
6 files changed, 7 insertions, 8 deletions
diff --git a/NOTICE b/NOTICE
index f1dc8950..9fef0f4e 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
index 910dd167..910dd167 100644
--- a/assets/data/cj_linebreak_data.postcard
+++ b/library/assets/cj_linebreak_data.postcard
Binary files differ
diff --git a/assets/data/icudata.postcard b/library/assets/icudata.postcard
index e910bf8e..e910bf8e 100644
--- a/assets/data/icudata.postcard
+++ b/library/assets/icudata.postcard
Binary files differ
diff --git a/assets/data/syntect.bin b/library/assets/syntect.bin
index 748cdfe6..748cdfe6 100644
--- a/assets/data/syntect.bin
+++ b/library/assets/syntect.bin
Binary files differ
diff --git a/library/src/layout/par.rs b/library/src/layout/par.rs
index 2d0944ce..6170a34d 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 747a75d1..1cb3cab1 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 {