From b5ce625ee5992988b50c429d67e383299a81ba3e Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 20 Apr 2024 23:39:22 +0100 Subject: [PATCH 1/2] improve melgeek/mj6xy_rev3 --- v3/melgeek/mj6xy/mj6xy_rev3.json | 393 +++++++++++++++++++------------ 1 file changed, 247 insertions(+), 146 deletions(-) diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 58327c7cfc..5f2fc44c99 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -18,26 +18,49 @@ "ISO Enter", [ "Shift Row", - "default", - "Split_lshift_rshift1", - "Split_lshift_rshift2", - "Split_lshift_rshift3", - "Split_lshift_rshift4" + "ANSI", + "ISO", + "64-key ANSI", + "64-key ISO" ], [ - "Bottom row", - "default", - "6.25U_Spc_Arrow", - "6.0U_Spc_Arrow", - "3.0U_Spc_Arrow", - "Split_3.0U_Arrow", - "7.0U_Spc" + "Right Shift", + "2.75u", + "Tsangan", + "Arrows", + "64-key", + "64-key 2u" + ], + [ + "Left Modifers", + "3x1.25u", + "Tsangan", + "WKL", + "HHKB", + "Minila" + ], + [ + "Spacebar", + "6.25u", + "Tsangan", + "6u", + "Split 6u", + "Minila" + ], + [ + "Right Modifiers", + "4x1.25u", + "Tsangan", + "WKL", + "HHKB", + "Minila", + "5x1u", + "4x1u" ] ], "keymap": [ [ { - "x": 2.5, "c": "#777777" }, "0,0", @@ -70,7 +93,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.5 }, @@ -107,7 +129,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.75 }, @@ -139,7 +160,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 2.25 }, @@ -156,61 +176,97 @@ "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,12\n\n\n3,1", + "3,14\n\n\n3,1" ], [ { - "x": 2.5, + "c": "#cccccc", + "w": 3.75, + "d": true + }, + "\n\n\n5,0", + { + "x": -3.75, + "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", { "c": "#cccccc", + "w": 6.25, + "d": true + }, + "\n\n\n6,0", + { + "x": -6.25, "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,14\n\n\n3,0" + "4,14\n\n\n6,0", + { + "x": 0.25, + "w": 1.75 + }, + "3,11\n\n\n3,2", + { + "c": "#777777" + }, + "3,13\n\n\n3,2", + { + "c": "#aaaaaa" + }, + "3,14\n\n\n3,2" ], [ { - "x": 2.5, - "c": "#aaaaaa", + "y": 0.25, "w": 1.25 }, "3,0\n\n\n2,1", - "3,1\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", @@ -219,20 +275,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,12\n\n\n2,1", - "3,14\n\n\n2,1" + "3,10\n\n\n2,1" ], [ { - "x": 2.5, "c": "#aaaaaa", - "w": 2.25 + "w": 2 }, "3,0\n\n\n2,2", { @@ -247,23 +295,29 @@ "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 }, - "3,11\n\n\n2,2", - "3,13\n\n\n2,2", - "3,14\n\n\n2,2" - ], - [ + "\n\n\n3,3", + "3,12\n\n\n3,3", { - "x": 2.5, - "c": "#aaaaaa", - "w": 2 + "c": "#777777" }, + "3,13\n\n\n3,3", + { + "c": "#aaaaaa" + }, + "3,14\n\n\n3,3" + ], + [ "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", @@ -274,189 +328,236 @@ "3,9\n\n\n2,3", "3,10\n\n\n2,3", "3,11\n\n\n2,3", - "3,12\n\n\n2,3", - "3,13\n\n\n2,3", - "3,14\n\n\n2,3" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa" - }, - "3,0\n\n\n2,4", - "3,1\n\n\n2,4", { - "c": "#cccccc" + "x": 3.25, + "w": 0.75, + "d": true }, - "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", + "\n\n\n3,4", { "c": "#aaaaaa", "w": 2 }, - "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.5, - "w": 1.25 + "y": 0.25, + "c": "#cccccc", + "w": 4, + "d": true }, - "4,0\n\n\n3,1", + "\n\n\n5,1", { - "w": 1.25 + "x": -4, + "c": "#aaaaaa", + "w": 1.5 }, - "4,1\n\n\n3,1", + "4,0\n\n\n4,1", + "4,1\n\n\n4,1", { - "w": 1.25 + "w": 1.5 }, - "4,2\n\n\n3,1", + "4,2\n\n\n4,1", { + "x": -0.25, "c": "#cccccc", - "w": 6.25 + "w": 7.25, + "d": true }, - "4,5\n\n\n3,1", + "\n\n\n6,1", { - "c": "#aaaaaa" + "x": -7, + "w": 7 + }, + "4,7\n\n\n5,1", + { + "c": "#aaaaaa", + "w": 1.5 }, - "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,11\n\n\n6,1", + "4,12\n\n\n6,1", + { + "w": 1.5 + }, + "4,14\n\n\n6,1" ], [ { - "x": 2.5, - "w": 1.25 + "w": 1.5 }, - "4,0\n\n\n3,2", + "4,0\n\n\n4,2", { - "w": 1.25 + "x": 1, + "w": 1.5 }, - "4,1\n\n\n3,2", + "4,2\n\n\n4,2", { - "w": 1.25 + "x": -0.25, + "c": "#cccccc", + "w": 7.25, + "d": true + }, + "\n\n\n6,2", + { + "c": "#aaaaaa", + "w": 1.5 }, - "4,2\n\n\n3,2", + "4,11\n\n\n6,2", { + "x": 1, + "w": 1.5 + }, + "4,14\n\n\n6,2" + ], + [ + { + "w": 1.5, + "d": true + }, + "\n\n\n4,3", + "4,1\n\n\n4,3", + { + "w": 1.5 + }, + "4,2\n\n\n4,3", + { + "x": -0.25, "c": "#cccccc", - "w": 6 + "w": 7.25, + "d": true }, - "4,5\n\n\n3,2", + "\n\n\n6,3", { "c": "#aaaaaa", - "w": 1.25 + "w": 1.5 }, - "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,11\n\n\n6,3", + "4,12\n\n\n6,3" ], [ { - "x": 2.5, + "c": "#cccccc", + "w": 4.25, + "d": true + }, + "\n\n\n5,4", + { + "x": -4.25, + "c": "#aaaaaa", "w": 1.75 }, - "4,0\n\n\n3,3", + "4,0\n\n\n4,4", { "w": 1.25 }, - "4,1\n\n\n3,3", + "4,1\n\n\n4,4", { "w": 1.25 }, - "4,2\n\n\n3,3", + "4,2\n\n\n4,4", { + "x": -0.5, + "c": "#cccccc", + "w": 6, + "d": true + }, + "\n\n\n6,4", + { + "x": -5.5, + "c": "#aaaaaa", "w": 1.25 }, - "4,3\n\n\n3,3", + "4,3\n\n\n5,4", { "c": "#cccccc", "w": 3 }, - "4,5\n\n\n3,3", + "4,5\n\n\n5,4", { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n3,3", + "4,9\n\n\n5,4", { "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\n6,4", + "4,11\n\n\n6,4", + { + "c": "#777777" + }, + "4,12\n\n\n6,4", + "4,13\n\n\n6,4", + "4,14\n\n\n6,4" ], [ { - "x": 2.5, - "w": 1.25 + "c": "#cccccc", + "w": 3.75, + "d": true }, - "4,0\n\n\n3,4", + "\n\n\n5,2", { - "w": 1.25 + "w": 6 }, - "4,1\n\n\n3,4", + "4,5\n\n\n5,2" + ], + [ { - "w": 1.25 + "w": 3.75, + "d": true }, - "4,2\n\n\n3,4", + "\n\n\n5,3", { "c": "#aaaaaa", "w": 3 }, - "4,3\n\n\n3,4", + "4,3\n\n\n5,3", { "w": 3 }, - "4,8\n\n\n3,4", - { - "w": 1.25 - }, - "4,10\n\n\n3,4", - "4,11\n\n\n3,4", - "4,12\n\n\n3,4", - "4,13\n\n\n3,4", - "4,14\n\n\n3,4" + "4,8\n\n\n5,3" ], [ { - "x": 2.5, - "w": 1.5 + "x": 3.75, + "c": "#cccccc", + "w": 6.25, + "d": true }, - "4,0\n\n\n3,5", - "4,1\n\n\n3,5", + "\n\n\n6,5", { - "w": 1.5 + "c": "#aaaaaa" + }, + "4,10\n\n\n6,5", + "4,11\n\n\n6,5", + { + "c": "#777777" }, - "4,2\n\n\n3,5", + "4,12\n\n\n6,5", + "4,13\n\n\n6,5", + "4,14\n\n\n6,5" + ], + [ { + "x": 3.75, "c": "#cccccc", - "w": 7 + "w": 7.25, + "d": true }, - "4,7\n\n\n3,5", + "\n\n\n6,6", { - "c": "#aaaaaa", - "w": 1.5 + "c": "#aaaaaa" }, - "4,11\n\n\n3,5", - "4,12\n\n\n3,5", + "4,11\n\n\n6,6", { - "w": 1.5 + "c": "#777777" }, - "4,14\n\n\n3,5" + "4,12\n\n\n6,6", + "4,13\n\n\n6,6", + "4,14\n\n\n6,6" ] ] } From fb6bb6cbcd46ac6dbdae2bf3fd540a2d36982198 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 6 Jul 2024 21:38:42 +0100 Subject: [PATCH 2/2] conjoin rows --- v3/melgeek/mj6xy/mj6xy_rev3.json | 541 +++++++++++++++++++------------ 1 file changed, 334 insertions(+), 207 deletions(-) diff --git a/v3/melgeek/mj6xy/mj6xy_rev3.json b/v3/melgeek/mj6xy/mj6xy_rev3.json index 5f2fc44c99..0a5eab6c6d 100644 --- a/v3/melgeek/mj6xy/mj6xy_rev3.json +++ b/v3/melgeek/mj6xy/mj6xy_rev3.json @@ -18,44 +18,28 @@ "ISO Enter", [ "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", - "2.75u", - "Tsangan", + "Bottom Row", + "Standard", "Arrows", - "64-key", - "64-key 2u" - ], - [ - "Left Modifers", - "3x1.25u", - "Tsangan", - "WKL", - "HHKB", - "Minila" - ], - [ - "Spacebar", - "6.25u", - "Tsangan", "6u", "Split 6u", - "Minila" - ], - [ - "Right Modifiers", - "4x1.25u", "Tsangan", "WKL", "HHKB", - "Minila", - "5x1u", - "4x1u" + "Tsangan Arrows", + "Minila" ] ], "keymap": [ @@ -176,97 +160,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,12\n\n\n3,1", - "3,14\n\n\n3,1" + "3,13\n\n\n2,0" ], [ { - "c": "#cccccc", - "w": 3.75, - "d": true - }, - "\n\n\n5,0", - { - "x": -3.75, - "c": "#aaaaaa", "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, - "d": true - }, - "\n\n\n6,0", - { - "x": -6.25, "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,14\n\n\n6,0", - { - "x": 0.25, - "w": 1.75 - }, - "3,11\n\n\n3,2", - { - "c": "#777777" - }, - "3,13\n\n\n3,2", - { - "c": "#aaaaaa" - }, - "3,14\n\n\n3,2" + "4,14\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", @@ -275,12 +220,18 @@ "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,10\n\n\n2,1", + "3,11\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n2,1", + "3,14\n\n\n2,1" ], [ { - "c": "#aaaaaa", - "w": 2 + "w": 2.25 }, "3,0\n\n\n2,2", { @@ -295,24 +246,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,3", - "3,12\n\n\n3,3", + "3,11\n\n\n2,2", { "c": "#777777" }, - "3,13\n\n\n3,3", + "3,13\n\n\n2,2", { "c": "#aaaaaa" }, - "3,14\n\n\n3,3" + "3,14\n\n\n2,2" ], [ + { + "w": 1.25 + }, "3,0\n\n\n2,3", { "c": "#cccccc" @@ -328,236 +279,412 @@ "3,9\n\n\n2,3", "3,10\n\n\n2,3", "3,11\n\n\n2,3", - { - "x": 3.25, - "w": 0.75, - "d": true - }, - "\n\n\n3,4", { "c": "#aaaaaa", - "w": 2 + "w": 2.75 }, - "3,12\n\n\n3,4", - "3,14\n\n\n3,4" + "3,13\n\n\n2,3" ], [ { - "y": 0.25, - "c": "#cccccc", - "w": 4, - "d": true + "w": 1.25 }, - "\n\n\n5,1", + "3,0\n\n\n2,4", { - "x": -4, - "c": "#aaaaaa", - "w": 1.5 + "c": "#cccccc" }, - "4,0\n\n\n4,1", - "4,1\n\n\n4,1", + "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", { - "w": 1.5 + "c": "#aaaaaa", + "w": 1.75 }, - "4,2\n\n\n4,1", + "3,12\n\n\n2,4", + "3,14\n\n\n2,4" + ], + [ { - "x": -0.25, - "c": "#cccccc", - "w": 7.25, - "d": true + "w": 1.25 }, - "\n\n\n6,1", + "3,0\n\n\n2,5", { - "x": -7, - "w": 7 + "c": "#cccccc" }, - "4,7\n\n\n5,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", { "c": "#aaaaaa", - "w": 1.5 + "w": 1.75 }, - "4,11\n\n\n6,1", - "4,12\n\n\n6,1", + "3,11\n\n\n2,5", { - "w": 1.5 + "c": "#777777" }, - "4,14\n\n\n6,1" + "3,13\n\n\n2,5", + { + "c": "#aaaaaa" + }, + "3,14\n\n\n2,5" ], [ { - "w": 1.5 + "w": 2 }, - "4,0\n\n\n4,2", + "3,0\n\n\n2,6", { - "x": 1, - "w": 1.5 + "c": "#cccccc" }, - "4,2\n\n\n4,2", + "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,12\n\n\n2,6", { - "x": -0.25, - "c": "#cccccc", - "w": 7.25, - "d": true + "c": "#777777" }, - "\n\n\n6,2", + "3,13\n\n\n2,6", { - "c": "#aaaaaa", - "w": 1.5 + "c": "#aaaaaa" }, - "4,11\n\n\n6,2", + "3,14\n\n\n2,6" + ], + [ { - "x": 1, - "w": 1.5 + "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", + { + "c": "#aaaaaa", + "w": 2 }, - "4,14\n\n\n6,2" + "3,12\n\n\n2,7", + "3,14\n\n\n2,7" ], [ + "3,0\n\n\n2,8", { - "w": 1.5, - "d": true + "c": "#cccccc" }, - "\n\n\n4,3", - "4,1\n\n\n4,3", + "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,12\n\n\n2,8", { - "w": 1.5 + "c": "#777777" }, - "4,2\n\n\n4,3", + "3,13\n\n\n2,8", { - "x": -0.25, - "c": "#cccccc", - "w": 7.25, - "d": true + "c": "#aaaaaa" + }, + "3,14\n\n\n2,8" + ], + [ + "3,0\n\n\n2,9", + { + "c": "#cccccc" }, - "\n\n\n6,3", + "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", - "w": 1.5 + "w": 2 }, - "4,11\n\n\n6,3", - "4,12\n\n\n6,3" + "3,12\n\n\n2,9", + "3,14\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": 4.25, - "d": true + "w": 6.25 }, - "\n\n\n5,4", + "4,5\n\n\n3,1", + { + "c": "#aaaaaa" + }, + "4,10\n\n\n3,1", + "4,11\n\n\n3,1", + { + "c": "#777777" + }, + "4,12\n\n\n3,1", + "4,13\n\n\n3,1", + "4,14\n\n\n3,1" + ], + [ { - "x": -4.25, "c": "#aaaaaa", - "w": 1.75 + "w": 1.25 }, - "4,0\n\n\n4,4", + "4,0\n\n\n3,2", { "w": 1.25 }, - "4,1\n\n\n4,4", + "4,1\n\n\n3,2", { "w": 1.25 }, - "4,2\n\n\n4,4", + "4,2\n\n\n3,2", { - "x": -0.5, "c": "#cccccc", - "w": 6, - "d": true + "w": 6 }, - "\n\n\n6,4", + "4,5\n\n\n3,2", { - "x": -5.5, "c": "#aaaaaa", "w": 1.25 }, - "4,3\n\n\n5,4", + "4,10\n\n\n3,2", + "4,11\n\n\n3,2", { - "c": "#cccccc", - "w": 3 + "c": "#777777" }, - "4,5\n\n\n5,4", + "4,12\n\n\n3,2", + "4,13\n\n\n3,2", + "4,14\n\n\n3,2" + ], + [ { "c": "#aaaaaa", "w": 1.25 }, - "4,9\n\n\n5,4", + "4,0\n\n\n3,3", { "w": 1.25 }, - "4,10\n\n\n6,4", - "4,11\n\n\n6,4", + "4,1\n\n\n3,3", + { + "w": 1.25 + }, + "4,2\n\n\n3,3", + { + "c": "#cccccc", + "w": 3 + }, + "4,3\n\n\n3,3", + { + "w": 3 + }, + "4,8\n\n\n3,3", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n3,3", + "4,11\n\n\n3,3", { "c": "#777777" }, - "4,12\n\n\n6,4", - "4,13\n\n\n6,4", - "4,14\n\n\n6,4" + "4,12\n\n\n3,3", + "4,13\n\n\n3,3", + "4,14\n\n\n3,3" ], [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,0\n\n\n3,4", + "4,1\n\n\n3,4", + { + "w": 1.5 + }, + "4,2\n\n\n3,4", { "c": "#cccccc", - "w": 3.75, - "d": true + "w": 7 }, - "\n\n\n5,2", + "4,7\n\n\n3,4", { - "w": 6 + "c": "#aaaaaa", + "w": 1.5 }, - "4,5\n\n\n5,2" + "4,11\n\n\n3,4", + "4,12\n\n\n3,4", + { + "w": 1.5 + }, + "4,14\n\n\n3,4" ], [ { - "w": 3.75, - "d": true + "w": 1.5 + }, + "4,0\n\n\n3,5", + { + "x": 1, + "w": 1.5 }, - "\n\n\n5,3", + "4,2\n\n\n3,5", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,5", { "c": "#aaaaaa", - "w": 3 + "w": 1.5 }, - "4,3\n\n\n5,3", + "4,11\n\n\n3,5", { - "w": 3 + "x": 1, + "w": 1.5 }, - "4,8\n\n\n5,3" + "4,14\n\n\n3,5" ], [ { - "x": 3.75, - "c": "#cccccc", - "w": 6.25, + "w": 1.5, "d": true }, - "\n\n\n6,5", + "\n\n\n3,6", + "4,1\n\n\n3,6", + { + "w": 1.5 + }, + "4,2\n\n\n3,6", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,6", + "4,12\n\n\n3,6" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,7", + "4,1\n\n\n3,7", + { + "w": 1.5 + }, + "4,2\n\n\n3,7", + { + "c": "#cccccc", + "w": 7 + }, + "4,7\n\n\n3,7", { "c": "#aaaaaa" }, - "4,10\n\n\n6,5", - "4,11\n\n\n6,5", + "4,11\n\n\n3,7", { "c": "#777777" }, - "4,12\n\n\n6,5", - "4,13\n\n\n6,5", - "4,14\n\n\n6,5" + "4,12\n\n\n3,7", + "4,13\n\n\n3,7", + "4,14\n\n\n3,7" ], [ { - "x": 3.75, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,0\n\n\n3,8", + { + "w": 1.25 + }, + "4,1\n\n\n3,8", + { + "w": 1.25 + }, + "4,2\n\n\n3,8", + { + "w": 1.25 + }, + "4,3\n\n\n3,8", + { "c": "#cccccc", - "w": 7.25, - "d": true + "w": 3 }, - "\n\n\n6,6", + "4,5\n\n\n3,8", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n3,8", + { + "w": 1.25 }, - "4,11\n\n\n6,6", + "4,10\n\n\n3,8", + "4,11\n\n\n3,8", { "c": "#777777" }, - "4,12\n\n\n6,6", - "4,13\n\n\n6,6", - "4,14\n\n\n6,6" + "4,12\n\n\n3,8", + "4,13\n\n\n3,8", + "4,14\n\n\n3,8" ] ] }