From aa62879de0ae7f86cd15f102962621c12972a4a8 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Sat, 29 Jul 2023 19:51:49 -0500
Subject: [PATCH 1/5] CLDR-15034 kbd: move pcm keyboard to 3.0 format

---
 keyboards/3.0/pcm.xml | 70 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 keyboards/3.0/pcm.xml

diff --git a/keyboards/3.0/pcm.xml b/keyboards/3.0/pcm.xml
new file mode 100644
index 00000000000..75d04529ec6
--- /dev/null
+++ b/keyboards/3.0/pcm.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboard SYSTEM '../dtd/ldmlKeyboard.dtd'>
+<keyboard locale="pcm" conformsTo="techpreview">
+	<version number="1.0.0" />
+	<names>
+		<name value="Nigerian Pidgin" />
+		<name value="Naijíriá Píjin" />
+	</names>
+	<settings fallback="omit" />
+	<keys>
+		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
+		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+		<key id="grave" to="̀" /> <!-- TODO: move to NCR -->
+		<key id="acute" to="́" /> <!-- TODO: move to NCR -->
+
+		<!-- accented vowels -->
+		<key id="odot" to="ọ" />
+		<key id="Odot" to="Ọ" />
+		<key id="edot" to="ẹ" />
+		<key id="Edot" to="Ẹ" />
+
+		<!-- currency -->
+		<key id="naira" to="₦" />
+	</keys>
+
+	<layers form="iso">
+		<layer modifier="none">
+			<row
+				keys="grave 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
+			<row keys="acute w e r t y u i o p open-square close-square" />
+			<row keys="a s d f g h j k l odot edot slash" />
+			<row keys="slash z c v b n m comma period semi-colon apos" />
+			<row keys="space" />
+		</layer>
+
+		<layer modifier="shift">
+			<row
+				keys="grave bang at hash dollar naira percent amp asterisk open-paren close-paren underscore plus" />
+			<row keys="acute W E R T Y U I O P open-curly close-curly" />
+			<row keys="A S D F G H J K L Odot Edot" />
+			<row keys="question Z C V B N M open-angle close-angle colon double-quote" />
+			<row keys="space" />
+		</layer>
+	</layers>
+
+	<transforms type="simple">
+		<transformGroup>
+			<!-- Change vowels with appended acute, grave, and dot below combiners to combined forms -->
+			<transform from="a\u{300}" to="à" />
+			<transform from="E\u{300}" to="È" />
+			<transform from="o\u{301}" to="ó" />
+			<transform from="O\u{300}" to="Ò" />
+			<transform from="o\u{323}" to="ọ" />
+			<transform from="A\u{323}" to="Ạ" />
+			<transform from="a\u{323}" to="ạ" />
+			<transform from="a\u{301}" to="á" />
+			<transform from="A\u{300}" to="À" />
+			<transform from="E\u{323}" to="Ẹ" />
+			<transform from="O\u{323}" to="Ọ" />
+			<transform from="''" to="\u{323}" /> <!-- Quick way to add dot below -->
+			<transform from="A\u{301}" to="Á" />
+			<transform from="e\u{323}" to="ẹ" />
+			<transform from="O\u{301}" to="Ó" />
+			<transform from="e\u{301}" to="é" />
+			<transform from="e\u{300}" to="è" />
+			<transform from="E\u{301}" to="É" />
+			<transform from="o\u{300}" to="ò" />
+		</transformGroup>
+	</transforms>
+</keyboard>
\ No newline at end of file

From 0592524affcdf55d7328d007be3ee393ee7fbcc3 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Thu, 24 Aug 2023 14:43:43 -0500
Subject: [PATCH 2/5] CLDR-15034 kbd: update to pcm keyboard

- drop normalization workaround anticipating CLDR-16943
- simplify
- re-add caps layer
- add test case

Keyman side is https://github.com/keymanapp/keyman/pull/9508
---
 keyboards/3.0/pcm.xml       | 112 ++++++++++++++++--------------------
 keyboards/test/pcm-test.xml |  21 +++++++
 2 files changed, 71 insertions(+), 62 deletions(-)
 create mode 100644 keyboards/test/pcm-test.xml

diff --git a/keyboards/3.0/pcm.xml b/keyboards/3.0/pcm.xml
index 75d04529ec6..5796575ee85 100644
--- a/keyboards/3.0/pcm.xml
+++ b/keyboards/3.0/pcm.xml
@@ -1,70 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard SYSTEM '../dtd/ldmlKeyboard.dtd'>
 <keyboard locale="pcm" conformsTo="techpreview">
-	<version number="1.0.0" />
-	<names>
-		<name value="Nigerian Pidgin" />
-		<name value="Naijíriá Píjin" />
-	</names>
-	<settings fallback="omit" />
-	<keys>
-		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
-		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
-		<key id="grave" to="̀" /> <!-- TODO: move to NCR -->
-		<key id="acute" to="́" /> <!-- TODO: move to NCR -->
+  <version number="1.0.0" />
+  <names>
+    <name value="Nigerian Pidgin" />
+    <name value="Naijíriá Píjin" />
+  </names>
+  <settings fallback="omit" />
+  <keys>
+    <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
+    <import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+    <key id="grave" to="\u{300}" />
+    <key id="acute" to="\u{301}" />
 
