From 1c73201feebbfd0649fd3edd9a225c0b83e9f4d1 Mon Sep 17 00:00:00 2001
From: babariviere <babariviere@users.noreply.github.com>
Date: Fri, 10 May 2024 15:31:45 +0000
Subject: [PATCH] keymap-drawer render

---
 keymap-drawer/cradio.svg  | 70 ++++++++++++---------------------------
 keymap-drawer/cradio.yaml | 38 +++++----------------
 2 files changed, 30 insertions(+), 78 deletions(-)

diff --git a/keymap-drawer/cradio.svg b/keymap-drawer/cradio.svg
index 7789342..49c6fba 100644
--- a/keymap-drawer/cradio.svg
+++ b/keymap-drawer/cradio.svg
@@ -1,4 +1,4 @@
-<svg width="732" height="2450" viewBox="0 0 732 2450" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="732" height="2408" viewBox="0 0 732 2408" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <defs>/* start glyphs */
 <svg id="mdi:apple-keyboard-command">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-command" viewBox="0 0 24 24"><path d="M6,2A4,4 0 0,1 10,6V8H14V6A4,4 0 0,1 18,2A4,4 0 0,1 22,6A4,4 0 0,1 18,10H16V14H18A4,4 0 0,1 22,18A4,4 0 0,1 18,22A4,4 0 0,1 14,18V16H10V18A4,4 0 0,1 6,22A4,4 0 0,1 2,18A4,4 0 0,1 6,14H8V10H6A4,4 0 0,1 2,6A4,4 0 0,1 6,2M16,18A2,2 0 0,0 18,20A2,2 0 0,0 20,18A2,2 0 0,0 18,16H16V18M14,10H10V14H14V10M6,16A2,2 0 0,0 4,18A2,2 0 0,0 6,20A2,2 0 0,0 8,18V16H6M8,6A2,2 0 0,0 6,4A2,2 0 0,0 4,6A2,2 0 0,0 6,8H8V6M18,8A2,2 0 0,0 20,6A2,2 0 0,0 18,4A2,2 0 0,0 16,6V8H18Z" /></svg>
