From e1696e868d0267ede1373ac543b1374297bb9376 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sat, 10 Feb 2024 14:01:04 -0800
Subject: [PATCH] Created layout

---
 gui/shaviankb/assets.tal    | 38 ++++++++++++++++++++++
 gui/shaviankb/shaviankb.tal | 65 -------------------------------------
 2 files changed, 38 insertions(+), 65 deletions(-)

diff --git a/gui/shaviankb/assets.tal b/gui/shaviankb/assets.tal
index 76e674d..ea50018 100644
--- a/gui/shaviankb/assets.tal
+++ b/gui/shaviankb/assets.tal
@@ -1,3 +1,41 @@
+@layout ( > )
+	( top row )
+	( > ) =keys/yew =keys/ooze =keys/seven
+	( > ) =keys/age =keys/egg =keys/eight
+	( > ) =keys/ice =keys/ash =keys/nine
+	( > ) =keys/are =keys/ah =keys/at
+	( > ) =keys/oil =keys/out =keys/colon
+	( > ) =keys/fee =keys/vow =keys/dot
+	( > ) =keys/yea =keys/woe =keys/period
+	( > ) =keys/thigh =keys/they =keys/underscore
+	( > ) =keys/hung =keys/haha =keys/star
+	( middle row )
+	( > ) =keys/roar =keys/loll =keys/four
+	( > ) =keys/eat =keys/if =keys/five
+	( > ) =keys/ado =keys/ian =keys/six
+	( > ) =keys/mime =keys/nun =keys/apos
+	( > ) =keys/or =keys/awe =keys/semi
+	( > ) =keys/tot =keys/dead =keys/em
+	( > ) =keys/so =keys/zoo =keys/hyphen
+	( > ) =keys/kick =keys/gag =keys/question
+	( > ) =keys/peep =keys/bib =keys/exclamation
+	( bottom row )
+	( > ) =keys/air =keys/on =keys/one
+	( > ) =keys/err =keys/up =keys/two
+	( > ) =keys/ear =keys/array =keys/three
+	( > ) =keys/wool =keys/oak =keys/zero
+	( > ) =keys/church =keys/judge =keys/paren-a
+	( > ) =keys/sure =keys/measure =keys/paren-b
+	( > ) =keys/none =keys/none =keys/left
+	( > ) =keys/none =keys/none =keys/right
+	( > ) =keys/none =keys/none =keys/backspace
+	( extra row )
+	( > ) =keys/none =keys/none =keys/none
+	( > ) =keys/none =keys/none =keys/comma
+	( > ) =keys/none =keys/none =keys/space
+	( > ) =keys/none =keys/none =keys/period
+	( > ) =keys/none =keys/none =keys/enter
+
 @button-icn
 &top [
 	001f 2040 4040 4040 00ff 0000 0000 0000
diff --git a/gui/shaviankb/shaviankb.tal b/gui/shaviankb/shaviankb.tal
index fe60b9c..81969d0 100644
--- a/gui/shaviankb/shaviankb.tal
+++ b/gui/shaviankb/shaviankb.tal
@@ -85,71 +85,6 @@
 	&c ( -- )
 		#0f AND DUP #09 GTH #27 MUL ADD [ LIT "0 ] ADD #18 DEO
 		JMP2r
-	
-(
-@|assets )
-
-@layout ( > )
-	&row1 ={
-	( > ) =keys/peep =keys/peep =keys/peep
-	( > ) =shavian =shavian =shavian
-	( > ) =shavian =shavian =shavian
-	( > ) =shavian =shavian =shavian
-	( > ) =shavian =shavian =shavian
-	( > ) =shavian =shavian =shavian
-	( > ) =shavian =shavian =shavian
-	( > ) =shavian =shavian =shavian
-	( > ) =shavian =shavian =shavian }
-
-
-@keys ( sprite* length* values )
-	&peep [ =shavian/peep ] ={ f090 9190 }
-	&bib ( > )
-		&tot
-	&dead ( > )
-		&kick
-	&gag ( > )
-		&fee
-	&vow ( > )
-		&thigh
-	&they ( > )
-		&so
-	&zoo ( > )
-		&sure
-	&measure ( > )
-		&church
-	&judge ( > )
-		&yea
-	&woe ( > )
-		&hung
-	&haha ( > )
-		&loll
-	&ado ( > )
-		&roar
-	&up ( > )
-		&mime
-	&on ( > )
-		&nun
-	&oak ( > )
-		&if
-	&wool ( > )
-		&eat
-	&ooze ( > )
-		&egg
-	&out ( > )
-		&age
-	&oil ( > )
-		&ash
-	&ah ( > )
-		&ice
-	&awe ( > )
-		&are
-	&array ( > )
-		&or
-	&ear ( > )
-		&air
-	&ian ( > )
-		&err &yew
 
 ~assets.tal