-		<!-- accented vowels -->
-		<key id="odot" to="ọ" />
-		<key id="Odot" to="Ọ" />
-		<key id="edot" to="ẹ" />
-		<key id="Edot" to="Ẹ" />
+    <!-- accented vowels -->
+    <key id="odot" to="ọ" />
+    <key id="Odot" to="Ọ" />
+    <key id="edot" to="ẹ" />
+    <key id="Edot" to="Ẹ" />
 
-		<!-- currency -->
-		<key id="naira" to="₦" />
-	</keys>
+    <!-- currency -->
+    <key id="naira" to="₦" />
+  </keys>
 
-	<layers form="iso">
-		<layer modifier="none">
-			<row
-				keys="grave 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
-			<row keys="acute w e r t y u i o p open-square close-square" />
-			<row keys="a s d f g h j k l odot edot slash" />
-			<row keys="slash z c v b n m comma period semi-colon apos" />
-			<row keys="space" />
-		</layer>
+  <layers form="iso">
+    <layer modifier="none">
+      <row keys="grave 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
+      <row keys="acute w e r t y u i o p open-square close-square" />
+      <row keys="a s d f g h j k l odot edot slash" />
+      <row keys="slash z c v b n m comma period semi-colon apos" />
+      <row keys="space" />
+    </layer>
 
-		<layer modifier="shift">
-			<row
-				keys="grave bang at hash dollar naira percent amp asterisk open-paren close-paren underscore plus" />
-			<row keys="acute W E R T Y U I O P open-curly close-curly" />
-			<row keys="A S D F G H J K L Odot Edot" />
-			<row keys="question Z C V B N M open-angle close-angle colon double-quote" />
-			<row keys="space" />
-		</layer>
-	</layers>
+    <layer modifier="shift">
+      <row keys="grave bang at hash dollar naira percent amp asterisk open-paren close-paren underscore plus" />
+      <row keys="acute W E R T Y U I O P open-curly close-curly" />
+      <row keys="A S D F G H J K L Odot Edot" />
+      <row keys="question Z C V B N M open-angle close-angle colon double-quote" />
+      <row keys="space" />
+    </layer>
 
-	<transforms type="simple">
-		<transformGroup>
-			<!-- Change vowels with appended acute, grave, and dot below combiners to combined forms -->
-			<transform from="a\u{300}" to="à" />
-			<transform from="E\u{300}" to="È" />
-			<transform from="o\u{301}" to="ó" />
-			<transform from="O\u{300}" to="Ò" />
-			<transform from="o\u{323}" to="ọ" />
-			<transform from="A\u{323}" to="Ạ" />
-			<transform from="a\u{323}" to="ạ" />
-			<transform from="a\u{301}" to="á" />
-			<transform from="A\u{300}" to="À" />
-			<transform from="E\u{323}" to="Ẹ" />
-			<transform from="O\u{323}" to="Ọ" />
-			<transform from="''" to="\u{323}" /> <!-- Quick way to add dot below -->
-			<transform from="A\u{301}" to="Á" />
-			<transform from="e\u{323}" to="ẹ" />
-			<transform from="O\u{301}" to="Ó" />
-			<transform from="e\u{301}" to="é" />
-			<transform from="e\u{300}" to="è" />
-			<transform from="E\u{301}" to="É" />
-			<transform from="o\u{300}" to="ò" />
-		</transformGroup>
-	</transforms>
-</keyboard>
\ No newline at end of file
+    <layer modifier="caps">
+      <row keys="grave 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
+      <row keys="acute W E R T Y U I O P open-square close-square" />
+      <row keys="A S D F G H J K L Odot Edot slash" />
+      <row keys="slash Z C V B N M comma period semi-colon apos" />
+      <row keys="space" />
+    </layer>
+
+  </layers>
+
+  <transforms type="simple">
+    <transformGroup>
+      <transform from="''" to="\u{323}" /> <!-- Quick way to add dot below -->
+    </transformGroup>
+  </transforms>
+</keyboard>
diff --git a/keyboards/test/pcm-test.xml b/keyboards/test/pcm-test.xml
new file mode 100644
index 00000000000..88fc500091e
--- /dev/null
+++ b/keyboards/test/pcm-test.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboardTest SYSTEM "../dtd/ldmlKeyboardTest.dtd">
+<keyboardTest conformsTo="techpreview">
+  <info keyboard="pcm.xml" author="Team Keyboard" name="pcm-test" />
+  <repertoire name="simple-repertoire" chars="[a b c d e ọ Ọ ẹ Ẹ ₦]" type="simple" />
+  <tests name="key-tests">
+    <test name="abc-test">
+      <startContext to="abc" />
+      <keystroke key="d" />
+      <check result="abcd" />
+    </test>
+    <test name="dot-below-test">
+      <startContext to="" />
+      <keystroke key="e" />
+      <keystroke key="apos" />
+      <check result="e'" />
+      <keystroke key="apos" />
+      <check result="e\u{323}" />
+    </test>
+  </tests>
+</keyboardTest>