@@ -253,7 +253,7 @@ rect.held, rect.combo.held {
 </style>
 <g transform="translate(30, 0)" class="layer-base">
 <text x="0" y="28" class="label">base:</text>
-<g transform="translate(0, 98)">
+<g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
@@ -313,16 +313,19 @@ rect.held, rect.combo.held {
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <text x="0" y="-4" class="key tap">R</text>
+<use href="#mdi:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:apple-keyboard-command"/>
 </g>
 <g transform="translate(140, 84)" class="key keypos-12">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <text x="0" y="-4" class="key tap">S</text>
+<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:apple-keyboard-option"/>
 </g>
 <g transform="translate(196, 100)" class="key keypos-13">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <text x="0" y="-4" class="key tap">T</text>
+<use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:apple-keyboard-control"/>
 </g>
 <g transform="translate(252, 108)" class="key keypos-14">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -338,16 +341,19 @@ rect.held, rect.combo.held {
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <text x="0" y="-4" class="key tap">N</text>
+<use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:apple-keyboard-control"/>
 </g>
 <g transform="translate(532, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <text x="0" y="-4" class="key tap">E</text>
+<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:apple-keyboard-option"/>
 </g>
 <g transform="translate(588, 101)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <text x="0" y="-4" class="key tap">I</text>
+<use href="#mdi:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:apple-keyboard-command"/>
 </g>
 <g transform="translate(644, 136)" class="key keypos-19">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -438,71 +444,37 @@ rect.held, rect.combo.held {
 <text x="112" y="37" class="combo tap">=</text>
 </g>
 <g class="combo combopos-3">
-<rect rx="6" ry="6" x="98" y="80" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="105" y="86" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-control"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="108" y="96" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
-</g>
-<g class="combo combopos-4">
 <rect rx="6" ry="6" x="154" y="79" width="28" height="26" class="combo"/>
 <use href="#mdi:keyboard-tab" xlink:href="#mdi:keyboard-tab" x="161" y="85" height="14" width="14.0" class="combo tap glyph mdi:keyboard-tab"/>
 <text x="168" y="103" class="combo hold">mods</text>
 </g>
-<g class="combo combopos-5">
-<rect rx="6" ry="6" x="42" y="106" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="49" y="112" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-command"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="52" y="122" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
-</g>
-<g class="combo combopos-6">
+<g class="combo combopos-4">
 <rect rx="6" ry="6" x="546" y="24" width="28" height="26" class="combo"/>
 <use href="#mdi:backspace-outline" xlink:href="#mdi:backspace-outline" x="553" y="30" height="14" width="14.0" class="combo tap glyph mdi:backspace-outline"/>
 </g>
-<g class="combo combopos-7">
-<rect rx="6" ry="6" x="546" y="80" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="553" y="86" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-control"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="556" y="96" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
-</g>
-<g class="combo combopos-8">
+<g class="combo combopos-5">
 <rect rx="6" ry="6" x="490" y="79" width="28" height="26" class="combo"/>
 <use href="#mdi:keyboard-return" xlink:href="#mdi:keyboard-return" x="497" y="85" height="14" width="14.0" class="combo tap glyph mdi:keyboard-return"/>
 </g>
-<g class="combo combopos-9">
-<rect rx="6" ry="6" x="602" y="106" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-command" xlink:href="#mdi:apple-keyboard-command" x="609" y="112" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-command"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="612" y="122" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
-</g>
-<g class="combo combopos-10">
-<path d="M112,-29 h22 a6.0,6.0 0 0 1 6.0,6.0 v32" class="combo"/>
-<path d="M112,-29 h-22 a6.0,6.0 0 0 0 -6.0,6.0 v106" class="combo"/>
-<rect rx="6" ry="6" x="98" y="-42" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="105" y="-36" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="108" y="-26" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
-</g>
-<g class="combo combopos-11">
-<path d="M560,-29 h-22 a6.0,6.0 0 0 0 -6.0,6.0 v32" class="combo"/>
-<path d="M560,-29 h22 a6.0,6.0 0 0 1 6.0,6.0 v106" class="combo"/>
-<rect rx="6" ry="6" x="546" y="-42" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="553" y="-36" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-option"/>
-<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="556" y="-26" height="8" width="8.0" class="combo hold glyph mdi:circle-small"/>
-</g>
-<g class="combo combopos-12">
+<g class="combo combopos-6">
 <rect rx="6" ry="6" x="182" y="59" width="28" height="26" class="combo"/>
 <text x="196" y="72" class="combo tap">-</text>
 </g>
-<g class="combo combopos-13">
+<g class="combo combopos-7">
 <rect rx="6" ry="6" x="182" y="115" width="28" height="26" class="combo"/>
 <text x="196" y="128" class="combo tap">_</text>
 </g>
-<g class="combo combopos-14">
+<g class="combo combopos-8">
 <rect rx="6" ry="6" x="462" y="59" width="28" height="26" class="combo"/>
 <text x="476" y="72" class="combo tap">:</text>
 </g>
-<g class="combo combopos-15">
+<g class="combo combopos-9">
 <rect rx="6" ry="6" x="462" y="115" width="28" height="26" class="combo"/>
 <text x="476" y="128" class="combo tap">;</text>
 </g>
 </g>
 </g>
-<g transform="translate(30, 378)" class="layer-sym">
+<g transform="translate(30, 336)" class="layer-sym">
 <text x="0" y="28" class="label">sym:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -670,7 +642,7 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 714)" class="layer-nav">
+<g transform="translate(30, 672)" class="layer-nav">
 <text x="0" y="28" class="label">nav:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -736,11 +708,13 @@ rect.held, rect.combo.held {
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <use href="#mdi:apple-keyboard-option" xlink:href="#mdi:apple-keyboard-option" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-option"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(196, 100)" class="key keypos-13">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
 <rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
 <use href="#mdi:apple-keyboard-control" xlink:href="#mdi:apple-keyboard-control" x="-7" y="-11" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-control"/>
+<use href="#mdi:circle-small" xlink:href="#mdi:circle-small" x="-4" y="16" height="8" width="8.0" class="key hold glyph mdi:circle-small"/>
 </g>
 <g transform="translate(252, 108)" class="key keypos-14">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@@ -845,7 +819,7 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1050)" class="layer-winnav">
+<g transform="translate(30, 1008)" class="layer-winnav">
 <text x="0" y="28" class="label">winnav:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -1045,7 +1019,7 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1386)" class="layer-num">
+<g transform="translate(30, 1344)" class="layer-num">
 <text x="0" y="28" class="label">num:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key trans keypos-0">
@@ -1223,7 +1197,7 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1722)" class="layer-fun">
+<g transform="translate(30, 1680)" class="layer-fun">
 <text x="0" y="28" class="label">fun:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -1386,7 +1360,7 @@ rect.held, rect.combo.held {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2058)" class="layer-mods">
+<g transform="translate(30, 2016)" class="layer-mods">
 <text x="0" y="28" class="label">mods:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
diff --git a/keymap-drawer/cradio.yaml b/keymap-drawer/cradio.yaml
index 960747d..a094c80 100644
--- a/keymap-drawer/cradio.yaml
+++ b/keymap-drawer/cradio.yaml
@@ -12,14 +12,14 @@ layers:
   - Y
   - ''''
   - A
-  - R
-  - S
-  - T
+  - {t: R, h: '$$mdi:apple-keyboard-command$$'}
+  - {t: S, h: '$$mdi:apple-keyboard-option$$'}
+  - {t: T, h: '$$mdi:apple-keyboard-control$$'}
   - G
   - M
-  - N
-  - E
-  - I
+  - {t: N, h: '$$mdi:apple-keyboard-control$$'}
+  - {t: E, h: '$$mdi:apple-keyboard-option$$'}
+  - {t: I, h: '$$mdi:apple-keyboard-command$$'}
   - O
   - Z
   - X
@@ -83,8 +83,8 @@ layers:
   - $$mdi:backspace-reverse-outline$$
   - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:circle-small$$'}
   - {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:circle-small$$'}
-  - $$mdi:apple-keyboard-option$$
-  - $$mdi:apple-keyboard-control$$
+  - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'}
+  - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'}
   - $$mdi:keyboard-tab$$
   - $$mdi:backspace-outline$$
   - $$mdi:arrow-left$$
@@ -255,37 +255,15 @@ combos:
 - p: [1, 2]
   k: '='
   l: [base]
-- p: [11, 12]
-  k: {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'}
-  l: [base]
 - p: [12, 13]
   k: {t: '$$mdi:keyboard-tab$$', h: mods}
   l: [base]
-- p: [10, 11]
-  k: {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:circle-small$$'}
-  l: [base]
 - p: [7, 8]
   k: $$mdi:backspace-outline$$
   l: [base]
-- p: [17, 18]
-  k: {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'}
-  l: [base]
 - p: [16, 17]
   k: $$mdi:keyboard-return$$
   l: [base]
-- p: [18, 19]
-  k: {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:circle-small$$'}
-  l: [base]
-- p: [2, 11]
-  k: {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'}
-  l: [base]
-  a: top
-  o: 0.5
-- p: [7, 18]
-  k: {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'}
-  l: [base]
-  a: top
-  o: 0.5
 - p: [3, 13]
   k: '-'
   l: [base]