From 31b9a88edb6a5f86bdb1c13ac693ecd90f6b9999 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Mon, 14 Aug 2023 16:09:09 -0700
Subject: [PATCH 1/6] Add text

---
 dyesub-tool/src/svg/measure.rs     | 4 ++--
 dyesub-tool/templates/document.xml | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dyesub-tool/src/svg/measure.rs b/dyesub-tool/src/svg/measure.rs
index fd59c9f..092c2a6 100644
--- a/dyesub-tool/src/svg/measure.rs
+++ b/dyesub-tool/src/svg/measure.rs
@@ -23,11 +23,11 @@ impl SVGMeasure {
         Self { measure, unit }
     }
 
-    fn to_user_units(self) -> f64 {
+    pub fn to_user_units(self) -> f64 {
         self.measure * self.unit.to_user_units()
     }
 
-    fn to_unit(self, unit: SVGUnit) -> Self {
+    pub fn to_unit(self, unit: SVGUnit) -> Self {
         SVGMeasure {
             measure: self.to_user_units() / unit.to_user_units(),
             unit,
diff --git a/dyesub-tool/templates/document.xml b/dyesub-tool/templates/document.xml
index 7804fe5..de05c53 100644
--- a/dyesub-tool/templates/document.xml
+++ b/dyesub-tool/templates/document.xml
@@ -1,7 +1,13 @@
 <svg version="1.1"
      width="{{ dimensions.width }}" height="{{ dimensions.height }}"
      xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <style type="text/css"><![CDATA[@import url('https://fonts.googleapis.com/css2?family=M+PLUS+Rounded+1c:wght@700&display=swap');]]></style>
+  </defs>
   {% for (x, y) in positions %}
-    <rect x="{{ x }}" y="{{ y }}" rx="2mm" width="{{ box_size }}" height="{{ box_size }}" fill="none" stroke="#cccccc" stroke-width="1pt" />
+    <g x="{{ x }}" y="{{ y }}" transform="translate({{ x.to_user_units() }},{{ y.to_user_units() }})" width="{{ box_size }}" height="{{ box_size }}">
+      <rect width="{{ box_size }}" height="{{ box_size }}" fill="none" stroke="#cccccc" stroke-width="1pt" rx="2mm" />
+      <text x="{{ box_size / 2.0 }}" y="{{ box_size / 2.0 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="0.5cm">あ</text>
+    </g>
   {% endfor %}
 </svg>

From 20e0b8dd084d1e00ed606320a346c73eda70fc03 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Tue, 15 Aug 2023 10:11:22 -0700
Subject: [PATCH 2/6] Show all letter keys, create Key struct

---
 dyesub-tool/src/key/mod.rs         | 28 ++++++++++++++++++++++++
 dyesub-tool/src/key/oyayubi.rs     | 34 ++++++++++++++++++++++++++++++
 dyesub-tool/src/main.rs            | 30 ++++++++++++++------------
 dyesub-tool/templates/document.xml | 13 ++++++++++--
 4 files changed, 90 insertions(+), 15 deletions(-)
 create mode 100644 dyesub-tool/src/key/mod.rs
 create mode 100644 dyesub-tool/src/key/oyayubi.rs

diff --git a/dyesub-tool/src/key/mod.rs b/dyesub-tool/src/key/mod.rs
new file mode 100644
index 0000000..52f710f
--- /dev/null
+++ b/dyesub-tool/src/key/mod.rs
@@ -0,0 +1,28 @@
+mod oyayubi;
+pub use oyayubi::OYAYUBI;
+
+use std::fmt::{Display, self};
+
+pub struct Key {
+    pub latin: char,
+    pub normal: char,
+    pub shift: char,
+    pub alt_shift: Option<char>,
+}
+
+impl Display for Key {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.latin)
+    }
+}
+
+impl Key {
+    const fn new(latin: char, normal: char, shift: char, alt_shift: Option<char>) -> Self {
+        Self {
+            latin,
+            normal,
+            shift,
+            alt_shift,
+        }
+    }
+}
\ No newline at end of file
diff --git a/dyesub-tool/src/key/oyayubi.rs b/dyesub-tool/src/key/oyayubi.rs
new file mode 100644
index 0000000..d94a77c
--- /dev/null
+++ b/dyesub-tool/src/key/oyayubi.rs
@@ -0,0 +1,34 @@
+use super::Key;
+
+pub const OYAYUBI: [Key; 30] = [
+    Key::new('Q', '。', 'ぁ', None),
+    Key::new('W', 'か', 'え', None),
+    Key::new('E', 'た', 'り', None),
+    Key::new('R', 'こ', 'ゃ', None),
+    Key::new('T', 'さ', 'れ', None),
+    Key::new('Y', 'ら', 'よ', Some('ぱ')),
+    Key::new('U', 'ち', 'に', None),
+    Key::new('I', 'く', 'る', None),
+    Key::new('O', 'つ', 'ま', None),
+    Key::new('P', '，', 'ぇ', Some('ぴ')),
+    Key::new('A', 'う', 'を', None),
+    Key::new('S', 'し', 'あ', None),
+    Key::new('D', 'て', 'な', None),
+    Key::new('F', 'け', 'ゅ', None),
+    Key::new('G', 'せ', 'も', None),
+    Key::new('H', 'は', 'み', None),
+    Key::new('J', 'と', 'お', None),
+    Key::new('K', 'き', 'の', None),
+    Key::new('L', 'い', 'ょ', Some('ぽ')),
+    Key::new(';', 'ん', 'っ', None), // Missing +
+    Key::new('Z', '．', 'ぅ', None),
+    Key::new('X', 'ひ', 'ー', None),
+    Key::new('C', 'す', 'ろ', None),
+    Key::new('V', 'ふ', 'や', None),
+    Key::new('B', 'へ', 'ぃ', None),
+    Key::new('N', 'め', 'ぬ', Some('ぷ')),
+    Key::new('M', 'そ', 'ゆ', None),
+    Key::new(',', 'ね', 'む', Some('ぺ')), // Missing <
+    Key::new('.', 'ほ', 'わ', None), // Missing >
+    Key::new('?', '・', 'ぉ', Some('ゎ')) // Missing /
+];
\ No newline at end of file
diff --git a/dyesub-tool/src/main.rs b/dyesub-tool/src/main.rs
index ba9def8..854d8f5 100644
--- a/dyesub-tool/src/main.rs
+++ b/dyesub-tool/src/main.rs
@@ -1,16 +1,19 @@
 pub mod svg;
 use svg::*;
 
+pub mod key;
+use key::*;
+
 use askama::Template;
 use derive_more::From;
 use std::{fs::OpenOptions, io::Write};
 
 #[derive(Template)]
 #[template(path = "document.xml")]
-struct DocumentTemplate {
-    dimensions: DocumentDimensions,
+struct DocumentTemplate<'a> {
+    dimensions: &'a DocumentDimensions,
     box_size: SVGMeasure,
-    positions: Vec<(SVGMeasure, SVGMeasure)>,
+    positions: Vec<(&'a Key, (SVGMeasure, SVGMeasure))>,
 }
 
 struct DocumentDimensions {
@@ -28,17 +31,19 @@ fn positions(
     size: SVGMeasure,
     padding: SVGMeasure,
     dimensions: &DocumentDimensions,
-    count: u32,
-) -> Vec<(SVGMeasure, SVGMeasure)> {
+) -> Vec<(&Key, (SVGMeasure, SVGMeasure))> {
     let grid = size + padding;
     let row_count = ((dimensions.width - padding * 2.0) / grid) as u32;
-    (0..count)
-        .map(|i| {
+    OYAYUBI
+        .iter()
+        .enumerate()
+        .map(|(i, key)| (
+            key,
             (
-                grid * (i % row_count).into() + padding,
-                grid * (i / row_count).into() + padding,
+                grid * (i as u32 % row_count).into() + padding,
+                grid * (i as u32 / row_count).into() + padding,
             )
-        })
+        ))
         .collect()
 }
 
@@ -53,11 +58,10 @@ fn main() -> Result<(), Error> {
         height: SVGMeasure::new(11.0, SVGUnit::Inch),
     };
     let box_size = SVGMeasure::new(14.0, SVGUnit::Millimeter);
-    let boxes = 54;
     let padding = SVGMeasure::new(2.5, SVGUnit::Millimeter);
     let document = DocumentTemplate {
-        positions: positions(box_size, padding, &dimensions, boxes),
-        dimensions,
+        positions: positions(box_size, padding, &dimensions),
+        dimensions: &dimensions,
         box_size,
     };
     write!(file, "{}", document.render()?)?;
diff --git a/dyesub-tool/templates/document.xml b/dyesub-tool/templates/document.xml
index de05c53..7f7d4cb 100644
--- a/dyesub-tool/templates/document.xml
+++ b/dyesub-tool/templates/document.xml
@@ -4,10 +4,19 @@
   <defs>
     <style type="text/css"><![CDATA[@import url('https://fonts.googleapis.com/css2?family=M+PLUS+Rounded+1c:wght@700&display=swap');]]></style>
   </defs>
-  {% for (x, y) in positions %}
+  {% for (key, (x, y)) in positions %}
     <g x="{{ x }}" y="{{ y }}" transform="translate({{ x.to_user_units() }},{{ y.to_user_units() }})" width="{{ box_size }}" height="{{ box_size }}">
       <rect width="{{ box_size }}" height="{{ box_size }}" fill="none" stroke="#cccccc" stroke-width="1pt" rx="2mm" />
-      <text x="{{ box_size / 2.0 }}" y="{{ box_size / 2.0 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="0.5cm">あ</text>
+      {% let dy = "0.125em" %}
+      {% let font_size = "0.45cm" %}
+      {% let latin_font_size = "0.4cm" %}
+      {% let alt_shift_font_size = "0.325cm" %}
+      <text x="{{ box_size * 0.25 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ latin_font_size }}" dy="{{ dy }}">{{ key.latin }}</text>
+      <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ key.shift }}</text>
+      <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.75 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ key.normal }}</text>
+      {% if let Some(alt_shift) = key.alt_shift %}
+      <text x="{{ box_size / 2.0 }}" y="{{ box_size / 2.0 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ alt_shift_font_size }}" dy="{{ dy }}">{{ alt_shift }}</text>
+      {% endif %}
     </g>
   {% endfor %}
 </svg>

