From 0cf4376826866dbe9fb53bcf374f81febc87a832 Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sun, 13 Oct 2019 17:36:45 -0600
Subject: [PATCH] Support polytonic Greek diacritics in the Greek keyboard

Although modern Greek is typically written with only acute accent marks,
polytonic diacritics are still used by the Greek orthodox church, the
Greek newspaper Estia, and students of classical Greek texts. Supporting
these special characters is helpful to all of those groups.

Note that for the short vowels (epsilon, upsilon, iota, and omicron) all
of the diacritics permitted on lowercase letters are also permitted on
their uppercase forms. However, for the long vowels (alpha, eta, and
omega) the diacritics permitted on uppercase letters are a subset of the
diacritics permitted on lowercase letters. That's just how Greek is.

Test: Manually turned on the Greek (Greece) keyboard in the aosp_x86-eng
emulator and tried out all the new characters with Shift, with Shift
Lock, and without any modifiers.

Bug: 142007431
Change-Id: Iec4a82cab02aea5176721e8447f7dfdba46bacb3
---
 java/res/xml/rowkeys_greek1.xml |  64 +++++++++++++++----
 java/res/xml/rowkeys_greek2.xml | 108 +++++++++++++++++++++++++++++---
 java/res/xml/rowkeys_greek3.xml |  54 ++++++++++++++--
 3 files changed, 199 insertions(+), 27 deletions(-)

diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml
index 6d767794c..45895a579 100644
--- a/java/res/xml/rowkeys_greek1.xml
+++ b/java/res/xml/rowkeys_greek1.xml
@@ -28,14 +28,14 @@
             <Key
                 latin:keySpec=":"
                 latin:keyHintLabel="1"
-                latin:moreKeys=";"
+                latin:moreKeys=";,&#x00B7;"
                 latin:additionalMoreKeys="1" />
         </case>
         <default>
             <Key
                 latin:keySpec=";"
                 latin:keyHintLabel="1"
-                latin:moreKeys=":"
+                latin:moreKeys=":,&#x00B7;"
                 latin:additionalMoreKeys="1" />
         </default>
     </switch>
@@ -64,17 +64,26 @@
     </switch>
         -->
     <!-- U+03B5: "ε" GREEK SMALL LETTER EPSILON
-         U+03AD: "έ" GREEK SMALL LETTER EPSILON WITH TONOS -->
+         U+03AD: "έ" GREEK SMALL LETTER EPSILON WITH TONOS
+         U+1F72: "ὲ" GREEK SMALL LETTER EPSILON WITH VARIA
+         U+1F10: "ἐ" GREEK SMALL LETTER EPSILON WITH PSILI
+         U+1F11: "ἑ" GREEK SMALL LETTER EPSILON WITH DASIA
+         U+1F14: "ἔ" GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+         U+1F15: "ἕ" GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+         U+1F12: "ἒ" GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+         U+1F13: "ἓ" GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA -->
     <Key
         latin:keySpec="&#x03B5;"
         latin:keyHintLabel="3"
         latin:additionalMoreKeys="3"
-        latin:moreKeys="&#x03AD;,%" />
-    <!-- U+03C1: "ρ" GREEK SMALL LETTER RHO -->
+        latin:moreKeys="&#x03AD;,%,&#x1F72;,&#x1F10;,&#x1F11;,&#x1F14;,&#x1F15;,&#x1F12;,&#x1F13;" />
+    <!-- U+03C1: "ρ" GREEK SMALL LETTER RHO
+         U+1FE5: "ῥ" GREEK SMALL LETTER RHO WITH DASIA -->
     <Key
         latin:keySpec="&#x03C1;"
         latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
+        latin:additionalMoreKeys="4"
+        latin:moreKeys="%,&#x1FE5;" />
     <!-- U+03C4: "τ" GREEK SMALL LETTER TAU -->
     <Key
         latin:keySpec="&#x03C4;"
