Adjust offset for some layouts (#20075)

1 files changed, 160 insertions, 70 deletions

diff --git a/keyboards/aozora/info.json b/keyboards/aozora/info.json
index b49708a336..28bdfe072c 100644
--- a/keyboards/aozora/info.json
+++ b/keyboards/aozora/info.json
@@ -18,79 +18,169 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (F6,B0)", "x":0, "y":0},
-                {"label":"K01 (F6,B1)", "x":1, "y":0},
-                {"label":"K02 (F6,B2)", "x":2, "y":0},
-                {"label":"K03 (F6,B3)", "x":3, "y":0},
-                {"label":"K04 (F6,B7)", "x":4, "y":0},
-                {"label":"K05 (F6,D0)", "x":5, "y":0},
-                {"label":"K06 (F6,D1)", "x":6, "y":0},
-                {"label":"K07 (F6,D4)", "x":7, "y":0},
-                {"label":"K08 (F6,D6)", "x":8, "y":0},
-                {"label":"K09 (F6,D7)", "x":9, "y":0},
-                {"label":"K0A (F6,B4)", "x":10, "y":0},
-                {"label":"K0B (F6,B5)", "x":11, "y":0},
-                {"label":"K0C (F6,B6)", "x":12, "y":0},
-                {"label":"K0D (F6,C6)", "x":13, "y":0, "w":2},
-                {"label":"K0E (F6,C7)", "x":15.25, "y":0},
-                {"label":"K0F (F6,F7)", "x":16.25, "y":0},
-                {"label":"K10 (F5,B0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (F5,B1)", "x":1.5, "y":1},
-                {"label":"K12 (F5,B2)", "x":2.5, "y":1},
-                {"label":"K13 (F5,B3)", "x":3.5, "y":1},
-                {"label":"K14 (F5,B7)", "x":4.5, "y":1},
-                {"label":"K15 (F5,D0)", "x":5.5, "y":1},
-                {"label":"K16 (F5,D1)", "x":6.5, "y":1},
-                {"label":"K17 (F5,D4)", "x":7.5, "y":1},
-                {"label":"K18 (F5,D6)", "x":8.5, "y":1},
-                {"label":"K19 (F5,D7)", "x":9.5, "y":1},
-                {"label":"K1A (F5,B4)", "x":10.5, "y":1},
-                {"label":"K1B (F5,B5)", "x":11.5, "y":1},
-                {"label":"K1C (F5,B6)", "x":12.5, "y":1},
-                {"label":"K1D (F5,C6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (F5,C7)", "x":15.25, "y":1},
-                {"label":"K1F (F5,F7)", "x":16.25, "y":1},
-                {"label":"K20 (F4,B0)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F4,B1)", "x":1.75, "y":2},
-                {"label":"K22 (F4,B2)", "x":2.75, "y":2},
-                {"label":"K23 (F4,B3)", "x":3.75, "y":2},
-                {"label":"K24 (F4,B7)", "x":4.75, "y":2},
-                {"label":"K25 (F4,D0)", "x":5.75, "y":2},
-                {"label":"K26 (F4,D1)", "x":6.75, "y":2},
-                {"label":"K27 (F4,D4)", "x":7.75, "y":2},
-                {"label":"K28 (F4,D6)", "x":8.75, "y":2},
-                {"label":"K29 (F4,D7)", "x":9.75, "y":2},
-                {"label":"K2A (F4,B4)", "x":10.75, "y":2},
-                {"label":"K2B (F4,B5)", "x":11.75, "y":2},
-                {"label":"K2D (F4,C6)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K30 (F1,B0)", "x":0, "y":3, "w":2.25},
-                {"label":"K31 (F1,B1)", "x":2.25, "y":3},
-                {"label":"K32 (F1,B2)", "x":3.25, "y":3},
-                {"label":"K33 (F1,B3)", "x":4.25, "y":3},
-                {"label":"K34 (F1,B7)", "x":5.25, "y":3},
-                {"label":"K35 (F1,D0)", "x":6.25, "y":3},
-                {"label":"K36 (F1,D1)", "x":7.25, "y":3},
-                {"label":"K37 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K38 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K39 (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3A (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3D (F1,C6)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F1,C7)", "x":15.25, "y":3},
-                {"label":"K3F (F1,F7)", "x":16.25, "y":3},
-                {"label":"K40 (F0,B0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F0,B1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F0,B2)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K44 (F0,B7)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K48 (F0,D6)", "x":10, "y":4, "w":1.25},
-                {"label":"K49 (F0,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4A (F0,B4)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F0,C6)", "x":14.25, "y":4},
-                {"label":"K4E (F0,C7)", "x":15.25, "y":4},
-                {"label":"K4F (F0,F7)", "x":16.25, "y":4}
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":15.25, "y":3},
+                {"x":16.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
             ]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"|", "x":13, "y":1.25}, {"label":"Backspace", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Del", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"~", "x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"\\", "x":12.25, "y":4.25}, {"label":"Shift", "x":13.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":15.25, "y":4.25}, {"label":"Fn", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"\u2190", "x":14.25, "y":5.25}, {"label":"\u2193", "x":15.25, "y":5.25}, {"label":"\u2192", "x":16.25, "y":5.25}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2, "w":1.25},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3},
+                {"x":13.25, "y":3, "w":1.75},
+
+                {"x":15.25, "y":3},
+                {"x":16.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
         }
     }
 }