From f5e043c981b123c0057d690ad705c55c5498b3c4 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Tue, 15 Aug 2023 10:21:49 -0700
Subject: [PATCH 3/6] Make Key an enum

---
 dyesub-tool/src/key/mod.rs         | 28 +++++-------
 dyesub-tool/src/key/oyayubi.rs     | 69 +++++++++++++++++-------------
 dyesub-tool/templates/document.xml | 25 ++++++-----
 3 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/dyesub-tool/src/key/mod.rs b/dyesub-tool/src/key/mod.rs
index 52f710f..6a10d6b 100644
--- a/dyesub-tool/src/key/mod.rs
+++ b/dyesub-tool/src/key/mod.rs
@@ -3,26 +3,20 @@ pub use oyayubi::OYAYUBI;
 
 use std::fmt::{Display, self};
 
-pub struct Key {
-    pub latin: char,
-    pub normal: char,
-    pub shift: char,
-    pub alt_shift: Option<char>,
+pub enum Key {
+    Oyayubi {
+        latin: char,
+        normal: char,
+        shift: char,
+        alt_shift: Option<char>,
+    }
 }
 
 impl Display for Key {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.latin)
-    }
-}
-
-impl Key {
-    const fn new(latin: char, normal: char, shift: char, alt_shift: Option<char>) -> Self {
-        Self {
-            latin,
-            normal,
-            shift,
-            alt_shift,
-        }
+        use Key::*;
+        write!(f, "{}", match self {
+            Oyayubi { latin, .. } => latin,
+        })
     }
 }