@@ -83,12 +92,24 @@
     <!-- U+03C5: "υ" GREEK SMALL LETTER UPSILON
          U+03CD: "ύ" GREEK SMALL LETTER UPSILON WITH TONOS
          U+03CB: "ϋ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-         U+03B0: "ΰ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS -->
+         U+03B0: "ΰ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+         U+1F7A: "ὺ" GREEK SMALL LETTER UPSILON WITH VARIA
+         U+1FE6: "ῦ" GREEK SMALL LETTER UPSILON WITH PERISPOMENI
+         U+1F50: "ὐ" GREEK SMALL LETTER UPSILON WITH PSILI
+         U+1F51: "ὑ" GREEK SMALL LETTER UPSILON WITH DASIA
+         U+1F54: "ὔ" GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+         U+1F55: "ὕ" GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+         U+1F52: "ὒ" GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+         U+1F53: "ὓ" GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+         U+1F56: "ὖ" GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+         U+1F57: "ὗ" GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+         U+1FE2: "ῢ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
+         U+1FE7: "ῧ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI -->
     <Key
         latin:keySpec="&#x03C5;"
         latin:keyHintLabel="6"
         latin:additionalMoreKeys="6"
-        latin:moreKeys="&#x03CD;,%,&#x03CB;,&#x03B0;" />
+        latin:moreKeys="&#x03CD;,%,&#x03CB;,&#x03B0;,&#x1F7A;,&#x1FE6;,&#x1F50;,&#x1F51;,&#x1F54;,&#x1F55;,&#x1F52;,&#x1F53;,&#x1F56;,&#x1F57;,&#x1FE2;,&#x1FE7;" />
     <!-- U+03B8: "θ" GREEK SMALL LETTER THETA -->
     <Key
         latin:keySpec="&#x03B8;"
@@ -97,19 +118,38 @@
     <!-- U+03B9: "ι" GREEK SMALL LETTER IOTA
          U+03AF: "ί" GREEK SMALL LETTER IOTA WITH TONOS
          U+03CA: "ϊ" GREEK SMALL LETTER IOTA WITH DIALYTIKA
-         U+0390: "ΐ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS -->
+         U+0390: "ΐ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+         U+1F76: "ὶ" GREEK SMALL LETTER IOTA WITH VARIA
+         U+1FD6: "ῖ" GREEK SMALL LETTER IOTA WITH PERISPOMENI
+         U+1F30: "ἰ" GREEK SMALL LETTER IOTA WITH PSILI
+         U+1F31: "ἱ" GREEK SMALL LETTER IOTA WITH DASIA
+         U+1F34: "ἴ" GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+         U+1F35: "ἵ" GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+         U+1F32: "ἲ" GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+         U+1F33: "ἳ" GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+         U+1F36: "ἶ" GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+         U+1F37: "ἷ" GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+         U+1FD2: "ῒ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
+         U+1FD7: "ῗ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI -->
     <Key
         latin:keySpec="&#x03B9;"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8"
-        latin:moreKeys="&#x03AF;,%,&#x03CA;,&#x0390;" />
+        latin:moreKeys="&#x03AF;,%,&#x03CA;,&#x0390;,&#x1F76;,&#x1FD6;,&#x1F30;,&#x1F31;,&#x1F34;,&#x1F35;,&#x1F32;,&#x1F33;,&#x1F36;,&#x1F37;,&#x1FD2;,&#x1FD7;" />
     <!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON
-         U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS -->
+         U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS
+         U+1F78: "ὸ" GREEK SMALL LETTER OMICRON WITH VARIA
+         U+1F40: "ὀ" GREEK SMALL LETTER OMICRON WITH PSILI
+         U+1F41: "ὁ" GREEK SMALL LETTER OMICRON WITH DASIA
+         U+1F44: "ὄ" GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+         U+1F45: "ὅ" GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+         U+1F42: "ὂ" GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+         U+1F43: "ὃ" GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA -->
     <Key
         latin:keySpec="&#x03BF;"
         latin:keyHintLabel="9"
         latin:additionalMoreKeys="9"