From faa52cd8b8ac7e75117e1dfad32014802ff55e52 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 20 Sep 2023 12:51:37 -0500
Subject: [PATCH 3/5] CLDR-15034 update to Keyboard3

- for #3274 / CLDR-17078
---
 keyboards/3.0/pcm.xml                                       | 6 +++---
 keyboards/test/pcm-test.xml                                 | 6 +++---
 .../src/test/java/org/unicode/cldr/unittest/TestAll.java    | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/keyboards/3.0/pcm.xml b/keyboards/3.0/pcm.xml
index 5796575ee85..f175fbd039a 100644
--- a/keyboards/3.0/pcm.xml
+++ b/keyboards/3.0/pcm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM '../dtd/ldmlKeyboard.dtd'>
-<keyboard locale="pcm" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM '../dtd/ldmlKeyboard3.dtd'>
+<keyboard3 locale="pcm" conformsTo="techpreview">
   <version number="1.0.0" />
   <names>
     <name value="Nigerian Pidgin" />
@@ -55,4 +55,4 @@
       <transform from="''" to="\u{323}" /> <!-- Quick way to add dot below -->
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/keyboards/test/pcm-test.xml b/keyboards/test/pcm-test.xml
index 88fc500091e..8f85126acc8 100644
--- a/keyboards/test/pcm-test.xml
+++ b/keyboards/test/pcm-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
   <info keyboard="pcm.xml" author="Team Keyboard" name="pcm-test" />
   <repertoire name="simple-repertoire" chars="[a b c d e ọ Ọ ẹ Ẹ ₦]" type="simple" />
   <tests name="key-tests">
@@ -18,4 +18,4 @@
       <check result="e\u{323}" />
     </test>
   </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java
index 888507d50c6..f55e4bc83de 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java
@@ -201,7 +201,6 @@ public TestAll() {
                     "org.unicode.cldr.unittest.TestIdentifierInfo",
                     "org.unicode.cldr.unittest.TestIdentity",
                     "org.unicode.cldr.unittest.TestInheritance",
-                    "org.unicode.cldr.unittest.TestKeyboardModifierSet",
                     "org.unicode.cldr.unittest.TestLdml2ICU",
                     "org.unicode.cldr.unittest.TestLocalCurrency",
                     "org.unicode.cldr.unittest.TestLocale",

From f2c680d82c45388f511a56922cd954b783f389f9 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 20 Sep 2023 12:55:53 -0500
Subject: [PATCH 4/5] CLDR-15034 kbd: pcm: apply review comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Kučera <10546952+miloush@users.noreply.github.com>
---
 keyboards/3.0/pcm.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/keyboards/3.0/pcm.xml b/keyboards/3.0/pcm.xml
index f175fbd039a..5ef43e5d682 100644
--- a/keyboards/3.0/pcm.xml
+++ b/keyboards/3.0/pcm.xml
@@ -11,6 +11,7 @@
     <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
     <import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
     <key id="grave" to="\u{300}" />
+    <key id="backquote" to="`" />
     <key id="acute" to="\u{301}" />
 
     <!-- accented vowels -->
@@ -34,15 +35,15 @@
 
     <layer modifier="shift">
       <row keys="grave bang at hash dollar naira percent amp asterisk open-paren close-paren underscore plus" />
-      <row keys="acute W E R T Y U I O P open-curly close-curly" />
+      <row keys="A S D F G H J K L Odot Edot question" />
       <row keys="A S D F G H J K L Odot Edot" />
       <row keys="question Z C V B N M open-angle close-angle colon double-quote" />
       <row keys="space" />
     </layer>
 
     <layer modifier="caps">
-      <row keys="grave 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
-      <row keys="acute W E R T Y U I O P open-square close-square" />
+      <row keys="backquote 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
+      <row keys="Q W E R T Y U I O P open-square close-square" />
       <row keys="A S D F G H J K L Odot Edot slash" />
       <row keys="slash Z C V B N M comma period semi-colon apos" />
       <row keys="space" />

From 92d147c6b7314a155ceb2bd80d9f3e46c8b3b7a4 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 20 Sep 2023 12:59:36 -0500
Subject: [PATCH 5/5] CLDR-15034 update to Keyboard3 (stray commit)

---
 .../src/test/java/org/unicode/cldr/unittest/TestAll.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java
index f55e4bc83de..888507d50c6 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAll.java
@@ -201,6 +201,7 @@ public TestAll() {
                     "org.unicode.cldr.unittest.TestIdentifierInfo",
                     "org.unicode.cldr.unittest.TestIdentity",
                     "org.unicode.cldr.unittest.TestInheritance",
+                    "org.unicode.cldr.unittest.TestKeyboardModifierSet",
                     "org.unicode.cldr.unittest.TestLdml2ICU",
                     "org.unicode.cldr.unittest.TestLocalCurrency",
                     "org.unicode.cldr.unittest.TestLocale",