\ No newline at end of file
diff --git a/dyesub-tool/src/key/oyayubi.rs b/dyesub-tool/src/key/oyayubi.rs
index d94a77c..5bbac60 100644
--- a/dyesub-tool/src/key/oyayubi.rs
+++ b/dyesub-tool/src/key/oyayubi.rs
@@ -1,34 +1,43 @@
 use super::Key;
 
+const fn k(latin: char, normal: char, shift: char, alt_shift: Option<char>) -> Key {
+    Key::Oyayubi {
+        latin,
+        normal,
+        shift,
+        alt_shift,
+    }
+}
+
 pub const OYAYUBI: [Key; 30] = [
-    Key::new('Q', '。', 'ぁ', None),
-    Key::new('W', 'か', 'え', None),
-    Key::new('E', 'た', 'り', None),
-    Key::new('R', 'こ', 'ゃ', None),
-    Key::new('T', 'さ', 'れ', None),
-    Key::new('Y', 'ら', 'よ', Some('ぱ')),
-    Key::new('U', 'ち', 'に', None),
-    Key::new('I', 'く', 'る', None),
-    Key::new('O', 'つ', 'ま', None),
-    Key::new('P', '，', 'ぇ', Some('ぴ')),
-    Key::new('A', 'う', 'を', None),
-    Key::new('S', 'し', 'あ', None),
-    Key::new('D', 'て', 'な', None),
-    Key::new('F', 'け', 'ゅ', None),
-    Key::new('G', 'せ', 'も', None),
-    Key::new('H', 'は', 'み', None),
-    Key::new('J', 'と', 'お', None),
-    Key::new('K', 'き', 'の', None),
-    Key::new('L', 'い', 'ょ', Some('ぽ')),
-    Key::new(';', 'ん', 'っ', None), // Missing +
-    Key::new('Z', '．', 'ぅ', None),
-    Key::new('X', 'ひ', 'ー', None),
-    Key::new('C', 'す', 'ろ', None),
-    Key::new('V', 'ふ', 'や', None),
-    Key::new('B', 'へ', 'ぃ', None),
-    Key::new('N', 'め', 'ぬ', Some('ぷ')),
-    Key::new('M', 'そ', 'ゆ', None),
-    Key::new(',', 'ね', 'む', Some('ぺ')), // Missing <
-    Key::new('.', 'ほ', 'わ', None), // Missing >
-    Key::new('?', '・', 'ぉ', Some('ゎ')) // Missing /
+    k('Q', '。', 'ぁ', None),
+    k('W', 'か', 'え', None),
+    k('E', 'た', 'り', None),
+    k('R', 'こ', 'ゃ', None),
+    k('T', 'さ', 'れ', None),
+    k('Y', 'ら', 'よ', Some('ぱ')),
+    k('U', 'ち', 'に', None),
+    k('I', 'く', 'る', None),
+    k('O', 'つ', 'ま', None),
+    k('P', '，', 'ぇ', Some('ぴ')),
+    k('A', 'う', 'を', None),
+    k('S', 'し', 'あ', None),
+    k('D', 'て', 'な', None),
+    k('F', 'け', 'ゅ', None),
+    k('G', 'せ', 'も', None),
+    k('H', 'は', 'み', None),
+    k('J', 'と', 'お', None),
+    k('K', 'き', 'の', None),
+    k('L', 'い', 'ょ', Some('ぽ')),
+    k(';', 'ん', 'っ', None), // Missing +
+    k('Z', '．', 'ぅ', None),
+    k('X', 'ひ', 'ー', None),
+    k('C', 'す', 'ろ', None),
+    k('V', 'ふ', 'や', None),
+    k('B', 'へ', 'ぃ', None),
+    k('N', 'め', 'ぬ', Some('ぷ')),
+    k('M', 'そ', 'ゆ', None),
+    k(',', 'ね', 'む', Some('ぺ')), // Missing <
+    k('.', 'ほ', 'わ', None), // Missing >
+    k('?', '・', 'ぉ', Some('ゎ')) // Missing /
 ];
