From 4871f651c5328cc8c16d1ec991f3e865094b24c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Apr 2023 07:45:43 +1000 Subject: Move remaining `LAYOUT_all`s to data driven (#20463) --- keyboards/gray_studio/hb85/hb85.h | 100 --------- keyboards/gray_studio/hb85/info.json | 405 ++++++++++++++++++++++++++++++++++- 2 files changed, 398 insertions(+), 107 deletions(-) delete mode 100644 keyboards/gray_studio/hb85/hb85.h (limited to 'keyboards/gray_studio/hb85') diff --git a/keyboards/gray_studio/hb85/hb85.h b/keyboards/gray_studio/hb85/hb85.h deleted file mode 100644 index 48808105f4..0000000000 --- a/keyboards/gray_studio/hb85/hb85.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -Copyright 2019 fcoury , MechMerlin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#include "quantum.h" - -// Generic layout enabling splits, and all positions available in STT, Basic, and AOP. - -#define LAYOUT_all( \ - K0C, K0B, K0A, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0E, \ - K1E, K1D, K1C, K1B, K1A, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K59, K58, K57, \ - K2E, K2D, K2C, K2B, K2A, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K56, K55, \ - K3E, K3D, K3C, K3B, K3A, K30, K31, K32, K33, K34, K35, K36, K37, K39, K76, K75, \ - K4E, K4D, K4C, K4B, K4A, K40, K41, K42, K43, K44, K45, K48, K46, K47, K49, K78, K77, \ - K6D, K6C, K61, K64, K65, K66, K67, K68, K69, K79 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, KC_NO, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K55, K56, K57, K58, K59, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K61, KC_NO, KC_NO, K64, K65, K66, K67, K68, K69, KC_NO, KC_NO, K6C, K6D, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K75, K76, K77, K78, K79, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -// Layout with blocker - -#define LAYOUT_stt( \ - K0C, K0B, K0A, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0E, \ - K1E, K1D, K1C, K1B, K1A, K10, K11, K12, K13, K14, K15, K16, K17, K18, K59, K58, K57, \ - K2E, K2D, K2C, K2B, K2A, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K56, K55, \ - K3E, K3D, K3C, K3B, K3A, K30, K31, K32, K33, K34, K35, K36, K37, K39, K76, K75, \ - K4E, K4C, K4B, K4A, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K78, K77, \ - K6D, K6C, K61, K64, K65, K67, K68, K69, K79 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, KC_NO, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, KC_NO, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K55, K56, K57, K58, K59, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K61, KC_NO, KC_NO, K64, K65, KC_NO, K67, K68, K69, KC_NO, KC_NO, K6C, K6D, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K75, K76, K77, K78, K79, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} - -#define LAYOUT_basic( \ - K0C, K0B, K0A, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0E, \ - K1E, K1D, K1C, K1B, K1A, K10, K11, K12, K13, K14, K15, K16, K17, K18, K59, K58, K57, \ - K2E, K2D, K2C, K2B, K2A, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K56, K55, \ - K3E, K3D, K3C, K3B, K3A, K30, K31, K32, K33, K34, K35, K36, K37, K39, K76, K75, \ - K4E, K4C, K4B, K4A, K40, K41, K42, K43, K44, K45, K46, K47, K49, K77, \ - K6D, K6C, K61, K64, K65 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, KC_NO, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, KC_NO, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, KC_NO, K49, K4A, K4B, K4C, KC_NO, K4E }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K55, K56, K57, K58, K59, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K61, KC_NO, KC_NO, K64, K65, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K6C, K6D, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K75, K76, K77, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} - -#define LAYOUT_aop( \ - K0C, K0B, K0A, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0E, \ - K1E, K1D, K1C, K1B, K1A, K10, K11, K12, K13, K14, K15, K16, K17, K18, K59, K58, K57, \ - K2E, K2D, K2C, K2B, K2A, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K56, K55, \ - K3E, K3D, K3C, K3B, K3A, K30, K31, K32, K33, K34, K35, K36, K37, K39, K76, K75, \ - K4E, K4C, K4B, K4A, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K78, K77, \ - K6D, K6C, K61, K64, K65, K66, K67, K68, K69, K79 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, KC_NO, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, KC_NO, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K55, K56, K57, K58, K59, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K61, KC_NO, KC_NO, K64, K65, K66, K67, K68, K69, KC_NO, KC_NO, K6C, K6D, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K75, K76, K77, K78, K79, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json index b0b0f11db3..e058e230fb 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/info.json @@ -28,19 +28,410 @@ "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { - "layout": [{"x":1.5, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15, "y":1.25}, {"x":16, "y":1.25}, {"x":17, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15, "y":2.25}, {"x":16, "y":2.25}, {"x":17, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13, "y":5.25}, {"x":14, "y":5.25}, {"x":15, "y":5.25}, {"x":16, "y":5.25}] - }, + "layout": [ + {"matrix": [0, 12], "x": 1.5, "y": 0}, - "LAYOUT_stt": { - "layout": [{"x":1.5, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15, "y":1.25}, {"x":16, "y":1.25}, {"x":17, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15, "y":2.25}, {"x":16, "y":2.25}, {"x":17, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":13, "y":5.25}, {"x":14, "y":5.25}, {"x":15, "y":5.25}, {"x":16, "y":5.25}] + {"matrix": [0, 11], "x": 2.75, "y": 0}, + {"matrix": [0, 10], "x": 3.75, "y": 0}, + {"matrix": [0, 0], "x": 4.75, "y": 0}, + {"matrix": [0, 1], "x": 5.75, "y": 0}, + + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + + {"matrix": [0, 6], "x": 11.25, "y": 0}, + {"matrix": [0, 7], "x": 12.25, "y": 0}, + {"matrix": [0, 8], "x": 13.25, "y": 0}, + {"matrix": [0, 9], "x": 14.25, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0}, + + {"matrix": [1, 14], "x": 0, "y": 1.25}, + {"matrix": [1, 13], "x": 1, "y": 1.25}, + {"matrix": [1, 12], "x": 2, "y": 1.25}, + {"matrix": [1, 11], "x": 3, "y": 1.25}, + {"matrix": [1, 10], "x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + {"matrix": [1, 1], "x": 6, "y": 1.25}, + {"matrix": [1, 2], "x": 7, "y": 1.25}, + {"matrix": [1, 3], "x": 8, "y": 1.25}, + {"matrix": [1, 4], "x": 9, "y": 1.25}, + {"matrix": [1, 5], "x": 10, "y": 1.25}, + {"matrix": [1, 6], "x": 11, "y": 1.25}, + {"matrix": [1, 7], "x": 12, "y": 1.25}, + {"matrix": [1, 8], "x": 13, "y": 1.25}, + {"matrix": [1, 9], "x": 14, "y": 1.25}, + {"matrix": [5, 9], "x": 15, "y": 1.25}, + {"matrix": [5, 8], "x": 16, "y": 1.25}, + {"matrix": [5, 7], "x": 17, "y": 1.25}, + + {"matrix": [2, 14], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 13], "x": 1.5, "y": 2.25}, + {"matrix": [2, 12], "x": 2.5, "y": 2.25}, + {"matrix": [2, 11], "x": 3.5, "y": 2.25}, + {"matrix": [2, 10], "x": 4.5, "y": 2.25}, + {"matrix": [2, 0], "x": 5.5, "y": 2.25}, + {"matrix": [2, 1], "x": 6.5, "y": 2.25}, + {"matrix": [2, 2], "x": 7.5, "y": 2.25}, + {"matrix": [2, 3], "x": 8.5, "y": 2.25}, + {"matrix": [2, 4], "x": 9.5, "y": 2.25}, + {"matrix": [2, 5], "x": 10.5, "y": 2.25}, + {"matrix": [2, 6], "x": 11.5, "y": 2.25}, + {"matrix": [2, 7], "x": 12.5, "y": 2.25}, + {"matrix": [2, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 9], "x": 15, "y": 2.25}, + {"matrix": [5, 6], "x": 16, "y": 2.25}, + {"matrix": [5, 5], "x": 17, "y": 2.25}, + + {"matrix": [3, 14], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 13], "x": 1.75, "y": 3.25}, + {"matrix": [3, 12], "x": 2.75, "y": 3.25}, + {"matrix": [3, 11], "x": 3.75, "y": 3.25}, + {"matrix": [3, 10], "x": 4.75, "y": 3.25}, + {"matrix": [3, 0], "x": 5.75, "y": 3.25}, + {"matrix": [3, 1], "x": 6.75, "y": 3.25}, + {"matrix": [3, 2], "x": 7.75, "y": 3.25}, + {"matrix": [3, 3], "x": 8.75, "y": 3.25}, + {"matrix": [3, 4], "x": 9.75, "y": 3.25}, + {"matrix": [3, 5], "x": 10.75, "y": 3.25}, + {"matrix": [3, 6], "x": 11.75, "y": 3.25}, + {"matrix": [3, 7], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 9], "x": 15, "y": 3.25}, + {"matrix": [7, 6], "x": 16, "y": 3.25}, + {"matrix": [7, 5], "x": 17, "y": 3.25}, + + {"matrix": [4, 14], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 13], "x": 1.25, "y": 4.25}, + {"matrix": [4, 12], "x": 2.25, "y": 4.25}, + {"matrix": [4, 11], "x": 3.25, "y": 4.25}, + {"matrix": [4, 10], "x": 4.25, "y": 4.25}, + {"matrix": [4, 0], "x": 5.25, "y": 4.25}, + {"matrix": [4, 1], "x": 6.25, "y": 4.25}, + {"matrix": [4, 2], "x": 7.25, "y": 4.25}, + {"matrix": [4, 3], "x": 8.25, "y": 4.25}, + {"matrix": [4, 4], "x": 9.25, "y": 4.25}, + {"matrix": [4, 5], "x": 10.25, "y": 4.25}, + {"matrix": [4, 8], "x": 11.25, "y": 4.25}, + {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 7], "x": 14, "y": 4.25}, + {"matrix": [4, 9], "x": 15, "y": 4.25}, + {"matrix": [7, 8], "x": 16, "y": 4.25}, + {"matrix": [7, 7], "x": 17, "y": 4.25}, + + {"matrix": [6, 13], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [6, 12], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [6, 1], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [6, 4], "x": 10, "y": 5.25}, + {"matrix": [6, 5], "x": 11, "y": 5.25}, + {"matrix": [6, 6], "x": 12, "y": 5.25}, + {"matrix": [6, 7], "x": 13, "y": 5.25}, + {"matrix": [6, 8], "x": 14, "y": 5.25}, + {"matrix": [6, 9], "x": 15, "y": 5.25}, + {"matrix": [7, 9], "x": 16, "y": 5.25} + ] }, + "LAYOUT_stt": { + "layout": [ + {"matrix": [0, 12], "x": 1.5, "y": 0}, - "LAYOUT_basic": { - "layout": [{"x":1.5, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15, "y":1.25}, {"x":16, "y":1.25}, {"x":17, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15, "y":2.25}, {"x":16, "y":2.25}, {"x":17, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":15, "y":4.25, "w":2}, {"x":17, "y":4.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}] + {"matrix": [0, 11], "x": 2.75, "y": 0}, + {"matrix": [0, 10], "x": 3.75, "y": 0}, + {"matrix": [0, 0], "x": 4.75, "y": 0}, + {"matrix": [0, 1], "x": 5.75, "y": 0}, + + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + + {"matrix": [0, 6], "x": 11.25, "y": 0}, + {"matrix": [0, 7], "x": 12.25, "y": 0}, + {"matrix": [0, 8], "x": 13.25, "y": 0}, + {"matrix": [0, 9], "x": 14.25, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0}, + + {"matrix": [1, 14], "x": 0, "y": 1.25}, + {"matrix": [1, 13], "x": 1, "y": 1.25}, + {"matrix": [1, 12], "x": 2, "y": 1.25}, + {"matrix": [1, 11], "x": 3, "y": 1.25}, + {"matrix": [1, 10], "x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + {"matrix": [1, 1], "x": 6, "y": 1.25}, + {"matrix": [1, 2], "x": 7, "y": 1.25}, + {"matrix": [1, 3], "x": 8, "y": 1.25}, + {"matrix": [1, 4], "x": 9, "y": 1.25}, + {"matrix": [1, 5], "x": 10, "y": 1.25}, + {"matrix": [1, 6], "x": 11, "y": 1.25}, + {"matrix": [1, 7], "x": 12, "y": 1.25}, + {"matrix": [1, 8], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [5, 9], "x": 15, "y": 1.25}, + {"matrix": [5, 8], "x": 16, "y": 1.25}, + {"matrix": [5, 7], "x": 17, "y": 1.25}, + + {"matrix": [2, 14], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 13], "x": 1.5, "y": 2.25}, + {"matrix": [2, 12], "x": 2.5, "y": 2.25}, + {"matrix": [2, 11], "x": 3.5, "y": 2.25}, + {"matrix": [2, 10], "x": 4.5, "y": 2.25}, + {"matrix": [2, 0], "x": 5.5, "y": 2.25}, + {"matrix": [2, 1], "x": 6.5, "y": 2.25}, + {"matrix": [2, 2], "x": 7.5, "y": 2.25}, + {"matrix": [2, 3], "x": 8.5, "y": 2.25}, + {"matrix": [2, 4], "x": 9.5, "y": 2.25}, + {"matrix": [2, 5], "x": 10.5, "y": 2.25}, + {"matrix": [2, 6], "x": 11.5, "y": 2.25}, + {"matrix": [2, 7], "x": 12.5, "y": 2.25}, + {"matrix": [2, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 9], "x": 15, "y": 2.25}, + {"matrix": [5, 6], "x": 16, "y": 2.25}, + {"matrix": [5, 5], "x": 17, "y": 2.25}, + + {"matrix": [3, 14], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 13], "x": 1.75, "y": 3.25}, + {"matrix": [3, 12], "x": 2.75, "y": 3.25}, + {"matrix": [3, 11], "x": 3.75, "y": 3.25}, + {"matrix": [3, 10], "x": 4.75, "y": 3.25}, + {"matrix": [3, 0], "x": 5.75, "y": 3.25}, + {"matrix": [3, 1], "x": 6.75, "y": 3.25}, + {"matrix": [3, 2], "x": 7.75, "y": 3.25}, + {"matrix": [3, 3], "x": 8.75, "y": 3.25}, + {"matrix": [3, 4], "x": 9.75, "y": 3.25}, + {"matrix": [3, 5], "x": 10.75, "y": 3.25}, + {"matrix": [3, 6], "x": 11.75, "y": 3.25}, + {"matrix": [3, 7], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 9], "x": 15, "y": 3.25}, + {"matrix": [7, 6], "x": 16, "y": 3.25}, + {"matrix": [7, 5], "x": 17, "y": 3.25}, + + {"matrix": [4, 14], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 12], "x": 2.25, "y": 4.25}, + {"matrix": [4, 11], "x": 3.25, "y": 4.25}, + {"matrix": [4, 10], "x": 4.25, "y": 4.25}, + {"matrix": [4, 0], "x": 5.25, "y": 4.25}, + {"matrix": [4, 1], "x": 6.25, "y": 4.25}, + {"matrix": [4, 2], "x": 7.25, "y": 4.25}, + {"matrix": [4, 3], "x": 8.25, "y": 4.25}, + {"matrix": [4, 4], "x": 9.25, "y": 4.25}, + {"matrix": [4, 5], "x": 10.25, "y": 4.25}, + {"matrix": [4, 6], "x": 11.25, "y": 4.25}, + {"matrix": [4, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 8], "x": 14, "y": 4.25}, + {"matrix": [4, 9], "x": 15, "y": 4.25}, + {"matrix": [7, 8], "x": 16, "y": 4.25}, + {"matrix": [7, 7], "x": 17, "y": 4.25}, + + {"matrix": [6, 13], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [6, 12], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [6, 1], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [6, 4], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [6, 5], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [6, 7], "x": 13, "y": 5.25}, + {"matrix": [6, 8], "x": 14, "y": 5.25}, + {"matrix": [6, 9], "x": 15, "y": 5.25}, + {"matrix": [7, 9], "x": 16, "y": 5.25} + ] }, + "LAYOUT_basic": { + "layout": [ + {"matrix": [0, 12], "x": 1.5, "y": 0}, + + {"matrix": [0, 11], "x": 2.75, "y": 0}, + {"matrix": [0, 10], "x": 3.75, "y": 0}, + {"matrix": [0, 0], "x": 4.75, "y": 0}, + {"matrix": [0, 1], "x": 5.75, "y": 0}, + + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + + {"matrix": [0, 6], "x": 11.25, "y": 0}, + {"matrix": [0, 7], "x": 12.25, "y": 0}, + {"matrix": [0, 8], "x": 13.25, "y": 0}, + {"matrix": [0, 9], "x": 14.25, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [1, 14], "x": 0, "y": 1.25}, + {"matrix": [1, 13], "x": 1, "y": 1.25}, + {"matrix": [1, 12], "x": 2, "y": 1.25}, + {"matrix": [1, 11], "x": 3, "y": 1.25}, + {"matrix": [1, 10], "x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + {"matrix": [1, 1], "x": 6, "y": 1.25}, + {"matrix": [1, 2], "x": 7, "y": 1.25}, + {"matrix": [1, 3], "x": 8, "y": 1.25}, + {"matrix": [1, 4], "x": 9, "y": 1.25}, + {"matrix": [1, 5], "x": 10, "y": 1.25}, + {"matrix": [1, 6], "x": 11, "y": 1.25}, + {"matrix": [1, 7], "x": 12, "y": 1.25}, + {"matrix": [1, 8], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [5, 9], "x": 15, "y": 1.25}, + {"matrix": [5, 8], "x": 16, "y": 1.25}, + {"matrix": [5, 7], "x": 17, "y": 1.25}, + + {"matrix": [2, 14], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 13], "x": 1.5, "y": 2.25}, + {"matrix": [2, 12], "x": 2.5, "y": 2.25}, + {"matrix": [2, 11], "x": 3.5, "y": 2.25}, + {"matrix": [2, 10], "x": 4.5, "y": 2.25}, + {"matrix": [2, 0], "x": 5.5, "y": 2.25}, + {"matrix": [2, 1], "x": 6.5, "y": 2.25}, + {"matrix": [2, 2], "x": 7.5, "y": 2.25}, + {"matrix": [2, 3], "x": 8.5, "y": 2.25}, + {"matrix": [2, 4], "x": 9.5, "y": 2.25}, + {"matrix": [2, 5], "x": 10.5, "y": 2.25}, + {"matrix": [2, 6], "x": 11.5, "y": 2.25}, + {"matrix": [2, 7], "x": 12.5, "y": 2.25}, + {"matrix": [2, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 9], "x": 15, "y": 2.25}, + {"matrix": [5, 6], "x": 16, "y": 2.25}, + {"matrix": [5, 5], "x": 17, "y": 2.25}, + + {"matrix": [3, 14], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 13], "x": 1.75, "y": 3.25}, + {"matrix": [3, 12], "x": 2.75, "y": 3.25}, + {"matrix": [3, 11], "x": 3.75, "y": 3.25}, + {"matrix": [3, 10], "x": 4.75, "y": 3.25}, + {"matrix": [3, 0], "x": 5.75, "y": 3.25}, + {"matrix": [3, 1], "x": 6.75, "y": 3.25}, + {"matrix": [3, 2], "x": 7.75, "y": 3.25}, + {"matrix": [3, 3], "x": 8.75, "y": 3.25}, + {"matrix": [3, 4], "x": 9.75, "y": 3.25}, + {"matrix": [3, 5], "x": 10.75, "y": 3.25}, + {"matrix": [3, 6], "x": 11.75, "y": 3.25}, + {"matrix": [3, 7], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 9], "x": 15, "y": 3.25}, + {"matrix": [7, 6], "x": 16, "y": 3.25}, + {"matrix": [7, 5], "x": 17, "y": 3.25}, + + {"matrix": [4, 14], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 12], "x": 2.25, "y": 4.25}, + {"matrix": [4, 11], "x": 3.25, "y": 4.25}, + {"matrix": [4, 10], "x": 4.25, "y": 4.25}, + {"matrix": [4, 0], "x": 5.25, "y": 4.25}, + {"matrix": [4, 1], "x": 6.25, "y": 4.25}, + {"matrix": [4, 2], "x": 7.25, "y": 4.25}, + {"matrix": [4, 3], "x": 8.25, "y": 4.25}, + {"matrix": [4, 4], "x": 9.25, "y": 4.25}, + {"matrix": [4, 5], "x": 10.25, "y": 4.25}, + {"matrix": [4, 6], "x": 11.25, "y": 4.25}, + {"matrix": [4, 7], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 15, "y": 4.25, "w": 2}, + {"matrix": [7, 7], "x": 17, "y": 4.25}, + + {"matrix": [6, 13], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [6, 12], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [6, 1], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [6, 4], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [6, 5], "x": 11.25, "y": 5.25, "w": 1.25} + ] + }, "LAYOUT_aop": { - "layout": [{"x":1.5, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15, "y":1.25}, {"x":16, "y":1.25}, {"x":17, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15, "y":2.25}, {"x":16, "y":2.25}, {"x":17, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13, "y":5.25}, {"x":14, "y":5.25}, {"x":15, "y":5.25}, {"x":16, "y":5.25}] + "layout": [ + {"matrix": [0, 12], "x": 1.5, "y": 0}, + + {"matrix": [0, 11], "x": 2.75, "y": 0}, + {"matrix": [0, 10], "x": 3.75, "y": 0}, + {"matrix": [0, 0], "x": 4.75, "y": 0}, + {"matrix": [0, 1], "x": 5.75, "y": 0}, + + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + + {"matrix": [0, 6], "x": 11.25, "y": 0}, + {"matrix": [0, 7], "x": 12.25, "y": 0}, + {"matrix": [0, 8], "x": 13.25, "y": 0}, + {"matrix": [0, 9], "x": 14.25, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0}, + + {"matrix": [1, 14], "x": 0, "y": 1.25}, + {"matrix": [1, 13], "x": 1, "y": 1.25}, + {"matrix": [1, 12], "x": 2, "y": 1.25}, + {"matrix": [1, 11], "x": 3, "y": 1.25}, + {"matrix": [1, 10], "x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + {"matrix": [1, 1], "x": 6, "y": 1.25}, + {"matrix": [1, 2], "x": 7, "y": 1.25}, + {"matrix": [1, 3], "x": 8, "y": 1.25}, + {"matrix": [1, 4], "x": 9, "y": 1.25}, + {"matrix": [1, 5], "x": 10, "y": 1.25}, + {"matrix": [1, 6], "x": 11, "y": 1.25}, + {"matrix": [1, 7], "x": 12, "y": 1.25}, + {"matrix": [1, 8], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [5, 9], "x": 15, "y": 1.25}, + {"matrix": [5, 8], "x": 16, "y": 1.25}, + {"matrix": [5, 7], "x": 17, "y": 1.25}, + + {"matrix": [2, 14], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 13], "x": 1.5, "y": 2.25}, + {"matrix": [2, 12], "x": 2.5, "y": 2.25}, + {"matrix": [2, 11], "x": 3.5, "y": 2.25}, + {"matrix": [2, 10], "x": 4.5, "y": 2.25}, + {"matrix": [2, 0], "x": 5.5, "y": 2.25}, + {"matrix": [2, 1], "x": 6.5, "y": 2.25}, + {"matrix": [2, 2], "x": 7.5, "y": 2.25}, + {"matrix": [2, 3], "x": 8.5, "y": 2.25}, + {"matrix": [2, 4], "x": 9.5, "y": 2.25}, + {"matrix": [2, 5], "x": 10.5, "y": 2.25}, + {"matrix": [2, 6], "x": 11.5, "y": 2.25}, + {"matrix": [2, 7], "x": 12.5, "y": 2.25}, + {"matrix": [2, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 9], "x": 15, "y": 2.25}, + {"matrix": [5, 6], "x": 16, "y": 2.25}, + {"matrix": [5, 5], "x": 17, "y": 2.25}, + + {"matrix": [3, 14], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 13], "x": 1.75, "y": 3.25}, + {"matrix": [3, 12], "x": 2.75, "y": 3.25}, + {"matrix": [3, 11], "x": 3.75, "y": 3.25}, + {"matrix": [3, 10], "x": 4.75, "y": 3.25}, + {"matrix": [3, 0], "x": 5.75, "y": 3.25}, + {"matrix": [3, 1], "x": 6.75, "y": 3.25}, + {"matrix": [3, 2], "x": 7.75, "y": 3.25}, + {"matrix": [3, 3], "x": 8.75, "y": 3.25}, + {"matrix": [3, 4], "x": 9.75, "y": 3.25}, + {"matrix": [3, 5], "x": 10.75, "y": 3.25}, + {"matrix": [3, 6], "x": 11.75, "y": 3.25}, + {"matrix": [3, 7], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 9], "x": 15, "y": 3.25}, + {"matrix": [7, 6], "x": 16, "y": 3.25}, + {"matrix": [7, 5], "x": 17, "y": 3.25}, + + {"matrix": [4, 14], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 12], "x": 2.25, "y": 4.25}, + {"matrix": [4, 11], "x": 3.25, "y": 4.25}, + {"matrix": [4, 10], "x": 4.25, "y": 4.25}, + {"matrix": [4, 0], "x": 5.25, "y": 4.25}, + {"matrix": [4, 1], "x": 6.25, "y": 4.25}, + {"matrix": [4, 2], "x": 7.25, "y": 4.25}, + {"matrix": [4, 3], "x": 8.25, "y": 4.25}, + {"matrix": [4, 4], "x": 9.25, "y": 4.25}, + {"matrix": [4, 5], "x": 10.25, "y": 4.25}, + {"matrix": [4, 6], "x": 11.25, "y": 4.25}, + {"matrix": [4, 7], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 8], "x": 14, "y": 4.25}, + {"matrix": [4, 9], "x": 15, "y": 4.25}, + {"matrix": [7, 8], "x": 16, "y": 4.25}, + {"matrix": [7, 7], "x": 17, "y": 4.25}, + + {"matrix": [6, 13], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [6, 12], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [6, 1], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [6, 4], "x": 10, "y": 5.25}, + {"matrix": [6, 5], "x": 11, "y": 5.25}, + {"matrix": [6, 6], "x": 12, "y": 5.25}, + {"matrix": [6, 7], "x": 13, "y": 5.25}, + {"matrix": [6, 8], "x": 14, "y": 5.25}, + {"matrix": [6, 9], "x": 15, "y": 5.25}, + {"matrix": [7, 9], "x": 16, "y": 5.25} + ] } } } -- cgit v1.2.3