Merge branch 'MAIN' into pr/770

Julow · Oct 5, 2024 · ca9c07f · ca9c07f
2 parents b1fec09 + 8a6dc34
commit ca9c07f
Show file tree

Hide file tree

Showing 54 changed files with 1,622 additions and 234 deletions.
diff --git a/assets/special_font.ttf b/assets/special_font.ttf
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,10 @@ plugins {
   id 'com.android.application' version '8.1.1'
 }
 
+dependencies {
+  testImplementation "junit:junit:4.13.2"
+}
+
 android {
   namespace 'juloo.keyboard2'
   compileSdk 34
@@ -21,6 +25,10 @@ android {
       res.srcDirs = ['res', 'build/generated-resources']
       assets.srcDirs = ['assets']
     }
+
+    test {
+      java.srcDirs = ['test']
+    }
   }
 
   signingConfigs {
@@ -84,9 +92,6 @@ android {
   }
 }
 
-dependencies {
-}
-
 tasks.register('buildKeyboardFont') {
   println "\nBuilding assets/special_font.ttf"
   mkdir "$buildDir"

diff --git a/doc/Possible-key-values.md b/doc/Possible-key-values.md
@@ -119,7 +119,7 @@ Keys ending in `_placeholder` are normally hidden unless the Fn key is pressed.
 `ole`, `ole_placeholder`,
 `meteg`, `meteg_placeholder`
 
-## Unexpected Keyboard specific
+## Keyboard behavior keys
 Value                  | Meaning
 :--------------------- | :------
 `config`               | Gear icon; opens Unexpected Keyboard settings.
@@ -148,3 +148,42 @@ These keys are known to do nothing.
 These keys are normally hidden unless the Fn modifier is activated.
 
 `f11_placeholder` | `f12_placeholder`
+
+## Complex keys
+
+More complex keys are of this form:
+
+```
+:<kind> <attributes>:<payload>
+```
+
+Where `<kind>` is one of the kinds documented below and `<attributes>` is a
+space separated list of attributes. `<payload>` depends on the `<kind>`.
+
+Attributes are:
+- `symbol='Sym'` specifies the symbol to be shown on the keyboard.
+- `flags='<flags>'` changes the behavior of the key.
+  `<flags>` is a coma separated list of:
+  + `dim`: Make the symbol dimmer.
+  + `small`: Make the symbol smaller.
+
+### Kind `str`
+
+Defines a key that outputs an arbitrary string. `<payload>` is a string wrapped
+in single-quotes (`'`), escaping of other single quotes is allowed with `\'`.
+
+For example:
+- `:str:'Arbitrary string with a \' inside'`
+- `:str symbol='Symbol':'Output string'`
+
+### Kind `char`
+
+Defines a key that outputs a single character. `<payload>` is the character to
+output, unquoted.
+This kind of key can be used to define a character key with a different symbol
+on it. `char` keys can be modified by `ctrl` and other modifiers, unlike `str`
+keys.
+
+For example:
+- `:char symbol='q':љ`, which is used to implement `ctrl` shortcuts in cyrillic
+  layouts.
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
@@ -120,6 +120,7 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <string name="key_descr_clipboard">Správce schránky</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Nedávno kopírovaný text</string>
   <string name="clipboard_pin_heading">Připnout</string>
   <string name="clipboard_remove_confirm">Odebrat ze schránky?</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -120,6 +120,7 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
   <string name="key_descr_home">Pos1</string>
   <string name="key_descr_end">Ende</string>
   <string name="key_descr_clipboard">Clipboard-Manager</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Zuletzt kopierter Text</string>
   <string name="clipboard_pin_heading">Angeheftet</string>
   <string name="clipboard_remove_confirm">Aus der Zwischenablage entfernen?</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -120,6 +120,7 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
   <string name="key_descr_home">Inicio</string>
   <string name="key_descr_end">Fin</string>
   <string name="key_descr_clipboard">Arreglar portapapeles</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Textos recién copiados</string>
   <string name="clipboard_pin_heading">Pegado</string>
   <string name="clipboard_remove_confirm">¿Sacar este portapapeles?</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
@@ -120,6 +120,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <!-- <string name="key_descr_home">Home</string> -->
   <!-- <string name="key_descr_end">End</string> -->
   <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
   <!-- <string name="clipboard_pin_heading">Pinned</string> -->
   <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -120,6 +120,7 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
   <string name="key_descr_home">Début</string>
   <string name="key_descr_end">Fin</string>
   <string name="key_descr_clipboard">Presse-papiers</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Texte récemment copié</string>
   <string name="clipboard_pin_heading">Épinglé</string>
   <string name="clipboard_remove_confirm">Supprimer ce presse-papiers ?</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
@@ -120,6 +120,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <!-- <string name="key_descr_home">Home</string> -->
   <!-- <string name="key_descr_end">End</string> -->
   <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
   <!-- <string name="clipboard_pin_heading">Pinned</string> -->
   <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
@@ -121,6 +121,7 @@ PCキーボードでの半角入力を再現しています。日本語入力、
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <string name="key_descr_clipboard">クリップボード</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">最近コピーしたテキスト</string>
   <string name="clipboard_pin_heading">お気に入り</string>
   <string name="clipboard_remove_confirm">クリップボードから削除しますか?</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
@@ -120,6 +120,7 @@
   <string name="key_descr_home">홈</string>
   <string name="key_descr_end">종료</string>
   <string name="key_descr_clipboard">클립보드 관리자</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">최근에 복사한 텍스트</string>
   <string name="clipboard_pin_heading">고정</string>
   <string name="clipboard_remove_confirm">이 클립보드를 제거하시겠습니까?</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
@@ -122,6 +122,7 @@ Tagad lieliski piemērota izmantošanai ikdienā.
   <string name="key_descr_home">Sākums</string>
   <string name="key_descr_end">Beigas</string>
   <string name="key_descr_clipboard">Starpliktuves pārvaldnieks</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Nesen starpliktuvē ievietots teksts</string>
   <string name="clipboard_pin_heading">Piesprausts</string>
   <string name="clipboard_remove_confirm">Noņemt šo starpliktuves vienumu?</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
@@ -120,6 +120,7 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <string name="key_descr_clipboard">Zarządzanie schowkiem</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Ostatnio skopiowane elementy</string>
   <string name="clipboard_pin_heading">Przypięte</string>
   <string name="clipboard_remove_confirm">Usunąć ten element ze schowka?</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
@@ -120,6 +120,7 @@ Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
   <!-- <string name="clipboard_pin_heading">Pinned</string> -->
   <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
@@ -120,6 +120,7 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e
   <!-- <string name="key_descr_home">Home</string> -->
   <!-- <string name="key_descr_end">End</string> -->
   <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
   <!-- <string name="clipboard_pin_heading">Pinned</string> -->
   <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
@@ -120,6 +120,7 @@
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <string name="key_descr_clipboard">Менеджер буфера обмена</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Недавно скопированный текст</string>
   <string name="clipboard_pin_heading">Закреплено</string>
   <string name="clipboard_remove_confirm">Удалить этот буфер обмена?</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
@@ -120,6 +120,7 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
   <string name="key_descr_home">BAŞ(Sol yön tuşu)</string>
   <string name="key_descr_end">SON(Sağ yön tuşu)</string>
   <string name="key_descr_clipboard">Pano</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Son kopyalanan metin</string>
   <string name="clipboard_pin_heading">Sabitlendi</string>
   <string name="clipboard_remove_confirm">Bu sabitlemeyi sil</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
@@ -120,6 +120,7 @@
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <string name="key_descr_clipboard">Менеджер буфера обміну</string>
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <string name="clipboard_history_heading">Нещодавно скопійований текст</string>
   <string name="clipboard_pin_heading">Закріплено</string>
   <string name="clipboard_remove_confirm">Видалити цей буфер обміну?</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
@@ -120,6 +120,7 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
   <!-- <string name="key_descr_home">Home</string> -->
   <!-- <string name="key_descr_end">End</string> -->
   <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
   <!-- <string name="clipboard_pin_heading">Pinned</string> -->
   <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
@@ -120,6 +120,7 @@
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="key_descr_combining">Combining diacritic</string> -->
   <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
   <!-- <string name="clipboard_pin_heading">Pinned</string> -->
   <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -120,6 +120,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <string name="key_descr_home">Home</string>
   <string name="key_descr_end">End</string>
   <string name="key_descr_clipboard">Clipboard manager</string>
+  <string name="key_descr_combining">Combining diacritic</string>
   <string name="clipboard_history_heading">Recently copied text</string>
   <string name="clipboard_pin_heading">Pinned</string>
   <string name="clipboard_remove_confirm">Remove this clipboard?</string>

diff --git a/srcs/compose/compile.py b/srcs/compose/compile.py
@@ -99,9 +99,12 @@ def strip_line(line):
 
 # Parse from a json file containing a dictionary sequence → result string.
 def parse_sequences_file_json(fname):
-    with open(fname, "r") as inp:
-        seqs = json.loads(strip_cstyle_comments(inp))
-    return list(seqs.items())
+    try:
+        with open(fname, "r") as inp:
+            seqs = json.loads(strip_cstyle_comments(inp))
+        return list(seqs.items())
+    except Exception as e:
+        print("Failed parsing '%s': %s" % (fname, str(e)), file=sys.stderr)
 
 # Format of the sequences file is determined by its extension
 def parse_sequences_file(fname, xkb_char_extra_names={}):

diff --git a/srcs/compose/compose/cyrillic.json b/srcs/compose/compose/cyrillic.json
@@ -0,0 +1,138 @@
+{
+  "\"": {
+    "і": "ї"
+  },
+  ",": {
+    "г": "ӻ",
+    "к": "ӄ",
+    "л": "ԓ",
+    "н": "ӈ",
+    "х": "ӽ"
+  },
+  ".": {
+    "г": "ӷ",
+    "ж": "җ",
+    "й": "ҋ",
+    "к": "қ",
+    "м": "ӎ",
+    "н": "ӊ",
+    "і": "ї"
+  },
+  "а": {
+    "е": "ѣ",
+    "у": "ѡ",
+    "ъ": "ѣ",
+    "ы": "ѣ",
+    "ь": "ꙙ",
+    "э": "ѣ",
+    "є": "ѣ",
+    "ꙑ": "ѣ"
+  },
+  "г": {
+    ",": "ӻ",
+    ".": "ӷ",
+    "й": "ғ",
+    "х": "ҁ",
+    "ј": "ғ"
+  },
+  "д": {
+    "е": "ꙉ",
+    "ж": "џ",
+    "з": "ꙃ",
+    "й": "ꙉ",
+    "ј": "ꙉ"
+  },
+  "е": {
+    "о": "ё"
+  },
+  "ж": {
+    ".": "җ"
+  },
+  "з": {
+    "ф": "ҙ"
+  },
+  "и": {
+    "и": "ӣ",
+    "й": "ӣ",
+    "у": "ѵ",
+    "ј": "ӣ"
+  },
+  "й": {
+    ".": "ҋ"
+  },
+  "к": {
+    ",": "ӄ",
+    ".": "қ",
+    "г": "ґ",
+    "с": "ѯ",
+    "х": "ҁ",
+    "ш": "ѯ"
+  },
+  "л": {
+    ",": "ԓ",
+    "ь": "љ"
+  },
+  "м": {
+    ".": "ӎ"
+  },
+  "н": {
+    ",": "ӈ",
+    ".": "ӊ",
+    "ь": "њ"
+  },
+  "о": {
+    "т": "ѿ",
+    "у": "ѹ"
+  },
+  "п": {
+    "с": "ѱ",
+    "ш": "ѱ"
+  },
+  "т": {
+    "й": "ћ",
+    "ф": "ѳ",
+    "ј": "ћ"
+  },
+  "у": {
+    "у": "ӯ",
+    "ъ": "ў"
+  },
+  "х": {
+    ",": "ӽ",
+    "й": "ҳ",
+    "ь": "ҳ",
+    "ј": "ҳ"
+  },
+  "ш": {
+    "ч": "щ"
+  },
+  "ы": {
+    "у": "ѡ",
+    "ъ": "ꙑ"
+  },
+  "ю": {
+    "а": "ꙓ",
+    "е": "ѥ",
+    "м": "ѭ",
+    "н": "ѩ",
+    "э": "ѥ"
+  },
+  "я": {
+    "ь": "ꙝ"
+  },
+  "і": {
+    "\"": "ї",
+    ".": "ї",
+    "й": "ӣ",
+    "у": "ѵ",
+    "і": "ӣ",
+    "ј": "ӣ"
+  },
+  "ѡ": {
+    "т": "ѿ"
+  },
+  "ꙑ": {
+    "ь": "ы",
+    "у": "ѡ"
+  }
+}