From 431b2db38b422a624d8676c7d5913c4882781abf Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 27 Apr 2024 20:39:20 +0100 Subject: [PATCH 1/2] revamp dz60v2 --- v3/dztech/dz60v2/dz60v2.json | 596 ++++++++++++++++------------------- 1 file changed, 270 insertions(+), 326 deletions(-) diff --git a/v3/dztech/dz60v2/dz60v2.json b/v3/dztech/dz60v2/dz60v2.json index 716c3ec649..0753083b16 100644 --- a/v3/dztech/dz60v2/dz60v2.json +++ b/v3/dztech/dz60v2/dz60v2.json @@ -18,58 +18,52 @@ "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" + "ANSI", + "ISO", + "64-key ANSI", + "64-key ISO" ], [ - "Bottom row", - "6.25U", - "7U", - "6.25U Arrows", - "6.25U Arrows B", - "7U Arrows", - "Split space", - "Split space arrows" - ] - ], - "presets": { - "Default": [ - 0, - 0, - 0, - 0 + "Right Shift", + "Standard", + "Tsangan", + "Arrows", + "64-key", + "64-key 2u" ], - "ISO": [ - 0, - 1, - 3, - 0 + [ + "Left Modifiers", + "Standard", + "1.5-1u-1.25u", + "Tsangan", + "WKL", + "HHKB", + "LWKL" ], - "HHKB": [ - 0, - 0, - 0, - 2 + [ + "Spacebar", + "Standard", + "Split", + "Tsangan", + "LWKL", + "HHKB" ], - "With arrows": [ - 0, - 0, - 3, - 3 + [ + "Right Modifiers", + "Standard", + "Tsangan", + "WKL", + "Tsangan HHKB", + "Arrows", + "Tsangan Arrows", + "Infinity", + "HHKB", + "2x1.5u,2x1u" ] - }, + ], "keymap": [ [ { - "x": 2.5, "c": "#777777" }, "0,0", @@ -102,7 +96,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.5 }, @@ -139,7 +132,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 1.75 }, @@ -171,7 +163,6 @@ ], [ { - "x": 2.5, "c": "#aaaaaa", "w": 2.25 }, @@ -188,57 +179,93 @@ "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,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,3\n\n\n3,0", + "4,3\n\n\n4,0", { "c": "#cccccc", + "w": 6.25, + "d": true + }, + "\n\n\n6,0", + { + "x": -6.25, "w": 6.25 }, - "4,6\n\n\n3,0", + "4,6\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,13\n\n\n3,0", + "4,13\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,12\n\n\n3,2", + { + "c": "#777777" + }, + "3,13\n\n\n3,2", + { + "c": "#aaaaaa" + }, + "3,14\n\n\n3,2" ], [ { - "y": 0.5, - "x": 2.5, - "w": 2.25 + "w": 1.25 }, "3,0\n\n\n2,1", + "3,1\n\n\n2,1", { "c": "#cccccc" }, @@ -250,19 +277,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" ], [ { - "x": 2.5, - "w": 2.25 + "c": "#aaaaaa", + "w": 2 }, "3,0\n\n\n2,2", { @@ -276,14 +296,28 @@ "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,10\n\n\n2,2", + "3,11\n\n\n2,2", { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.25 + "x": 3.25, + "w": 0.75, + "d": true + }, + "\n\n\n3,3", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n3,3", + { + "c": "#777777" + }, + "3,13\n\n\n3,3", + { + "c": "#aaaaaa" }, + "3,14\n\n\n3,3" + ], + [ "3,0\n\n\n2,3", "3,1\n\n\n2,3", { @@ -299,371 +333,281 @@ "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", + "3,12\n\n\n3,4", { "c": "#aaaaaa", - "w": 2.75 + "w": 2 }, - "3,13\n\n\n2,3" + "3,13\n\n\n3,4" ], [ { - "x": 2.5, - "w": 1.25 - }, - "3,0\n\n\n2,4", - "3,1\n\n\n2,4", - { - "c": "#cccccc" + "c": "#cccccc", + "w": 3.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\n5,1", { + "x": -3.75, "c": "#aaaaaa", - "w": 1.75 + "w": 1.5 }, - "3,13\n\n\n2,4", - "3,14\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,3\n\n\n4,1", { - "c": "#cccccc" + "c": "#cccccc", + "w": 2.25 }, - "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" - ], - [ + "4,4\n\n\n5,1", { - "y": 0.25, - "x": 2.5, + "x": -2.25, "c": "#aaaaaa", - "w": 2 - }, - "3,0\n\n\n2,6", - { - "c": "#cccccc" + "w": 6.25, + "d": true }, - "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", + "\n\n\n6,4", { - "c": "#aaaaaa", - "w": 2 + "x": -4, + "c": "#cccccc", + "w": 1.25 }, - "3,13\n\n\n2,6" - ], - [ + "4,6\n\n\n5,1", { - "x": 2.5 + "w": 2.75 }, - "3,0\n\n\n2,7", - "3,1\n\n\n2,7", + "4,8\n\n\n5,1", { - "c": "#cccccc" + "c": "#aaaaaa" }, - "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,12\n\n\n2,7", + "4,10\n\n\n6,4", + "4,11\n\n\n6,4", { - "c": "#aaaaaa", - "w": 2 + "c": "#777777" }, - "3,13\n\n\n2,7" + "4,12\n\n\n6,4", + "4,13\n\n\n6,4", + "4,14\n\n\n6,4" ], [ { - "x": 2.5, - "w": 2 - }, - "3,0\n\n\n2,8", - { - "c": "#cccccc" + "c": "#cccccc", + "w": 4, + "d": true }, - "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", + "\n\n\n5,2", { - "c": "#aaaaaa" + "x": -4, + "c": "#aaaaaa", + "w": 1.5 }, - "3,13\n\n\n2,8", - "3,14\n\n\n2,8" - ], - [ + "4,0\n\n\n4,2", + "4,1\n\n\n4,2", { - "x": 2.5 + "w": 1.5 }, - "3,0\n\n\n2,9", - "3,1\n\n\n2,9", + "4,3\n\n\n4,2", { - "c": "#cccccc" + "x": -0.25, + "c": "#cccccc", + "w": 7.25, + "d": true }, - "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,12\n\n\n2,9", + "\n\n\n6,1", { - "c": "#aaaaaa" + "x": -7, + "w": 7 }, - "3,13\n\n\n2,9", - "3,14\n\n\n2,9" - ], - [ + "4,6\n\n\n5,2", { - "y": 0.5, - "x": 2.5, + "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n3,1", - "4,1\n\n\n3,1", + "4,11\n\n\n6,1", + "4,13\n\n\n6,1", { "w": 1.5 }, - "4,3\n\n\n3,1", + "4,14\n\n\n6,1" + ], + [ { "c": "#cccccc", - "w": 7 + "w": 4, + "d": true }, - "4,6\n\n\n3,1", + "\n\n\n4,3", { + "x": -4, "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n3,1", - "4,13\n\n\n3,1", + "4,0\n\n\n4,3", { + "x": 1, "w": 1.5 }, - "4,14\n\n\n3,1" - ], - [ + "4,3\n\n\n4,3", { - "x": 2.5, - "w": 1.25 + "x": -0.25, + "c": "#cccccc", + "w": 7.25, + "d": true }, - "4,0\n\n\n3,2", + "\n\n\n6,2", { - "w": 1.25 + "c": "#aaaaaa", + "w": 1.5 }, - "4,1\n\n\n3,2", + "4,11\n\n\n6,2", { - "w": 1.25 + "x": 1, + "w": 1.5 }, - "4,3\n\n\n3,2", + "4,14\n\n\n6,2" + ], + [ { "c": "#cccccc", - "w": 6.25 + "w": 4, + "d": true }, - "4,6\n\n\n3,2", + "\n\n\n4,4", { - "c": "#aaaaaa" + "x": -4, + "c": "#aaaaaa", + "w": 1.5, + "d": true }, - "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" - ], - [ + "\n\n\n4,4", + "4,1\n\n\n4,4", { - "x": 2.5, "w": 1.5 }, - "4,0\n\n\n3,3", - "4,1\n\n\n3,3", - { - "w": 1.25 - }, - "4,3\n\n\n3,3", + "4,3\n\n\n4,4", { + "x": -0.25, "c": "#cccccc", - "w": 6.25 + "w": 7.25, + "d": true }, - "4,6\n\n\n3,3", + "\n\n\n6,3", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.5 }, - "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,11\n\n\n6,3", + "4,13\n\n\n6,3" ], [ { - "x": 2.5, + "w": 3, + "d": true + }, + "\n\n\n5,3", + { + "x": -3, "w": 1.5 }, - "4,0\n\n\n3,4", + "4,0\n\n\n4,5", { "w": 1.5 }, - "4,1\n\n\n3,4", + "4,1\n\n\n4,5", { "c": "#cccccc", "w": 7 }, - "4,6\n\n\n3,4", - { - "c": "#aaaaaa" - }, - "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" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,5", + "4,6\n\n\n5,3", { - "w": 1.25 + "x": -6.25, + "c": "#aaaaaa", + "w": 7.25, + "d": true }, - "4,1\n\n\n3,5", + "\n\n\n6,5", + "4,11\n\n\n6,5", { - "w": 1.25 + "c": "#777777" }, - "4,3\n\n\n3,5", + "4,12\n\n\n6,5", + "4,13\n\n\n6,5", + "4,14\n\n\n6,5" + ], + [ { "c": "#cccccc", - "w": 2.25 - }, - "4,4\n\n\n3,5", - { - "w": 1.25 - }, - "4,6\n\n\n3,5", - { - "w": 2.75 + "w": 4, + "d": true }, - "4,8\n\n\n3,5", + "\n\n\n5,4", { + "x": -0.25, "c": "#aaaaaa", - "w": 1.25 + "w": 6.25, + "d": true }, - "4,10\n\n\n3,5", + "\n\n\n6,6", { - "w": 1.25 + "x": -6, + "c": "#cccccc", + "w": 6 }, - "4,11\n\n\n3,5", + "4,6\n\n\n5,4", { - "w": 1.25 + "c": "#aaaaaa", + "w": 1.5 }, - "4,13\n\n\n3,5", + "4,10\n\n\n6,6", + "4,11\n\n\n6,6", + "4,13\n\n\n6,6", { - "w": 1.25 + "w": 1.5 }, - "4,14\n\n\n3,5" + "4,14\n\n\n6,6" ], [ { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,6", - { - "w": 1.25 - }, - "4,1\n\n\n3,6", - { - "w": 1.25 - }, - "4,3\n\n\n3,6", - { - "c": "#cccccc", - "w": 2.25 + "x": 3.75, + "w": 6.25, + "d": true }, - "4,4\n\n\n3,6", + "\n\n\n6,7", { - "w": 1.25 + "w": 1.5 }, - "4,6\n\n\n3,6", + "4,10\n\n\n6,7", + "4,11\n\n\n6,7" + ], + [ { - "w": 2.75 + "x": 3.75, + "w": 6.25, + "d": true }, - "4,8\n\n\n3,6", + "\n\n\n6,8", { - "c": "#aaaaaa" + "w": 1.5 }, - "4,10\n\n\n3,6", - "4,11\n\n\n3,6", - "4,12\n\n\n3,6", - "4,13\n\n\n3,6", - "4,14\n\n\n3,6" - ], - [ + "4,10\n\n\n6,8", { - "rx": 0.25, - "y": 6.5, - "x": 13.5, - "w": 1.75 + "w": 1.5 }, - "3,12\n\n\n2,2", - "3,13\n\n\n2,2", - "3,14\n\n\n2,2" - ], - [ + "4,12\n\n\n6,8", { - "y": 2, - "x": 13.5, - "w": 1.75 + "c": "#cccccc" }, - "3,12\n\n\n2,5", - "3,13\n\n\n2,5", - "3,14\n\n\n2,5" + "4,13\n\n\n6,8", + "4,14\n\n\n6,8" ] ] } From 524d87a83db0ccc3abd055f2882643bc7d5f6c89 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 8 Jul 2024 09:14:44 +0100 Subject: [PATCH 2/2] reformat --- v3/dztech/dz60v2/dz60v2.json | 698 ++++++++++++++++++++++++----------- 1 file changed, 482 insertions(+), 216 deletions(-) diff --git a/v3/dztech/dz60v2/dz60v2.json b/v3/dztech/dz60v2/dz60v2.json index 0753083b16..f4ba583ed9 100644 --- a/v3/dztech/dz60v2/dz60v2.json +++ b/v3/dztech/dz60v2/dz60v2.json @@ -19,46 +19,31 @@ [ "Row 4", "ANSI", + "ANSI Tsangan", + "ANSI Arrows", "ISO", + "ISO Tsangan", + "ISO Arrows", "64-key ANSI", - "64-key ISO" + "64-key ANSI 2u Right", + "64-key ISO", + "64-key ISO 2u Right" ], [ - "Right Shift", + "Row 5", "Standard", - "Tsangan", "Arrows", - "64-key", - "64-key 2u" - ], - [ - "Left Modifiers", - "Standard", - "1.5-1u-1.25u", + "2x1.5u-2x1u", + "Split Standard", + "Split Arrows", + "Split 2x1.5u-2x1u", "Tsangan", "WKL", "HHKB", - "LWKL" - ], - [ - "Spacebar", - "Standard", - "Split", - "Tsangan", - "LWKL", - "HHKB" - ], - [ - "Right Modifiers", - "Standard", - "Tsangan", - "WKL", - "Tsangan HHKB", - "Arrows", "Tsangan Arrows", - "Infinity", - "HHKB", - "2x1.5u,2x1u" + "LWKL Standard", + "LWKL Arrows", + "LWKL 2x1.5u-2x1u" ] ], "keymap": [ @@ -179,93 +164,55 @@ "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,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,3\n\n\n4,0", + "4,3\n\n\n3,0", { "c": "#cccccc", - "w": 6.25, - "d": true - }, - "\n\n\n6,0", - { - "x": -6.25, "w": 6.25 }, - "4,6\n\n\n5,0", + "4,6\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,13\n\n\n6,0", + "4,13\n\n\n3,0", { "w": 1.25 }, - "4,14\n\n\n6,0", - { - "x": 0.25, - "w": 1.75 - }, - "3,12\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" ], [ { - "w": 1.25 + "y": 0.25, + "w": 2.25 }, "3,0\n\n\n2,1", - "3,1\n\n\n2,1", { "c": "#cccccc" }, @@ -277,12 +224,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,13\n\n\n2,1", + "3,14\n\n\n2,1" ], [ { - "c": "#aaaaaa", - "w": 2 + "w": 2.25 }, "3,0\n\n\n2,2", { @@ -297,32 +250,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", - { - "x": 3.25, - "w": 0.75, - "d": true - }, - "\n\n\n3,3", { - "c": "#aaaaaa" + "c": "#aaaaaa", + "w": 1.75 }, - "3,12\n\n\n3,3", + "3,12\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", - "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", @@ -334,280 +284,596 @@ "3,10\n\n\n2,3", "3,11\n\n\n2,3", { - "x": 3.25, - "w": 0.75, - "d": true + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,3" + ], + [ + { + "w": 1.25 }, - "\n\n\n3,4", - "3,12\n\n\n3,4", + "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.75 + }, + "3,13\n\n\n2,4", + "3,14\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", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12\n\n\n2,5", + { + "c": "#777777" + }, + "3,13\n\n\n2,5", + { + "c": "#aaaaaa" + }, + "3,14\n\n\n2,5" + ], + [ + { + "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", + { + "c": "#aaaaaa" + }, + "3,12\n\n\n2,6", + { + "c": "#777777" + }, + "3,13\n\n\n2,6", + { + "c": "#aaaaaa" + }, + "3,14\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", + "3,12\n\n\n2,7", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,13\n\n\n2,7" + ], + [ + "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", + "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": "#aaaaaa" + }, + "3,14\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", + "3,12\n\n\n2,9", { "c": "#aaaaaa", "w": 2 }, - "3,13\n\n\n3,4" + "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,3\n\n\n3,1", { "c": "#cccccc", - "w": 3.75, - "d": true + "w": 6.25 + }, + "4,6\n\n\n3,1", + { + "c": "#aaaaaa" }, - "\n\n\n5,1", + "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" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n3,2", + { + "w": 1.25 + }, + "4,1\n\n\n3,2", + { + "w": 1.25 + }, + "4,3\n\n\n3,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,2", { - "x": -3.75, "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n4,1", - "4,1\n\n\n4,1", + "4,10\n\n\n3,2", + { + "w": 1.5 + }, + "4,12\n\n\n3,2", + "4,13\n\n\n3,2", + "4,14\n\n\n3,2" + ], + [ + { + "w": 1.25 + }, + "4,0\n\n\n3,3", + { + "w": 1.25 + }, + "4,1\n\n\n3,3", { "w": 1.25 }, - "4,3\n\n\n4,1", + "4,3\n\n\n3,3", { "c": "#cccccc", "w": 2.25 }, - "4,4\n\n\n5,1", + "4,4\n\n\n3,3", + { + "w": 1.25 + }, + "4,6\n\n\n3,3", + { + "w": 2.75 + }, + "4,8\n\n\n3,3", { - "x": -2.25, "c": "#aaaaaa", - "w": 6.25, - "d": true + "w": 1.25 + }, + "4,10\n\n\n3,3", + { + "w": 1.25 + }, + "4,11\n\n\n3,3", + { + "w": 1.25 + }, + "4,13\n\n\n3,3", + { + "w": 1.25 + }, + "4,14\n\n\n3,3" + ], + [ + { + "w": 1.25 + }, + "4,0\n\n\n3,4", + { + "w": 1.25 }, - "\n\n\n6,4", + "4,1\n\n\n3,4", + { + "w": 1.25 + }, + "4,3\n\n\n3,4", { - "x": -4, "c": "#cccccc", + "w": 2.25 + }, + "4,4\n\n\n3,4", + { "w": 1.25 }, - "4,6\n\n\n5,1", + "4,6\n\n\n3,4", { "w": 2.75 }, - "4,8\n\n\n5,1", + "4,8\n\n\n3,4", { "c": "#aaaaaa" }, - "4,10\n\n\n6,4", - "4,11\n\n\n6,4", + "4,10\n\n\n3,4", + "4,11\n\n\n3,4", { "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,4", + "4,13\n\n\n3,4", + "4,14\n\n\n3,4" ], [ { - "c": "#cccccc", - "w": 4, - "d": true + "c": "#aaaaaa", + "w": 1.25 }, - "\n\n\n5,2", + "4,0\n\n\n3,5", { - "x": -4, - "c": "#aaaaaa", - "w": 1.5 + "w": 1.25 }, - "4,0\n\n\n4,2", - "4,1\n\n\n4,2", + "4,1\n\n\n3,5", { - "w": 1.5 + "w": 1.25 }, - "4,3\n\n\n4,2", + "4,3\n\n\n3,5", { - "x": -0.25, "c": "#cccccc", - "w": 7.25, - "d": true + "w": 2.25 }, - "\n\n\n6,1", + "4,4\n\n\n3,5", { - "x": -7, - "w": 7 + "w": 1.25 + }, + "4,6\n\n\n3,5", + { + "w": 2.75 }, - "4,6\n\n\n5,2", + "4,8\n\n\n3,5", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,1", - "4,13\n\n\n6,1", + "4,10\n\n\n3,5", { "w": 1.5 }, - "4,14\n\n\n6,1" + "4,12\n\n\n3,5", + "4,13\n\n\n3,5", + "4,14\n\n\n3,5" ], [ + { + "w": 1.5 + }, + "4,0\n\n\n3,6", + "4,1\n\n\n3,6", + { + "w": 1.5 + }, + "4,3\n\n\n3,6", { "c": "#cccccc", - "w": 4, - "d": true + "w": 7 }, - "\n\n\n4,3", + "4,6\n\n\n3,6", { - "x": -4, "c": "#aaaaaa", "w": 1.5 }, - "4,0\n\n\n4,3", + "4,11\n\n\n3,6", + "4,13\n\n\n3,6", + { + "w": 1.5 + }, + "4,14\n\n\n3,6" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,7", { "x": 1, "w": 1.5 }, - "4,3\n\n\n4,3", + "4,3\n\n\n3,7", { - "x": -0.25, "c": "#cccccc", - "w": 7.25, - "d": true + "w": 7 }, - "\n\n\n6,2", + "4,6\n\n\n3,7", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,2", + "4,11\n\n\n3,7", { "x": 1, "w": 1.5 }, - "4,14\n\n\n6,2" + "4,14\n\n\n3,7" ], [ { - "c": "#cccccc", - "w": 4, - "d": true - }, - "\n\n\n4,4", - { - "x": -4, - "c": "#aaaaaa", "w": 1.5, "d": true }, - "\n\n\n4,4", - "4,1\n\n\n4,4", + "\n\n\n3,8", + "4,1\n\n\n3,8", { "w": 1.5 }, - "4,3\n\n\n4,4", + "4,3\n\n\n3,8", { - "x": -0.25, "c": "#cccccc", - "w": 7.25, - "d": true + "w": 7 }, - "\n\n\n6,3", + "4,6\n\n\n3,8", { "c": "#aaaaaa", "w": 1.5 }, - "4,11\n\n\n6,3", - "4,13\n\n\n6,3" + "4,11\n\n\n3,8", + "4,13\n\n\n3,8" ], [ { - "w": 3, - "d": true - }, - "\n\n\n5,3", - { - "x": -3, "w": 1.5 }, - "4,0\n\n\n4,5", + "4,0\n\n\n3,9", + "4,1\n\n\n3,9", { "w": 1.5 }, - "4,1\n\n\n4,5", + "4,3\n\n\n3,9", { "c": "#cccccc", "w": 7 }, - "4,6\n\n\n5,3", + "4,6\n\n\n3,9", { - "x": -6.25, - "c": "#aaaaaa", - "w": 7.25, - "d": true + "c": "#aaaaaa" }, - "\n\n\n6,5", - "4,11\n\n\n6,5", + "4,11\n\n\n3,9", { "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,9", + "4,13\n\n\n3,9", + "4,14\n\n\n3,9" ], [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,0\n\n\n3,10", + "4,1\n\n\n3,10", + { + "w": 1.5 + }, + "4,3\n\n\n3,10", { "c": "#cccccc", - "w": 4, - "d": true + "w": 6 }, - "\n\n\n5,4", + "4,6\n\n\n3,10", { - "x": -0.25, "c": "#aaaaaa", - "w": 6.25, + "w": 1.5 + }, + "4,10\n\n\n3,10", + "4,11\n\n\n3,10", + "4,13\n\n\n3,10", + { + "w": 1.5 + }, + "4,14\n\n\n3,10" + ], + [ + { + "w": 1.5, "d": true }, - "\n\n\n6,6", + "\n\n\n3,11", + "4,1\n\n\n3,11", + { + "w": 1.5 + }, + "4,3\n\n\n3,11", { - "x": -6, "c": "#cccccc", "w": 6 }, - "4,6\n\n\n5,4", + "4,6\n\n\n3,11", { "c": "#aaaaaa", "w": 1.5 }, - "4,10\n\n\n6,6", - "4,11\n\n\n6,6", - "4,13\n\n\n6,6", + "4,10\n\n\n3,11", + "4,11\n\n\n3,11" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n3,12", { "w": 1.5 }, - "4,14\n\n\n6,6" + "4,1\n\n\n3,12", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,12", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n3,12", + { + "w": 1.25 + }, + "4,11\n\n\n3,12", + { + "w": 1.25 + }, + "4,13\n\n\n3,12", + { + "w": 1.25 + }, + "4,14\n\n\n3,12" ], [ { - "x": 3.75, - "w": 6.25, - "d": true + "w": 1.5 }, - "\n\n\n6,7", + "4,0\n\n\n3,13", { "w": 1.5 }, - "4,10\n\n\n6,7", - "4,11\n\n\n6,7" + "4,1\n\n\n3,13", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,13", + { + "c": "#aaaaaa" + }, + "4,10\n\n\n3,13", + "4,11\n\n\n3,13", + { + "c": "#777777" + }, + "4,12\n\n\n3,13", + "4,13\n\n\n3,13", + "4,14\n\n\n3,13" ], [ { - "x": 3.75, - "w": 6.25, - "d": true + "c": "#aaaaaa", + "w": 1.5 }, - "\n\n\n6,8", + "4,0\n\n\n3,14", { "w": 1.5 }, - "4,10\n\n\n6,8", + "4,1\n\n\n3,14", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,14", { + "c": "#aaaaaa", "w": 1.5 }, - "4,12\n\n\n6,8", + "4,10\n\n\n3,14", { - "c": "#cccccc" + "w": 1.5 }, - "4,13\n\n\n6,8", - "4,14\n\n\n6,8" + "4,12\n\n\n3,14", + "4,13\n\n\n3,14", + "4,14\n\n\n3,14" ] ] }