diff --git a/v3/xd/xd60rev2.json b/v3/xd/xd60rev2.json index 75a7e27cea..a19f88df7b 100644 --- a/v3/xd/xd60rev2.json +++ b/v3/xd/xd60rev2.json @@ -15,35 +15,40 @@ "layouts": { "labels": [ "Split Backspace", - "ISO Enter", [ - "Row 4", - "Default", - "Split right shift", - "Arrows", - "Default ISO", - "ISO split right shift", - "ISO arrows", - "[2U] Default", - "[2U] Split left shift", - "[2U] Split right shift", - "[2U] Split both shifts" + "Enter key Cluster", + "ANSI", + "ISO", + "Split ANSI" ], [ - "Bottom row", - "6.25U", - "7U", - "6.25U Arrows", - "6.25U Arrows B", - "7U Arrows", + "Shift Row", + "ANSI Standard", + "ANSI Tsangan", + "ANSI Arrows", + "ISO Standard", + "ISO Tsangan", + "ISO Arrows", + "64-key ANSI", + "64-key ANSI 2u RShift", + "64-key ISO", + "64-key ISO 2u RShift" + ], + [ + "Bottom Row", + "Standard", + "Standard Arrows", + "Tsangan", + "WKL", "HHKB", - "WKL" + "Tsangan Arrows", + "LWKL Standard", + "LWKL Arrows" ] ], "keymap": [ [ { - "x": 2.5, "c": "#777777" }, "0,0", @@ -76,7 +81,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.5 }, @@ -109,11 +113,16 @@ "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n1,1", + { + "x": 1, + "c": "#cccccc", + "w": 1.5 + }, + "1,13\n\n\n1,2" ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.75 }, @@ -141,11 +150,19 @@ "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n1,1", + { + "x": 1.5 + }, + "2,12\n\n\n1,2", + { + "c": "#777777", + "w": 1.25 + }, + "2,13\n\n\n1,2" ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 2.25 }, @@ -171,7 +188,6 @@ ], [ { - "x": 2.5, "w": 1.25 }, "4,0\n\n\n3,0", @@ -208,8 +224,7 @@ ], [ { - "y": 0.5, - "x": 2.5, + "y": 0.25, "w": 2.25 }, "3,0\n\n\n2,1", @@ -235,7 +250,6 @@ ], [ { - "x": 2.5, "w": 2.25 }, "3,0\n\n\n2,2", @@ -252,23 +266,28 @@ "3,9\n\n\n2,2", "3,10\n\n\n2,2", { + "c": "#aaaaaa", "w": 1.75 }, "4,7\n\n\n2,2", + { + "c": "#777777" + }, "3,13\n\n\n2,2", + { + "c": "#aaaaaa" + }, "3,12\n\n\n2,2" ], [ { - "x": 2.5, - "c": "#aaaaaa", "w": 1.25 }, "3,0\n\n\n2,3", - "3,1\n\n\n2,3", { "c": "#cccccc" }, + "3,1\n\n\n2,3", "3,2\n\n\n2,3", "3,3\n\n\n2,3", "3,4\n\n\n2,3", @@ -287,14 +306,13 @@ ], [ { - "x": 2.5, "w": 1.25 }, "3,0\n\n\n2,4", - "3,1\n\n\n2,4", { "c": "#cccccc" }, + "3,1\n\n\n2,4", "3,2\n\n\n2,4", "3,3\n\n\n2,4", "3,4\n\n\n2,4", @@ -314,14 +332,13 @@ ], [ { - "x": 2.5, "w": 1.25 }, "3,0\n\n\n2,5", - "3,1\n\n\n2,5", { "c": "#cccccc" }, + "3,1\n\n\n2,5", "3,2\n\n\n2,5", "3,3\n\n\n2,5", "3,4\n\n\n2,5", @@ -332,16 +349,21 @@ "3,9\n\n\n2,5", "3,10\n\n\n2,5", { + "c": "#aaaaaa", "w": 1.75 }, "4,7\n\n\n2,5", + { + "c": "#777777" + }, "3,13\n\n\n2,5", + { + "c": "#aaaaaa" + }, "3,12\n\n\n2,5" ], [ { - "x": 2.5, - "c": "#aaaaaa", "w": 2 }, "3,0\n\n\n2,6", @@ -358,19 +380,24 @@ "3,9\n\n\n2,6", "3,10\n\n\n2,6", "3,11\n\n\n2,6", + { + "c": "#aaaaaa" + }, "4,7\n\n\n2,6", { - "c": "#aaaaaa", - "w": 2 + "c": "#777777" }, - "3,13\n\n\n2,6" + "3,13\n\n\n2,6", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,6" ], [ { - "x": 2.5 + "w": 2 }, "3,0\n\n\n2,7", - "3,1\n\n\n2,7", { "c": "#cccccc" }, @@ -392,14 +419,11 @@ "3,13\n\n\n2,7" ], [ - { - "x": 2.5, - "w": 2 - }, "3,0\n\n\n2,8", { "c": "#cccccc" }, + "3,1\n\n\n2,8", "3,2\n\n\n2,8", "3,3\n\n\n2,8", "3,4\n\n\n2,8", @@ -410,22 +434,25 @@ "3,9\n\n\n2,8", "3,10\n\n\n2,8", "3,11\n\n\n2,8", - "4,7\n\n\n2,8", { "c": "#aaaaaa" }, + "4,7\n\n\n2,8", + { + "c": "#777777" + }, "3,13\n\n\n2,8", + { + "c": "#aaaaaa" + }, "3,12\n\n\n2,8" ], [ - { - "x": 2.5 - }, "3,0\n\n\n2,9", - "3,1\n\n\n2,9", { "c": "#cccccc" }, + "3,1\n\n\n2,9", "3,2\n\n\n2,9", "3,3\n\n\n2,9", "3,4\n\n\n2,9", @@ -438,121 +465,121 @@ "3,11\n\n\n2,9", "4,7\n\n\n2,9", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 2 }, - "3,13\n\n\n2,9", - "3,12\n\n\n2,9" + "3,13\n\n\n2,9" ], [ { - "y": 0.5, - "x": 2.5, - "w": 1.5 + "y": 0.25, + "w": 1.25 }, "4,0\n\n\n3,1", + { + "w": 1.25 + }, "4,1\n\n\n3,1", { - "w": 1.5 + "w": 1.25 }, "4,2\n\n\n3,1", { "c": "#cccccc", - "w": 7 + "w": 6.25 }, "4,5\n\n\n3,1", { - "c": "#aaaaaa", - "w": 1.5 + "c": "#aaaaaa" }, + "4,10\n\n\n3,1", "4,11\n\n\n3,1", - "4,12\n\n\n3,1", { - "w": 1.5 + "c": "#777777" }, + "4,8\n\n\n3,1", + "4,12\n\n\n3,1", "4,13\n\n\n3,1" ], [ { - "x": 2.5, - "w": 1.25 + "c": "#aaaaaa", + "w": 1.5 }, "4,0\n\n\n3,2", - { - "w": 1.25 - }, "4,1\n\n\n3,2", { - "w": 1.25 + "w": 1.5 }, "4,2\n\n\n3,2", { "c": "#cccccc", - "w": 6.25 + "w": 7 }, "4,5\n\n\n3,2", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.5 }, - "4,10\n\n\n3,2", "4,11\n\n\n3,2", - "4,8\n\n\n3,2", "4,12\n\n\n3,2", + { + "w": 1.5 + }, "4,13\n\n\n3,2" ], [ { - "x": 2.5, "w": 1.5 }, "4,0\n\n\n3,3", - "4,1\n\n\n3,3", { - "w": 1.25 + "x": 1, + "w": 1.5 }, "4,2\n\n\n3,3", { "c": "#cccccc", - "w": 6.25 + "w": 7 }, "4,5\n\n\n3,3", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.5 }, - "4,10\n\n\n3,3", "4,11\n\n\n3,3", - "4,8\n\n\n3,3", - "4,12\n\n\n3,3", + { + "x": 1, + "w": 1.5 + }, "4,13\n\n\n3,3" ], [ { - "x": 2.5, - "w": 1.5 + "w": 1.5, + "d": true }, - "4,0\n\n\n3,4", + "\n\n\n3,4", + "4,1\n\n\n3,4", { "w": 1.5 }, - "4,1\n\n\n3,4", + "4,2\n\n\n3,4", { "c": "#cccccc", "w": 7 }, "4,5\n\n\n3,4", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.5 }, - "4,10\n\n\n3,4", "4,11\n\n\n3,4", - "4,8\n\n\n3,4", - "4,12\n\n\n3,4", - "4,13\n\n\n3,4" + "4,12\n\n\n3,4" ], [ { - "x": 2.5, - "w": 1.5, - "d": true + "w": 1.5 }, "4,0\n\n\n3,5", "4,1\n\n\n3,5", @@ -566,31 +593,26 @@ }, "4,5\n\n\n3,5", { - "c": "#aaaaaa", - "w": 1.5 + "c": "#aaaaaa" }, "4,11\n\n\n3,5", - "4,12\n\n\n3,5", { - "w": 1.5, - "d": true + "c": "#777777" }, + "4,8\n\n\n3,5", + "4,12\n\n\n3,5", "4,13\n\n\n3,5" ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, "4,0\n\n\n3,6", - { - "d": true - }, - "\n\n\n3,6", { "w": 1.5 }, - "4,2\n\n\n3,6", + "4,1\n\n\n3,6", { "c": "#cccccc", "w": 7 @@ -598,17 +620,47 @@ "4,5\n\n\n3,6", { "c": "#aaaaaa", - "w": 1.5 + "w": 1.25 + }, + "4,10\n\n\n3,6", + { + "w": 1.25 }, "4,11\n\n\n3,6", { - "d": true + "w": 1.25 }, - "\n\n\n3,6", + "4,12\n\n\n3,6", { - "w": 1.5 + "w": 1.25 }, "4,13\n\n\n3,6" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,7", + { + "w": 1.5 + }, + "4,1\n\n\n3,7", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,7", + { + "c": "#aaaaaa" + }, + "4,10\n\n\n3,7", + "4,11\n\n\n3,7", + { + "c": "#777777" + }, + "4,8\n\n\n3,7", + "4,12\n\n\n3,7", + "4,13\n\n\n3,7" ] ] } diff --git a/v3/xd/xd60rev3.json b/v3/xd/xd60rev3.json index 76e037dca2..bb7972de3a 100644 --- a/v3/xd/xd60rev3.json +++ b/v3/xd/xd60rev3.json @@ -15,35 +15,40 @@ "layouts": { "labels": [ "Split Backspace", - "ISO Enter", [ - "Row 4", - "Default", - "Split right shift", - "Arrows", - "Default ISO", - "ISO split right shift", - "ISO arrows", - "[2U] Default", - "[2U] Split left shift", - "[2U] Split right shift", - "[2U] Split both shifts" + "Enter key Cluster", + "ANSI", + "ISO", + "Split ANSI" ], [ - "Bottom row", - "6.25U", - "7U", - "6.25U Arrows", - "6.25U Arrows B", - "7U Arrows", + "Shift Row", + "ANSI Standard", + "ANSI Tsangan", + "ANSI Arrows", + "ISO Standard", + "ISO Tsangan", + "ISO Arrows", + "64-key ANSI", + "64-key ANSI 2u RShift", + "64-key ISO", + "64-key ISO 2u RShift" + ], + [ + "Bottom Row", + "Standard", + "Standard Arrows", + "Tsangan", + "WKL", "HHKB", - "WKL" + "Tsangan Arrows", + "LWKL Standard", + "LWKL Arrows" ] ], "keymap": [ [ { - "x": 2.5, "c": "#777777" }, "0,0", @@ -76,7 +81,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.5 }, @@ -109,11 +113,16 @@ "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n1,1", + { + "x": 1, + "c": "#cccccc", + "w": 1.5 + }, + "1,13\n\n\n1,2" ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.75 }, @@ -141,11 +150,19 @@ "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n1,1", + { + "x": 1.5 + }, + "2,12\n\n\n1,2", + { + "c": "#777777", + "w": 1.25 + }, + "2,13\n\n\n1,2" ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 2.25 }, @@ -171,7 +188,6 @@ ], [ { - "x": 2.5, "w": 1.25 }, "4,0\n\n\n3,0", @@ -208,8 +224,7 @@ ], [ { - "y": 0.5, - "x": 2.5, + "y": 0.25, "w": 2.25 }, "3,0\n\n\n2,1", @@ -235,7 +250,6 @@ ], [ { - "x": 2.5, "w": 2.25 }, "3,0\n\n\n2,2", @@ -252,23 +266,28 @@ "3,9\n\n\n2,2", "3,10\n\n\n2,2", { + "c": "#aaaaaa", "w": 1.75 }, "4,7\n\n\n2,2", + { + "c": "#777777" + }, "3,13\n\n\n2,2", + { + "c": "#aaaaaa" + }, "3,12\n\n\n2,2" ], [ { - "x": 2.5, - "c": "#aaaaaa", "w": 1.25 }, "3,0\n\n\n2,3", - "3,1\n\n\n2,3", { "c": "#cccccc" }, + "3,1\n\n\n2,3", "3,2\n\n\n2,3", "3,3\n\n\n2,3", "3,4\n\n\n2,3", @@ -287,14 +306,13 @@ ], [ { - "x": 2.5, "w": 1.25 }, "3,0\n\n\n2,4", - "3,1\n\n\n2,4", { "c": "#cccccc" }, + "3,1\n\n\n2,4", "3,2\n\n\n2,4", "3,3\n\n\n2,4", "3,4\n\n\n2,4", @@ -314,14 +332,13 @@ ], [ { - "x": 2.5, "w": 1.25 }, "3,0\n\n\n2,5", - "3,1\n\n\n2,5", { "c": "#cccccc" }, + "3,1\n\n\n2,5", "3,2\n\n\n2,5", "3,3\n\n\n2,5", "3,4\n\n\n2,5", @@ -332,16 +349,21 @@ "3,9\n\n\n2,5", "3,10\n\n\n2,5", { + "c": "#aaaaaa", "w": 1.75 }, "4,7\n\n\n2,5", + { + "c": "#777777" + }, "3,13\n\n\n2,5", + { + "c": "#aaaaaa" + }, "3,12\n\n\n2,5" ], [ { - "x": 2.5, - "c": "#aaaaaa", "w": 2 }, "3,0\n\n\n2,6", @@ -358,19 +380,24 @@ "3,9\n\n\n2,6", "3,10\n\n\n2,6", "3,11\n\n\n2,6", + { + "c": "#aaaaaa" + }, "4,7\n\n\n2,6", { - "c": "#aaaaaa", - "w": 2 + "c": "#777777" }, - "3,13\n\n\n2,6" + "3,13\n\n\n2,6", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,6" ], [ { - "x": 2.5 + "w": 2 }, "3,0\n\n\n2,7", - "3,1\n\n\n2,7", { "c": "#cccccc" }, @@ -392,14 +419,11 @@ "3,13\n\n\n2,7" ], [ - { - "x": 2.5, - "w": 2 - }, "3,0\n\n\n2,8", { "c": "#cccccc" }, + "3,1\n\n\n2,8", "3,2\n\n\n2,8", "3,3\n\n\n2,8", "3,4\n\n\n2,8", @@ -410,22 +434,25 @@ "3,9\n\n\n2,8", "3,10\n\n\n2,8", "3,11\n\n\n2,8", - "4,7\n\n\n2,8", { "c": "#aaaaaa" }, + "4,7\n\n\n2,8", + { + "c": "#777777" + }, "3,13\n\n\n2,8", + { + "c": "#aaaaaa" + }, "3,12\n\n\n2,8" ], [ - { - "x": 2.5 - }, "3,0\n\n\n2,9", - "3,1\n\n\n2,9", { "c": "#cccccc" }, + "3,1\n\n\n2,9", "3,2\n\n\n2,9", "3,3\n\n\n2,9", "3,4\n\n\n2,9", @@ -438,121 +465,121 @@ "3,11\n\n\n2,9", "4,7\n\n\n2,9", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 2 }, - "3,13\n\n\n2,9", - "3,12\n\n\n2,9" + "3,13\n\n\n2,9" ], [ { - "y": 0.5, - "x": 2.5, - "w": 1.5 + "y": 0.25, + "w": 1.25 }, "4,0\n\n\n3,1", + { + "w": 1.25 + }, "4,1\n\n\n3,1", { - "w": 1.5 + "w": 1.25 }, "4,2\n\n\n3,1", { "c": "#cccccc", - "w": 7 + "w": 6.25 }, "4,5\n\n\n3,1", { - "c": "#aaaaaa", - "w": 1.5 + "c": "#aaaaaa" }, + "4,10\n\n\n3,1", "4,11\n\n\n3,1", - "4,12\n\n\n3,1", { - "w": 1.5 + "c": "#777777" }, + "4,8\n\n\n3,1", + "4,12\n\n\n3,1", "4,13\n\n\n3,1" ], [ { - "x": 2.5, - "w": 1.25 + "c": "#aaaaaa", + "w": 1.5 }, "4,0\n\n\n3,2", - { - "w": 1.25 - }, "4,1\n\n\n3,2", { - "w": 1.25 + "w": 1.5 }, "4,2\n\n\n3,2", { "c": "#cccccc", - "w": 6.25 + "w": 7 }, "4,5\n\n\n3,2", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.5 }, - "4,10\n\n\n3,2", "4,11\n\n\n3,2", - "4,8\n\n\n3,2", "4,12\n\n\n3,2", + { + "w": 1.5 + }, "4,13\n\n\n3,2" ], [ { - "x": 2.5, "w": 1.5 }, "4,0\n\n\n3,3", - "4,1\n\n\n3,3", { - "w": 1.25 + "x": 1, + "w": 1.5 }, "4,2\n\n\n3,3", { "c": "#cccccc", - "w": 6.25 + "w": 7 }, "4,5\n\n\n3,3", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.5 }, - "4,10\n\n\n3,3", "4,11\n\n\n3,3", - "4,8\n\n\n3,3", - "4,12\n\n\n3,3", + { + "x": 1, + "w": 1.5 + }, "4,13\n\n\n3,3" ], [ { - "x": 2.5, - "w": 1.5 + "w": 1.5, + "d": true }, - "4,0\n\n\n3,4", + "\n\n\n3,4", + "4,1\n\n\n3,4", { "w": 1.5 }, - "4,1\n\n\n3,4", + "4,2\n\n\n3,4", { "c": "#cccccc", "w": 7 }, "4,5\n\n\n3,4", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.5 }, - "4,10\n\n\n3,4", "4,11\n\n\n3,4", - "4,8\n\n\n3,4", - "4,12\n\n\n3,4", - "4,13\n\n\n3,4" + "4,12\n\n\n3,4" ], [ { - "x": 2.5, - "w": 1.5, - "d": true + "w": 1.5 }, "4,0\n\n\n3,5", "4,1\n\n\n3,5", @@ -566,31 +593,26 @@ }, "4,5\n\n\n3,5", { - "c": "#aaaaaa", - "w": 1.5 + "c": "#aaaaaa" }, "4,11\n\n\n3,5", - "4,12\n\n\n3,5", { - "w": 1.5, - "d": true + "c": "#777777" }, + "4,8\n\n\n3,5", + "4,12\n\n\n3,5", "4,13\n\n\n3,5" ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, "4,0\n\n\n3,6", - { - "d": true - }, - "\n\n\n3,6", { "w": 1.5 }, - "4,2\n\n\n3,6", + "4,1\n\n\n3,6", { "c": "#cccccc", "w": 7 @@ -598,17 +620,47 @@ "4,5\n\n\n3,6", { "c": "#aaaaaa", - "w": 1.5 + "w": 1.25 + }, + "4,10\n\n\n3,6", + { + "w": 1.25 }, "4,11\n\n\n3,6", { - "d": true + "w": 1.25 }, - "\n\n\n3,6", + "4,12\n\n\n3,6", { - "w": 1.5 + "w": 1.25 }, "4,13\n\n\n3,6" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,7", + { + "w": 1.5 + }, + "4,1\n\n\n3,7", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,7", + { + "c": "#aaaaaa" + }, + "4,10\n\n\n3,7", + "4,11\n\n\n3,7", + { + "c": "#777777" + }, + "4,8\n\n\n3,7", + "4,12\n\n\n3,7", + "4,13\n\n\n3,7" ] ] }