keymaps (#276)

Author: fabi1cazenave

Makefile

@@ -1,10 +1,10 @@
 all:
-	@find layouts -type f \( -name '*.toml' -o -name '*.yaml' \) | while read -r file; do \
+	@find keymaps -type f \( -name '*.toml' -o -name '*.yaml' \) | while read -r file; do \
 		kalamine build "$$file" --out "$$(echo $$file | sed 's/....$$/json/')"; \
 	done
 
 watch:
-	@inotifywait -m -r layouts -e close_write | while read -r path _action file; do \
+	@inotifywait -m -r keymaps -e close_write | while read -r path _action file; do \
 		case $$file in \
 			*.yaml | *.toml) echo kalamine build "$$path$$file" --out "$$path$$(basename "$${file%.*}").json";; \
 		esac \
@@ -21,7 +21,7 @@ clean:
 install:
 	@echo "Installer script for XKB (GNU/Linux)."
 	@echo
-	xkalamine install layouts/ergol.toml
+	xkalamine install keymaps/ergol.toml
 
 uninstall:
 	@echo "Unistaller script for XKB (GNU/Linux)."

README.md

@@ -97,7 +97,7 @@ window.addEventListener('DOMContentLoaded', () => {
   // fetch a kalamine keyboard layout
   const fetchLayout = () => {
     const selected = gLayout.querySelector(`option[value="${gLayout.value}"`);
-    return fetch(`../layouts/${selected.dataset.folder}/${gLayout.value}.json`)
+    return fetch(`../keymaps/${selected.dataset.folder}/${gLayout.value}.json`)
       .then(response => response.json())
       .then(layout => {
         gKeyboard.setKeyboardLayout(layout.keymap, layout.deadkeys, gGeometry.value);

code/duck-typist.js

@@ -550,7 +550,7 @@ window.addEventListener('DOMContentLoaded', () => {
       if (value) {
         const layoutFolder = document
           .querySelector(`#layout option[value="${value}"]`).dataset.folder;
-        fetch(`../layouts/${layoutFolder}/${value}.json`)
+        fetch(`../keymaps/${layoutFolder}/${value}.json`)
           .then(response => response.json())
           .then(data => {
             const selectedOption = document

code/layout-analyzer.js

@@ -99,7 +99,7 @@ <h2><span class="key_list"></span><span class="quacks">🦆</span></h2>
   <x-keyboard></x-keyboard>
   <p style="text-align: right;">
     <span style="float: left;">
-      {{< layout-list >}}
+      {{< keymap-list >}}
       <select id="dict">
         <option value="fr,french_1k">Français 1k</option>
         <option value="fr,french_10k" selected>Français 10k</option>

layouts/en/ISRT.json keymaps/en/ISRT.json

@@ -21,7 +21,7 @@
 
 <div id="sticky-select">
   <form>
-    {{< layout-list >}}
+    {{< keymap-list >}}
     <select id="geometry">
       <option value="iso" selected>ISO</option>
       <option value="ansi">ANSI</option>

layouts/en/ISRT.yaml keymaps/en/ISRT.yaml

@@ -29,8 +29,8 @@ author = "authors"
         source = "../corpus"
         target = "static/corpus"
     [[module.mounts]]
-        source = "../layouts"
-        target = "static/layouts"
+        source = "../keymaps"
+        target = "static/keymaps"
     [[module.mounts]]
         source = "static"
         target = "static"

layouts/en/MTGAP.json keymaps/en/MTGAP.json

@@ -1,5 +1,5 @@
 {{ $default_layout := "ergol" }}
-{{ $layouts := dict
+{{ $keymaps := dict
   "en" (dict
     "qwerty"      "Qwerty"
     "dvorak"      "Dvorak"
@@ -36,9 +36,9 @@
 }}
 
 <select id="layout">
-  {{ range $language, $layouts_language := $layouts }}
+  {{ range $language, $keymaps_language := $keymaps }}
     <option disabled>  [{{ $language }}]</option>
-    {{ range $json_name, $displayed_name := $layouts_language }}
+    {{ range $json_name, $displayed_name := $keymaps_language }}
       {{ if eq $default_layout $json_name }}
         <option data-folder="{{$language}}" value="{{ $json_name }}" selected> {{ $displayed_name }} </option>
       {{ else }}

layouts/en/MTGAP.yaml keymaps/en/MTGAP.yaml

@@ -36,7 +36,7 @@
     {{ with .Get "data" }}
     <dialog>
       <input spellcheck="false" placeholder="zone de saisie {{ $name }}" />
-      <x-keyboard src="/layouts/fr/{{ . }}.json"></x-keyboard>
+      <x-keyboard src="/keymaps/fr/{{ . }}.json"></x-keyboard>
     </dialog>
     {{ end }}
     <nav>