preserve g-code snippet comments in output, fixes #14

Cargo.lock

@@ -207,9 +207,9 @@ checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
 
 [[package]]
 name = "g-code"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b90737b7735bf4bcc68982c447e1e0beebf826b4aa71f06d5a627357ca1e52d"
+checksum = "3ce6421233f5b738db44d6cf210465c2606cda44ed92cabd7920685506cb0c29"
 dependencies = [
  "codespan",
  "codespan-reporting",
@@ -593,7 +593,7 @@ dependencies = [
 
 [[package]]
 name = "svg2gcode"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "euclid",
  "g-code",

cli/Cargo.toml

@@ -11,7 +11,7 @@ license = "MIT"
 svg2gcode = { path = "../lib" }
 env_logger = { version = "0", default-features = false, features = ["atty", "termcolor", "humantime"] }
 log = "0"
-g-code = "0.2"
+g-code = ">= 0.2.6"
 codespan-reporting = "0.11"
 structopt = "0.3"
 roxmltree = "0"

lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "svg2gcode"
-version = "0.0.2"
+version = "0.0.3"
 authors = ["Sameer Puri <crates@purisa.me>"]
 edition = "2018"
 description = "Convert paths in SVG files to GCode for a pen plotter, laser engraver, or other machine."
@@ -8,7 +8,7 @@ repository = "https://github.com/sameer/svg2gcode"
 license = "MIT"
 
 [dependencies]
-g-code = ">= 0.2.4"
+g-code = ">= 0.2.6"
 lyon_geom = ">= 0.17.2"
 euclid = "0.22"
 log = "0"

lib/src/machine.rs

@@ -67,8 +67,7 @@ impl<'input> Machine<'input> {
             self.tool_state = Some(Tool::On);
             self.tool_on_action
                 .iter()
-                .flat_map(|s| s.iter_fields())
-                .map(Token::from)
+                .flat_map(Snippet::iter_emit_tokens)
                 .collect()
         } else {
             vec![]
@@ -81,8 +80,7 @@ impl<'input> Machine<'input> {
             self.tool_state = Some(Tool::Off);
             self.tool_off_action
                 .iter()
-                .flat_map(|s| s.iter_fields())
-                .map(Token::from)
+                .flat_map(Snippet::iter_emit_tokens)
                 .collect()
         } else {
             vec![]
@@ -93,8 +91,7 @@ impl<'input> Machine<'input> {
     pub fn program_begin(&self) -> Vec<Token<'input>> {
         self.program_begin_sequence
             .iter()
-            .flat_map(|s| s.iter_fields())
-            .map(Token::from)
+            .flat_map(Snippet::iter_emit_tokens)
             .collect()
     }
 
@@ -102,8 +99,7 @@ impl<'input> Machine<'input> {
     pub fn program_end(&self) -> Vec<Token<'input>> {
         self.program_end_sequence
             .iter()
-            .flat_map(|s| s.iter_fields())
-            .map(Token::from)
+            .flat_map(Snippet::iter_emit_tokens)
             .collect()
     }
 

web/Cargo.toml

@@ -12,7 +12,7 @@ license = "MIT"
 wasm-bindgen = "0.2"
 svg2gcode = { path = "../lib" }
 roxmltree = "0"
-g-code = ">= 0.2.5"
+g-code = ">= 0.2.6"
 codespan-reporting = "0.11"
 codespan = "0.11"
 serde = "1"