fix a few problems in the new layouts

Author: aradzie

.DS_Store

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard SYSTEM "../dtd/ldmlKeyboard.dtd">
-<keyboard locale="et-ee-k0-windows">
+<keyboard locale="et-t-k0-windows">
 	<version platform="10" number="$Revision$"/>
 	<names>
 		<name value="Estonian"/>

…0/keyboards/windows/et-ee-k0-windows.xml ….0/keyboards/windows/et-t-k0-windows.xmlpackages/keybr-generators/cldr-keyboards-43.0/keyboards/windows/et-ee-k0-windows.xml renamed to packages/keybr-generators/cldr-keyboards-43.0/keyboards/windows/et-t-k0-windows.xml packages/keybr-generators/cldr-keyboards-43.0/keyboards/windows/et-ee-k0-windows.xml renamed to packages/keybr-generators/cldr-keyboards-43.0/keyboards/windows/et-t-k0-windows.xml

@@ -44,6 +44,7 @@ for (const [id, layout] of [
   ["en_gallium", importKlc("layouts/en_gallium.klc")],
   ["en_gallium_matrix", importKlc("layouts/en_gallium_matrix.klc")],
   ["en_graphite", importKeymap("layouts/en_graphite.json")],
+  ["en_graphite_angle_kp", importKeymap("layouts/en_graphite_angle_kp.json")],
   ["en_halmak", importKeymap("layouts/en_halmak.json")],
   ["en_hands_down_neu", importKeymap("layouts/en_hands_down_neu.json")],
   ["en_hands_down_promethium", importKeymap("layouts/en_hands_down_promethium.json")],
@@ -62,7 +63,7 @@ for (const [id, layout] of [
   ["es_mx", importCldr("cldr-keyboards-43.0/keyboards/windows/es-419-t-k0-windows.xml")],
   ["es_latam_dvorak", importKeymap("layouts/es_latam_dvorak.json")],
   ["es_dvorak", importKeymap("layouts/es_dvorak.json")],
-  ["et-ee", importCldr("cldr-keyboards-43.0/keyboards/windows/et-ee-k0-windows.xml")],
+  ["et-ee", importCldr("cldr-keyboards-43.0/keyboards/windows/et-t-k0-windows.xml")],
   ["fa_ir", importCldr("cldr-keyboards-43.0/keyboards/windows/fa-t-k0-windows-extended.xml")],
   ["fa_ir_legacy", importCldr("cldr-keyboards-43.0/keyboards/windows/fa-t-k0-windows.xml")],
   ["fi_fi", importCldr("cldr-keyboards-43.0/keyboards/windows/fi-t-k0-windows.xml")],
@@ -80,7 +81,7 @@ for (const [id, layout] of [
   ["it_it", importCldr("cldr-keyboards-43.0/keyboards/windows/it-t-k0-windows.xml")],
   ["ja_jp_jis", importKeymap("layouts/ja_jp_jis.json")],
   ["lt_lt", importCldr("cldr-keyboards-43.0/keyboards/windows/lt-t-k0-windows-lt1582.xml")],
-  ["lv_t", importCldr("cldr-keyboards-43.0/keyboards/windows/lv-t-k0-windows.xml")],
+  ["lv_lv", importCldr("cldr-keyboards-43.0/keyboards/windows/lv-t-k0-windows.xml")],
   ["nb_kvikk", importKeymap("layouts/nb_kvikk.json")],
   ["nb_no", importCldr("cldr-keyboards-43.0/keyboards/windows/nb-t-k0-windows.xml")],
   ["nb_skarp", importKeymap("layouts/nb_skarp.json")],

packages/keybr-generators/lib/generate-layouts.ts

@@ -102,7 +102,7 @@ export class Language implements EnumItem {
     /* id= */ "lt",
     /* script= */ "latin",
     /* direction= */ "ltr",
-    /* alphabet= */ "aąbcčdeęėfghiįyjklmnņoprsštuųūvzž",
+    /* alphabet= */ "aąbcčdeęėfghiįyjklmnoprsštuųūvzž",
   );
   static readonly LV = new Language(
     /* id= */ "lv",
@@ -132,7 +132,7 @@ export class Language implements EnumItem {
     /* id= */ "pt",
     /* script= */ "latin",
     /* direction= */ "ltr",
-    /* alphabet= */ "abcdefghijklmnopqrstuvwxyzäāčēģīķļņšūž",
+    /* alphabet= */ "aáâãàbcçdeéêfghiíjlmnoóôõpqrstuúvxz",
   );
   static readonly RO = new Language(
     /* id= */ "ro",

packages/keybr-keyboard/lib/language.ts

@@ -159,7 +159,7 @@
 - `0xaa`: English/MTGAP
 - `0xab`: Spanish/Dvorak
 - `0xac`: Spanish/Dvorak (Latin American)
-- `0xad`:
+- `0xad`: English/Graphite Angle KP
 - `0xae`:
 - `0xaf`:
 - `0xb0`:
@@ -243,7 +243,7 @@
 - `0xfe`:
 - `0xff`:
 
-87 allocated identifiers
+88 allocated identifiers
 
-153 free identifiers
+152 free identifiers
 

packages/keybr-keyboard/lib/layout-id.md

@@ -977,6 +977,21 @@ export class Layout implements XEnumItem {
       Geometry.MATRIX,
     ),
   );
+  static readonly EN_GRAPHITE_ANGLE_KP = new Layout(
+    /* id= */ "en-graphite-angle-kp",
+    /* xid= */ 0xad,
+    /* name= */ "Graphite Angle KP",
+    /* family= */ "en-graphite-angle-kp",
+    /* language= */ Language.EN,
+    /* emulate= */ true,
+    /* geometries= */ new Enum(
+      Geometry.ANSI_101,
+      Geometry.ANSI_101_FULL,
+      Geometry.ISO_102,
+      Geometry.ISO_102_FULL,
+      Geometry.MATRIX,
+    ),
+  );
   static readonly TH_TH = new Layout(
     /* id= */ "th-th",
     /* xid= */ 0x9a,
@@ -1282,6 +1297,7 @@ export class Layout implements XEnumItem {
     Layout.EN_GALLIUM,
     Layout.EN_GALLIUM_MATRIX,
     Layout.EN_GRAPHITE,
+    Layout.EN_GRAPHITE_ANGLE_KP,
     Layout.EN_APT_v3,
     Layout.EN_FOCAL,
     Layout.EN_ENTHIUM_V6,

packages/keybr-keyboard/lib/layout.ts

@@ -44,6 +44,7 @@ import { LAYOUT_EN_FOCAL } from "./layout/en_focal.ts";
 import { LAYOUT_EN_GALLIUM } from "./layout/en_gallium.ts";
 import { LAYOUT_EN_GALLIUM_MATRIX } from "./layout/en_gallium_matrix.ts";
 import { LAYOUT_EN_GRAPHITE } from "./layout/en_graphite.ts";
+import { LAYOUT_EN_GRAPHITE_ANGLE_KP } from "./layout/en_graphite_angle_kp.ts";
 import { LAYOUT_EN_HALMAK } from "./layout/en_halmak.ts";
 import { LAYOUT_EN_HANDS_DOWN_NEU } from "./layout/en_hands_down_neu.ts";
 import { LAYOUT_EN_HANDS_DOWN_PROMETHIUM } from "./layout/en_hands_down_promethium.ts";
@@ -134,6 +135,7 @@ const layouts = new Map<Layout, CharacterDict>([
   [Layout.EN_GALLIUM, LAYOUT_EN_GALLIUM],
   [Layout.EN_GALLIUM_MATRIX, LAYOUT_EN_GALLIUM_MATRIX],
   [Layout.EN_GRAPHITE, LAYOUT_EN_GRAPHITE],
+  [Layout.EN_GRAPHITE_ANGLE_KP, LAYOUT_EN_GRAPHITE_ANGLE_KP],
   [Layout.EN_HALMAK, LAYOUT_EN_HALMAK],
   [Layout.EN_HANDS_DOWN_NEU, LAYOUT_EN_HANDS_DOWN_NEU],
   [Layout.EN_HANDS_DOWN_PROMETHIUM, LAYOUT_EN_HANDS_DOWN_PROMETHIUM],