diff --git a/developer/src/inst/kmdev.wxs b/developer/src/inst/kmdev.wxs
index b76f0ac34ad..f804b8b9cf8 100644
--- a/developer/src/inst/kmdev.wxs
+++ b/developer/src/inst/kmdev.wxs
@@ -59,7 +59,7 @@
-
+
@@ -198,7 +198,7 @@
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/basic.txt b/developer/src/kmc-ldml/test/fixtures/basic.txt
index 0c46c3451b6..124b9bdbc32 100644
--- a/developer/src/kmc-ldml/test/fixtures/basic.txt
+++ b/developer/src/kmc-ldml/test/fixtures/basic.txt
@@ -489,6 +489,7 @@ block(strs) # struct COMP_KMXPLUS_STRS {
diff(strs,strNull) sizeof(strNull,2)
diff(strs,strVersion) sizeof(strVersion,2)
+ diff(strs,strConformsTo) sizeof(strConformsTo,2)
diff(strs,strName) sizeof(strName,2)
diff(strs,strFromSet) sizeof(strFromSet,2)
diff(strs,strUSet) sizeof(strUSet,2)
@@ -508,7 +509,6 @@ block(strs) # struct COMP_KMXPLUS_STRS {
diff(strs,strLocale) sizeof(strLocale,2)
diff(strs,strLayout) sizeof(strLayout,2)
diff(strs,strAuthor) sizeof(strAuthor,2)
- diff(strs,strConformsTo) sizeof(strConformsTo,2)
diff(strs,strThat) sizeof(strThat,2)
diff(strs,strUs) sizeof(strUs,2)
diff(strs,strVse) sizeof(strVse,2)
@@ -524,6 +524,7 @@ block(strs) # struct COMP_KMXPLUS_STRS {
#str #00
block(strNull) block(x) 00 00 # the zero-length string
block(strVersion) 31 00 2e 00 30 00 2e 00 30 00 block(x) 00 00 # '1.0.0'
+ block(strConformsTo) 34 00 35 00 block(x) 00 00 # '45'
block(strName) 54 00 65 00 73 00 74 00 4b 00 62 00 64 00 block(x) 00 00 # 'TestKbd'
block(strFromSet) 5B 00 5C 00 75 00 31 00 41 00 37 00 35 00 2D 00 5C 00 75 00 31 00 41 00 37 00 39 00 5D 00 block(x) 00 00 # [\u1a75-\u1a79]
block(strUSet) 5b 00 61 00 62 00 63 00 5d 00 block(x) 00 00 # '[abc]'
@@ -545,8 +546,6 @@ block(strs) # struct COMP_KMXPLUS_STRS {
block(strLocale) 6d 00 74 00 block(x) 00 00 # 'mt'
block(strLayout) 71 00 77 00 65 00 72 00 74 00 79 00 block(x) 00 00 # 'qwerty'
block(strAuthor) 73 00 72 00 6c 00 32 00 39 00 35 00 block(x) 00 00 # 'srl295'
- block(strConformsTo) 74 00 65 00 63 00 68 00 70 00 72 00 65 00 76 00
- 69 00 65 00 77 00 block(x) 00 00 # 'techpreview'
block(strThat) 74 00 68 00 61 00 74 00 block(x) 00 00 # 'that'
block(strUs) 75 00 73 00 block(x) 00 00 # 'us' (layout)
block(strVse) 76 00 73 00 65 00 block(x) 00 00 # 'vse'
diff --git a/developer/src/kmc-ldml/test/fixtures/basic.xml b/developer/src/kmc-ldml/test/fixtures/basic.xml
index 568eb39cf85..c8565271ed1 100644
--- a/developer/src/kmc-ldml/test/fixtures/basic.xml
+++ b/developer/src/kmc-ldml/test/fixtures/basic.xml
@@ -4,8 +4,7 @@
@@keys: [K_Q][K_W][K_Q]
@@expected: \u0127\u1790\u17B6\u0127
-->
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
index 184991ad4c1..d0a05695c36 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
index 44412e2c1fd..d2a2dd611a0 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml
index 41c414b41e3..1f0c35dfd0e 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml
index c3db581640f..6ff77d83b0d 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
index ec5cda2e425..1046e0f4d85 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml
index e6c43aafd97..0eb1435edca 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml
index 8ba588ce14b..cbfadb01783 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
index d3b66576731..aeab3a71a5c 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
index 15590710ba3..ead9c5d2031 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
index ee967fc027c..7f08c5dd984 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
index 9486e904b7c..958e5d83815 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
index 022241b4f57..bb437bec764 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
index 00e67686e4c..99f9609d21b 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
index 13835331a91..20991504b78 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
index e714f74c76f..a22eb6dc8e9 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
index 6f7884888cb..c793eefa4e6 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
index 39947cd1898..1d2d53aa131 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
@@ -1,11 +1,10 @@
-
-
+
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
index 238f89e4329..0c4a0ee78a0 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
@@ -1,11 +1,10 @@
-
-
+
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
index 5bde7c586c1..29a2ba7b73c 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
index f4d78bf203c..6255e04d559 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
index 77ec94b805f..a80f26e39c1 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
index 0aa7fe9562a..0dec7a50fc7 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
index 494d61fe59e..d5ea11be313 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
index 395e9204a0a..6417058b5c4 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml
index 233aa516db8..f06f79258ef 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml
index 9e8f15bb960..ce9cfd99e46 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml
index 4dab6ea4f25..2f5183600e1 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml
index 11a08b1e9b1..c7c6dccd712 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
index 20c1e5534c7..b7c5ade4bc2 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
index 38002138f97..f670d95d4f1 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml
index 916ea8cb088..3a242dddfd7 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml
index 12d3f6f77bb..b1ca16c5a18 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
index 469c8d0d8f0..c15dac8c269 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
index 51707442338..ddc77d70abb 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
index b3ca93e0775..211961d6162 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
index 26b5b98bdc8..c8a38602eac 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
index df544e40705..7d3df0cb34f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml
index ec1a75afe7b..ace1485521c 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml
index bf17a8a0879..52c6e3a2e9f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
index 3dd5e8b1c3e..3d63234dbe7 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
index 99e84cdaa9e..aa44f8180b8 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
index 4df6a1b0f4e..8a3a73100d8 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml
index 3921edc4412..49cb176d295 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
index f8fe4bdeec3..ada70bb7df8 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
index de81a4b701a..81efa7472bf 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
index ab22d5a1401..816fc4f8191 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
index 35e60b04160..6c6340f965e 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
index baae3588f92..35d25ecef87 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml
index 430bdb24179..c679470d9ca 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml
index ec1fe5c6e80..8b79031c803 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml b/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml
index 450ee66a631..9ce063580bf 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml
@@ -4,8 +4,7 @@
@@keys: [K_Q][K_W][K_Q]
@@expected: \u0127\u1790\u17B6\u0127
-->
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml b/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml
index 0b76fbe1ce2..3eddaffdeea 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml
@@ -4,8 +4,7 @@
@@keys: [K_Q][K_W][K_Q]
@@expected: \u0127\u1790\u17B6\u0127
-->
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml b/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml
index 62e1e781192..fa21ebe28cf 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml
@@ -4,8 +4,7 @@
@@keys: [K_Q][K_W][K_Q]
@@expected: \u0127\u1790\u17B6\u0127
-->
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml
index 00eeb302a85..739a8f7ef56 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml
index 2f54cb328af..c109649e0ea 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml
index 68add1ff7b4..a685984aaf7 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml
index 92066dcfcaf..a644d5875fe 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml
index 48b15801934..fba5698c000 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml
index 70be7647e3a..883adfc41fd 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml
index f37d9e5c57a..6c28d3f00d7 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml
index 050bd4466dd..6ccd7987fdb 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml
index 2c921d90464..012c5513d7a 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml
index d9eb951b4db..a91fd675910 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml
index 0bbf24c44f7..c6c283ef52d 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml
index d5af2a70fe3..c081ea68bd2 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml
index 9cdd6a5799f..06030a37edb 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml
index 6264b114a11..0fff4b03282 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml
index bce70eb2275..aa3b2ba201a 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml
index e9498288374..e86bf34df74 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
index a8a99bb0d5d..329c6de64a6 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml
index 4323a879376..130c4ce4072 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml
index 9c9e3ae0554..a161320e2d0 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml
index b99361915ca..2b4c55fc903 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml
index 956cb616ecd..07d58a435d2 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml
index 9ac22715818..7cbc13c9215 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml
index 0ad3b3f7ad5..c0d966cfbb8 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml
index 5c2d4af4eee..bc502a9d627 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml
index 018770ff0d5..1d1b8368145 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml
index 1ba9dbec8fb..dfb28b8c427 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml
index b263b303659..9e5a0d3bb46 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml
index d6d6349ec66..48bc2ed3446 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml
index 2233d4a32a9..761856fef5f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml
index 70e14736ee7..48d17dd4606 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml
index e06fef4353e..4a69ec87b94 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml
index 780c00e776e..44b9754d573 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml
@@ -4,8 +4,7 @@
This will fail because the two markers given don't exist anywhere.
-->
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml
index 097912a7fba..cd6b752aa49 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml
index aa8cbcb616c..d6528623bac 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml
index 129a6acfa52..10c744e5ca1 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml
index a7313ad03b0..219ee763f19 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml
index 7c183bdc223..b3363bb703b 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml
@@ -8,8 +8,7 @@
into something testable for implementation.
-->
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml
index a57b1042978..767f4979268 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml
index a0ec80e4887..7f3a44b4fda 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml
@@ -1,7 +1,6 @@
-
-
+
diff --git a/developer/src/kmc-ldml/test/fixtures/test-fr.xml b/developer/src/kmc-ldml/test/fixtures/test-fr.xml
index 519140174fb..a1509159010 100644
--- a/developer/src/kmc-ldml/test/fixtures/test-fr.xml
+++ b/developer/src/kmc-ldml/test/fixtures/test-fr.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/developer/src/kmc-ldml/test/test-meta.ts b/developer/src/kmc-ldml/test/test-meta.ts
index 428d96f4b79..1e5a5a1aeb6 100644
--- a/developer/src/kmc-ldml/test/test-meta.ts
+++ b/developer/src/kmc-ldml/test/test-meta.ts
@@ -16,7 +16,7 @@ describe('meta', function () {
assert.equal(compilerTestCallbacks.messages.length, 0);
assert.isEmpty(meta.author.value); // TODO-LDML: default author string "unknown"?
- assert.equal(meta.conform.value, 'techpreview');
+ assert.equal(meta.conform.value, '45');
assert.isEmpty(meta.layout.value); // TODO-LDML: assumed layout?
assert.isEmpty(meta.indicator.value); // TODO-LDML: synthesize an indicator?
assert.equal(meta.settings, KeyboardSettings.none);
@@ -28,7 +28,7 @@ describe('meta', function () {
assert.equal(compilerTestCallbacks.messages.length, 0);
assert.equal(meta.author.value, 'The Keyman Team');
- assert.equal(meta.conform.value, 'techpreview');
+ assert.equal(meta.conform.value, '45');
assert.equal(meta.layout.value, 'QWIRKY');
assert.equal(meta.indicator.value, 'QW');
assert.equal(meta.version.value, "1.2.3");
diff --git a/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas b/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
index e8d577f0432..002c0d6f501 100644
--- a/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
+++ b/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
@@ -79,8 +79,8 @@ function TLDMLKeyboardProjectTemplate.GetKeyboardFilename: string;
// ''#13#10+
''#13#10+
' '#13#10+
- ' '#13#10+
- ' '#13#10+
+ ' '#13#10+
+ ' '#13#10+
' '#13#10+
' '#13#10+
' '#13#10+