From 6b1551d1039542a73c979da56468c46c3194ce42 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 24 Nov 2024 10:56:19 +0100
Subject: layouts format: Add 'c' as a synonym for 'key0'

The attribute 'c' specifies the symbol in the center of a key, just like
'key0'. This adds consistency with the cardinal direction attributes and
is intended to make layouts more readable.
---
 srcs/juloo.keyboard2/KeyboardData.java |  2 +-
 srcs/layouts/latn_qwerty_us.xml        | 58 +++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'srcs')

diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java
index 3432fe1..aca8ba3 100644
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -473,7 +473,7 @@ public final class KeyboardData
     {
       KeyValue[] ks = new KeyValue[9];
       int keysflags = 0;
-      keysflags |= parse_key_attr(parser, parser.getAttributeValue(null, "key0"), ks, 0);
+      keysflags |= parse_key_attr(parser, get_key_attr(parser, "key0", "c"), ks, 0);
       /* Swipe gestures (key1-key8 diagram above), with compass-point synonyms. */
       keysflags |= parse_key_attr(parser, get_key_attr(parser, "key1", "nw"), ks, 1);
       keysflags |= parse_key_attr(parser, get_key_attr(parser, "key2", "ne"), ks, 2);
diff --git a/srcs/layouts/latn_qwerty_us.xml b/srcs/layouts/latn_qwerty_us.xml
index 08c4961..a97525e 100644
--- a/srcs/layouts/latn_qwerty_us.xml
+++ b/srcs/layouts/latn_qwerty_us.xml
@@ -8,7 +8,7 @@ symbols to the corners of a key, they are arranged following the cardinal
 directions:
 
    nw   n   ne
-   w   key0  e
+   w    c    e
    sw   s   se
 
 Symbols prefixed with 'loc ' are not visible on the keyboard. They are used to
@@ -23,37 +23,37 @@ doc/Possible-key-values.md for the keys that have a special meaning.
 -->
 <keyboard name="QWERTY (US)" script="latin">
   <row>
-    <key key0="q" ne="1" se="loc esc"/>
-    <key key0="w" nw="~" ne="2" sw="\@"/>
-    <key key0="e" nw="!" ne="3" sw="\#" se="loc €"/>
-    <key key0="r" ne="4" sw="$"/>
-    <key key0="t" ne="5" sw="%"/>
-    <key key0="y" ne="6" sw="^"/>
-    <key key0="u" ne="7" sw="&amp;"/>
-    <key key0="i" ne="8" sw="*"/>
-    <key key0="o" ne="9" sw="(" se=")"/>
-    <key key0="p" ne="0"/>
+    <key c="q" ne="1" se="loc esc"/>
+    <key c="w" nw="~" ne="2" sw="\@"/>
+    <key c="e" nw="!" ne="3" sw="\#" se="loc €"/>
+    <key c="r" ne="4" sw="$"/>
+    <key c="t" ne="5" sw="%"/>
+    <key c="y" ne="6" sw="^"/>
+    <key c="u" ne="7" sw="&amp;"/>
+    <key c="i" ne="8" sw="*"/>
+    <key c="o" ne="9" sw="(" se=")"/>
+    <key c="p" ne="0"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" nw="loc tab" ne="`"/>
-    <key key0="s" ne="loc §" sw="loc ß"/>
-    <key key0="d"/>
-    <key key0="f"/>
-    <key key0="g" ne="-" sw="_"/>
-    <key key0="h" ne="=" sw="+"/>
-    <key key0="j" se="}" sw="{"/>
-    <key key0="k" sw="[" se="]"/>
-    <key key0="l" ne="|" sw="\\"/>
+    <key shift="0.5" c="a" nw="loc tab" ne="`"/>
+    <key c="s" ne="loc §" sw="loc ß"/>
+    <key c="d"/>
+    <key c="f"/>
+    <key c="g" ne="-" sw="_"/>
+    <key c="h" ne="=" sw="+"/>
+    <key c="j" se="}" sw="{"/>
+    <key c="k" sw="[" se="]"/>
+    <key c="l" ne="|" sw="\\"/>
   </row>
   <row>
-    <key width="1.5" key0="shift" ne="loc capslock"/>
-    <key key0="z"/>
-    <key key0="x" ne="loc †"/>
-    <key key0="c" ne="&lt;" sw="."/>
-    <key key0="v" ne="&gt;" sw=","/>
-    <key key0="b" ne="\?" sw="/"/>
-    <key key0="n" ne=":" sw=";"/>
-    <key key0="m" ne="&quot;" sw="'"/>
-    <key width="1.5" key0="backspace" ne="delete"/>
+    <key width="1.5" c="shift" ne="loc capslock"/>
+    <key c="z"/>
+    <key c="x" ne="loc †"/>
+    <key c="c" ne="&lt;" sw="."/>
+    <key c="v" ne="&gt;" sw=","/>
+    <key c="b" ne="\?" sw="/"/>
+    <key c="n" ne=":" sw=";"/>
+    <key c="m" ne="&quot;" sw="'"/>
+    <key width="1.5" c="backspace" ne="delete"/>
   </row>
 </keyboard>
-- 
cgit v1.2.3