From d755be081f199f88adc1f041a88f8e17c2c3d75b Mon Sep 17 00:00:00 2001
From: Anastazius Khayatidaryan <zdarian@asu.edu>
Date: Mon, 14 Jul 2025 19:31:34 -0700
Subject: [PATCH 1/5] improved dvorak, but added as alternate

---
 srcs/layouts/latn_dvorak2.xml | 39 +++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcs/layouts/latn_dvorak2.xml

diff --git a/srcs/layouts/latn_dvorak2.xml b/srcs/layouts/latn_dvorak2.xml
new file mode 100644
index 000000000..3d270796e
--- /dev/null
+++ b/srcs/layouts/latn_dvorak2.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="Dvorak" script="latin">
+  <row>
+    <key width="1.2" key0="shift" key7="esc" key4="delete"/>
+    <key width="0.9" key0="." key1="&quot;" key4="'" />
+    <key key0="p" key1="!" key2="loc accent_ring" key3="f11_placeholder" key4="," />
+    <key key0="y" key1="loc accent_grave" key3="f12_placeholder" key1="&lt;" key4="&gt;" />
+    <key key0="f" key3="loc €" key7="$" key8="%" />
+    <key key0="g" key7="=" key8="+" />
+    <key key0="c" key3="(" key2=")" key1="loc accent_trema" key4="loc accent_circonflexe" />
+    <key key0="r" key3="{" key2="}" />
+    <key key0="l" key4="loc £" key3="[" key2="]" />
+    <key width="0.9" key0="backspace" key7="\?" key3="/" />
+  </row>
+  <row>
+    <key key0="a" key2="loc accent_caron" key7="1" key3="loc å" key4="\#" />
+    <key key0="o" key2="loc accent_macron" key7="2" key3="loc accent_ogonek" />
+    <key key0="e" key7="3" key3="loc accent_dot_above" />
+    <key key0="u" key2="loc æ" key7="4" key3="loc accent_double_aigu" />
+    <key key0="i" key7="5" key8="|" />
+    <key key0="d" key7="6" key8="loc ð" />
+    <key key0="h" key7="7" key8="loc ȝ" />
+    <key key0="t" key7="8" key8="loc þ" />
+    <key key0="n" key7="9" key8="\\" />
+    <key key0="s" key7="0" key4="loc ß" key3="tab" />
+  </row>
+  <row>
+    <key key0=";" key7=":" />
+    <key key0="q" key1="loc accent_tilde" key7="~" key8="^" />
+    <key key0="j" key1="loc accent_aigu" />
+    <key key0="k" key1="loc ø" />
+    <key key0="x" key1="loc accent_cedille"/>
+    <key key0="b"/>
+    <key key0="m" key7="`" key8="&amp;" />
+    <key key0="w" key8="loc ƿ" />
+    <key key0="v" key8="\@" key7="*" />
+    <key key0="z" key7="-" key3="_"/>
+  </row>
+</keyboard>

From aed453a8fc4487562850c5ceb600a0ddcd797256 Mon Sep 17 00:00:00 2001
From: Anastazius Khayatidaryan <zdarian@asu.edu>
Date: Mon, 14 Jul 2025 20:39:59 -0700
Subject: [PATCH 2/5] fix overlapping tags

---
 srcs/layouts/latn_dvorak2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcs/layouts/latn_dvorak2.xml b/srcs/layouts/latn_dvorak2.xml
index 3d270796e..727da9e3c 100644
--- a/srcs/layouts/latn_dvorak2.xml
+++ b/srcs/layouts/latn_dvorak2.xml
@@ -4,7 +4,7 @@
     <key width="1.2" key0="shift" key7="esc" key4="delete"/>
     <key width="0.9" key0="." key1="&quot;" key4="'" />
     <key key0="p" key1="!" key2="loc accent_ring" key3="f11_placeholder" key4="," />
-    <key key0="y" key1="loc accent_grave" key3="f12_placeholder" key1="&lt;" key4="&gt;" />
+    <key key0="y" key2="loc accent_grave" key3="f12_placeholder" key1="&lt;" key4="&gt;" />
     <key key0="f" key3="loc €" key7="$" key8="%" />
     <key key0="g" key7="=" key8="+" />
     <key key0="c" key3="(" key2=")" key1="loc accent_trema" key4="loc accent_circonflexe" />

From 4b4e24a851a0290fe794d99a198bb4c1f8a9c833 Mon Sep 17 00:00:00 2001
From: Anastazius Khayatidaryan <zdarian@asu.edu>
Date: Mon, 14 Jul 2025 20:40:40 -0700
Subject: [PATCH 3/5] removed temporary tse as tajiki doesnt need it