\ No newline at end of file
diff --git a/dyesub-tool/templates/document.xml b/dyesub-tool/templates/document.xml
index 7f7d4cb..a905954 100644
--- a/dyesub-tool/templates/document.xml
+++ b/dyesub-tool/templates/document.xml
@@ -6,17 +6,20 @@
   </defs>
   {% for (key, (x, y)) in positions %}
     <g x="{{ x }}" y="{{ y }}" transform="translate({{ x.to_user_units() }},{{ y.to_user_units() }})" width="{{ box_size }}" height="{{ box_size }}">
-      <rect width="{{ box_size }}" height="{{ box_size }}" fill="none" stroke="#cccccc" stroke-width="1pt" rx="2mm" />
-      {% let dy = "0.125em" %}
-      {% let font_size = "0.45cm" %}
-      {% let latin_font_size = "0.4cm" %}
-      {% let alt_shift_font_size = "0.325cm" %}
-      <text x="{{ box_size * 0.25 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ latin_font_size }}" dy="{{ dy }}">{{ key.latin }}</text>
-      <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ key.shift }}</text>
-      <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.75 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ key.normal }}</text>
-      {% if let Some(alt_shift) = key.alt_shift %}
-      <text x="{{ box_size / 2.0 }}" y="{{ box_size / 2.0 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ alt_shift_font_size }}" dy="{{ dy }}">{{ alt_shift }}</text>
-      {% endif %}
+      {% match key %}
+        {% when crate::key::Key::Oyayubi with { latin, normal, shift, alt_shift } %}
+          <rect width="{{ box_size }}" height="{{ box_size }}" fill="none" stroke="#cccccc" stroke-width="1pt" rx="2mm" />
+          {% let dy = "0.125em" %}
+          {% let font_size = "0.45cm" %}
+          {% let latin_font_size = "0.4cm" %}
+          {% let alt_shift_font_size = "0.325cm" %}
+          <text x="{{ box_size * 0.25 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ latin_font_size }}" dy="{{ dy }}">{{ latin }}</text>
+          <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ shift }}</text>
+          <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.75 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ normal }}</text>
+          {% if let Some(alt_shift) = alt_shift %}
+            <text x="{{ box_size / 2.0 }}" y="{{ box_size / 2.0 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ alt_shift_font_size }}" dy="{{ dy }}">{{ alt_shift }}</text>
+          {% endif %}
+      {% endmatch %}
     </g>
   {% endfor %}
 </svg>

From da997bd5b619ca206c99765ae6aa0e1d2b58d0d8 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Tue, 15 Aug 2023 11:06:55 -0700
Subject: [PATCH 4/6] Add single keys with variable units

---
 dyesub-tool/src/key/mod.rs         | 38 +++++++++++++++++++++++---
 dyesub-tool/src/key/oyayubi.rs     | 10 +------
 dyesub-tool/src/main.rs            | 43 +++++++++++++++++++-----------
 dyesub-tool/templates/document.xml | 18 ++++++++-----
 4 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/dyesub-tool/src/key/mod.rs b/dyesub-tool/src/key/mod.rs
index 6a10d6b..d90bf4a 100644
--- a/dyesub-tool/src/key/mod.rs
+++ b/dyesub-tool/src/key/mod.rs
@@ -3,20 +3,52 @@ pub use oyayubi::OYAYUBI;
 
 use std::fmt::{Display, self};
 
-pub enum Key {
+#[derive(Clone, Copy)]
+pub enum Key<'a> {
     Oyayubi {
         latin: char,
         normal: char,
         shift: char,
         alt_shift: Option<char>,
+    },
+    Single {
+        text: &'a str,
+        u: f64,
+    },
+}
+
+pub const fn oyayubi<'a>(latin: char, normal: char, shift: char, alt_shift: Option<char>) -> Key<'a> {
+    Key::Oyayubi {
+        latin,
+        normal,
+        shift,
+        alt_shift,
     }
 }
 