-        latin:moreKeys="&#x03CC;,%" />
+        latin:moreKeys="&#x03CC;,%,&#x1F78;,&#x1F40;,&#x1F41;,&#x1F44;,&#x1F45;,&#x1F42;,&#x1F43;" />
     <!-- U+03C0: "π" GREEK SMALL LETTER PI -->
     <Key
         latin:keySpec="&#x03C0;"
diff --git a/java/res/xml/rowkeys_greek2.xml b/java/res/xml/rowkeys_greek2.xml
index d8769caa9..97dde5b42 100644
--- a/java/res/xml/rowkeys_greek2.xml
+++ b/java/res/xml/rowkeys_greek2.xml
@@ -21,11 +21,55 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
-         U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS -->
-    <Key
-        latin:keySpec="&#x03B1;"
-        latin:moreKeys="&#x03AC;" />
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+        >
+            <!-- U+0391: "Α" GREEK CAPITAL LETTER ALPHA
+                 U+0386: "Ά" GREEK CAPITAL LETTER ALPHA WITH TONOS
+                 U+1FBA: "Ὰ" GREEK CAPITAL LETTER ALPHA WITH VARIA
+                 U+1F08: "Ἀ" GREEK CAPITAL LETTER ALPHA WITH PSILI
+                 U+1F09: "Ἁ" GREEK CAPITAL LETTER ALPHA WITH DASIA
+                 U+1F04: "Ἄ" GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+                 U+1F05: "Ἅ" GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+                 U+1F0A: "Ἂ" GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+                 U+1F0B: "Ἃ" GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+                 U+1F0E: "Ἆ" GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+                 U+1F0F: "Ἇ" GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI -->
+            <Key
+                latin:keySpec="&#x0391;"
+                latin:moreKeys="&#x0386;,&#x1FBA;,&#x1F08;,&#x1F09;,&#x1F04;,&#x1F05;,&#x1F0A;,&#x1F0B;,&#x1F0E;,&#x1F0F;" />
+        </case>
+        <default>
+            <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
+                 U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS
+                 U+1F70: "ὰ" GREEK SMALL LETTER ALPHA WITH VARIA
+                 U+1FB6: "ᾶ" GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+                 U+1F00: "ἀ" GREEK SMALL LETTER ALPHA WITH PSILI
+                 U+1F01: "ἁ" GREEK SMALL LETTER ALPHA WITH DASIA
+                 U+1F04: "ἄ" GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+                 U+1F05: "ἅ" GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+                 U+1F02: "ἂ" GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+                 U+1F03: "ἃ" GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+                 U+1F06: "ἆ" GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+                 U+1F07: "ἇ" GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+                 U+1FB3: "ᾳ" GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
+                 U+1FB4: "ᾴ" GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+                 U+1FB2: "ᾲ" GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+                 U+1FB7: "ᾷ" GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+                 U+1F80: "ᾀ" GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+                 U+1F81: "ᾁ" GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+                 U+1F84: "ᾄ" GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+                 U+1F85: "ᾅ" GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+                 U+1F82: "ᾂ" GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+                 U+1F83: "ᾃ" GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+                 U+1F86: "ᾆ" GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+                 U+1F87: "ᾇ" GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->
+            <Key
+                latin:keySpec="&#x03B1;"
+                latin:moreKeys="&#x03AC;,&#x1F70;,&#x1FB6;,&#x1F00;,&#x1F01;,&#x1F04;,&#x1F05;,&#x1F02;,&#x1F03;,&#x1F06;,&#x1F07;,&#x1FB3;,&#x1FB4;,&#x1FB2;,&#x1FB7;,&#x1F80;,&#x1F81;,&#x1F84;,&#x1F85;,&#x1F82;,&#x1F83;,&#x1F86;,&#x1F87;" />
+        </default>
+    </switch>
     <!-- U+03C3: "σ" GREEK SMALL LETTER SIGMA -->
     <Key
         latin:keySpec="&#x03C3;" />
