From 23622697fb51d4312ff81dba7fa31d41ee6f70c4 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Thu, 18 Apr 2024 15:31:00 +0200 Subject: [PATCH] chore(web): Update test keyboard Add two longpress menus to the `diacritic_rota` keyboard: - longpress on 1: one subkey that is too wide to fit in the osk. Keyman is expected to resize the key so that it does fit. - longpress on 2: Subkeys for A-Z. Subkeys B and Y are double wide. The keys are expected to be displayed in multiple rows so that each row fits within the width. Note that there are too many keys so that the rows don't fit vertically. Already existing is the longpress on .. Since the base keys are wider they won't fit in one row. Keyman is expected to display them in two rows. --- .../web/keyboards/diacritic_rota/README.md | 13 +- .../diacritic_rota/build/diacritic_rota.js | 250 +++++++++++++----- .../diacritic_rota/diacritic_rota.kpj | 103 +------- .../source/diacritic_rota.keyman-touch-layout | 122 ++++++++- .../diacritic_rota/source/diacritic_rota.kmn | 2 + 5 files changed, 321 insertions(+), 169 deletions(-) diff --git a/web/src/test/manual/web/keyboards/diacritic_rota/README.md b/web/src/test/manual/web/keyboards/diacritic_rota/README.md index 87ab030fa6d..e8946e3191e 100644 --- a/web/src/test/manual/web/keyboards/diacritic_rota/README.md +++ b/web/src/test/manual/web/keyboards/diacritic_rota/README.md @@ -5,7 +5,18 @@ Version 1.0 Description ----------- -Diacritic Rota generated from template + +Diacritic Rota keyboard used for testing multitap and longpress. + +- longpress on 1: one subkey that is too wide to fit in the + osk. Keyman is expected to resize the key so that it does fit. +- longpress on 2: Subkeys for A-Z. Subkeys B and Y are + double wide. The keys are expected to be displayed in multiple rows + so that each row fits within the width. Note that there are too many + keys so that the rows don't fit vertically. +- longpress on .: 8 subkeys which won't fit in one row + because the base keys are wider. Keyman is expected to display them + in two rows. Links ----- diff --git a/web/src/test/manual/web/keyboards/diacritic_rota/build/diacritic_rota.js b/web/src/test/manual/web/keyboards/diacritic_rota/build/diacritic_rota.js index 159c4d811ba..11e052f4b7a 100644 --- a/web/src/test/manual/web/keyboards/diacritic_rota/build/diacritic_rota.js +++ b/web/src/test/manual/web/keyboards/diacritic_rota/build/diacritic_rota.js @@ -35,7 +35,7 @@ function Keyboard_diacritic_rota() this.KM=0; this.KBVER="1.0"; this.KMBM=modCodes.SHIFT /* 0x0010 */; - this.KVKD="T_DK_DIA_GRAVE T_DK_DIA_ACUTE T_DK_DIA_CIRCUM"; + this.KVKD="T_DK_DIA_GRAVE T_DK_DIA_ACUTE T_DK_DIA_CIRCUM T_NEW_71"; this.KVKL={ "phone": { "font": "Tahoma", @@ -269,7 +269,14 @@ function Keyboard_diacritic_rota() { "id": "K_1", "text": "1", - "hint": "pqrs", + "hint": "• pqrs", + "sk": [ + { + "text": "Monster", + "id": "T_new_71", + "width": "600" + } + ], "multitap": [ { "text": "p", @@ -316,7 +323,115 @@ function Keyboard_diacritic_rota() { "id": "K_2", "text": "2", - "hint": "tuv", + "hint": "• tuv", + "sk": [ + { + "text": "A", + "id": "U_0041" + }, + { + "text": "B", + "id": "U_0042", + "width": "205" + }, + { + "text": "C", + "id": "U_0043" + }, + { + "text": "D", + "id": "U_0044" + }, + { + "text": "E", + "id": "U_0045" + }, + { + "text": "F", + "id": "U_0046" + }, + { + "text": "G", + "id": "U_0047" + }, + { + "text": "H", + "id": "U_0048" + }, + { + "text": "I", + "id": "U_0049" + }, + { + "text": "J", + "id": "U_004A" + }, + { + "text": "K", + "id": "U_004B" + }, + { + "text": "L", + "id": "U_004C" + }, + { + "text": "M", + "id": "U_004D" + }, + { + "text": "N", + "id": "U_004E" + }, + { + "text": "O", + "id": "U_004F" + }, + { + "text": "P", + "id": "U_0050" + }, + { + "text": "Q", + "id": "U_0051" + }, + { + "text": "R", + "id": "U_0052" + }, + { + "text": "S", + "id": "U_0053" + }, + { + "text": "T", + "id": "U_0054" + }, + { + "text": "U", + "id": "U_0055" + }, + { + "text": "V", + "id": "U_0056" + }, + { + "text": "W", + "id": "U_0057" + }, + { + "text": "X", + "id": "U_0058" + }, + { + "text": "Y", + "id": "U_0059", + "width": "205" + }, + { + "text": "Z", + "id": "U_005A" + } + ], "multitap": [ { "text": "t", @@ -932,7 +1047,7 @@ function Keyboard_diacritic_rota() this.s_bigcircum_20="ÂBĈDÊFĜĤÎĴKLMNÔPQRŜTÛVŴXŶẐ"; this.s_dias_21="̀́̂"; this.s_all_dks_22=[{t:'d',d:0},{t:'d',d:1},{t:'d',d:2}]; - this.KVER="17.0.216.0"; + this.KVER="17.0.230.0"; this.KVS=[]; this.gs=function(t,e) { return this.g_main_0(t,e); @@ -990,380 +1105,387 @@ function Keyboard_diacritic_rota() k.KDO(-1,t,2); } } + else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, 0x103)) { + if(1){ + r=m=1; // Line 42 + k.KDC(0,t); + k.KO(-1,t,"Monster"); + } + } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_SPACE /* 0x20 */)) { if(k.KFCM(2,t,[{t:'a',a:this.s_dias_21},{t:'a',a:this.s_all_dks_22}])){ - r=m=1; // Line 45 + r=m=1; // Line 47 k.KDC(2,t); k.KO(-1,t," "); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_SPACE /* 0x20 */)) { if(k.KFCM(2,t,[{t:'a',a:this.s_dias_21},{t:'a',a:this.s_all_dks_22}])){ - r=m=1; // Line 46 + r=m=1; // Line 48 k.KDC(2,t); k.KO(-1,t," "); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_A /* 0x41 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"A"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_B /* 0x42 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"B"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_C /* 0x43 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"C"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_D /* 0x44 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"D"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_E /* 0x45 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"E"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_F /* 0x46 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"F"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_G /* 0x47 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"G"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_H /* 0x48 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"H"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_I /* 0x49 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"I"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_J /* 0x4A */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"J"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_K /* 0x4B */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"K"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_L /* 0x4C */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"L"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_M /* 0x4D */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"M"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_N /* 0x4E */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"N"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_O /* 0x4F */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"O"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_P /* 0x50 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"P"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_Q /* 0x51 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"Q"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_R /* 0x52 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"R"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_S /* 0x53 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"S"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_T /* 0x54 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"T"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_U /* 0x55 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"U"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_V /* 0x56 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"V"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_W /* 0x57 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"W"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_X /* 0x58 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"X"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_Y /* 0x59 */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"Y"); } } else if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_Z /* 0x5A */)) { if(1){ - r=m=1; // Line 43 + r=m=1; // Line 45 k.KDC(0,t); k.KO(-1,t,"Z"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_A /* 0x41 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"a"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_B /* 0x42 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"b"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_C /* 0x43 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"c"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_D /* 0x44 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"d"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_E /* 0x45 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"e"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_F /* 0x46 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"f"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_G /* 0x47 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"g"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_H /* 0x48 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"h"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_I /* 0x49 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"i"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_J /* 0x4A */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"j"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_K /* 0x4B */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"k"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_L /* 0x4C */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"l"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_M /* 0x4D */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"m"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_N /* 0x4E */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"n"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_O /* 0x4F */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"o"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_P /* 0x50 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"p"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_Q /* 0x51 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"q"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_R /* 0x52 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"r"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_S /* 0x53 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"s"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_T /* 0x54 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"t"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_U /* 0x55 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"u"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_V /* 0x56 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"v"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_W /* 0x57 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"w"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_X /* 0x58 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"x"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_Y /* 0x59 */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"y"); } } else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_Z /* 0x5A */)) { if(1){ - r=m=1; // Line 42 + r=m=1; // Line 44 k.KDC(0,t); k.KO(-1,t,"z"); } @@ -1379,32 +1501,32 @@ function Keyboard_diacritic_rota() this.g_combine_1=function(t,e) { var k=KeymanWeb,r=1,m=0; if(k.KFCM(3,t,['̀',{t:'d',d:0},{t:'a',a:this.s_basealpha_13}])){ - m=1; // Line 54 + m=1; // Line 56 k.KDC(3,t); k.KIO(-1,this.s_alphagrave_15,3,t); } else if(k.KFCM(3,t,['́',{t:'d',d:1},{t:'a',a:this.s_basealpha_13}])){ - m=1; // Line 55 + m=1; // Line 57 k.KDC(3,t); k.KIO(-1,this.s_alphaacute_17,3,t); } else if(k.KFCM(3,t,['̂',{t:'d',d:2},{t:'a',a:this.s_basealpha_13}])){ - m=1; // Line 56 + m=1; // Line 58 k.KDC(3,t); k.KIO(-1,this.s_alphacircum_19,3,t); } else if(k.KFCM(3,t,['̀',{t:'d',d:0},{t:'a',a:this.s_bigalpha_14}])){ - m=1; // Line 58 + m=1; // Line 60 k.KDC(3,t); k.KIO(-1,this.s_biggrave_16,3,t); } else if(k.KFCM(3,t,['́',{t:'d',d:1},{t:'a',a:this.s_bigalpha_14}])){ - m=1; // Line 59 + m=1; // Line 61 k.KDC(3,t); k.KIO(-1,this.s_bigacute_18,3,t); } else if(k.KFCM(3,t,['̂',{t:'d',d:2},{t:'a',a:this.s_bigalpha_14}])){ - m=1; // Line 60 + m=1; // Line 62 k.KDC(3,t); k.KIO(-1,this.s_bigcircum_20,3,t); } diff --git a/web/src/test/manual/web/keyboards/diacritic_rota/diacritic_rota.kpj b/web/src/test/manual/web/keyboards/diacritic_rota/diacritic_rota.kpj index 6faa433afad..bdb9b508cda 100644 --- a/web/src/test/manual/web/keyboards/diacritic_rota/diacritic_rota.kpj +++ b/web/src/test/manual/web/keyboards/diacritic_rota/diacritic_rota.kpj @@ -1,108 +1,9 @@ - $PROJECTPATH\build + 2.0 True True + True - - - id_85f15e8781135a61e942537e889f86d5 - diacritic_rota.kmn - source\diacritic_rota.kmn - 1.0 - .kmn -
- Diacritic 10-key Rota - © SIL International -
- - - id_7292a020a8da8934369953d0ebddf263 - diacritic_rota.kps - source\diacritic_rota.kps - - .kps -
- Diacritic Rota - © SIL International -
- - - id_ede98e4633e239f933cbfd1f4e1b766c - HISTORY.md - HISTORY.md - - .md - - - id_53e892b8b41cc4caece1cfd5ef21d6e7 - LICENSE.md - LICENSE.md - - .md - - - id_0730bb7c2e8f9ea2438b52e419dd86c9 - README.md - README.md - - .md - - - id_a197bb37458f532f655b4d319f8aa412 - diacritic_rota.keyboard_info - diacritic_rota.keyboard_info - - .keyboard_info - - - id_d2f63226cea395ca25e084d9d03672d0 - diacritic_rota.ico - source\diacritic_rota.ico - - .ico - id_85f15e8781135a61e942537e889f86d5 - - - id_f8f493ea21b1b91d0f6cf759b44b2ca4 - diacritic_rota.kmx - source\..\build\diacritic_rota.kmx - - .kmx - id_7292a020a8da8934369953d0ebddf263 - - - id_0214b6194bc2616c1386e16bddcaafe5 - diacritic_rota.js - source\..\build\diacritic_rota.js - - .js - id_7292a020a8da8934369953d0ebddf263 - - - id_1e7faf118f61879d05872df07cbf6bde - diacritic_rota.kvk - source\..\build\diacritic_rota.kvk - - .kvk - id_7292a020a8da8934369953d0ebddf263 - - - id_356e5d149c1e539356d72698c1e401a6 - welcome.htm - source\welcome.htm - - .htm - id_7292a020a8da8934369953d0ebddf263 - - - id_8da344c4cea6f467013357fe099006f5 - readme.htm - source\readme.htm - - .htm - id_7292a020a8da8934369953d0ebddf263 - - diff --git a/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.keyman-touch-layout b/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.keyman-touch-layout index 998755428f0..d1a1c1372c5 100644 --- a/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.keyman-touch-layout +++ b/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.keyman-touch-layout @@ -232,7 +232,14 @@ { "id": "K_1", "text": "1", - "hint": "pqrs", + "hint": "• pqrs", + "sk": [ + { + "text": "Monster", + "id": "T_new_71", + "width": 600 + } + ], "multitap": [ { "text": "p", @@ -279,7 +286,115 @@ { "id": "K_2", "text": "2", - "hint": "tuv", + "hint": "• tuv", + "sk": [ + { + "text": "A", + "id": "U_0041" + }, + { + "text": "B", + "id": "U_0042", + "width": 205 + }, + { + "text": "C", + "id": "U_0043" + }, + { + "text": "D", + "id": "U_0044" + }, + { + "text": "E", + "id": "U_0045" + }, + { + "text": "F", + "id": "U_0046" + }, + { + "text": "G", + "id": "U_0047" + }, + { + "text": "H", + "id": "U_0048" + }, + { + "text": "I", + "id": "U_0049" + }, + { + "text": "J", + "id": "U_004A" + }, + { + "text": "K", + "id": "U_004B" + }, + { + "text": "L", + "id": "U_004C" + }, + { + "text": "M", + "id": "U_004D" + }, + { + "text": "N", + "id": "U_004E" + }, + { + "text": "O", + "id": "U_004F" + }, + { + "text": "P", + "id": "U_0050" + }, + { + "text": "Q", + "id": "U_0051" + }, + { + "text": "R", + "id": "U_0052" + }, + { + "text": "S", + "id": "U_0053" + }, + { + "text": "T", + "id": "U_0054" + }, + { + "text": "U", + "id": "U_0055" + }, + { + "text": "V", + "id": "U_0056" + }, + { + "text": "W", + "id": "U_0057" + }, + { + "text": "X", + "id": "U_0058" + }, + { + "text": "Y", + "id": "U_0059", + "width": 205 + }, + { + "text": "Z", + "id": "U_005A" + } + ], "multitap": [ { "text": "t", @@ -376,7 +491,8 @@ "text": "*Shift*", "width": 100, "sp": 1, - "nextlayer": "shift" + "nextlayer": "shift", + "hint": "" }, { "id": "K_0", diff --git a/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.kmn b/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.kmn index d92eb3cadab..2033c2cfb32 100644 --- a/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.kmn +++ b/web/src/test/manual/web/keyboards/diacritic_rota/source/diacritic_rota.kmn @@ -39,6 +39,8 @@ group(main) using keys + [ SHIFT T_DK_DIA_ACUTE ] > U+0301 dk(2) + [ SHIFT T_DK_DIA_CIRCUM ] > U+0302 dk(3) ++ [T_NEW_71] > 'Monster' + + any(basekeys) > index(basealpha, 1) + any(bigkeys) > index(bigalpha, 1)