-impl Display for Key {
+pub const fn single<'a>(text: &'a str, u: f64) -> Key<'a> {
+    Key::Single {
+        text,
+        u,
+    }
+}
+
+impl<'a> Key<'a> {
+    pub fn width_mod(&self) -> f64 {
+        use Key::*;
+        match self {
+            Oyayubi { .. } => 1.0,
+            Single { u, .. } => *u,
+        }
+    }
+}
+
+impl<'a> Display for Key<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         use Key::*;
         write!(f, "{}", match self {
-            Oyayubi { latin, .. } => latin,
+            Oyayubi { latin, .. } => latin.to_string(),
+            Single { text, .. } => text.to_string(),
         })
     }
 }
\ No newline at end of file
diff --git a/dyesub-tool/src/key/oyayubi.rs b/dyesub-tool/src/key/oyayubi.rs
index 5bbac60..ffffea5 100644
--- a/dyesub-tool/src/key/oyayubi.rs
+++ b/dyesub-tool/src/key/oyayubi.rs
@@ -1,13 +1,5 @@
 use super::Key;
-
-const fn k(latin: char, normal: char, shift: char, alt_shift: Option<char>) -> Key {
-    Key::Oyayubi {
-        latin,
-        normal,
-        shift,
-        alt_shift,
-    }
-}
+use super::oyayubi as k;
 
 pub const OYAYUBI: [Key; 30] = [
     k('Q', '。', 'ぁ', None),
diff --git a/dyesub-tool/src/main.rs b/dyesub-tool/src/main.rs
index 854d8f5..f054c96 100644
--- a/dyesub-tool/src/main.rs
+++ b/dyesub-tool/src/main.rs
@@ -7,13 +7,14 @@ use key::*;
 use askama::Template;
 use derive_more::From;
 use std::{fs::OpenOptions, io::Write};
+use lazy_static::lazy_static;
 
 #[derive(Template)]
 #[template(path = "document.xml")]
 struct DocumentTemplate<'a> {
     dimensions: &'a DocumentDimensions,
     box_size: SVGMeasure,
-    positions: Vec<(&'a Key, (SVGMeasure, SVGMeasure))>,
+    positions: Vec<(&'a Key<'a>, (SVGMeasure, SVGMeasure))>,
 }
 
 struct DocumentDimensions {
@@ -27,24 +28,25 @@ enum Error {
     Template(askama::Error),
 }
 
-fn positions(
+fn positions<'a>(
+    keys: &'a Vec<Key>,
     size: SVGMeasure,
     padding: SVGMeasure,
     dimensions: &DocumentDimensions,
-) -> Vec<(&Key, (SVGMeasure, SVGMeasure))> {
+) -> Vec<(&'a Key<'a>, (SVGMeasure, SVGMeasure))> {
     let grid = size + padding;
-    let row_count = ((dimensions.width - padding * 2.0) / grid) as u32;
-    OYAYUBI
-        .iter()
-        .enumerate()
-        .map(|(i, key)| (
-            key,
-            (
-                grid * (i as u32 % row_count).into() + padding,
-                grid * (i as u32 / row_count).into() + padding,
-            )
-        ))
-        .collect()
+    let mut x = padding;
+    let mut y = padding;
+    let mut positions = Vec::with_capacity(keys.len());
+    for key in keys {
+        if x + grid > dimensions.width {
+            x = padding;
+            y = y + grid;
+        }
+        positions.push((key, (x, y)));
+        x = x + size * key.width_mod() + padding;
+    }
+    positions
 }
 
 fn main() -> Result<(), Error> {
@@ -60,10 +62,19 @@ fn main() -> Result<(), Error> {
     let box_size = SVGMeasure::new(14.0, SVGUnit::Millimeter);
     let padding = SVGMeasure::new(2.5, SVGUnit::Millimeter);
     let document = DocumentTemplate {
-        positions: positions(box_size, padding, &dimensions),
+        positions: positions(&KEYS, box_size, padding, &dimensions),
         dimensions: &dimensions,
         box_size,
     };
     write!(file, "{}", document.render()?)?;
     Ok(())
 }
+
+lazy_static! {
+    static ref KEYS: Vec<Key<'static>> = {
+        let mut keys = OYAYUBI.to_vec();
+        keys.push(single("親指左", 3.0));
+        keys.push(single("親指右", 3.0));
+        keys
+    };
+}
\ No newline at end of file
diff --git a/dyesub-tool/templates/document.xml b/dyesub-tool/templates/document.xml
index a905954..07e94ae 100644
--- a/dyesub-tool/templates/document.xml
+++ b/dyesub-tool/templates/document.xml
@@ -5,20 +5,24 @@
     <style type="text/css"><![CDATA[@import url('https://fonts.googleapis.com/css2?family=M+PLUS+Rounded+1c:wght@700&display=swap');]]></style>
   </defs>
   {% for (key, (x, y)) in positions %}
-    <g x="{{ x }}" y="{{ y }}" transform="translate({{ x.to_user_units() }},{{ y.to_user_units() }})" width="{{ box_size }}" height="{{ box_size }}">
+    {% let width = box_size * key.width_mod() %}
+    <g x="{{ x }}" y="{{ y }}" transform="translate({{ x.to_user_units() }},{{ y.to_user_units() }})" width="{{ width }}" height="{{ box_size }}">
+      <rect width="{{ width }}" height="{{ box_size }}" fill="none" stroke="#cccccc" stroke-width="1pt" rx="2mm" />
+      {% let dy = "0.125em" %}
       {% match key %}
         {% when crate::key::Key::Oyayubi with { latin, normal, shift, alt_shift } %}
-          <rect width="{{ box_size }}" height="{{ box_size }}" fill="none" stroke="#cccccc" stroke-width="1pt" rx="2mm" />
-          {% let dy = "0.125em" %}
           {% let font_size = "0.45cm" %}
           {% let latin_font_size = "0.4cm" %}
           {% let alt_shift_font_size = "0.325cm" %}
-          <text x="{{ box_size * 0.25 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ latin_font_size }}" dy="{{ dy }}">{{ latin }}</text>
-          <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ shift }}</text>
-          <text x="{{ box_size * 0.75 }}" y="{{ box_size * 0.75 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ normal }}</text>
+          <text x="{{ width * 0.25 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ latin_font_size }}" dy="{{ dy }}">{{ latin }}</text>
+          <text x="{{ width * 0.75 }}" y="{{ box_size * 0.25 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ shift }}</text>
+          <text x="{{ width * 0.75 }}" y="{{ box_size * 0.75 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ normal }}</text>
           {% if let Some(alt_shift) = alt_shift %}