@@ -38,11 +82,55 @@
     <!-- U+03B3: "γ" GREEK SMALL LETTER GAMMA -->
     <Key
         latin:keySpec="&#x03B3;" />
-    <!-- U+03B7: "η" GREEK SMALL LETTER ETA
-         U+03AE: "ή" GREEK SMALL LETTER ETA WITH TONOS -->
-    <Key
-        latin:keySpec="&#x03B7;"
-        latin:moreKeys="&#x03AE;" />
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+        >
+            <!-- U+0397: "Η" GREEK CAPITAL LETTER ETA
+                 U+0389: "Ή" GREEK CAPITAL LETTER ETA WITH TONOS
+                 U+1FCA: "Ὴ" GREEK CAPITAL LETTER ETA WITH VARIA
+                 U+1F28: "Ἠ" GREEK CAPITAL LETTER ETA WITH PSILI
+                 U+1F29: "Ἡ" GREEK CAPITAL LETTER ETA WITH DASIA
+                 U+1F2C: "Ἤ" GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+                 U+1F2D: "Ἥ" GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+                 U+1F2A: "Ἢ" GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+                 U+1F2B: "Ἣ" GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+                 U+1F2E: "Ἦ" GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+                 U+1F2F: "Ἧ" GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI -->
+            <Key
+                latin:keySpec="&#x0397;"
+                latin:moreKeys="&#x0389;,&#x1FCA;,&#x1F28;,&#x1F29;,&#x1F2C;,&#x1F2D;,&#x1F2A;,&#x1F2B;,&#x1F2E;,&#x1F2F;" />
+        </case>
+        <default>
+            <!-- U+03B7: "η" GREEK SMALL LETTER ETA
+                 U+03AE: "ή" GREEK SMALL LETTER ETA WITH TONOS
+                 U+1F74: "ὴ" GREEK SMALL LETTER ETA WITH VARIA
+                 U+1FC6: "ῆ" GREEK SMALL LETTER ETA WITH PERISPOMENI
+                 U+1F20: "ἠ" GREEK SMALL LETTER ETA WITH PSILI
+                 U+1F21: "ἡ" GREEK SMALL LETTER ETA WITH DASIA
+                 U+1F24: "ἤ" GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+                 U+1F25: "ἥ" GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+                 U+1F22: "ἢ" GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+                 U+1F23: "ἣ" GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+                 U+1F26: "ἦ" GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+                 U+1F27: "ἧ" GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+                 U+1FC3: "ῃ" GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
+                 U+1FC4: "ῄ" GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+                 U+1FC2: "ῂ" GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+                 U+1FC7: "ῇ" GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+                 U+1F90: "ᾐ" GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+                 U+1F91: "ᾑ" GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+                 U+1F94: "ᾔ" GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+                 U+1F95: "ᾕ" GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+                 U+1F92: "ᾒ" GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+                 U+1F93: "ᾓ" GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+                 U+1F96: "ᾖ" GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+                 U+1F97: "ᾗ" GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->
+            <Key
+                latin:keySpec="&#x03B7;"
+                latin:moreKeys="&#x03AE;,&#x1F74;,&#x1FC6;,&#x1F20;,&#x1F21;,&#x1F24;,&#x1F25;,&#x1F22;,&#x1F23;,&#x1F26;,&#x1F27;,&#x1FC3;,&#x1FC4;,&#x1FC2;,&#x1FC7;,&#x1F90;,&#x1F91;,&#x1F94;,&#x1F95;,&#x1F92;,&#x1F93;,&#x1F96;,&#x1F97;" />
+        </default>
+    </switch>
     <!-- U+03BE: "ξ" GREEK SMALL LETTER XI -->
     <Key
         latin:keySpec="&#x03BE;" />