---
 srcs/layouts/cyrl_yqukeng_tj.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcs/layouts/cyrl_yqukeng_tj.xml b/srcs/layouts/cyrl_yqukeng_tj.xml
index e0a16b015..04eb2aa4a 100644
--- a/srcs/layouts/cyrl_yqukeng_tj.xml
+++ b/srcs/layouts/cyrl_yqukeng_tj.xml
@@ -33,7 +33,7 @@
     <key key0="с"  key7="&amp;" key8="\#" />
     <key key0="м" key7="|" key8="\\" />
     <key key0="и" key7="~" />
-    <key key0="т" key7="ц" />
+    <key key0="т" />
     <key key0="ӣ" key3="&lt;" key2="&gt;" />
     <key key0="б" key7="ъ" key8="ы" />
     <key key0="ю" key7="&quot;" key8="'"/>

From d1c8994b923a2e126cd27348b21fc1aa5d038f21 Mon Sep 17 00:00:00 2001
From: Anastazius Khayatidaryan <zdarian@asu.edu>
Date: Tue, 15 Jul 2025 00:03:12 -0700
Subject: [PATCH 4/5] removed f11 f12 and ran gen_layouts.py

---
 res/values/layouts.xml        | 3 +++
 srcs/layouts/latn_dvorak2.xml | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/values/layouts.xml b/res/values/layouts.xml
index 22337f9fe..a92eeb5fb 100644
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -42,6 +42,7 @@
     <item>latn_azerty_fr</item>
     <item>latn_bepo_fr</item>
     <item>latn_bone</item>
+    <item>latn_dvorak2</item>
     <item>latn_neo2</item>
     <item>latn_qwerty_apl</item>
     <item>latn_qwerty_az</item>
@@ -129,6 +130,7 @@
     <item>AZERTY (Français)</item>
     <item>BEPO (Français)</item>
     <item>Bone</item>
+    <item>Dvorak</item>
     <item>Neo 2</item>
     <item>QWERTY (APL)</item>
     <item>QWERTY (Azərbaycanca)</item>
@@ -216,6 +218,7 @@
     <item>@xml/latn_azerty_fr</item>
     <item>@xml/latn_bepo_fr</item>
     <item>@xml/latn_bone</item>
+    <item>@xml/latn_dvorak2</item>
     <item>@xml/latn_neo2</item>
     <item>@xml/latn_qwerty_apl</item>
     <item>@xml/latn_qwerty_az</item>
diff --git a/srcs/layouts/latn_dvorak2.xml b/srcs/layouts/latn_dvorak2.xml
index 727da9e3c..e2c2b0fdf 100644
--- a/srcs/layouts/latn_dvorak2.xml
+++ b/srcs/layouts/latn_dvorak2.xml
@@ -3,8 +3,8 @@
   <row>
     <key width="1.2" key0="shift" key7="esc" key4="delete"/>
     <key width="0.9" key0="." key1="&quot;" key4="'" />
-    <key key0="p" key1="!" key2="loc accent_ring" key3="f11_placeholder" key4="," />
-    <key key0="y" key2="loc accent_grave" key3="f12_placeholder" key1="&lt;" key4="&gt;" />
+    <key key0="p" key1="!" key2="loc accent_ring" key4="," />
+    <key key0="y" key2="loc accent_grave" key1="&lt;" key4="&gt;" />
     <key key0="f" key3="loc €" key7="$" key8="%" />
     <key key0="g" key7="=" key8="+" />
     <key key0="c" key3="(" key2=")" key1="loc accent_trema" key4="loc accent_circonflexe" />

From 78621564542fef95f06d3e9106a502e01dbd3bdb Mon Sep 17 00:00:00 2001
From: Anastazius Khayatidaryan <zdarian@asu.edu>
Date: Sat, 26 Jul 2025 16:20:01 -0700
Subject: [PATCH 5/5] move backspace; improve alignment; keys are smaller
 though

---
 srcs/layouts/latn_dvorak2.xml | 75 ++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/srcs/layouts/latn_dvorak2.xml b/srcs/layouts/latn_dvorak2.xml