-            <text x="{{ box_size / 2.0 }}" y="{{ box_size / 2.0 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ alt_shift_font_size }}" dy="{{ dy }}">{{ alt_shift }}</text>
+            <text x="{{ width / 2.0 }}" y="{{ box_size / 2.0 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ alt_shift_font_size }}" dy="{{ dy }}">{{ alt_shift }}</text>
           {% endif %}
+        {% when crate::key::Key::Single with { text, u } %}
+          {% let font_size = "0.5cm" %}
+          <text x="{{ width * 0.5 }}" y="{{ box_size * 0.5 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ text }}</text>
       {% endmatch %}
     </g>
   {% endfor %}

From 52ed2c87d3f57a1bd57cb37c6d8e75d99e156962 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Tue, 15 Aug 2023 11:34:46 -0700
Subject: [PATCH 5/6] Add icon keys and row breaks

---
 dyesub-tool/assets/next.svg        |   3 +
 dyesub-tool/assets/nixos.svg       | 124 +++++++++++++++++++++++++++++
 dyesub-tool/assets/playpause.svg   |   3 +
 dyesub-tool/assets/previous.svg    |   3 +
 dyesub-tool/src/key/mod.rs         |  16 ++++
 dyesub-tool/src/main.rs            |  11 +++
 dyesub-tool/templates/document.xml |   4 +
 7 files changed, 164 insertions(+)
 create mode 100644 dyesub-tool/assets/next.svg
 create mode 100644 dyesub-tool/assets/nixos.svg
 create mode 100644 dyesub-tool/assets/playpause.svg
 create mode 100644 dyesub-tool/assets/previous.svg

