From 6b07a4238a788a6eb701972a0263ca062692b749 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 14 Apr 2024 15:53:31 +0100 Subject: [PATCH] refine shift row --- v3/do60/do60.json | 629 ++++++++++++++++++---------------------------- 1 file changed, 238 insertions(+), 391 deletions(-) diff --git a/v3/do60/do60.json b/v3/do60/do60.json index ff5da25345..6b58afad48 100644 --- a/v3/do60/do60.json +++ b/v3/do60/do60.json @@ -120,16 +120,18 @@ ], [ "Shift Row", - "ANSI Standard", - "ANSI 1.75-1u Right Shift", - "ANSI 1u-1.75u Right Shift", - "ANSI Arrows", - "ISO Standard", - "ISO 1.75-1u Right Shift", - "ISO 1u-1.75u Right Shift", - "ISO Arrows", - "2u Left Shift ANSI", - "2u Left Shift ISO" + "ANSI", + "ISO", + "2u LShift ANSI", + "2u LShift ISO" + ], + [ + "RShift Cluster", + "2.75u", + "1.75u-1u", + "1u-1.75u", + "Arrows", + "64 Key" ], [ "Bottom Row", @@ -257,8 +259,8 @@ }, "1,12\n\n\n1,1", { - "w": 1.25, - "c": "#777777" + "c": "#777777", + "w": 1.25 }, "1,14\n\n\n1,1", { @@ -285,58 +287,100 @@ "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 + }, + "3,11\n\n\n3,1", + { + "w": 1.75 + }, + "3,13\n\n\n3,1", + "3,14\n\n\n3,1", + { + "x": 0.25 + }, + "3,11\n\n\n3,2", + "3,13\n\n\n3,2", + { + "w": 1.75 + }, + "3,14\n\n\n3,2", + { + "x": 0.25, + "w": 1.75 + }, + "3,11\n\n\n3,3", + "3,13\n\n\n3,3", + "3,14\n\n\n3,3", + { + "x": 0.25, + "w": 0.75, + "d": true + }, + "\n\n\n3,4", + "3,12\n\n\n3,4", + { + "c": "#777777" + }, + "3,13\n\n\n3,4", + { + "c": "#cccccc" + }, + "3,14\n\n\n3,4" ], [ { + "c": "#aaaaaa", "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", { - "w": 6.25, - "c": "#cccccc" + "c": "#cccccc", + "w": 6.25 }, - "4,6\n\n\n3,0", + "4,6\n\n\n4,0", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,0", + "4,10\n\n\n4,0", { "w": 1.25 }, - "4,11\n\n\n3,0", + "4,11\n\n\n4,0", { "w": 1.25 }, - "4,12\n\n\n3,0", + "4,12\n\n\n4,0", { "w": 1.25 }, - "4,14\n\n\n3,0" + "4,14\n\n\n4,0" ], [ { "y": 0.25, - "w": 2.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", @@ -345,18 +389,12 @@ "3,7\n\n\n2,1", "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 - }, - "3,13\n\n\n2,1", - "3,14\n\n\n2,1" + "3,10\n\n\n2,1" ], [ { - "w": 2.25 + "c": "#aaaaaa", + "w": 2 }, "3,0\n\n\n2,2", { @@ -371,22 +409,17 @@ "3,8\n\n\n2,2", "3,9\n\n\n2,2", "3,10\n\n\n2,2", - "3,11\n\n\n2,2", - "3,13\n\n\n2,2", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,14\n\n\n2,2" + "3,11\n\n\n2,2" ], [ { - "w": 2.25 + "c": "#aaaaaa" }, "3,0\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", @@ -396,681 +429,495 @@ "3,8\n\n\n2,3", "3,9\n\n\n2,3", "3,10\n\n\n2,3", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,11\n\n\n2,3", - { - "c": "#777777" - }, - "3,13\n\n\n2,3", - { - "c": "#cccccc" - }, - "3,14\n\n\n2,3" - ], - [ - { - "c": "#aaaaaa", - "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": 2.75 - }, - "3,13\n\n\n2,4" - ], - [ - { - "w": 1.25 - }, - "3,0\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", - "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", - "3,11\n\n\n2,5", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n2,5", - "3,14\n\n\n2,5" - ], - [ - { - "w": 1.25 - }, - "3,0\n\n\n2,6", - { - "c": "#cccccc" - }, - "3,1\n\n\n2,6", - "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", - "3,13\n\n\n2,6", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,14\n\n\n2,6" + "3,11\n\n\n2,3" ], [ { - "w": 1.25 - }, - "3,0\n\n\n2,7", - { - "c": "#cccccc" - }, - "3,1\n\n\n2,7", - "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", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,11\n\n\n2,7", - { - "c": "#777777" - }, - "3,13\n\n\n2,7", - { - "c": "#cccccc" - }, - "3,14\n\n\n2,7" - ], - [ - { - "c": "#aaaaaa", - "w": 2 - }, - "3,0\n\n\n2,8", - { - "c": "#cccccc" - }, - "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" - }, - "3,12\n\n\n2,8", - { - "c": "#777777" - }, - "3,13\n\n\n2,8", - { - "c": "#cccccc" - }, - "3,14\n\n\n2,8" - ], - [ - { - "c": "#aaaaaa" - }, - "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", - { - "c": "#aaaaaa" - }, - "3,12\n\n\n2,9", - { - "c": "#777777" - }, - "3,13\n\n\n2,9", - { - "c": "#cccccc" - }, - "3,14\n\n\n2,9" - ], - [ - { - "c": "#aaaaaa", "y": 0.25, + "c": "#aaaaaa", "w": 1.25 }, - "4,0\n\n\n3,1", + "4,0\n\n\n4,1", { "w": 1.25 }, - "4,1\n\n\n3,1", + "4,1\n\n\n4,1", { "w": 1.25 }, - "4,2\n\n\n3,1", + "4,2\n\n\n4,1", { - "w": 2.75, - "c": "#cccccc" + "c": "#cccccc", + "w": 2.75 }, - "4,5\n\n\n3,1", + "4,5\n\n\n4,1", { "w": 1.25 }, - "4,6\n\n\n3,1", + "4,6\n\n\n4,1", { "w": 2.25 }, - "4,7\n\n\n3,1", + "4,7\n\n\n4,1", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,1", + "4,10\n\n\n4,1", { "w": 1.25 }, - "4,11\n\n\n3,1", + "4,11\n\n\n4,1", { "w": 1.25 }, - "4,12\n\n\n3,1", + "4,12\n\n\n4,1", { "w": 1.25 }, - "4,14\n\n\n3,1" + "4,14\n\n\n4,1" ], [ { "w": 1.25 }, - "4,0\n\n\n3,2", + "4,0\n\n\n4,2", { "w": 1.25 }, - "4,1\n\n\n3,2", + "4,1\n\n\n4,2", { "w": 1.25 }, - "4,2\n\n\n3,2", + "4,2\n\n\n4,2", { - "w": 6.25, - "c": "#cccccc" + "c": "#cccccc", + "w": 6.25 }, - "4,6\n\n\n3,2", + "4,6\n\n\n4,2", { "c": "#aaaaaa" }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", + "4,10\n\n\n4,2", + "4,11\n\n\n4,2", { "c": "#777777" }, - "4,12\n\n\n3,2", - "4,13\n\n\n3,2", - "4,14\n\n\n3,2" + "4,12\n\n\n4,2", + "4,13\n\n\n4,2", + "4,14\n\n\n4,2" ], [ { "c": "#aaaaaa", "w": 1.25 }, - "4,0\n\n\n3,3", + "4,0\n\n\n4,3", { "w": 1.25 }, - "4,1\n\n\n3,3", + "4,1\n\n\n4,3", { "w": 1.25 }, - "4,2\n\n\n3,3", + "4,2\n\n\n4,3", { - "w": 2.75, - "c": "#cccccc" + "c": "#cccccc", + "w": 2.75 }, - "4,5\n\n\n3,3", + "4,5\n\n\n4,3", { "w": 1.25 }, - "4,6\n\n\n3,3", + "4,6\n\n\n4,3", { "w": 2.25 }, - "4,7\n\n\n3,3", + "4,7\n\n\n4,3", { "c": "#aaaaaa" }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", + "4,10\n\n\n4,3", + "4,11\n\n\n4,3", { "c": "#777777" }, - "4,12\n\n\n3,3", - "4,13\n\n\n3,3", - "4,14\n\n\n3,3" + "4,12\n\n\n4,3", + "4,13\n\n\n4,3", + "4,14\n\n\n4,3" ], [ { "c": "#aaaaaa", "w": 1.25 }, - "4,0\n\n\n3,4", + "4,0\n\n\n4,4", { "w": 1.25 }, - "4,1\n\n\n3,4", + "4,1\n\n\n4,4", { "w": 1.25 }, - "4,2\n\n\n3,4", + "4,2\n\n\n4,4", { - "w": 3, - "c": "#cccccc" + "c": "#cccccc", + "w": 3 }, - "4,5\n\n\n3,4", + "4,5\n\n\n4,4", { "w": 3 }, - "4,7\n\n\n3,4", + "4,7\n\n\n4,4", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,4", - "4,11\n\n\n3,4", + "4,10\n\n\n4,4", + "4,11\n\n\n4,4", { "c": "#777777" }, - "4,12\n\n\n3,4", - "4,13\n\n\n3,4", - "4,14\n\n\n3,4" + "4,12\n\n\n4,4", + "4,13\n\n\n4,4", + "4,14\n\n\n4,4" ], [ { "c": "#aaaaaa", "w": 1.25 }, - "4,0\n\n\n3,5", + "4,0\n\n\n4,5", { "w": 1.25 }, - "4,1\n\n\n3,5", + "4,1\n\n\n4,5", { "w": 1.25 }, - "4,2\n\n\n3,5", + "4,2\n\n\n4,5", { - "w": 3, - "c": "#cccccc" + "c": "#cccccc", + "w": 3 }, - "4,5\n\n\n3,5", + "4,5\n\n\n4,5", { "w": 2.75 }, - "4,7\n\n\n3,5", + "4,7\n\n\n4,5", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,5", + "4,10\n\n\n4,5", { "w": 1.25 }, - "4,11\n\n\n3,5", + "4,11\n\n\n4,5", { "c": "#777777" }, - "4,12\n\n\n3,5", - "4,13\n\n\n3,5", - "4,14\n\n\n3,5" + "4,12\n\n\n4,5", + "4,13\n\n\n4,5", + "4,14\n\n\n4,5" ], [ { "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n3,6", - "4,1\n\n\n3,6", + "4,0\n\n\n4,6", + "4,1\n\n\n4,6", { "w": 1.5 }, - "4,2\n\n\n3,6", + "4,2\n\n\n4,6", { - "w": 7, - "c": "#cccccc" + "c": "#cccccc", + "w": 7 }, - "4,6\n\n\n3,6", + "4,6\n\n\n4,6", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,6", - "4,12\n\n\n3,6", + "4,11\n\n\n4,6", + "4,12\n\n\n4,6", { "w": 1.5 }, - "4,14\n\n\n3,6" + "4,14\n\n\n4,6" ], [ { "w": 1.5 }, - "4,0\n\n\n3,7", + "4,0\n\n\n4,7", { "d": true }, - "4,1\n\n\n3,7", + "4,1\n\n\n4,7", { "w": 1.5 }, - "4,2\n\n\n3,7", + "4,2\n\n\n4,7", { - "w": 7, - "c": "#cccccc" + "c": "#cccccc", + "w": 7 }, - "4,6\n\n\n3,7", + "4,6\n\n\n4,7", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,7", + "4,11\n\n\n4,7", { "x": 1, "w": 1.5 }, - "4,14\n\n\n3,7" + "4,14\n\n\n4,7" ], [ { - "d": true, - "w": 1.5 + "w": 1.5, + "d": true }, - "4,0\n\n\n3,8", - "4,1\n\n\n3,8", + "4,0\n\n\n4,8", + "4,1\n\n\n4,8", { "w": 1.5 }, - "4,2\n\n\n3,8", + "4,2\n\n\n4,8", { - "w": 7, - "c": "#cccccc" + "c": "#cccccc", + "w": 7 }, - "4,6\n\n\n3,8", + "4,6\n\n\n4,8", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,8", - "4,12\n\n\n3,8" + "4,11\n\n\n4,8", + "4,12\n\n\n4,8" ], [ { "w": 1.5 }, - "4,0\n\n\n3,9", - "4,1\n\n\n3,9", + "4,0\n\n\n4,9", + "4,1\n\n\n4,9", { "w": 1.5 }, - "4,2\n\n\n3,9", + "4,2\n\n\n4,9", { - "w": 7, - "c": "#cccccc" + "c": "#cccccc", + "w": 7 }, - "4,6\n\n\n3,9", + "4,6\n\n\n4,9", { "c": "#aaaaaa" }, - "4,11\n\n\n3,9", + "4,11\n\n\n4,9", { "c": "#777777" }, - "4,12\n\n\n3,9", - "4,13\n\n\n3,9", - "4,14\n\n\n3,9" + "4,12\n\n\n4,9", + "4,13\n\n\n4,9", + "4,14\n\n\n4,9" ], [ { "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n3,10", - "4,1\n\n\n3,10", + "4,0\n\n\n4,10", + "4,1\n\n\n4,10", { "w": 1.5 }, - "4,2\n\n\n3,10", + "4,2\n\n\n4,10", { - "w": 6, - "c": "#cccccc" + "c": "#cccccc", + "w": 6 }, - "4,6\n\n\n3,10", + "4,6\n\n\n4,10", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n3,10", - "4,11\n\n\n3,10", - "4,12\n\n\n3,10", + "4,10\n\n\n4,10", + "4,11\n\n\n4,10", + "4,12\n\n\n4,10", { "w": 1.5 }, - "4,14\n\n\n3,10" + "4,14\n\n\n4,10" ], [ { "w": 1.5 }, - "4,0\n\n\n3,11", - "4,1\n\n\n3,11", + "4,0\n\n\n4,11", + "4,1\n\n\n4,11", { "w": 1.5 }, - "4,2\n\n\n3,11", + "4,2\n\n\n4,11", { - "w": 3, - "c": "#cccccc" + "c": "#cccccc", + "w": 3 }, - "4,5\n\n\n3,11", + "4,5\n\n\n4,11", { "w": 3 }, - "4,7\n\n\n3,11", + "4,7\n\n\n4,11", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n3,11", - "4,11\n\n\n3,11", - "4,12\n\n\n3,11", + "4,10\n\n\n4,11", + "4,11\n\n\n4,11", + "4,12\n\n\n4,11", { "w": 1.5 }, - "4,14\n\n\n3,11" + "4,14\n\n\n4,11" ], [ { - "d": true, - "w": 1.5 + "w": 1.5, + "d": true }, - "4,0\n\n\n3,12", - "4,1\n\n\n3,12", + "4,0\n\n\n4,12", + "4,1\n\n\n4,12", { "w": 1.5 }, - "4,2\n\n\n3,12", + "4,2\n\n\n4,12", { - "w": 6, - "c": "#cccccc" + "c": "#cccccc", + "w": 6 }, - "4,6\n\n\n3,12", + "4,6\n\n\n4,12", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n3,12", - "4,11\n\n\n3,12" + "4,10\n\n\n4,12", + "4,11\n\n\n4,12" ], [ { - "d": true, - "w": 1.5 + "w": 1.5, + "d": true }, - "4,0\n\n\n3,13", - "4,1\n\n\n3,13", + "4,0\n\n\n4,13", + "4,1\n\n\n4,13", { "w": 1.5 }, - "4,2\n\n\n3,13", + "4,2\n\n\n4,13", { - "w": 3, - "c": "#cccccc" + "c": "#cccccc", + "w": 3 }, - "4,5\n\n\n3,13", + "4,5\n\n\n4,13", { "w": 3 }, - "4,7\n\n\n3,13", + "4,7\n\n\n4,13", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n3,13", - "4,11\n\n\n3,13" + "4,10\n\n\n4,13", + "4,11\n\n\n4,13" ], [ { "w": 1.5 }, - "4,0\n\n\n3,14", + "4,0\n\n\n4,14", { "w": 1.5 }, - "4,1\n\n\n3,14", + "4,1\n\n\n4,14", { "c": "#cccccc", "w": 7 }, - "4,6\n\n\n3,14", + "4,6\n\n\n4,14", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,14", + "4,10\n\n\n4,14", { "w": 1.25 }, - "4,11\n\n\n3,14", + "4,11\n\n\n4,14", { "w": 1.25 }, - "4,12\n\n\n3,14", + "4,12\n\n\n4,14", { "w": 1.25 }, - "4,14\n\n\n3,14" + "4,14\n\n\n4,14" ], [ { "w": 1.5 }, - "4,0\n\n\n3,15", + "4,0\n\n\n4,15", { "w": 1.5 }, - "4,1\n\n\n3,15", + "4,1\n\n\n4,15", { "c": "#cccccc", "w": 7 }, - "4,6\n\n\n3,15", + "4,6\n\n\n4,15", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n3,15", - "4,11\n\n\n3,15", - "4,12\n\n\n3,15", + "4,10\n\n\n4,15", + "4,11\n\n\n4,15", + "4,12\n\n\n4,15", { "w": 1.5 }, - "4,14\n\n\n3,15" + "4,14\n\n\n4,15" ], [ { "w": 1.5 }, - "4,0\n\n\n3,16", + "4,0\n\n\n4,16", { "w": 1.5 }, - "4,1\n\n\n3,16", + "4,1\n\n\n4,16", { "c": "#cccccc", "w": 7 }, - "4,6\n\n\n3,16", + "4,6\n\n\n4,16", { "c": "#aaaaaa" }, - "4,10\n\n\n3,16", - "4,11\n\n\n3,16", + "4,10\n\n\n4,16", + "4,11\n\n\n4,16", { "c": "#777777" }, - "4,12\n\n\n3,16", - "4,13\n\n\n3,16", - "4,14\n\n\n3,16" + "4,12\n\n\n4,16", + "4,13\n\n\n4,16", + "4,14\n\n\n4,16" ] ] }