From 4bd6eb9dca3d1cb12c90b903ad23fb71f4ba6be5 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 1 Mar 2025 20:36:24 +0100 Subject: [PATCH] Reorganize document lib This change reduces the amount of symlinks required per document. --- showbits-thermal-printer/src/documents.rs | 7 +++++-- showbits-thermal-printer/src/documents/egg/lib | 1 + showbits-thermal-printer/src/documents/egg/lib.typ | 1 - showbits-thermal-printer/src/documents/egg/main.typ | 2 +- showbits-thermal-printer/src/documents/egg/plugin.wasm | 1 - showbits-thermal-printer/src/documents/image/lib | 1 + showbits-thermal-printer/src/documents/image/lib.typ | 1 - showbits-thermal-printer/src/documents/image/main.typ | 4 ++-- showbits-thermal-printer/src/documents/image/plugin.wasm | 1 - .../src/documents/{lib.typ => lib/main.typ} | 3 +-- showbits-thermal-printer/src/documents/lib/plugin.wasm | 1 + showbits-thermal-printer/src/documents/plugin.wasm | 1 - showbits-thermal-printer/src/documents/text/lib | 1 + showbits-thermal-printer/src/documents/text/lib.typ | 1 - showbits-thermal-printer/src/documents/text/main.typ | 2 +- showbits-thermal-printer/src/documents/text/plugin.wasm | 1 - 16 files changed, 14 insertions(+), 15 deletions(-) create mode 120000 showbits-thermal-printer/src/documents/egg/lib delete mode 120000 showbits-thermal-printer/src/documents/egg/lib.typ delete mode 120000 showbits-thermal-printer/src/documents/egg/plugin.wasm create mode 120000 showbits-thermal-printer/src/documents/image/lib delete mode 120000 showbits-thermal-printer/src/documents/image/lib.typ delete mode 120000 showbits-thermal-printer/src/documents/image/plugin.wasm rename showbits-thermal-printer/src/documents/{lib.typ => lib/main.typ} (95%) create mode 120000 showbits-thermal-printer/src/documents/lib/plugin.wasm delete mode 120000 showbits-thermal-printer/src/documents/plugin.wasm create mode 120000 showbits-thermal-printer/src/documents/text/lib delete mode 120000 showbits-thermal-printer/src/documents/text/lib.typ delete mode 120000 showbits-thermal-printer/src/documents/text/plugin.wasm diff --git a/showbits-thermal-printer/src/documents.rs b/showbits-thermal-printer/src/documents.rs index 974fe37..ffe9d12 100644 --- a/showbits-thermal-printer/src/documents.rs +++ b/showbits-thermal-printer/src/documents.rs @@ -6,6 +6,9 @@ pub mod text; fn typst_with_lib() -> Typst { Typst::new() - .with_file("/lib.typ", include_str!("documents/lib.typ")) - .with_file("/plugin.wasm", include_bytes!("documents/plugin.wasm")) + .with_file("/lib/main.typ", include_str!("documents/lib/main.typ")) + .with_file( + "/lib/plugin.wasm", + include_bytes!("documents/lib/plugin.wasm"), + ) } diff --git a/showbits-thermal-printer/src/documents/egg/lib b/showbits-thermal-printer/src/documents/egg/lib new file mode 120000 index 0000000..dc598c5 --- /dev/null +++ b/showbits-thermal-printer/src/documents/egg/lib @@ -0,0 +1 @@ +../lib \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/egg/lib.typ b/showbits-thermal-printer/src/documents/egg/lib.typ deleted file mode 120000 index ea61142..0000000 --- a/showbits-thermal-printer/src/documents/egg/lib.typ +++ /dev/null @@ -1 +0,0 @@ -../lib.typ \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/egg/main.typ b/showbits-thermal-printer/src/documents/egg/main.typ index 9a1a6f5..766cb71 100644 --- a/showbits-thermal-printer/src/documents/egg/main.typ +++ b/showbits-thermal-printer/src/documents/egg/main.typ @@ -1,6 +1,6 @@ #import "@preview/oxifmt:0.2.1": strfmt #import "@preview/suiji:0.3.0": * -#import "lib.typ"; +#import "lib/main.typ" as lib; #show: it => lib.init(it) #let data = json("data.json") diff --git a/showbits-thermal-printer/src/documents/egg/plugin.wasm b/showbits-thermal-printer/src/documents/egg/plugin.wasm deleted file mode 120000 index 04468b6..0000000 --- a/showbits-thermal-printer/src/documents/egg/plugin.wasm +++ /dev/null @@ -1 +0,0 @@ -../plugin.wasm \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/image/lib b/showbits-thermal-printer/src/documents/image/lib new file mode 120000 index 0000000..dc598c5 --- /dev/null +++ b/showbits-thermal-printer/src/documents/image/lib @@ -0,0 +1 @@ +../lib \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/image/lib.typ b/showbits-thermal-printer/src/documents/image/lib.typ deleted file mode 120000 index ea61142..0000000 --- a/showbits-thermal-printer/src/documents/image/lib.typ +++ /dev/null @@ -1 +0,0 @@ -../lib.typ \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/image/main.typ b/showbits-thermal-printer/src/documents/image/main.typ index 1389a29..bee4a55 100644 --- a/showbits-thermal-printer/src/documents/image/main.typ +++ b/showbits-thermal-printer/src/documents/image/main.typ @@ -1,10 +1,10 @@ -#import "lib.typ"; +#import "lib/main.typ" as lib; #show: it => lib.init(it) #let data = json("data.json") #let dithered = lib.dither( - "image.png", + read("image.png", encoding: none), bright: data.bright, algorithm: data.algo, ) diff --git a/showbits-thermal-printer/src/documents/image/plugin.wasm b/showbits-thermal-printer/src/documents/image/plugin.wasm deleted file mode 120000 index 04468b6..0000000 --- a/showbits-thermal-printer/src/documents/image/plugin.wasm +++ /dev/null @@ -1 +0,0 @@ -../plugin.wasm \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/lib.typ b/showbits-thermal-printer/src/documents/lib/main.typ similarity index 95% rename from showbits-thermal-printer/src/documents/lib.typ rename to showbits-thermal-printer/src/documents/lib/main.typ index edb1dbf..dc67132 100644 --- a/showbits-thermal-printer/src/documents/lib.typ +++ b/showbits-thermal-printer/src/documents/lib/main.typ @@ -43,11 +43,10 @@ } #let dither( - path, + data, bright: true, algorithm: "floyd-steinberg", ) = layout(size => { - let data = read(path, encoding: none) let dithered = p.dither( data, _length_to_bytes(size.width), diff --git a/showbits-thermal-printer/src/documents/lib/plugin.wasm b/showbits-thermal-printer/src/documents/lib/plugin.wasm new file mode 120000 index 0000000..7e86c3e --- /dev/null +++ b/showbits-thermal-printer/src/documents/lib/plugin.wasm @@ -0,0 +1 @@ +../../../../showbits-typst-plugin/target/wasm32-unknown-unknown/release/showbits_typst_plugin.wasm \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/plugin.wasm b/showbits-thermal-printer/src/documents/plugin.wasm deleted file mode 120000 index df71aee..0000000 --- a/showbits-thermal-printer/src/documents/plugin.wasm +++ /dev/null @@ -1 +0,0 @@ -../../../showbits-typst-plugin/target/wasm32-unknown-unknown/release/showbits_typst_plugin.wasm \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/text/lib b/showbits-thermal-printer/src/documents/text/lib new file mode 120000 index 0000000..dc598c5 --- /dev/null +++ b/showbits-thermal-printer/src/documents/text/lib @@ -0,0 +1 @@ +../lib \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/text/lib.typ b/showbits-thermal-printer/src/documents/text/lib.typ deleted file mode 120000 index ea61142..0000000 --- a/showbits-thermal-printer/src/documents/text/lib.typ +++ /dev/null @@ -1 +0,0 @@ -../lib.typ \ No newline at end of file diff --git a/showbits-thermal-printer/src/documents/text/main.typ b/showbits-thermal-printer/src/documents/text/main.typ index 1c6c3fc..bbca5ad 100644 --- a/showbits-thermal-printer/src/documents/text/main.typ +++ b/showbits-thermal-printer/src/documents/text/main.typ @@ -1,4 +1,4 @@ -#import "lib.typ"; +#import "lib/main.typ" as lib; #show: it => lib.init(it) #let data = json("data.json") diff --git a/showbits-thermal-printer/src/documents/text/plugin.wasm b/showbits-thermal-printer/src/documents/text/plugin.wasm deleted file mode 120000 index 04468b6..0000000 --- a/showbits-thermal-printer/src/documents/text/plugin.wasm +++ /dev/null @@ -1 +0,0 @@ -../plugin.wasm \ No newline at end of file