diff --git a/dyesub-tool/assets/next.svg b/dyesub-tool/assets/next.svg
new file mode 100644
index 0000000..b805ced
--- /dev/null
+++ b/dyesub-tool/assets/next.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+  <path fill-rule="evenodd" d="M4.72 3.97a.75.75 0 011.06 0l7.5 7.5a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06-1.06L11.69 12 4.72 5.03a.75.75 0 010-1.06zm6 0a.75.75 0 011.06 0l7.5 7.5a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 11-1.06-1.06L17.69 12l-6.97-6.97a.75.75 0 010-1.06z" clip-rule="evenodd" />
+</svg>
diff --git a/dyesub-tool/assets/nixos.svg b/dyesub-tool/assets/nixos.svg
new file mode 100644
index 0000000..8041d98
--- /dev/null
+++ b/dyesub-tool/assets/nixos.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="44.00663"
+   height="38.168068"
+   viewBox="0 0 41.256216 35.782565"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="nixos.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.087376"
+     inkscape:cx="31.442514"
+     inkscape:cy="15.66395"
+     inkscape:document-units="px"
+     inkscape:current-layer="g5329"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1080"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="print-logo"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-160.45368,535.40252)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="text-2"
+     transform="translate(-27.871478,-422.6377)" />
+  <g
+     style="display:inline"
+     inkscape:label="text-vegur"
+     id="g5329"
+     inkscape:groupmode="layer"
+     transform="translate(-160.45368,535.40252)">
+    <g
+       transform="matrix(0.34788402,0,0,0.34788402,88.02172,-315.64249)"
+       id="g892"
+       style="fill:#000000">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.709135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 244.38844,-579.00705 28.88469,50.03541 -13.27432,0.12452 -7.71151,-13.44265 -7.76655,13.37082 -6.59552,-0.003 -3.37805,-5.83608 11.06498,-19.02614 -7.85472,-13.66872 z"
+         id="path4861"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.709135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 254.81405,-599.61716 -28.88958,50.03257 -6.745,-11.43362 7.78592,-13.3997 -15.46274,-0.0406 -3.29545,-5.71322 3.36517,-5.84351 22.00961,0.0695 7.9101,-13.63673 z"
+         id="use4863"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.709135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 257.03036,-559.62188 57.77427,0.003 -6.52931,11.55814 -15.49744,-0.043 7.69619,13.41143 -3.30007,5.71054 -6.74322,0.008 -10.94463,-19.09562 -15.76482,-0.032 z"
+         id="use4865"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.709135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 290.65703,-581.54493 -28.88469,-50.03541 13.27432,-0.12452 7.71151,13.44265 7.76655,-13.37082 6.59552,0.003 3.37805,5.83609 -11.06498,19.02614 7.85472,13.66872 z"
+         id="use4867"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4873"
+         d="m 244.38844,-579.00705 28.88469,50.03541 -13.27432,0.12452 -7.71151,-13.44265 -7.76655,13.37082 -6.59552,-0.003 -3.37805,-5.83608 11.06498,-19.02614 -7.85472,-13.66872 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.709135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="use4875"
+         d="m 277.93827,-601.05655 -57.77427,-0.003 6.52931,-11.55815 15.49743,0.043 -7.69618,-13.41144 3.30007,-5.71055 6.74322,-0.007 10.94462,19.09563 15.76482,0.032 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.709135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="use4877"
+         d="m 280.19223,-560.94548 28.88958,-50.03256 6.745,11.43363 -7.78592,13.3997 15.46274,0.0406 3.29544,5.71322 -3.36516,5.84353 -22.00961,-0.0695 -7.9101,13.63676 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.709135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/dyesub-tool/assets/playpause.svg b/dyesub-tool/assets/playpause.svg
new file mode 100644
index 0000000..3a02310
--- /dev/null
+++ b/dyesub-tool/assets/playpause.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+  <path d="M15 6.75a.75.75 0 00-.75.75V18a.75.75 0 00.75.75h.75a.75.75 0 00.75-.75V7.5a.75.75 0 00-.75-.75H15zM20.25 6.75a.75.75 0 00-.75.75V18c0 .414.336.75.75.75H21a.75.75 0 00.75-.75V7.5a.75.75 0 00-.75-.75h-.75zM5.055 7.06C3.805 6.347 2.25 7.25 2.25 8.69v8.122c0 1.44 1.555 2.343 2.805 1.628l7.108-4.061c1.26-.72 1.26-2.536 0-3.256L5.055 7.061z" />
+</svg>
diff --git a/dyesub-tool/assets/previous.svg b/dyesub-tool/assets/previous.svg
new file mode 100644
index 0000000..b55a8f9
--- /dev/null
+++ b/dyesub-tool/assets/previous.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+  <path fill-rule="evenodd" d="M13.28 3.97a.75.75 0 010 1.06L6.31 12l6.97 6.97a.75.75 0 11-1.06 1.06l-7.5-7.5a.75.75 0 010-1.06l7.5-7.5a.75.75 0 011.06 0zm6 0a.75.75 0 010 1.06L12.31 12l6.97 6.97a.75.75 0 11-1.06 1.06l-7.5-7.5a.75.75 0 010-1.06l7.5-7.5a.75.75 0 011.06 0z" clip-rule="evenodd" />
+</svg>
diff --git a/dyesub-tool/src/key/mod.rs b/dyesub-tool/src/key/mod.rs
index d90bf4a..28e3553 100644
--- a/dyesub-tool/src/key/mod.rs
+++ b/dyesub-tool/src/key/mod.rs
@@ -15,6 +15,11 @@ pub enum Key<'a> {
         text: &'a str,
         u: f64,
     },
+    Icon {
+        icon_path: &'a str,
+        u: f64,
+    },
+    Break,
 }
 
 pub const fn oyayubi<'a>(latin: char, normal: char, shift: char, alt_shift: Option<char>) -> Key<'a> {
@@ -33,12 +38,21 @@ pub const fn single<'a>(text: &'a str, u: f64) -> Key<'a> {
     }
 }
 
+pub const fn icon<'a>(icon_path: &'a str, u: f64) -> Key<'a> {
+    Key::Icon {
+        icon_path,
+        u,
+    }
+}
+
 impl<'a> Key<'a> {
     pub fn width_mod(&self) -> f64 {
         use Key::*;
         match self {
             Oyayubi { .. } => 1.0,
             Single { u, .. } => *u,
+            Icon { u, .. } => *u,
+            Break => 0.0,
         }
     }
 }
