Merge `typst` and `typst-library`

1 files changed, 18 insertions, 43 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 2bd65a40..8279a484 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2704,14 +2704,26 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 name = "typst"
 version = "0.9.0"
 dependencies = [
+ "az",
  "bitflags 2.4.1",
+ "chinese-number",
+ "ciborium",
  "comemo",
+ "csv",
  "ecow",
  "fontdb",
+ "hayagriva",
+ "hypher",
+ "icu_properties",
+ "icu_provider",
+ "icu_provider_adapters",
+ "icu_provider_blob",
+ "icu_segmenter",
  "image",
  "indexmap 2.0.2",
  "kurbo",
  "lasso",
+ "lipsum",
  "log",
  "once_cell",
  "palette",
@@ -2720,16 +2732,22 @@ dependencies = [
  "roxmltree",
  "rustybuzz",
  "serde",
+ "serde_json",
+ "serde_yaml 0.9.27",
  "siphasher",
  "smallvec",
  "stacker",
+ "syntect",
  "time",
  "toml",
  "tracing",
  "ttf-parser",
+ "typed-arena",
  "typst-macros",
  "typst-syntax",
+ "unicode-bidi",
  "unicode-math-class",
+ "unicode-script",
  "unicode-segmentation",
  "usvg",
  "wasmi",
@@ -2771,7 +2789,6 @@ dependencies = [
  "tracing-flame",
  "tracing-subscriber",
  "typst",
- "typst-library",
  "typst-pdf",
  "typst-render",
  "typst-svg",
@@ -2795,7 +2812,6 @@ dependencies = [
  "syntect",
  "typed-arena",
  "typst",
- "typst-library",
  "unicode_names2",
  "unscanny",
  "yaml-front-matter",
@@ -2815,46 +2831,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "typst-library"
-version = "0.9.0"
-dependencies = [
- "az",
- "chinese-number",
- "ciborium",
- "comemo",
- "csv",
- "ecow",
- "hayagriva",
- "hypher",
- "icu_properties",
- "icu_provider",
- "icu_provider_adapters",
- "icu_provider_blob",
- "icu_segmenter",
- "indexmap 2.0.2",
- "kurbo",
- "lipsum",
- "log",
- "once_cell",
- "roxmltree",
- "rustybuzz",
- "serde_json",
- "serde_yaml 0.9.27",
- "smallvec",
- "syntect",
- "time",
- "toml",
- "tracing",
- "ttf-parser",
- "typed-arena",
- "typst",
- "unicode-bidi",
- "unicode-math-class",
- "unicode-script",
- "unicode-segmentation",
-]
-
-[[package]]
 name = "typst-macros"
 version = "0.9.0"
 dependencies = [
@@ -2948,7 +2924,6 @@ dependencies = [
  "tiny-skia",
  "ttf-parser",
  "typst",
- "typst-library",
  "typst-pdf",
  "typst-render",
  "typst-svg",