index e2c2b0fdf..6b376e5b4 100644
--- a/srcs/layouts/latn_dvorak2.xml
+++ b/srcs/layouts/latn_dvorak2.xml
@@ -1,39 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Dvorak" script="latin">
-  <row>
-    <key width="1.2" key0="shift" key7="esc" key4="delete"/>
-    <key width="0.9" key0="." key1="&quot;" key4="'" />
-    <key key0="p" key1="!" key2="loc accent_ring" key4="," />
-    <key key0="y" key2="loc accent_grave" key1="&lt;" key4="&gt;" />
-    <key key0="f" key3="loc €" key7="$" key8="%" />
-    <key key0="g" key7="=" key8="+" />
-    <key key0="c" key3="(" key2=")" key1="loc accent_trema" key4="loc accent_circonflexe" />
-    <key key0="r" key3="{" key2="}" />
-    <key key0="l" key4="loc £" key3="[" key2="]" />
-    <key width="0.9" key0="backspace" key7="\?" key3="/" />
-  </row>
-  <row>
-    <key key0="a" key2="loc accent_caron" key7="1" key3="loc å" key4="\#" />
-    <key key0="o" key2="loc accent_macron" key7="2" key3="loc accent_ogonek" />
-    <key key0="e" key7="3" key3="loc accent_dot_above" />
-    <key key0="u" key2="loc æ" key7="4" key3="loc accent_double_aigu" />
-    <key key0="i" key7="5" key8="|" />
-    <key key0="d" key7="6" key8="loc ð" />
-    <key key0="h" key7="7" key8="loc ȝ" />
-    <key key0="t" key7="8" key8="loc þ" />
-    <key key0="n" key7="9" key8="\\" />
-    <key key0="s" key7="0" key4="loc ß" key3="tab" />
-  </row>
-  <row>
-    <key key0=";" key7=":" />
-    <key key0="q" key1="loc accent_tilde" key7="~" key8="^" />
-    <key key0="j" key1="loc accent_aigu" />
-    <key key0="k" key1="loc ø" />
-    <key key0="x" key1="loc accent_cedille"/>
-    <key key0="b"/>
-    <key key0="m" key7="`" key8="&amp;" />
-    <key key0="w" key8="loc ƿ" />
-    <key key0="v" key8="\@" key7="*" />
-    <key key0="z" key7="-" key3="_"/>
-  </row>
+  <row>
+    <key width="1.2" key0="shift" key3="loc accent_tilde" key7="~" key4="esc" />
+    <key width="0.85" key0="," key1="&quot;" key4="'" />
+    <key width="0.85" key0="." key1="&lt;" key4="&gt;" />
+    <key key0="p" key7="!" key8="loc accent_ring" />
+    <key width="1.1" key0="y" key7="$" key8="loc accent_grave" />
+    <key width="1.1" key0="f" key7="loc €" key8="%" />
+    <key key0="g" key7="=" key8="+" />
+    <key key0="c" key3="(" key2=")" key1="loc accent_trema" key4="loc accent_circonflexe" />
+    <key key0="r" key3="{" key2="}" />
+    <key key0="l" key4="loc £" key3="[" key2="]" />
+    <key width="0.8" key0="/" key7="\?"  key3="^" />
+  </row>
+  <row>
+    <key width="1.02" key0="a" key2="loc accent_caron" key7="1" key3="loc å" key4="\#" />
+    <key width="1.02" key0="o" key2="loc accent_macron" key7="2" key3="loc accent_ogonek" key8="loc ø" />
+    <key width="1.02" key0="e" key7="3" key3="loc accent_dot_above" key8="loc ə" />
+    <key width="1.02" key0="u" key8="loc æ" key7="4" key3="loc accent_double_aigu" />
+    <key width="1.01" key0="i" key7="5" key8="loc ı" />
+    <key width="1.01" key0="d" key7="6" key8="loc ð" />
+    <key key0="h" key7="7" key8="ȝ" />
+    <key key0="t" key7="8" key8="loc þ" />
+    <key key0="n" key7="9" key8="\\" />
+    <key key0="s" key7="0" key4="loc ß" />
+    <key width="0.8" key0="-" key3="_" key7="tab" />
+  </row>
+  <row>
+    <key width="0.88" key0=";" key7=":" />
+    <key key0="q" key7="loc shareText" />
+    <key key0="j" key7="loc accent_aigu" />
+    <key key0="k" key7="|" />
+    <key width="0.98" key0="x" key7="loc accent_cedille"/>
+    <key width="0.98" key0="b" key7="&amp;" />
+    <key width="0.96" key0="m" key7="`" />
+    <key width="0.96" key0="w" key7="ƿ" />
+    <key width="0.96" key0="v" key7="*" />
+    <key width="0.96" key0="z" key7="\@" />
+    <key width="1.2" key0="backspace" key7="delete"/>
+  </row>
 </keyboard>