@@ -49,6 +63,8 @@ impl<'a> Display for Key<'a> {
         write!(f, "{}", match self {
             Oyayubi { latin, .. } => latin.to_string(),
             Single { text, .. } => text.to_string(),
+            Icon { icon_path, .. } => icon_path.to_string(),
+            Break => "".to_string(),
         })
     }
 }
\ No newline at end of file
diff --git a/dyesub-tool/src/main.rs b/dyesub-tool/src/main.rs
index f054c96..33139d2 100644
--- a/dyesub-tool/src/main.rs
+++ b/dyesub-tool/src/main.rs
@@ -39,6 +39,11 @@ fn positions<'a>(
     let mut y = padding;
     let mut positions = Vec::with_capacity(keys.len());
     for key in keys {
+        if let Key::Break = key {
+            x = padding;
+            y = y + grid;
+            continue;
+        }
         if x + grid > dimensions.width {
             x = padding;
             y = y + grid;
@@ -73,8 +78,14 @@ fn main() -> Result<(), Error> {
 lazy_static! {
     static ref KEYS: Vec<Key<'static>> = {
         let mut keys = OYAYUBI.to_vec();
+        keys.push(Key::Break);
         keys.push(single("親指左", 3.0));
         keys.push(single("親指右", 3.0));
+        keys.push(Key::Break);
+        keys.push(icon("assets/nixos.svg", 1.0));
+        keys.push(icon("assets/playpause.svg", 1.0));
+        keys.push(icon("assets/previous.svg", 1.0));
+        keys.push(icon("assets/next.svg", 1.0));
         keys
     };
 }
\ No newline at end of file
diff --git a/dyesub-tool/templates/document.xml b/dyesub-tool/templates/document.xml
index 07e94ae..49a9758 100644
--- a/dyesub-tool/templates/document.xml
+++ b/dyesub-tool/templates/document.xml
@@ -23,6 +23,10 @@
         {% when crate::key::Key::Single with { text, u } %}
           {% let font_size = "0.5cm" %}
           <text x="{{ width * 0.5 }}" y="{{ box_size * 0.5 }}" dominant-baseline="middle" text-anchor="middle" style="font-family: 'M PLUS Rounded 1c'" font-size="{{ font_size }}" dy="{{ dy }}">{{ text }}</text>
+        {% when crate::key::Key::Icon with { icon_path, u } %}
+          {% let icon_width_mm = 7.5 %}
+          <image x="{{ width.measure * 0.5 - icon_width_mm * 0.5 }}mm" y="{{ box_size.measure * 0.5 - icon_width_mm * 0.5 }}mm" href="{{ icon_path }}" width="{{ icon_width_mm }}mm" height="{{ icon_width_mm }}mm" />
+        {% when crate::key::Key::Break %}
       {% endmatch %}
     </g>
   {% endfor %}

From 31572568daf0104bcb93ed7b2e42731b02f80d26 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Tue, 15 Aug 2023 11:37:39 -0700
Subject: [PATCH 6/6] Add margin controls, increase to 0.25in

---
 dyesub-tool/src/main.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dyesub-tool/src/main.rs b/dyesub-tool/src/main.rs
index 33139d2..0c0d63f 100644
--- a/dyesub-tool/src/main.rs
+++ b/dyesub-tool/src/main.rs
@@ -31,21 +31,22 @@ enum Error {
 fn positions<'a>(
     keys: &'a Vec<Key>,
     size: SVGMeasure,
+    margin: SVGMeasure,
     padding: SVGMeasure,
     dimensions: &DocumentDimensions,
 ) -> Vec<(&'a Key<'a>, (SVGMeasure, SVGMeasure))> {
     let grid = size + padding;
-    let mut x = padding;
-    let mut y = padding;
+    let mut x = margin;
+    let mut y = margin;
     let mut positions = Vec::with_capacity(keys.len());
     for key in keys {
         if let Key::Break = key {
-            x = padding;
+            x = margin;
             y = y + grid;
             continue;
         }
-        if x + grid > dimensions.width {
-            x = padding;
+        if x + grid > dimensions.width - margin {
+            x = margin;
             y = y + grid;
         }
         positions.push((key, (x, y)));
@@ -66,8 +67,9 @@ fn main() -> Result<(), Error> {
     };
     let box_size = SVGMeasure::new(14.0, SVGUnit::Millimeter);
     let padding = SVGMeasure::new(2.5, SVGUnit::Millimeter);
+    let margin = SVGMeasure::new(0.25, SVGUnit::Inch);
     let document = DocumentTemplate {
-        positions: positions(&KEYS, box_size, padding, &dimensions),
+        positions: positions(&KEYS, box_size, margin, padding, &dimensions),
         dimensions: &dimensions,
         box_size,
     };