diff --git a/java/res/xml/rowkeys_greek3.xml b/java/res/xml/rowkeys_greek3.xml
index 3f989bc9c..0c2667be1 100644
--- a/java/res/xml/rowkeys_greek3.xml
+++ b/java/res/xml/rowkeys_greek3.xml
@@ -30,11 +30,55 @@
     <!-- U+03C8: "ψ" GREEK SMALL LETTER PSI -->
     <Key
         latin:keySpec="&#x03C8;" />
-    <!-- U+03C9: "ω" GREEK SMALL LETTER OMEGA
-         U+03CE: "ώ" GREEK SMALL LETTER OMEGA WITH TONOS -->
-    <Key
-        latin:keySpec="&#x03C9;"
-        latin:moreKeys="&#x03CE;" />
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+        >
+            <!-- U+03A9: "Ω" GREEK CAPITAL LETTER OMEGA
+                 U+038F: "Ώ" GREEK CAPITAL LETTER OMEGA WITH TONOS
+                 U+1FFA: "Ὼ" GREEK CAPITAL LETTER OMEGA WITH VARIA
+                 U+1F68: "Ὠ" GREEK CAPITAL LETTER OMEGA WITH PSILI
+                 U+1F69: "Ὡ" GREEK CAPITAL LETTER OMEGA WITH DASIA
+                 U+1F6C: "Ὤ" GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+                 U+1F6D: "Ὥ" GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+                 U+1F6A: "Ὢ" GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+                 U+1F6B: "Ὣ" GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+                 U+1F6E: "Ὦ" GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+                 U+1F6F: "Ὧ" GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI -->
+            <Key
+                latin:keySpec="&#x03C9;"
+                latin:moreKeys="&#x038F;,&#x1FFA;,&#x1F68;,&#x1F69;,&#x1F6C;,&#x1F6D;,&#x1F6A;,&#x1F6B;,&#x1F6E;,&#x1F6F;" />
+        </case>
+        <default>
+            <!-- U+03C9: "ω" GREEK SMALL LETTER OMEGA
+                 U+03CE: "ώ" GREEK SMALL LETTER OMEGA WITH TONOS
+                 U+1F7C: "ὼ" GREEK SMALL LETTER OMEGA WITH VARIA
+                 U+1FF6: "ῶ" GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+                 U+1F60: "ὠ" GREEK SMALL LETTER OMEGA WITH PSILI
+                 U+1F61: "ὡ" GREEK SMALL LETTER OMEGA WITH DASIA
+                 U+1F64: "ὤ" GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+                 U+1F65: "ὥ" GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+                 U+1F62: "ὢ" GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+                 U+1F63: "ὣ" GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+                 U+1F66: "ὦ" GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+                 U+1F67: "ὧ" GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+                 U+1FF3: "ῳ" GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
+                 U+1FF4: "ῴ" GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+                 U+1FF2: "ῲ" GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+                 U+1FF7: "ῷ" GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+                 U+1FA0: "ᾠ" GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+                 U+1FA1: "ᾡ" GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+                 U+1FA4: "ᾤ" GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+                 U+1FA5: "ᾥ" GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+                 U+1FA2: "ᾢ" GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+                 U+1FA3: "ᾣ" GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+                 U+1FA6: "ᾦ" GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+                 U+1FA7: "ᾧ" GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->
+            <Key
+                latin:keySpec="&#x03C9;"
+                latin:moreKeys="&#x03CE;,&#x1F7C;,&#x1FF6;,&#x1F60;,&#x1F61;,&#x1F64;,&#x1F65;,&#x1F62;,&#x1F63;,&#x1F66;,&#x1F67;,&#x1FF3;,&#x1FF4;,&#x1FF2;,&#x1FF7;,&#x1FA0;,&#x1FA1;,&#x1FA4;,&#x1FA5;,&#x1FA2;,&#x1FA3;,&#x1FA6;,&#x1FA7;" />
+        </default>
+    </switch>
     <!-- U+03B2: "β" GREEK SMALL LETTER BETA -->
     <Key
         latin:keySpec="&#x03B2;" />