Merge branch 'v0.8-pre' into Use-palette-for-colors

432-Technologies · Feb 18, 2025 · ee275ce · ee275ce
2 parents 6aa29f3 + b627902
commit ee275ce
Show file tree

Hide file tree

Showing 21 changed files with 361 additions and 374 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.8.20-pre"
+version = "0.8.21-pre"
 license = "MIT"
 edition = "2021"
 repository = "https://github.com/432-Technologies/dessin"

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # [dessin](https://docs.rs/dessin/)
 
-**dessin is library aimed at building complex drawings, combine them, move them and export them as PDF or SVG.**
+**Try out the new [API](https://github.com/432-Technologies/dessin/tree/v0.8-pre)**
+
+Generate complex drawing for PDF, SVG, and many more to come ! 
 
 ## Getting started
 

diff --git a/dessin-image/Cargo.toml b/dessin-image/Cargo.toml
@@ -16,14 +16,14 @@ edition = "2021"
 license = "MIT"
 name = "dessin-image"
 repository = "https://github.com/432-technologies/dessin"
-version = "0.8.20-pre"
+version = "0.8.21-pre"
 
 [dependencies]
 data-encoding = "^2.3.3"
-dessin = { version = "0.8.20-pre", path = "../dessin" }
+dessin = { version = "0.8.21-pre", path = "../dessin" }
 font-kit = "0.11.0"
-image = "^0.24.6"
+image = "0.24"
 imageproc = "^0.23.0"
-nalgebra = "^0.32.2"
+nalgebra = "^0.33"
 rand = "^0.8.5"
 raqote = "0.8.2"
diff --git a/dessin-image/src/lib.rs b/dessin-image/src/lib.rs
@@ -130,7 +130,11 @@ impl Exporter for ImageExporter {
         Ok(())
     }
 
-    fn export_curve(&mut self, curve: CurvePosition) -> Result<(), Self::Error> {
+    fn export_curve(
+        &mut self,
+        curve: CurvePosition,
+        StylePosition { stroke, fill }: StylePosition,
+    ) -> Result<(), Self::Error> {
         let mut path = PathBuilder::new();
 
         for (idx, k) in curve.keypoints.iter().enumerate() {
@@ -300,7 +304,34 @@ impl ToImage for Shape {
         let height = bb.height().ceil() as u32;
         let mut exporter = ImageExporter::new(width, height);
 
-        self.write_into_exporter(&mut exporter, &transform)?;
+        // self.write_into_exporter(
+        //     &mut exporter,
+        //     &transform,
+        //     StylePosition {
+        //         stroke: None,
+        //         fill: None,
+        //     },
+        // )?;
+
+        if let Shape::Style { fill, stroke, .. } = self {
+            self.write_into_exporter(
+                &mut exporter,
+                &transform,
+                StylePosition {
+                    fill: *fill,
+                    stroke: *stroke,
+                },
+            )? //Needed to be complete
+        } else {
+            self.write_into_exporter(
+                &mut exporter,
+                &transform,
+                StylePosition {
+                    fill: None,
+                    stroke: None,
+                },
+            )?
+        }
 
         let raw: Vec<u32> = exporter.finalize().into_vec();
         let raw: Vec<u8> = unsafe {

diff --git a/dessin-macros/Cargo.toml b/dessin-macros/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 license = "MIT"
 name = "dessin-macros"
 repository = "https://github.com/432-technologies/dessin"
-version = "0.8.20-pre"
+version = "0.8.21-pre"
 
 [lib]
 proc-macro = true

diff --git a/dessin-macros/src/dessin_macro.rs b/dessin-macros/src/dessin_macro.rs
@@ -5,7 +5,7 @@ use syn::{
     parse::{Parse, ParseStream},
     punctuated::Punctuated,
     token::{Brace, Bracket, Comma, Paren},
-    Expr, ExprAssign, ExprForLoop, ExprLet, Path, Result, Token,
+    Expr, ExprAssign, ExprForLoop, ExprLet, Pat, Path, Result, Token,
 };
 
 enum Action {
@@ -195,7 +195,13 @@ enum DessinIfElseArg {
 impl Parse for DessinIfElseArg {
     fn parse(input: ParseStream) -> Result<Self> {
         if input.peek(Token![let]) {
-            let let_exp: ExprLet = input.parse()?;
+            let let_exp = ExprLet {
+                attrs: vec![],
+                let_token: input.parse().unwrap(),
+                pat: Box::new(Pat::parse_single(&input).unwrap()),
+                eq_token: input.parse().unwrap(),
+                expr: Box::new(Expr::parse_without_eager_brace(&input).unwrap()),
+            };
             return Ok(DessinIfElseArg::Let(let_exp));
         }
 

diff --git a/dessin-macros/src/dessin_macro_old.rs b/dessin-macros/src/dessin_macro_old.rs
@@ -642,15 +642,15 @@ fn simple_if() {
     )
     .unwrap();
 }
-#[test]
-fn if_let() {
-    syn::parse_str::<Dessin>(
-        "if let Some(x) = my_condition {
-            Circle: ()
-        }",
-    )
-    .unwrap();
-}
+// #[test]
+// fn if_let() {
+//     syn::parse_str::<Dessin>(
+//         "if let Some(x) = my_condition {
+//             Circle: ()
+//         }",
+//     )
+//     .unwrap();
+// }
 #[test]
 fn combined_if() {
     syn::parse_str::<Dessin>(

diff --git a/dessin-pdf/Cargo.toml b/dessin-pdf/Cargo.toml
@@ -10,11 +10,11 @@ edition = "2021"
 license = "MIT"
 name = "dessin-pdf"
 repository = "https://github.com/432-technologies/dessin"
-version = "0.8.20-pre"
+version = "0.8.21-pre"
 
 [dependencies]
-dessin = { version = "0.8.20-pre", path = "../dessin" }
-fontdue = "^0.8.0"
-image = "^0.24.8"
-nalgebra = "^0.32.3"
-printpdf = { version = "^0.6", features = ["webp", "svg"] }
+dessin = { version = "0.8.21-pre", path = "../dessin" }
+fontdue = "^0.9"
+image = "0.24"
+nalgebra = "^0.33"
+printpdf = { version = "^0.7", features = ["webp", "svg"] }