From 2bc2a01f2ebe4c5e83951c38f2f438bb52e6b235 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 28 Mar 2024 11:52:55 +0000 Subject: [PATCH] add Stepped Caps lock --- src/melgeek/mj6xy/mj6xy_rev3.json | 454 ++++++++++++++++-------------- v3/melgeek/mj6xy/mj6xy_rev3.json | 454 ++++++++++++++++-------------- 2 files changed, 482 insertions(+), 426 deletions(-) diff --git a/src/melgeek/mj6xy/mj6xy_rev3.json b/src/melgeek/mj6xy/mj6xy_rev3.json index 23eb133a58..193ad5275b 100755 --- a/src/melgeek/mj6xy/mj6xy_rev3.json +++ b/src/melgeek/mj6xy/mj6xy_rev3.json @@ -10,6 +10,7 @@ "layouts": { "labels": [ "Split Backspace", + "Stepped", "ISO Enter", [ "Shift Row", @@ -40,6 +41,7 @@ "keymap": [ [ { + "x": 2, "c": "#777777" }, "0,0", @@ -72,6 +74,7 @@ ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.5 }, @@ -94,7 +97,7 @@ { "w": 1.5 }, - "1,13\n\n\n1,0", + "1,13\n\n\n2,0", { "x": 1.25, "c": "#777777", @@ -104,14 +107,21 @@ "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n2,1" ], [ { "c": "#aaaaaa", + "w": 1.25, + "w2": 1.75, + "l": true + }, + "2,0\n\n\n1,1", + { + "x": 0.75, "w": 1.75 }, - "2,0", + "2,0\n\n\n1,0", { "c": "#cccccc" }, @@ -130,530 +140,548 @@ "c": "#777777", "w": 2.25 }, - "2,13\n\n\n1,0", + "2,13\n\n\n2,0", { "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n2,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,0", + "3,0\n\n\n3,0", { "c": "#cccccc" }, - "3,2\n\n\n2,0", - "3,3\n\n\n2,0", - "3,4\n\n\n2,0", - "3,5\n\n\n2,0", - "3,6\n\n\n2,0", - "3,7\n\n\n2,0", - "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,2\n\n\n3,0", + "3,3\n\n\n3,0", + "3,4\n\n\n3,0", + "3,5\n\n\n3,0", + "3,6\n\n\n3,0", + "3,7\n\n\n3,0", + "3,8\n\n\n3,0", + "3,9\n\n\n3,0", + "3,10\n\n\n3,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": 2, "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\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" ], [ { + "x": 2, "y": 0.25, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,1", + "3,0\n\n\n3,1", { "c": "#cccccc" }, - "3,2\n\n\n2,1", - "3,3\n\n\n2,1", - "3,4\n\n\n2,1", - "3,5\n\n\n2,1", - "3,6\n\n\n2,1", - "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", + "3,2\n\n\n3,1", + "3,3\n\n\n3,1", + "3,4\n\n\n3,1", + "3,5\n\n\n3,1", + "3,6\n\n\n3,1", + "3,7\n\n\n3,1", + "3,8\n\n\n3,1", + "3,9\n\n\n3,1", + "3,10\n\n\n3,1", + "3,11\n\n\n3,1", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,1", - "3,14\n\n\n2,1" + "3,12\n\n\n3,1", + "3,14\n\n\n3,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,2", + "3,0\n\n\n3,2", { "c": "#cccccc" }, - "3,2\n\n\n2,2", - "3,3\n\n\n2,2", - "3,4\n\n\n2,2", - "3,5\n\n\n2,2", - "3,6\n\n\n2,2", - "3,7\n\n\n2,2", - "3,8\n\n\n2,2", - "3,9\n\n\n2,2", - "3,10\n\n\n2,2", + "3,2\n\n\n3,2", + "3,3\n\n\n3,2", + "3,4\n\n\n3,2", + "3,5\n\n\n3,2", + "3,6\n\n\n3,2", + "3,7\n\n\n3,2", + "3,8\n\n\n3,2", + "3,9\n\n\n3,2", + "3,10\n\n\n3,2", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,2", - "3,13\n\n\n2,2", - "3,14\n\n\n2,2" + "3,11\n\n\n3,2", + "3,13\n\n\n3,2", + "3,14\n\n\n3,2" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,3", + "3,0\n\n\n3,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", - "3,5\n\n\n2,3", - "3,6\n\n\n2,3", - "3,7\n\n\n2,3", - "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,1\n\n\n3,3", + "3,2\n\n\n3,3", + "3,3\n\n\n3,3", + "3,4\n\n\n3,3", + "3,5\n\n\n3,3", + "3,6\n\n\n3,3", + "3,7\n\n\n3,3", + "3,8\n\n\n3,3", + "3,9\n\n\n3,3", + "3,10\n\n\n3,3", + "3,11\n\n\n3,3", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,3" + "3,13\n\n\n3,3" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,4", + "3,0\n\n\n3,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", + "3,1\n\n\n3,4", + "3,2\n\n\n3,4", + "3,3\n\n\n3,4", + "3,4\n\n\n3,4", + "3,5\n\n\n3,4", + "3,6\n\n\n3,4", + "3,7\n\n\n3,4", + "3,8\n\n\n3,4", + "3,9\n\n\n3,4", + "3,10\n\n\n3,4", + "3,11\n\n\n3,4", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,4", - "3,14\n\n\n2,4" + "3,12\n\n\n3,4", + "3,14\n\n\n3,4" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,5", + "3,0\n\n\n3,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,1\n\n\n3,5", + "3,2\n\n\n3,5", + "3,3\n\n\n3,5", + "3,4\n\n\n3,5", + "3,5\n\n\n3,5", + "3,6\n\n\n3,5", + "3,7\n\n\n3,5", + "3,8\n\n\n3,5", + "3,9\n\n\n3,5", + "3,10\n\n\n3,5", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,5", - "3,13\n\n\n2,5", - "3,14\n\n\n2,5" + "3,11\n\n\n3,5", + "3,13\n\n\n3,5", + "3,14\n\n\n3,5" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,6", + "3,0\n\n\n3,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", + "3,2\n\n\n3,6", + "3,3\n\n\n3,6", + "3,4\n\n\n3,6", + "3,5\n\n\n3,6", + "3,6\n\n\n3,6", + "3,7\n\n\n3,6", + "3,8\n\n\n3,6", + "3,9\n\n\n3,6", + "3,10\n\n\n3,6", + "3,11\n\n\n3,6", { "c": "#aaaaaa" }, - "3,12\n\n\n2,6", - "3,13\n\n\n2,6", - "3,14\n\n\n2,6" + "3,12\n\n\n3,6", + "3,13\n\n\n3,6", + "3,14\n\n\n3,6" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,7", + "3,0\n\n\n3,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", + "3,2\n\n\n3,7", + "3,3\n\n\n3,7", + "3,4\n\n\n3,7", + "3,5\n\n\n3,7", + "3,6\n\n\n3,7", + "3,7\n\n\n3,7", + "3,8\n\n\n3,7", + "3,9\n\n\n3,7", + "3,10\n\n\n3,7", + "3,11\n\n\n3,7", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,7", - "3,14\n\n\n2,7" + "3,12\n\n\n3,7", + "3,14\n\n\n3,7" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,8", + "3,0\n\n\n3,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", - "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", + "3,1\n\n\n3,8", + "3,2\n\n\n3,8", + "3,3\n\n\n3,8", + "3,4\n\n\n3,8", + "3,5\n\n\n3,8", + "3,6\n\n\n3,8", + "3,7\n\n\n3,8", + "3,8\n\n\n3,8", + "3,9\n\n\n3,8", + "3,10\n\n\n3,8", + "3,11\n\n\n3,8", { "c": "#aaaaaa" }, - "3,12\n\n\n2,8", - "3,13\n\n\n2,8", - "3,14\n\n\n2,8" + "3,12\n\n\n3,8", + "3,13\n\n\n3,8", + "3,14\n\n\n3,8" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,9", + "3,0\n\n\n3,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", + "3,1\n\n\n3,9", + "3,2\n\n\n3,9", + "3,3\n\n\n3,9", + "3,4\n\n\n3,9", + "3,5\n\n\n3,9", + "3,6\n\n\n3,9", + "3,7\n\n\n3,9", + "3,8\n\n\n3,9", + "3,9\n\n\n3,9", + "3,10\n\n\n3,9", + "3,11\n\n\n3,9", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,9", - "3,14\n\n\n2,9" + "3,12\n\n\n3,9", + "3,14\n\n\n3,9" ], [ { + "x": 2, "y": 0.25, "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", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,1", + "4,5\n\n\n4,1", { "c": "#aaaaaa" }, - "4,10\n\n\n3,1", - "4,11\n\n\n3,1", - "4,12\n\n\n3,1", - "4,13\n\n\n3,1", - "4,14\n\n\n3,1" + "4,10\n\n\n4,1", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", + "4,13\n\n\n4,1", + "4,14\n\n\n4,1" ], [ { + "x": 2, "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", { "c": "#cccccc", "w": 6 }, - "4,5\n\n\n3,2", + "4,5\n\n\n4,2", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", - "4,12\n\n\n3,2", - "4,13\n\n\n3,2", - "4,14\n\n\n3,2" + "4,10\n\n\n4,2", + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", + "4,13\n\n\n4,2", + "4,14\n\n\n4,2" ], [ { + "x": 2, "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", { "c": "#cccccc", "w": 3 }, - "4,3\n\n\n3,3", + "4,3\n\n\n4,3", { "w": 3 }, - "4,8\n\n\n3,3", + "4,8\n\n\n4,3", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", - "4,12\n\n\n3,3", - "4,13\n\n\n3,3", - "4,14\n\n\n3,3" + "4,10\n\n\n4,3", + "4,11\n\n\n4,3", + "4,12\n\n\n4,3", + "4,13\n\n\n4,3", + "4,14\n\n\n4,3" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,4", - "4,1\n\n\n3,4", + "4,0\n\n\n4,4", + "4,1\n\n\n4,4", { "w": 1.5 }, - "4,2\n\n\n3,4", + "4,2\n\n\n4,4", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,4", + "4,7\n\n\n4,4", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,4", - "4,12\n\n\n3,4", + "4,11\n\n\n4,4", + "4,12\n\n\n4,4", { "w": 1.5 }, - "4,14\n\n\n3,4" + "4,14\n\n\n4,4" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,5", + "4,0\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,2\n\n\n3,5", + "4,2\n\n\n4,5", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,5", + "4,7\n\n\n4,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,12\n\n\n3,5", + "4,12\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,14\n\n\n3,5" + "4,14\n\n\n4,5" ], [ { - "x": 1.5 + "x": 3.5 }, - "4,1\n\n\n3,6", + "4,1\n\n\n4,6", { "w": 1.5 }, - "4,2\n\n\n3,6", + "4,2\n\n\n4,6", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,6", + "4,7\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" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,7", - "4,1\n\n\n3,7", + "4,0\n\n\n4,7", + "4,1\n\n\n4,7", { "w": 1.5 }, - "4,2\n\n\n3,7", + "4,2\n\n\n4,7", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,7", + "4,7\n\n\n4,7", { "c": "#aaaaaa" }, - "4,11\n\n\n3,7", - "4,12\n\n\n3,7", - "4,13\n\n\n3,7", - "4,14\n\n\n3,7" + "4,11\n\n\n4,7", + "4,12\n\n\n4,7", + "4,13\n\n\n4,7", + "4,14\n\n\n4,7" ], [ { + "x": 2, "w": 1.75 }, - "4,0\n\n\n3,8", + "4,0\n\n\n4,8", { "w": 1.25 }, - "4,1\n\n\n3,8", + "4,1\n\n\n4,8", { "w": 1.25 }, - "4,2\n\n\n3,8", + "4,2\n\n\n4,8", { "w": 1.25 }, - "4,3\n\n\n3,8", + "4,3\n\n\n4,8", { "c": "#cccccc", "w": 3 }, - "4,5\n\n\n3,8", + "4,5\n\n\n4,8", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n3,8", + "4,9\n\n\n4,8", { "w": 1.25 }, - "4,10\n\n\n3,8", - "4,11\n\n\n3,8", - "4,12\n\n\n3,8", - "4,13\n\n\n3,8", - "4,14\n\n\n3,8" + "4,10\n\n\n4,8", + "4,11\n\n\n4,8", + "4,12\n\n\n4,8", + "4,13\n\n\n4,8", + "4,14\n\n\n4,8" ] ] } diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 3b9140c394..cc9a0d30dc 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -8,6 +8,7 @@ "layouts": { "labels": [ "Split Backspace", + "Stepped", "ISO Enter", [ "Shift Row", @@ -38,6 +39,7 @@ "keymap": [ [ { + "x": 2, "c": "#777777" }, "0,0", @@ -70,6 +72,7 @@ ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.5 }, @@ -92,7 +95,7 @@ { "w": 1.5 }, - "1,13\n\n\n1,0", + "1,13\n\n\n2,0", { "x": 1.25, "c": "#777777", @@ -102,14 +105,21 @@ "h2": 1, "x2": -0.25 }, - "2,13\n\n\n1,1" + "2,13\n\n\n2,1" ], [ { "c": "#aaaaaa", + "w": 1.25, + "w2": 1.75, + "l": true + }, + "2,0\n\n\n1,1", + { + "x": 0.75, "w": 1.75 }, - "2,0", + "2,0\n\n\n1,0", { "c": "#cccccc" }, @@ -128,530 +138,548 @@ "c": "#777777", "w": 2.25 }, - "2,13\n\n\n1,0", + "2,13\n\n\n2,0", { "x": 0.25, "c": "#cccccc" }, - "2,12\n\n\n1,1" + "2,12\n\n\n2,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,0", + "3,0\n\n\n3,0", { "c": "#cccccc" }, - "3,2\n\n\n2,0", - "3,3\n\n\n2,0", - "3,4\n\n\n2,0", - "3,5\n\n\n2,0", - "3,6\n\n\n2,0", - "3,7\n\n\n2,0", - "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,2\n\n\n3,0", + "3,3\n\n\n3,0", + "3,4\n\n\n3,0", + "3,5\n\n\n3,0", + "3,6\n\n\n3,0", + "3,7\n\n\n3,0", + "3,8\n\n\n3,0", + "3,9\n\n\n3,0", + "3,10\n\n\n3,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": 2, "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\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" ], [ { + "x": 2, "y": 0.25, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,1", + "3,0\n\n\n3,1", { "c": "#cccccc" }, - "3,2\n\n\n2,1", - "3,3\n\n\n2,1", - "3,4\n\n\n2,1", - "3,5\n\n\n2,1", - "3,6\n\n\n2,1", - "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", + "3,2\n\n\n3,1", + "3,3\n\n\n3,1", + "3,4\n\n\n3,1", + "3,5\n\n\n3,1", + "3,6\n\n\n3,1", + "3,7\n\n\n3,1", + "3,8\n\n\n3,1", + "3,9\n\n\n3,1", + "3,10\n\n\n3,1", + "3,11\n\n\n3,1", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,1", - "3,14\n\n\n2,1" + "3,12\n\n\n3,1", + "3,14\n\n\n3,1" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2.25 }, - "3,0\n\n\n2,2", + "3,0\n\n\n3,2", { "c": "#cccccc" }, - "3,2\n\n\n2,2", - "3,3\n\n\n2,2", - "3,4\n\n\n2,2", - "3,5\n\n\n2,2", - "3,6\n\n\n2,2", - "3,7\n\n\n2,2", - "3,8\n\n\n2,2", - "3,9\n\n\n2,2", - "3,10\n\n\n2,2", + "3,2\n\n\n3,2", + "3,3\n\n\n3,2", + "3,4\n\n\n3,2", + "3,5\n\n\n3,2", + "3,6\n\n\n3,2", + "3,7\n\n\n3,2", + "3,8\n\n\n3,2", + "3,9\n\n\n3,2", + "3,10\n\n\n3,2", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,2", - "3,13\n\n\n2,2", - "3,14\n\n\n2,2" + "3,11\n\n\n3,2", + "3,13\n\n\n3,2", + "3,14\n\n\n3,2" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,3", + "3,0\n\n\n3,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", - "3,5\n\n\n2,3", - "3,6\n\n\n2,3", - "3,7\n\n\n2,3", - "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,1\n\n\n3,3", + "3,2\n\n\n3,3", + "3,3\n\n\n3,3", + "3,4\n\n\n3,3", + "3,5\n\n\n3,3", + "3,6\n\n\n3,3", + "3,7\n\n\n3,3", + "3,8\n\n\n3,3", + "3,9\n\n\n3,3", + "3,10\n\n\n3,3", + "3,11\n\n\n3,3", { "c": "#aaaaaa", "w": 2.75 }, - "3,13\n\n\n2,3" + "3,13\n\n\n3,3" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,4", + "3,0\n\n\n3,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", + "3,1\n\n\n3,4", + "3,2\n\n\n3,4", + "3,3\n\n\n3,4", + "3,4\n\n\n3,4", + "3,5\n\n\n3,4", + "3,6\n\n\n3,4", + "3,7\n\n\n3,4", + "3,8\n\n\n3,4", + "3,9\n\n\n3,4", + "3,10\n\n\n3,4", + "3,11\n\n\n3,4", { "c": "#aaaaaa", "w": 1.75 }, - "3,12\n\n\n2,4", - "3,14\n\n\n2,4" + "3,12\n\n\n3,4", + "3,14\n\n\n3,4" ], [ { + "x": 2, "c": "#aaaaaa", "w": 1.25 }, - "3,0\n\n\n2,5", + "3,0\n\n\n3,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,1\n\n\n3,5", + "3,2\n\n\n3,5", + "3,3\n\n\n3,5", + "3,4\n\n\n3,5", + "3,5\n\n\n3,5", + "3,6\n\n\n3,5", + "3,7\n\n\n3,5", + "3,8\n\n\n3,5", + "3,9\n\n\n3,5", + "3,10\n\n\n3,5", { "c": "#aaaaaa", "w": 1.75 }, - "3,11\n\n\n2,5", - "3,13\n\n\n2,5", - "3,14\n\n\n2,5" + "3,11\n\n\n3,5", + "3,13\n\n\n3,5", + "3,14\n\n\n3,5" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,6", + "3,0\n\n\n3,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", + "3,2\n\n\n3,6", + "3,3\n\n\n3,6", + "3,4\n\n\n3,6", + "3,5\n\n\n3,6", + "3,6\n\n\n3,6", + "3,7\n\n\n3,6", + "3,8\n\n\n3,6", + "3,9\n\n\n3,6", + "3,10\n\n\n3,6", + "3,11\n\n\n3,6", { "c": "#aaaaaa" }, - "3,12\n\n\n2,6", - "3,13\n\n\n2,6", - "3,14\n\n\n2,6" + "3,12\n\n\n3,6", + "3,13\n\n\n3,6", + "3,14\n\n\n3,6" ], [ { + "x": 2, "c": "#aaaaaa", "w": 2 }, - "3,0\n\n\n2,7", + "3,0\n\n\n3,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", + "3,2\n\n\n3,7", + "3,3\n\n\n3,7", + "3,4\n\n\n3,7", + "3,5\n\n\n3,7", + "3,6\n\n\n3,7", + "3,7\n\n\n3,7", + "3,8\n\n\n3,7", + "3,9\n\n\n3,7", + "3,10\n\n\n3,7", + "3,11\n\n\n3,7", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,7", - "3,14\n\n\n2,7" + "3,12\n\n\n3,7", + "3,14\n\n\n3,7" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,8", + "3,0\n\n\n3,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", - "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", + "3,1\n\n\n3,8", + "3,2\n\n\n3,8", + "3,3\n\n\n3,8", + "3,4\n\n\n3,8", + "3,5\n\n\n3,8", + "3,6\n\n\n3,8", + "3,7\n\n\n3,8", + "3,8\n\n\n3,8", + "3,9\n\n\n3,8", + "3,10\n\n\n3,8", + "3,11\n\n\n3,8", { "c": "#aaaaaa" }, - "3,12\n\n\n2,8", - "3,13\n\n\n2,8", - "3,14\n\n\n2,8" + "3,12\n\n\n3,8", + "3,13\n\n\n3,8", + "3,14\n\n\n3,8" ], [ { + "x": 2, "c": "#aaaaaa" }, - "3,0\n\n\n2,9", + "3,0\n\n\n3,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", + "3,1\n\n\n3,9", + "3,2\n\n\n3,9", + "3,3\n\n\n3,9", + "3,4\n\n\n3,9", + "3,5\n\n\n3,9", + "3,6\n\n\n3,9", + "3,7\n\n\n3,9", + "3,8\n\n\n3,9", + "3,9\n\n\n3,9", + "3,10\n\n\n3,9", + "3,11\n\n\n3,9", { "c": "#aaaaaa", "w": 2 }, - "3,12\n\n\n2,9", - "3,14\n\n\n2,9" + "3,12\n\n\n3,9", + "3,14\n\n\n3,9" ], [ { + "x": 2, "y": 0.25, "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", { "c": "#cccccc", "w": 6.25 }, - "4,5\n\n\n3,1", + "4,5\n\n\n4,1", { "c": "#aaaaaa" }, - "4,10\n\n\n3,1", - "4,11\n\n\n3,1", - "4,12\n\n\n3,1", - "4,13\n\n\n3,1", - "4,14\n\n\n3,1" + "4,10\n\n\n4,1", + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", + "4,13\n\n\n4,1", + "4,14\n\n\n4,1" ], [ { + "x": 2, "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", { "c": "#cccccc", "w": 6 }, - "4,5\n\n\n3,2", + "4,5\n\n\n4,2", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", - "4,12\n\n\n3,2", - "4,13\n\n\n3,2", - "4,14\n\n\n3,2" + "4,10\n\n\n4,2", + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", + "4,13\n\n\n4,2", + "4,14\n\n\n4,2" ], [ { + "x": 2, "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", { "c": "#cccccc", "w": 3 }, - "4,3\n\n\n3,3", + "4,3\n\n\n4,3", { "w": 3 }, - "4,8\n\n\n3,3", + "4,8\n\n\n4,3", { "c": "#aaaaaa", "w": 1.25 }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", - "4,12\n\n\n3,3", - "4,13\n\n\n3,3", - "4,14\n\n\n3,3" + "4,10\n\n\n4,3", + "4,11\n\n\n4,3", + "4,12\n\n\n4,3", + "4,13\n\n\n4,3", + "4,14\n\n\n4,3" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,4", - "4,1\n\n\n3,4", + "4,0\n\n\n4,4", + "4,1\n\n\n4,4", { "w": 1.5 }, - "4,2\n\n\n3,4", + "4,2\n\n\n4,4", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,4", + "4,7\n\n\n4,4", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,4", - "4,12\n\n\n3,4", + "4,11\n\n\n4,4", + "4,12\n\n\n4,4", { "w": 1.5 }, - "4,14\n\n\n3,4" + "4,14\n\n\n4,4" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,5", + "4,0\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,2\n\n\n3,5", + "4,2\n\n\n4,5", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,5", + "4,7\n\n\n4,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,12\n\n\n3,5", + "4,12\n\n\n4,5", { "x": 1, "w": 1.5 }, - "4,14\n\n\n3,5" + "4,14\n\n\n4,5" ], [ { - "x": 1.5 + "x": 3.5 }, - "4,1\n\n\n3,6", + "4,1\n\n\n4,6", { "w": 1.5 }, - "4,2\n\n\n3,6", + "4,2\n\n\n4,6", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,6", + "4,7\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" ], [ { + "x": 2, "w": 1.5 }, - "4,0\n\n\n3,7", - "4,1\n\n\n3,7", + "4,0\n\n\n4,7", + "4,1\n\n\n4,7", { "w": 1.5 }, - "4,2\n\n\n3,7", + "4,2\n\n\n4,7", { "c": "#cccccc", "w": 7 }, - "4,7\n\n\n3,7", + "4,7\n\n\n4,7", { "c": "#aaaaaa" }, - "4,11\n\n\n3,7", - "4,12\n\n\n3,7", - "4,13\n\n\n3,7", - "4,14\n\n\n3,7" + "4,11\n\n\n4,7", + "4,12\n\n\n4,7", + "4,13\n\n\n4,7", + "4,14\n\n\n4,7" ], [ { + "x": 2, "w": 1.75 }, - "4,0\n\n\n3,8", + "4,0\n\n\n4,8", { "w": 1.25 }, - "4,1\n\n\n3,8", + "4,1\n\n\n4,8", { "w": 1.25 }, - "4,2\n\n\n3,8", + "4,2\n\n\n4,8", { "w": 1.25 }, - "4,3\n\n\n3,8", + "4,3\n\n\n4,8", { "c": "#cccccc", "w": 3 }, - "4,5\n\n\n3,8", + "4,5\n\n\n4,8", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n3,8", + "4,9\n\n\n4,8", { "w": 1.25 }, - "4,10\n\n\n3,8", - "4,11\n\n\n3,8", - "4,12\n\n\n3,8", - "4,13\n\n\n3,8", - "4,14\n\n\n3,8" + "4,10\n\n\n4,8", + "4,11\n\n\n4,8", + "4,12\n\n\n4,8", + "4,13\n\n\n4,8", + "4,14\n\n\n4,8" ] ] }