From e0d4e07b86b2dc4319ed0b93a807438a914c662d Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 17 Jun 2024 11:27:32 +0100 Subject: [PATCH 1/2] initial commit --- v3/xd/xd60rev2.json | 504 ++++++++++++++++++-------------------------- v3/xd/xd60rev3.json | 504 ++++++++++++++++++-------------------------- 2 files changed, 412 insertions(+), 596 deletions(-) diff --git a/v3/xd/xd60rev2.json b/v3/xd/xd60rev2.json index 75a7e27cea..4d514ae5b0 100644 --- a/v3/xd/xd60rev2.json +++ b/v3/xd/xd60rev2.json @@ -15,35 +15,56 @@ "layouts": { "labels": [ "Split Backspace", - "ISO Enter", [ - "Row 4", - "Default", - "Split right shift", + "Enter key Cluster", + "ANSI", + "ISO", + "Split ANSI" + ], + [ + "Shift Row", + "ANSI", + "ISO", + "64-key ANSI", + "64-key ISO" + ], + [ + "Right Shift Cluster", + "Standard", + "Tsangan", "Arrows", - "Default ISO", - "ISO split right shift", - "ISO arrows", - "[2U] Default", - "[2U] Split left shift", - "[2U] Split right shift", - "[2U] Split both shifts" + "64-key", + "64-Key 2u" + ], + [ + "Left Modifiers", + "Standard", + "Standard Alt.", + "Tsangan", + "HHKB", + "WKL", + "LWKL" + ], + [ + "Spacebar", + "Standard", + "Tsangan", + "LWKL" ], [ - "Bottom row", - "6.25U", - "7U", - "6.25U Arrows", - "6.25U Arrows B", - "7U Arrows", + "Right Modifiers", + "Standard", + "Standard Alt.", + "Arrows", + "Tsangan", "HHKB", - "WKL" + "WKL", + "Tsangan Arrows" ] ], "keymap": [ [ { - "x": 2.5, "c": "#777777" }, "0,0", @@ -76,7 +97,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.5 }, @@ -109,11 +129,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 +166,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 }, @@ -162,60 +195,89 @@ "3,8\n\n\n2,0", "3,9\n\n\n2,0", "3,10\n\n\n2,0", - "3,11\n\n\n2,0", + "3,11\n\n\n3,0", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,0" + "3,13\n\n\n3,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,11\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n3,1", + "3,12\n\n\n3,1" ], [ { - "x": 2.5, + "w": 3.75, + "d": true + }, + "\n\n\n5,0", + { + "x": -3.75, "w": 1.25 }, - "4,0\n\n\n3,0", + "4,0\n\n\n4,0", { "w": 1.25 }, - "4,1\n\n\n3,0", + "4,1\n\n\n4,0", { "w": 1.25 }, - "4,2\n\n\n3,0", + "4,2\n\n\n4,0", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,0", + "4,5\n\n\n5,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,0", + "4,10\n\n\n6,0", { "w": 1.25 }, - "4,11\n\n\n3,0", + "4,11\n\n\n6,0", { "w": 1.25 }, - "4,12\n\n\n3,0", + "4,12\n\n\n6,0", { "w": 1.25 }, - "4,13\n\n\n3,0" + "4,13\n\n\n6,0", + { + "x": 0.25, + "w": 1.75 + }, + "4,7\n\n\n3,2", + { + "c": "#777777" + }, + "3,13\n\n\n3,2", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n3,2" ], [ { - "y": 0.5, - "x": 2.5, - "w": 2.25 + "y": 0.25, + "w": 1.25 }, "3,0\n\n\n2,1", { "c": "#cccccc" }, + "3,1\n\n\n2,1", "3,2\n\n\n2,1", "3,3\n\n\n2,1", "3,4\n\n\n2,1", @@ -225,18 +287,28 @@ "3,8\n\n\n2,1", "3,9\n\n\n2,1", "3,10\n\n\n2,1", - "3,11\n\n\n2,1", { - "c": "#aaaaaa", - "w": 1.75 + "x": 4, + "w": 0.75, + "d": true + }, + "\n\n\n3,3", + { + "c": "#aaaaaa" + }, + "4,7\n\n\n3,3", + { + "c": "#777777" + }, + "3,13\n\n\n3,3", + { + "c": "#aaaaaa" }, - "3,13\n\n\n2,1", - "3,12\n\n\n2,1" + "3,12\n\n\n3,3" ], [ { - "x": 2.5, - "w": 2.25 + "w": 2 }, "3,0\n\n\n2,2", { @@ -251,24 +323,26 @@ "3,8\n\n\n2,2", "3,9\n\n\n2,2", "3,10\n\n\n2,2", + "3,11\n\n\n2,2", { - "w": 1.75 + "x": 3.25, + "w": 0.75, + "d": true }, - "4,7\n\n\n2,2", - "3,13\n\n\n2,2", - "3,12\n\n\n2,2" - ], - [ + "\n\n\n3,4", + "4,7\n\n\n3,4", { - "x": 2.5, "c": "#aaaaaa", - "w": 1.25 + "w": 2 }, + "3,13\n\n\n3,4" + ], + [ "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", @@ -278,337 +352,171 @@ "3,8\n\n\n2,3", "3,9\n\n\n2,3", "3,10\n\n\n2,3", - "3,11\n\n\n2,3", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,13\n\n\n2,3" + "3,11\n\n\n2,3" ], [ { - "x": 2.5, - "w": 1.25 - }, - "3,0\n\n\n2,4", - "3,1\n\n\n2,4", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,4", - "3,3\n\n\n2,4", - "3,4\n\n\n2,4", - "3,5\n\n\n2,4", - "3,6\n\n\n2,4", - "3,7\n\n\n2,4", - "3,8\n\n\n2,4", - "3,9\n\n\n2,4", - "3,10\n\n\n2,4", - "3,11\n\n\n2,4", - { + "y": 0.25, "c": "#aaaaaa", - "w": 1.75 + "w": 1.5 }, - "3,13\n\n\n2,4", - "3,12\n\n\n2,4" - ], - [ + "4,0\n\n\n4,1", + "4,1\n\n\n4,1", { - "x": 2.5, "w": 1.25 }, - "3,0\n\n\n2,5", - "3,1\n\n\n2,5", + "4,2\n\n\n4,1", { - "c": "#cccccc" - }, - "3,2\n\n\n2,5", - "3,3\n\n\n2,5", - "3,4\n\n\n2,5", - "3,5\n\n\n2,5", - "3,6\n\n\n2,5", - "3,7\n\n\n2,5", - "3,8\n\n\n2,5", - "3,9\n\n\n2,5", - "3,10\n\n\n2,5", - { - "w": 1.75 - }, - "4,7\n\n\n2,5", - "3,13\n\n\n2,5", - "3,12\n\n\n2,5" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 2 - }, - "3,0\n\n\n2,6", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,6", - "3,3\n\n\n2,6", - "3,4\n\n\n2,6", - "3,5\n\n\n2,6", - "3,6\n\n\n2,6", - "3,7\n\n\n2,6", - "3,8\n\n\n2,6", - "3,9\n\n\n2,6", - "3,10\n\n\n2,6", - "3,11\n\n\n2,6", - "4,7\n\n\n2,6", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,13\n\n\n2,6" - ], - [ - { - "x": 2.5 - }, - "3,0\n\n\n2,7", - "3,1\n\n\n2,7", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,7", - "3,3\n\n\n2,7", - "3,4\n\n\n2,7", - "3,5\n\n\n2,7", - "3,6\n\n\n2,7", - "3,7\n\n\n2,7", - "3,8\n\n\n2,7", - "3,9\n\n\n2,7", - "3,10\n\n\n2,7", - "3,11\n\n\n2,7", - "4,7\n\n\n2,7", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,13\n\n\n2,7" - ], - [ - { - "x": 2.5, - "w": 2 + "x": 6.25, + "w": 1.25 }, - "3,0\n\n\n2,8", + "4,10\n\n\n6,1", { - "c": "#cccccc" + "w": 1.25 }, - "3,2\n\n\n2,8", - "3,3\n\n\n2,8", - "3,4\n\n\n2,8", - "3,5\n\n\n2,8", - "3,6\n\n\n2,8", - "3,7\n\n\n2,8", - "3,8\n\n\n2,8", - "3,9\n\n\n2,8", - "3,10\n\n\n2,8", - "3,11\n\n\n2,8", - "4,7\n\n\n2,8", + "4,11\n\n\n6,1", + "4,12\n\n\n6,1", { - "c": "#aaaaaa" + "w": 1.5 }, - "3,13\n\n\n2,8", - "3,12\n\n\n2,8" + "4,13\n\n\n6,1" ], [ { - "x": 2.5 - }, - "3,0\n\n\n2,9", - "3,1\n\n\n2,9", - { - "c": "#cccccc" + "w": 1.5 }, - "3,2\n\n\n2,9", - "3,3\n\n\n2,9", - "3,4\n\n\n2,9", - "3,5\n\n\n2,9", - "3,6\n\n\n2,9", - "3,7\n\n\n2,9", - "3,8\n\n\n2,9", - "3,9\n\n\n2,9", - "3,10\n\n\n2,9", - "3,11\n\n\n2,9", - "4,7\n\n\n2,9", + "4,0\n\n\n4,2", { - "c": "#aaaaaa" + "x": -1.5, + "w": 4, + "d": true }, - "3,13\n\n\n2,9", - "3,12\n\n\n2,9" - ], - [ + "\n\n\n5,1", { - "y": 0.5, - "x": 2.5, - "w": 1.5 + "x": -2.5 }, - "4,0\n\n\n3,1", - "4,1\n\n\n3,1", + "4,1\n\n\n4,2", { "w": 1.5 }, - "4,2\n\n\n3,1", + "4,2\n\n\n4,2", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,1", - "4,12\n\n\n3,1", - { - "w": 1.5 - }, - "4,13\n\n\n3,1" + "4,5\n\n\n5,1" ], [ { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,2", - { - "w": 1.25 + "c": "#aaaaaa", + "w": 1.5, + "d": true }, - "4,1\n\n\n3,2", + "\n\n\n4,3", + "4,1\n\n\n4,3", { - "w": 1.25 + "w": 1.5 }, - "4,2\n\n\n3,2", + "4,2\n\n\n4,3", { - "c": "#cccccc", - "w": 6.25 + "x": 6 }, - "4,5\n\n\n3,2", + "4,10\n\n\n6,2", + "4,11\n\n\n6,2", { - "c": "#aaaaaa" + "c": "#777777" }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", - "4,8\n\n\n3,2", - "4,12\n\n\n3,2", - "4,13\n\n\n3,2" + "4,8\n\n\n6,2", + "4,12\n\n\n6,2", + "4,13\n\n\n6,2" ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n3,3", - "4,1\n\n\n3,3", - { - "w": 1.25 - }, - "4,2\n\n\n3,3", + "4,0\n\n\n4,4", { - "c": "#cccccc", - "w": 6.25 + "x": 1, + "w": 1.5 }, - "4,5\n\n\n3,3", + "4,2\n\n\n4,4", { - "c": "#aaaaaa" + "x": 6, + "d": true }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", - "4,8\n\n\n3,3", - "4,12\n\n\n3,3", - "4,13\n\n\n3,3" - ], - [ + "\n\n\n6,3", { - "x": 2.5, "w": 1.5 }, - "4,0\n\n\n3,4", + "4,11\n\n\n6,3", + "4,12\n\n\n6,3", { "w": 1.5 }, - "4,1\n\n\n3,4", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n3,4", - { - "c": "#aaaaaa" - }, - "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,13\n\n\n6,3" ], [ { - "x": 2.5, - "w": 1.5, + "w": 1.5 + }, + "4,0\n\n\n4,5", + { + "x": -1.5, + "w": 3, "d": true }, - "4,0\n\n\n3,5", - "4,1\n\n\n3,5", + "\n\n\n5,2", { + "x": -1.5, "w": 1.5 }, - "4,2\n\n\n3,5", + "4,1\n\n\n4,5", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n3,5", + "4,5\n\n\n5,2", { "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,5", - "4,12\n\n\n3,5", - { - "w": 1.5, "d": true }, - "4,13\n\n\n3,5" - ], - [ + "\n\n\n6,4", { - "x": 2.5, "w": 1.5 }, - "4,0\n\n\n3,6", + "4,11\n\n\n6,4", + "4,12\n\n\n6,4" + ], + [ { + "x": 10, "d": true }, - "\n\n\n3,6", + "\n\n\n6,5", { "w": 1.5 }, - "4,2\n\n\n3,6", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n3,6", + "4,11\n\n\n6,5", { - "c": "#aaaaaa", + "x": 1, "w": 1.5 }, - "4,11\n\n\n3,6", + "4,13\n\n\n6,5" + ], + [ { + "x": 10, "d": true }, - "\n\n\n3,6", + "\n\n\n6,6", + "4,11\n\n\n6,6", { - "w": 1.5 + "c": "#777777" }, - "4,13\n\n\n3,6" + "4,8\n\n\n6,6", + "4,12\n\n\n6,6", + "4,13\n\n\n6,6" ] ] } diff --git a/v3/xd/xd60rev3.json b/v3/xd/xd60rev3.json index 76e037dca2..9b52e31136 100644 --- a/v3/xd/xd60rev3.json +++ b/v3/xd/xd60rev3.json @@ -15,35 +15,56 @@ "layouts": { "labels": [ "Split Backspace", - "ISO Enter", [ - "Row 4", - "Default", - "Split right shift", + "Enter key Cluster", + "ANSI", + "ISO", + "Split ANSI" + ], + [ + "Shift Row", + "ANSI", + "ISO", + "64-key ANSI", + "64-key ISO" + ], + [ + "Right Shift Cluster", + "Standard", + "Tsangan", "Arrows", - "Default ISO", - "ISO split right shift", - "ISO arrows", - "[2U] Default", - "[2U] Split left shift", - "[2U] Split right shift", - "[2U] Split both shifts" + "64-key", + "64-Key 2u" + ], + [ + "Left Modifiers", + "Standard", + "Standard Alt.", + "Tsangan", + "HHKB", + "WKL", + "LWKL" + ], + [ + "Spacebar", + "Standard", + "Tsangan", + "LWKL" ], [ - "Bottom row", - "6.25U", - "7U", - "6.25U Arrows", - "6.25U Arrows B", - "7U Arrows", + "Right Modifiers", + "Standard", + "Standard Alt.", + "Arrows", + "Tsangan", "HHKB", - "WKL" + "WKL", + "Tsangan Arrows" ] ], "keymap": [ [ { - "x": 2.5, "c": "#777777" }, "0,0", @@ -76,7 +97,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.5 }, @@ -109,11 +129,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 +166,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 }, @@ -162,60 +195,89 @@ "3,8\n\n\n2,0", "3,9\n\n\n2,0", "3,10\n\n\n2,0", - "3,11\n\n\n2,0", + "3,11\n\n\n3,0", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,0" + "3,13\n\n\n3,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,11\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n3,1", + "3,12\n\n\n3,1" ], [ { - "x": 2.5, + "w": 3.75, + "d": true + }, + "\n\n\n5,0", + { + "x": -3.75, "w": 1.25 }, - "4,0\n\n\n3,0", + "4,0\n\n\n4,0", { "w": 1.25 }, - "4,1\n\n\n3,0", + "4,1\n\n\n4,0", { "w": 1.25 }, - "4,2\n\n\n3,0", + "4,2\n\n\n4,0", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,0", + "4,5\n\n\n5,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,0", + "4,10\n\n\n6,0", { "w": 1.25 }, - "4,11\n\n\n3,0", + "4,11\n\n\n6,0", { "w": 1.25 }, - "4,12\n\n\n3,0", + "4,12\n\n\n6,0", { "w": 1.25 }, - "4,13\n\n\n3,0" + "4,13\n\n\n6,0", + { + "x": 0.25, + "w": 1.75 + }, + "4,7\n\n\n3,2", + { + "c": "#777777" + }, + "3,13\n\n\n3,2", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n3,2" ], [ { - "y": 0.5, - "x": 2.5, - "w": 2.25 + "y": 0.25, + "w": 1.25 }, "3,0\n\n\n2,1", { "c": "#cccccc" }, + "3,1\n\n\n2,1", "3,2\n\n\n2,1", "3,3\n\n\n2,1", "3,4\n\n\n2,1", @@ -225,18 +287,28 @@ "3,8\n\n\n2,1", "3,9\n\n\n2,1", "3,10\n\n\n2,1", - "3,11\n\n\n2,1", { - "c": "#aaaaaa", - "w": 1.75 + "x": 4, + "w": 0.75, + "d": true + }, + "\n\n\n3,3", + { + "c": "#aaaaaa" + }, + "4,7\n\n\n3,3", + { + "c": "#777777" + }, + "3,13\n\n\n3,3", + { + "c": "#aaaaaa" }, - "3,13\n\n\n2,1", - "3,12\n\n\n2,1" + "3,12\n\n\n3,3" ], [ { - "x": 2.5, - "w": 2.25 + "w": 2 }, "3,0\n\n\n2,2", { @@ -251,24 +323,26 @@ "3,8\n\n\n2,2", "3,9\n\n\n2,2", "3,10\n\n\n2,2", + "3,11\n\n\n2,2", { - "w": 1.75 + "x": 3.25, + "w": 0.75, + "d": true }, - "4,7\n\n\n2,2", - "3,13\n\n\n2,2", - "3,12\n\n\n2,2" - ], - [ + "\n\n\n3,4", + "4,7\n\n\n3,4", { - "x": 2.5, "c": "#aaaaaa", - "w": 1.25 + "w": 2 }, + "3,13\n\n\n3,4" + ], + [ "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", @@ -278,337 +352,171 @@ "3,8\n\n\n2,3", "3,9\n\n\n2,3", "3,10\n\n\n2,3", - "3,11\n\n\n2,3", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,13\n\n\n2,3" + "3,11\n\n\n2,3" ], [ { - "x": 2.5, - "w": 1.25 - }, - "3,0\n\n\n2,4", - "3,1\n\n\n2,4", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,4", - "3,3\n\n\n2,4", - "3,4\n\n\n2,4", - "3,5\n\n\n2,4", - "3,6\n\n\n2,4", - "3,7\n\n\n2,4", - "3,8\n\n\n2,4", - "3,9\n\n\n2,4", - "3,10\n\n\n2,4", - "3,11\n\n\n2,4", - { + "y": 0.25, "c": "#aaaaaa", - "w": 1.75 + "w": 1.5 }, - "3,13\n\n\n2,4", - "3,12\n\n\n2,4" - ], - [ + "4,0\n\n\n4,1", + "4,1\n\n\n4,1", { - "x": 2.5, "w": 1.25 }, - "3,0\n\n\n2,5", - "3,1\n\n\n2,5", + "4,2\n\n\n4,1", { - "c": "#cccccc" - }, - "3,2\n\n\n2,5", - "3,3\n\n\n2,5", - "3,4\n\n\n2,5", - "3,5\n\n\n2,5", - "3,6\n\n\n2,5", - "3,7\n\n\n2,5", - "3,8\n\n\n2,5", - "3,9\n\n\n2,5", - "3,10\n\n\n2,5", - { - "w": 1.75 - }, - "4,7\n\n\n2,5", - "3,13\n\n\n2,5", - "3,12\n\n\n2,5" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 2 - }, - "3,0\n\n\n2,6", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,6", - "3,3\n\n\n2,6", - "3,4\n\n\n2,6", - "3,5\n\n\n2,6", - "3,6\n\n\n2,6", - "3,7\n\n\n2,6", - "3,8\n\n\n2,6", - "3,9\n\n\n2,6", - "3,10\n\n\n2,6", - "3,11\n\n\n2,6", - "4,7\n\n\n2,6", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,13\n\n\n2,6" - ], - [ - { - "x": 2.5 - }, - "3,0\n\n\n2,7", - "3,1\n\n\n2,7", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,7", - "3,3\n\n\n2,7", - "3,4\n\n\n2,7", - "3,5\n\n\n2,7", - "3,6\n\n\n2,7", - "3,7\n\n\n2,7", - "3,8\n\n\n2,7", - "3,9\n\n\n2,7", - "3,10\n\n\n2,7", - "3,11\n\n\n2,7", - "4,7\n\n\n2,7", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,13\n\n\n2,7" - ], - [ - { - "x": 2.5, - "w": 2 + "x": 6.25, + "w": 1.25 }, - "3,0\n\n\n2,8", + "4,10\n\n\n6,1", { - "c": "#cccccc" + "w": 1.25 }, - "3,2\n\n\n2,8", - "3,3\n\n\n2,8", - "3,4\n\n\n2,8", - "3,5\n\n\n2,8", - "3,6\n\n\n2,8", - "3,7\n\n\n2,8", - "3,8\n\n\n2,8", - "3,9\n\n\n2,8", - "3,10\n\n\n2,8", - "3,11\n\n\n2,8", - "4,7\n\n\n2,8", + "4,11\n\n\n6,1", + "4,12\n\n\n6,1", { - "c": "#aaaaaa" + "w": 1.5 }, - "3,13\n\n\n2,8", - "3,12\n\n\n2,8" + "4,13\n\n\n6,1" ], [ { - "x": 2.5 - }, - "3,0\n\n\n2,9", - "3,1\n\n\n2,9", - { - "c": "#cccccc" + "w": 1.5 }, - "3,2\n\n\n2,9", - "3,3\n\n\n2,9", - "3,4\n\n\n2,9", - "3,5\n\n\n2,9", - "3,6\n\n\n2,9", - "3,7\n\n\n2,9", - "3,8\n\n\n2,9", - "3,9\n\n\n2,9", - "3,10\n\n\n2,9", - "3,11\n\n\n2,9", - "4,7\n\n\n2,9", + "4,0\n\n\n4,2", { - "c": "#aaaaaa" + "x": -1.5, + "w": 4, + "d": true }, - "3,13\n\n\n2,9", - "3,12\n\n\n2,9" - ], - [ + "\n\n\n5,1", { - "y": 0.5, - "x": 2.5, - "w": 1.5 + "x": -2.5 }, - "4,0\n\n\n3,1", - "4,1\n\n\n3,1", + "4,1\n\n\n4,2", { "w": 1.5 }, - "4,2\n\n\n3,1", + "4,2\n\n\n4,2", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,1", - "4,12\n\n\n3,1", - { - "w": 1.5 - }, - "4,13\n\n\n3,1" + "4,5\n\n\n5,1" ], [ { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,2", - { - "w": 1.25 + "c": "#aaaaaa", + "w": 1.5, + "d": true }, - "4,1\n\n\n3,2", + "\n\n\n4,3", + "4,1\n\n\n4,3", { - "w": 1.25 + "w": 1.5 }, - "4,2\n\n\n3,2", + "4,2\n\n\n4,3", { - "c": "#cccccc", - "w": 6.25 + "x": 6 }, - "4,5\n\n\n3,2", + "4,10\n\n\n6,2", + "4,11\n\n\n6,2", { - "c": "#aaaaaa" + "c": "#777777" }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", - "4,8\n\n\n3,2", - "4,12\n\n\n3,2", - "4,13\n\n\n3,2" + "4,8\n\n\n6,2", + "4,12\n\n\n6,2", + "4,13\n\n\n6,2" ], [ { - "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n3,3", - "4,1\n\n\n3,3", - { - "w": 1.25 - }, - "4,2\n\n\n3,3", + "4,0\n\n\n4,4", { - "c": "#cccccc", - "w": 6.25 + "x": 1, + "w": 1.5 }, - "4,5\n\n\n3,3", + "4,2\n\n\n4,4", { - "c": "#aaaaaa" + "x": 6, + "d": true }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", - "4,8\n\n\n3,3", - "4,12\n\n\n3,3", - "4,13\n\n\n3,3" - ], - [ + "\n\n\n6,3", { - "x": 2.5, "w": 1.5 }, - "4,0\n\n\n3,4", + "4,11\n\n\n6,3", + "4,12\n\n\n6,3", { "w": 1.5 }, - "4,1\n\n\n3,4", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n3,4", - { - "c": "#aaaaaa" - }, - "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,13\n\n\n6,3" ], [ { - "x": 2.5, - "w": 1.5, + "w": 1.5 + }, + "4,0\n\n\n4,5", + { + "x": -1.5, + "w": 3, "d": true }, - "4,0\n\n\n3,5", - "4,1\n\n\n3,5", + "\n\n\n5,2", { + "x": -1.5, "w": 1.5 }, - "4,2\n\n\n3,5", + "4,1\n\n\n4,5", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n3,5", + "4,5\n\n\n5,2", { "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,5", - "4,12\n\n\n3,5", - { - "w": 1.5, "d": true }, - "4,13\n\n\n3,5" - ], - [ + "\n\n\n6,4", { - "x": 2.5, "w": 1.5 }, - "4,0\n\n\n3,6", + "4,11\n\n\n6,4", + "4,12\n\n\n6,4" + ], + [ { + "x": 10, "d": true }, - "\n\n\n3,6", + "\n\n\n6,5", { "w": 1.5 }, - "4,2\n\n\n3,6", - { - "c": "#cccccc", - "w": 7 - }, - "4,5\n\n\n3,6", + "4,11\n\n\n6,5", { - "c": "#aaaaaa", + "x": 1, "w": 1.5 }, - "4,11\n\n\n3,6", + "4,13\n\n\n6,5" + ], + [ { + "x": 10, "d": true }, - "\n\n\n3,6", + "\n\n\n6,6", + "4,11\n\n\n6,6", { - "w": 1.5 + "c": "#777777" }, - "4,13\n\n\n3,6" + "4,8\n\n\n6,6", + "4,12\n\n\n6,6", + "4,13\n\n\n6,6" ] ] } From 40d383e82d82ce9a73d12923d3312132127d4015 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 6 Jul 2024 10:01:43 +0100 Subject: [PATCH 2/2] @xelus22 feedback --- v3/xd/xd60rev2.json | 486 ++++++++++++++++++++++++++++---------------- v3/xd/xd60rev3.json | 486 ++++++++++++++++++++++++++++---------------- 2 files changed, 630 insertions(+), 342 deletions(-) diff --git a/v3/xd/xd60rev2.json b/v3/xd/xd60rev2.json index 4d514ae5b0..a19f88df7b 100644 --- a/v3/xd/xd60rev2.json +++ b/v3/xd/xd60rev2.json @@ -23,43 +23,27 @@ ], [ "Shift Row", - "ANSI", - "ISO", + "ANSI Standard", + "ANSI Tsangan", + "ANSI Arrows", + "ISO Standard", + "ISO Tsangan", + "ISO Arrows", "64-key ANSI", - "64-key ISO" + "64-key ANSI 2u RShift", + "64-key ISO", + "64-key ISO 2u RShift" ], [ - "Right Shift Cluster", + "Bottom Row", "Standard", + "Standard Arrows", "Tsangan", - "Arrows", - "64-key", - "64-Key 2u" - ], - [ - "Left Modifiers", - "Standard", - "Standard Alt.", - "Tsangan", - "HHKB", "WKL", - "LWKL" - ], - [ - "Spacebar", - "Standard", - "Tsangan", - "LWKL" - ], - [ - "Right Modifiers", - "Standard", - "Standard Alt.", - "Arrows", - "Tsangan", "HHKB", - "WKL", - "Tsangan Arrows" + "Tsangan Arrows", + "LWKL Standard", + "LWKL Arrows" ] ], "keymap": [ @@ -195,89 +179,58 @@ "3,8\n\n\n2,0", "3,9\n\n\n2,0", "3,10\n\n\n2,0", - "3,11\n\n\n3,0", + "3,11\n\n\n2,0", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n3,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,11\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n3,1", - "3,12\n\n\n3,1" + "3,13\n\n\n2,0" ], [ { - "w": 3.75, - "d": true - }, - "\n\n\n5,0", - { - "x": -3.75, "w": 1.25 }, - "4,0\n\n\n4,0", + "4,0\n\n\n3,0", { "w": 1.25 }, - "4,1\n\n\n4,0", + "4,1\n\n\n3,0", { "w": 1.25 }, - "4,2\n\n\n4,0", + "4,2\n\n\n3,0", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n5,0", + "4,5\n\n\n3,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n6,0", + "4,10\n\n\n3,0", { "w": 1.25 }, - "4,11\n\n\n6,0", + "4,11\n\n\n3,0", { "w": 1.25 }, - "4,12\n\n\n6,0", + "4,12\n\n\n3,0", { "w": 1.25 }, - "4,13\n\n\n6,0", - { - "x": 0.25, - "w": 1.75 - }, - "4,7\n\n\n3,2", - { - "c": "#777777" - }, - "3,13\n\n\n3,2", - { - "c": "#aaaaaa" - }, - "3,12\n\n\n3,2" + "4,13\n\n\n3,0" ], [ { "y": 0.25, - "w": 1.25 + "w": 2.25 }, "3,0\n\n\n2,1", { "c": "#cccccc" }, - "3,1\n\n\n2,1", "3,2\n\n\n2,1", "3,3\n\n\n2,1", "3,4\n\n\n2,1", @@ -287,28 +240,17 @@ "3,8\n\n\n2,1", "3,9\n\n\n2,1", "3,10\n\n\n2,1", + "3,11\n\n\n2,1", { - "x": 4, - "w": 0.75, - "d": true - }, - "\n\n\n3,3", - { - "c": "#aaaaaa" - }, - "4,7\n\n\n3,3", - { - "c": "#777777" - }, - "3,13\n\n\n3,3", - { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.75 }, - "3,12\n\n\n3,3" + "3,13\n\n\n2,1", + "3,12\n\n\n2,1" ], [ { - "w": 2 + "w": 2.25 }, "3,0\n\n\n2,2", { @@ -323,21 +265,24 @@ "3,8\n\n\n2,2", "3,9\n\n\n2,2", "3,10\n\n\n2,2", - "3,11\n\n\n2,2", { - "x": 3.25, - "w": 0.75, - "d": true + "c": "#aaaaaa", + "w": 1.75 }, - "\n\n\n3,4", - "4,7\n\n\n3,4", + "4,7\n\n\n2,2", { - "c": "#aaaaaa", - "w": 2 + "c": "#777777" + }, + "3,13\n\n\n2,2", + { + "c": "#aaaaaa" }, - "3,13\n\n\n3,4" + "3,12\n\n\n2,2" ], [ + { + "w": 1.25 + }, "3,0\n\n\n2,3", { "c": "#cccccc" @@ -352,171 +297,370 @@ "3,8\n\n\n2,3", "3,9\n\n\n2,3", "3,10\n\n\n2,3", - "3,11\n\n\n2,3" + "3,11\n\n\n2,3", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,3" ], [ { - "y": 0.25, + "w": 1.25 + }, + "3,0\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", + "3,5\n\n\n2,4", + "3,6\n\n\n2,4", + "3,7\n\n\n2,4", + "3,8\n\n\n2,4", + "3,9\n\n\n2,4", + "3,10\n\n\n2,4", + "3,11\n\n\n2,4", + { "c": "#aaaaaa", - "w": 1.5 + "w": 1.75 }, - "4,0\n\n\n4,1", - "4,1\n\n\n4,1", + "3,13\n\n\n2,4", + "3,12\n\n\n2,4" + ], + [ { "w": 1.25 }, - "4,2\n\n\n4,1", + "3,0\n\n\n2,5", { - "x": 6.25, - "w": 1.25 + "c": "#cccccc" }, - "4,10\n\n\n6,1", + "3,1\n\n\n2,5", + "3,2\n\n\n2,5", + "3,3\n\n\n2,5", + "3,4\n\n\n2,5", + "3,5\n\n\n2,5", + "3,6\n\n\n2,5", + "3,7\n\n\n2,5", + "3,8\n\n\n2,5", + "3,9\n\n\n2,5", + "3,10\n\n\n2,5", { - "w": 1.25 + "c": "#aaaaaa", + "w": 1.75 }, - "4,11\n\n\n6,1", - "4,12\n\n\n6,1", + "4,7\n\n\n2,5", { - "w": 1.5 + "c": "#777777" + }, + "3,13\n\n\n2,5", + { + "c": "#aaaaaa" }, - "4,13\n\n\n6,1" + "3,12\n\n\n2,5" ], [ { - "w": 1.5 + "w": 2 }, - "4,0\n\n\n4,2", + "3,0\n\n\n2,6", { - "x": -1.5, - "w": 4, - "d": true + "c": "#cccccc" }, - "\n\n\n5,1", + "3,2\n\n\n2,6", + "3,3\n\n\n2,6", + "3,4\n\n\n2,6", + "3,5\n\n\n2,6", + "3,6\n\n\n2,6", + "3,7\n\n\n2,6", + "3,8\n\n\n2,6", + "3,9\n\n\n2,6", + "3,10\n\n\n2,6", + "3,11\n\n\n2,6", { - "x": -2.5 + "c": "#aaaaaa" }, - "4,1\n\n\n4,2", + "4,7\n\n\n2,6", { - "w": 1.5 + "c": "#777777" }, - "4,2\n\n\n4,2", + "3,13\n\n\n2,6", { - "c": "#cccccc", - "w": 7 + "c": "#aaaaaa" }, - "4,5\n\n\n5,1" + "3,12\n\n\n2,6" ], [ + { + "w": 2 + }, + "3,0\n\n\n2,7", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,7", + "3,3\n\n\n2,7", + "3,4\n\n\n2,7", + "3,5\n\n\n2,7", + "3,6\n\n\n2,7", + "3,7\n\n\n2,7", + "3,8\n\n\n2,7", + "3,9\n\n\n2,7", + "3,10\n\n\n2,7", + "3,11\n\n\n2,7", + "4,7\n\n\n2,7", { "c": "#aaaaaa", - "w": 1.5, - "d": true + "w": 2 }, - "\n\n\n4,3", - "4,1\n\n\n4,3", + "3,13\n\n\n2,7" + ], + [ + "3,0\n\n\n2,8", { - "w": 1.5 + "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", + "3,5\n\n\n2,8", + "3,6\n\n\n2,8", + "3,7\n\n\n2,8", + "3,8\n\n\n2,8", + "3,9\n\n\n2,8", + "3,10\n\n\n2,8", + "3,11\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" + ], + [ + "3,0\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", + "3,5\n\n\n2,9", + "3,6\n\n\n2,9", + "3,7\n\n\n2,9", + "3,8\n\n\n2,9", + "3,9\n\n\n2,9", + "3,10\n\n\n2,9", + "3,11\n\n\n2,9", + "4,7\n\n\n2,9", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,13\n\n\n2,9" + ], + [ + { + "y": 0.25, + "w": 1.25 + }, + "4,0\n\n\n3,1", + { + "w": 1.25 + }, + "4,1\n\n\n3,1", + { + "w": 1.25 + }, + "4,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 6.25 }, - "4,2\n\n\n4,3", + "4,5\n\n\n3,1", { - "x": 6 + "c": "#aaaaaa" }, - "4,10\n\n\n6,2", - "4,11\n\n\n6,2", + "4,10\n\n\n3,1", + "4,11\n\n\n3,1", { "c": "#777777" }, - "4,8\n\n\n6,2", - "4,12\n\n\n6,2", - "4,13\n\n\n6,2" + "4,8\n\n\n3,1", + "4,12\n\n\n3,1", + "4,13\n\n\n3,1" ], [ { "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n4,4", + "4,0\n\n\n3,2", + "4,1\n\n\n3,2", { - "x": 1, "w": 1.5 }, - "4,2\n\n\n4,4", + "4,2\n\n\n3,2", { - "x": 6, - "d": true + "c": "#cccccc", + "w": 7 }, - "\n\n\n6,3", + "4,5\n\n\n3,2", { + "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,3", - "4,12\n\n\n6,3", + "4,11\n\n\n3,2", + "4,12\n\n\n3,2", { "w": 1.5 }, - "4,13\n\n\n6,3" + "4,13\n\n\n3,2" ], [ { "w": 1.5 }, - "4,0\n\n\n4,5", + "4,0\n\n\n3,3", { - "x": -1.5, - "w": 3, + "x": 1, + "w": 1.5 + }, + "4,2\n\n\n3,3", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,3", + { + "x": 1, + "w": 1.5 + }, + "4,13\n\n\n3,3" + ], + [ + { + "w": 1.5, "d": true }, - "\n\n\n5,2", + "\n\n\n3,4", + "4,1\n\n\n3,4", { - "x": -1.5, "w": 1.5 }, - "4,1\n\n\n4,5", + "4,2\n\n\n3,4", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n5,2", + "4,5\n\n\n3,4", { "c": "#aaaaaa", - "d": true + "w": 1.5 }, - "\n\n\n6,4", + "4,11\n\n\n3,4", + "4,12\n\n\n3,4" + ], + [ { "w": 1.5 }, - "4,11\n\n\n6,4", - "4,12\n\n\n6,4" + "4,0\n\n\n3,5", + "4,1\n\n\n3,5", + { + "w": 1.5 + }, + "4,2\n\n\n3,5", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,5", + { + "c": "#aaaaaa" + }, + "4,11\n\n\n3,5", + { + "c": "#777777" + }, + "4,8\n\n\n3,5", + "4,12\n\n\n3,5", + "4,13\n\n\n3,5" ], [ { - "x": 10, - "d": true + "c": "#aaaaaa", + "w": 1.5 }, - "\n\n\n6,5", + "4,0\n\n\n3,6", { "w": 1.5 }, - "4,11\n\n\n6,5", + "4,1\n\n\n3,6", { - "x": 1, - "w": 1.5 + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n3,6", + { + "w": 1.25 }, - "4,13\n\n\n6,5" + "4,11\n\n\n3,6", + { + "w": 1.25 + }, + "4,12\n\n\n3,6", + { + "w": 1.25 + }, + "4,13\n\n\n3,6" ], [ { - "x": 10, - "d": true + "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" }, - "\n\n\n6,6", - "4,11\n\n\n6,6", + "4,10\n\n\n3,7", + "4,11\n\n\n3,7", { "c": "#777777" }, - "4,8\n\n\n6,6", - "4,12\n\n\n6,6", - "4,13\n\n\n6,6" + "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 9b52e31136..bb7972de3a 100644 --- a/v3/xd/xd60rev3.json +++ b/v3/xd/xd60rev3.json @@ -23,43 +23,27 @@ ], [ "Shift Row", - "ANSI", - "ISO", + "ANSI Standard", + "ANSI Tsangan", + "ANSI Arrows", + "ISO Standard", + "ISO Tsangan", + "ISO Arrows", "64-key ANSI", - "64-key ISO" + "64-key ANSI 2u RShift", + "64-key ISO", + "64-key ISO 2u RShift" ], [ - "Right Shift Cluster", + "Bottom Row", "Standard", + "Standard Arrows", "Tsangan", - "Arrows", - "64-key", - "64-Key 2u" - ], - [ - "Left Modifiers", - "Standard", - "Standard Alt.", - "Tsangan", - "HHKB", "WKL", - "LWKL" - ], - [ - "Spacebar", - "Standard", - "Tsangan", - "LWKL" - ], - [ - "Right Modifiers", - "Standard", - "Standard Alt.", - "Arrows", - "Tsangan", "HHKB", - "WKL", - "Tsangan Arrows" + "Tsangan Arrows", + "LWKL Standard", + "LWKL Arrows" ] ], "keymap": [ @@ -195,89 +179,58 @@ "3,8\n\n\n2,0", "3,9\n\n\n2,0", "3,10\n\n\n2,0", - "3,11\n\n\n3,0", + "3,11\n\n\n2,0", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n3,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,11\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n3,1", - "3,12\n\n\n3,1" + "3,13\n\n\n2,0" ], [ { - "w": 3.75, - "d": true - }, - "\n\n\n5,0", - { - "x": -3.75, "w": 1.25 }, - "4,0\n\n\n4,0", + "4,0\n\n\n3,0", { "w": 1.25 }, - "4,1\n\n\n4,0", + "4,1\n\n\n3,0", { "w": 1.25 }, - "4,2\n\n\n4,0", + "4,2\n\n\n3,0", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n5,0", + "4,5\n\n\n3,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n6,0", + "4,10\n\n\n3,0", { "w": 1.25 }, - "4,11\n\n\n6,0", + "4,11\n\n\n3,0", { "w": 1.25 }, - "4,12\n\n\n6,0", + "4,12\n\n\n3,0", { "w": 1.25 }, - "4,13\n\n\n6,0", - { - "x": 0.25, - "w": 1.75 - }, - "4,7\n\n\n3,2", - { - "c": "#777777" - }, - "3,13\n\n\n3,2", - { - "c": "#aaaaaa" - }, - "3,12\n\n\n3,2" + "4,13\n\n\n3,0" ], [ { "y": 0.25, - "w": 1.25 + "w": 2.25 }, "3,0\n\n\n2,1", { "c": "#cccccc" }, - "3,1\n\n\n2,1", "3,2\n\n\n2,1", "3,3\n\n\n2,1", "3,4\n\n\n2,1", @@ -287,28 +240,17 @@ "3,8\n\n\n2,1", "3,9\n\n\n2,1", "3,10\n\n\n2,1", + "3,11\n\n\n2,1", { - "x": 4, - "w": 0.75, - "d": true - }, - "\n\n\n3,3", - { - "c": "#aaaaaa" - }, - "4,7\n\n\n3,3", - { - "c": "#777777" - }, - "3,13\n\n\n3,3", - { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.75 }, - "3,12\n\n\n3,3" + "3,13\n\n\n2,1", + "3,12\n\n\n2,1" ], [ { - "w": 2 + "w": 2.25 }, "3,0\n\n\n2,2", { @@ -323,21 +265,24 @@ "3,8\n\n\n2,2", "3,9\n\n\n2,2", "3,10\n\n\n2,2", - "3,11\n\n\n2,2", { - "x": 3.25, - "w": 0.75, - "d": true + "c": "#aaaaaa", + "w": 1.75 }, - "\n\n\n3,4", - "4,7\n\n\n3,4", + "4,7\n\n\n2,2", { - "c": "#aaaaaa", - "w": 2 + "c": "#777777" + }, + "3,13\n\n\n2,2", + { + "c": "#aaaaaa" }, - "3,13\n\n\n3,4" + "3,12\n\n\n2,2" ], [ + { + "w": 1.25 + }, "3,0\n\n\n2,3", { "c": "#cccccc" @@ -352,171 +297,370 @@ "3,8\n\n\n2,3", "3,9\n\n\n2,3", "3,10\n\n\n2,3", - "3,11\n\n\n2,3" + "3,11\n\n\n2,3", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,3" ], [ { - "y": 0.25, + "w": 1.25 + }, + "3,0\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", + "3,5\n\n\n2,4", + "3,6\n\n\n2,4", + "3,7\n\n\n2,4", + "3,8\n\n\n2,4", + "3,9\n\n\n2,4", + "3,10\n\n\n2,4", + "3,11\n\n\n2,4", + { "c": "#aaaaaa", - "w": 1.5 + "w": 1.75 }, - "4,0\n\n\n4,1", - "4,1\n\n\n4,1", + "3,13\n\n\n2,4", + "3,12\n\n\n2,4" + ], + [ { "w": 1.25 }, - "4,2\n\n\n4,1", + "3,0\n\n\n2,5", { - "x": 6.25, - "w": 1.25 + "c": "#cccccc" }, - "4,10\n\n\n6,1", + "3,1\n\n\n2,5", + "3,2\n\n\n2,5", + "3,3\n\n\n2,5", + "3,4\n\n\n2,5", + "3,5\n\n\n2,5", + "3,6\n\n\n2,5", + "3,7\n\n\n2,5", + "3,8\n\n\n2,5", + "3,9\n\n\n2,5", + "3,10\n\n\n2,5", { - "w": 1.25 + "c": "#aaaaaa", + "w": 1.75 }, - "4,11\n\n\n6,1", - "4,12\n\n\n6,1", + "4,7\n\n\n2,5", { - "w": 1.5 + "c": "#777777" + }, + "3,13\n\n\n2,5", + { + "c": "#aaaaaa" }, - "4,13\n\n\n6,1" + "3,12\n\n\n2,5" ], [ { - "w": 1.5 + "w": 2 }, - "4,0\n\n\n4,2", + "3,0\n\n\n2,6", { - "x": -1.5, - "w": 4, - "d": true + "c": "#cccccc" }, - "\n\n\n5,1", + "3,2\n\n\n2,6", + "3,3\n\n\n2,6", + "3,4\n\n\n2,6", + "3,5\n\n\n2,6", + "3,6\n\n\n2,6", + "3,7\n\n\n2,6", + "3,8\n\n\n2,6", + "3,9\n\n\n2,6", + "3,10\n\n\n2,6", + "3,11\n\n\n2,6", { - "x": -2.5 + "c": "#aaaaaa" }, - "4,1\n\n\n4,2", + "4,7\n\n\n2,6", { - "w": 1.5 + "c": "#777777" }, - "4,2\n\n\n4,2", + "3,13\n\n\n2,6", { - "c": "#cccccc", - "w": 7 + "c": "#aaaaaa" }, - "4,5\n\n\n5,1" + "3,12\n\n\n2,6" ], [ + { + "w": 2 + }, + "3,0\n\n\n2,7", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,7", + "3,3\n\n\n2,7", + "3,4\n\n\n2,7", + "3,5\n\n\n2,7", + "3,6\n\n\n2,7", + "3,7\n\n\n2,7", + "3,8\n\n\n2,7", + "3,9\n\n\n2,7", + "3,10\n\n\n2,7", + "3,11\n\n\n2,7", + "4,7\n\n\n2,7", { "c": "#aaaaaa", - "w": 1.5, - "d": true + "w": 2 }, - "\n\n\n4,3", - "4,1\n\n\n4,3", + "3,13\n\n\n2,7" + ], + [ + "3,0\n\n\n2,8", { - "w": 1.5 + "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", + "3,5\n\n\n2,8", + "3,6\n\n\n2,8", + "3,7\n\n\n2,8", + "3,8\n\n\n2,8", + "3,9\n\n\n2,8", + "3,10\n\n\n2,8", + "3,11\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" + ], + [ + "3,0\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", + "3,5\n\n\n2,9", + "3,6\n\n\n2,9", + "3,7\n\n\n2,9", + "3,8\n\n\n2,9", + "3,9\n\n\n2,9", + "3,10\n\n\n2,9", + "3,11\n\n\n2,9", + "4,7\n\n\n2,9", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,13\n\n\n2,9" + ], + [ + { + "y": 0.25, + "w": 1.25 + }, + "4,0\n\n\n3,1", + { + "w": 1.25 + }, + "4,1\n\n\n3,1", + { + "w": 1.25 + }, + "4,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 6.25 }, - "4,2\n\n\n4,3", + "4,5\n\n\n3,1", { - "x": 6 + "c": "#aaaaaa" }, - "4,10\n\n\n6,2", - "4,11\n\n\n6,2", + "4,10\n\n\n3,1", + "4,11\n\n\n3,1", { "c": "#777777" }, - "4,8\n\n\n6,2", - "4,12\n\n\n6,2", - "4,13\n\n\n6,2" + "4,8\n\n\n3,1", + "4,12\n\n\n3,1", + "4,13\n\n\n3,1" ], [ { "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n4,4", + "4,0\n\n\n3,2", + "4,1\n\n\n3,2", { - "x": 1, "w": 1.5 }, - "4,2\n\n\n4,4", + "4,2\n\n\n3,2", { - "x": 6, - "d": true + "c": "#cccccc", + "w": 7 }, - "\n\n\n6,3", + "4,5\n\n\n3,2", { + "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,3", - "4,12\n\n\n6,3", + "4,11\n\n\n3,2", + "4,12\n\n\n3,2", { "w": 1.5 }, - "4,13\n\n\n6,3" + "4,13\n\n\n3,2" ], [ { "w": 1.5 }, - "4,0\n\n\n4,5", + "4,0\n\n\n3,3", { - "x": -1.5, - "w": 3, + "x": 1, + "w": 1.5 + }, + "4,2\n\n\n3,3", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,3", + { + "x": 1, + "w": 1.5 + }, + "4,13\n\n\n3,3" + ], + [ + { + "w": 1.5, "d": true }, - "\n\n\n5,2", + "\n\n\n3,4", + "4,1\n\n\n3,4", { - "x": -1.5, "w": 1.5 }, - "4,1\n\n\n4,5", + "4,2\n\n\n3,4", { "c": "#cccccc", "w": 7 }, - "4,5\n\n\n5,2", + "4,5\n\n\n3,4", { "c": "#aaaaaa", - "d": true + "w": 1.5 }, - "\n\n\n6,4", + "4,11\n\n\n3,4", + "4,12\n\n\n3,4" + ], + [ { "w": 1.5 }, - "4,11\n\n\n6,4", - "4,12\n\n\n6,4" + "4,0\n\n\n3,5", + "4,1\n\n\n3,5", + { + "w": 1.5 + }, + "4,2\n\n\n3,5", + { + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,5", + { + "c": "#aaaaaa" + }, + "4,11\n\n\n3,5", + { + "c": "#777777" + }, + "4,8\n\n\n3,5", + "4,12\n\n\n3,5", + "4,13\n\n\n3,5" ], [ { - "x": 10, - "d": true + "c": "#aaaaaa", + "w": 1.5 }, - "\n\n\n6,5", + "4,0\n\n\n3,6", { "w": 1.5 }, - "4,11\n\n\n6,5", + "4,1\n\n\n3,6", { - "x": 1, - "w": 1.5 + "c": "#cccccc", + "w": 7 + }, + "4,5\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n3,6", + { + "w": 1.25 }, - "4,13\n\n\n6,5" + "4,11\n\n\n3,6", + { + "w": 1.25 + }, + "4,12\n\n\n3,6", + { + "w": 1.25 + }, + "4,13\n\n\n3,6" ], [ { - "x": 10, - "d": true + "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" }, - "\n\n\n6,6", - "4,11\n\n\n6,6", + "4,10\n\n\n3,7", + "4,11\n\n\n3,7", { "c": "#777777" }, - "4,8\n\n\n6,6", - "4,12\n\n\n6,6", - "4,13\n\n\n6,6" + "4,8\n\n\n3,7", + "4,12\n\n\n3,7", + "4,13\n\n\n3,7" ] ] }