Website updatesv1.6

3 files changed, 72 insertions, 70 deletions

diff --git a/Makefile b/Makefile
index 77fbb3290..520303bf7 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ install: all install_otf
 
 glyphinfo: docs/lab/glyphinfo.json docs/glyphs/metrics.json
 
-src/glyphorder.txt: $(all_ufo) misc/gen-glyphorder.py
+src/glyphorder.txt: src/Interface-Regular.ufo/lib.plist src/Interface-Black.ufo/lib.plist src/diacritics.txt misc/gen-glyphorder.py
 	misc/gen-glyphorder.py src/Interface-*.ufo > src/glyphorder.txt
 
 docs/lab/glyphinfo.json: _local/UnicodeData.txt src/glyphorder.txt misc/gen-glyphinfo.py
diff --git a/docs/lab/glyphinfo.json b/docs/lab/glyphinfo.json
index f41cc48a1..b5784c27f 100644
--- a/docs/lab/glyphinfo.json
+++ b/docs/lab/glyphinfo.json
@@ -1,63 +1,65 @@
 {"glyphs":[
   [".null", 0, "[Control]", "#ff4c4c"]
+, [".notdef", null, null, "#dddddd"]
 , ["space", 32, "SPACE", "#ede5f9"]
 , ["A", 65, "LATIN CAPITAL LETTER A", "#dbeaf7"]
+, ["AE", 198, "LATIN CAPITAL LETTER AE"]
 , ["Lambda", 923, "GREEK CAPITAL LETTER LAMDA"]
 , ["B", 66, "LATIN CAPITAL LETTER B", "#dbeaf7"]
+, ["Delta", 916, "GREEK CAPITAL LETTER DELTA"]
+, ["Delta", 8710, "INCREMENT"]
 , ["C", 67, "LATIN CAPITAL LETTER C", "#dbeaf7"]
 , ["Chook", 391, "LATIN CAPITAL LETTER C WITH HOOK"]
 , ["D", 68, "LATIN CAPITAL LETTER D", "#dbeaf7"]
-, ["E", 69, "LATIN CAPITAL LETTER E", "#dbeaf7"]
 , ["Dzcaron_", 453, "LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON"]
+, ["E", 69, "LATIN CAPITAL LETTER E", "#dbeaf7"]
+, ["OE", 338, "LATIN CAPITAL LIGATURE OE"]
 , ["F", 70, "LATIN CAPITAL LETTER F", "#dbeaf7"]
 , ["G", 71, "LATIN CAPITAL LETTER G", "#dbeaf7"]
+, ["Gbar", 484, "LATIN CAPITAL LETTER G WITH STROKE"]
 , ["H", 72, "LATIN CAPITAL LETTER H", "#dbeaf7"]
 , ["Hcedilla", 7720, "LATIN CAPITAL LETTER H WITH CEDILLA"]
-, ["Gbar", 484, "LATIN CAPITAL LETTER G WITH STROKE"]
 , ["Hbar", 294, "LATIN CAPITAL LETTER H WITH STROKE"]
 , ["I", 73, "LATIN CAPITAL LETTER I", "#dbeaf7"]
+, ["Enhookcyrillic", 1223, "CYRILLIC CAPITAL LETTER EN WITH HOOK"]
 , ["Idieresisacute", 7726, "LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE", "<derived>"]
+, ["Endescendercyrillic", 1186, "CYRILLIC CAPITAL LETTER EN WITH DESCENDER"]
 , ["Itildebelow", 7724, "LATIN CAPITAL LETTER I WITH TILDE BELOW", "<derived>"]
-, ["Enhookcyrillic", 1223, "CYRILLIC CAPITAL LETTER EN WITH HOOK"]
+, ["uni04C9", 1225, "CYRILLIC CAPITAL LETTER EN WITH TAIL"]
 , ["J", 74, "LATIN CAPITAL LETTER J", "#dbeaf7"]
-, ["Endescendercyrillic", 1186, "CYRILLIC CAPITAL LETTER EN WITH DESCENDER"]
+, ["Enghecyrillic", 1188, "CYRILLIC CAPITAL LIGATURE EN GHE"]
 , ["K", 75, "LATIN CAPITAL LETTER K", "#dbeaf7"]
-, ["uni04C9", 1225, "CYRILLIC CAPITAL LETTER EN WITH TAIL"]
+, ["Kacyr", 1050, "CYRILLIC CAPITAL LETTER KA"]
 , ["L", 76, "LATIN CAPITAL LETTER L", "#dbeaf7"]
-, ["Enghecyrillic", 1188, "CYRILLIC CAPITAL LIGATURE EN GHE"]
 , ["Lslash", 321, "LATIN CAPITAL LETTER L WITH STROKE"]
 , ["M", 77, "LATIN CAPITAL LETTER M", "#dbeaf7"]
 , ["N", 78, "LATIN CAPITAL LETTER N", "#dbeaf7"]
+, ["Kabashkircyrillic", 1184, "CYRILLIC CAPITAL LETTER BASHKIR KA"]
 , ["afii10026", 1048, "CYRILLIC CAPITAL LETTER I"]
+, ["Kadescendercyrillic", 1178, "CYRILLIC CAPITAL LETTER KA WITH DESCENDER"]
 , ["uni048A", 1162, "CYRILLIC CAPITAL LETTER SHORT I WITH TAIL"]
 , ["O", 79, "LATIN CAPITAL LETTER O", "#dbeaf7"]
-, ["Kabashkircyrillic", 1184, "CYRILLIC CAPITAL LETTER BASHKIR KA"]
 , ["Oslash", 216, "LATIN CAPITAL LETTER O WITH STROKE"]
-, ["Kadescendercyrillic", 1178, "CYRILLIC CAPITAL LETTER KA WITH DESCENDER"]
 , ["Ohorn", 416, "LATIN CAPITAL LETTER O WITH HORN"]
+, ["uni04CD", 1229, "CYRILLIC CAPITAL LETTER EM WITH TAIL"]
+, ["Theta", 920, "GREEK CAPITAL LETTER THETA"]
 , ["P", 80, "LATIN CAPITAL LETTER P", "#dbeaf7"]
 , ["Q", 81, "LATIN CAPITAL LETTER Q", "#dbeaf7"]
 , ["R", 82, "LATIN CAPITAL LETTER R", "#dbeaf7"]
-, ["uni04CD", 1229, "CYRILLIC CAPITAL LETTER EM WITH TAIL"]
 , ["S", 83, "LATIN CAPITAL LETTER S", "#dbeaf7"]
 , ["Germandbls", 7838, "LATIN CAPITAL LETTER SHARP S"]
 , ["T", 84, "LATIN CAPITAL LETTER T", "#dbeaf7"]
 , ["U", 85, "LATIN CAPITAL LETTER U", "#dbeaf7"]
+, ["uni048E", 1166, "CYRILLIC CAPITAL LETTER ER WITH TICK"]
 , ["Uhorn", 431, "LATIN CAPITAL LETTER U WITH HORN"]
 , ["V", 86, "LATIN CAPITAL LETTER V", "#dbeaf7"]
 , ["W", 87, "LATIN CAPITAL LETTER W", "#dbeaf7"]
+, ["response", 8479, "RESPONSE", "#cceff2"]
 , ["X", 88, "LATIN CAPITAL LETTER X", "#dbeaf7"]
-, ["uni048E", 1166, "CYRILLIC CAPITAL LETTER ER WITH TICK"]
 , ["Y", 89, "LATIN CAPITAL LETTER Y", "#dbeaf7"]
 , ["Z", 90, "LATIN CAPITAL LETTER Z", "#dbeaf7"]
-, ["AE", 198, "LATIN CAPITAL LETTER AE"]
-, ["response", 8479, "RESPONSE", "#cceff2"]
-, ["OE", 338, "LATIN CAPITAL LIGATURE OE"]
 , ["Thorn", 222, "LATIN CAPITAL LETTER THORN"]
 , ["Gamma", 915, "GREEK CAPITAL LETTER GAMMA"]
-, ["Delta", 916, "GREEK CAPITAL LETTER DELTA"]
-, ["Delta", 8710, "INCREMENT"]
-, ["Theta", 920, "GREEK CAPITAL LETTER THETA"]
 , ["Xi", 926, "GREEK CAPITAL LETTER XI"]
 , ["Pi", 928, "GREEK CAPITAL LETTER PI"]
 , ["Sigma", 931, "GREEK CAPITAL LETTER SIGMA"]
@@ -277,18 +279,18 @@
 , ["two", 50, "DIGIT TWO", "#e2f4ea"]
 , ["two.tnum", null, null, "#ebf6c8"]
 , ["three", 51, "DIGIT THREE", "#e2f4ea"]
-, ["four", 52, "DIGIT FOUR", "#e2f4ea"]
 , ["three.tnum", null, null, "#ebf6c8"]
+, ["four", 52, "DIGIT FOUR", "#e2f4ea"]
 , ["four.1", null, null, "#ccf6ca"]
 , ["four.tnum.1", null, null, "#ebf6c8"]
 , ["five", 53, "DIGIT FIVE", "#e2f4ea"]
 , ["six", 54, "DIGIT SIX", "#e2f4ea"]
-, ["six.1", null, null, "#ccf6ca"]
 , ["five.tnum", null, null, "#ebf6c8"]
+, ["six.1", null, null, "#ccf6ca"]
 , ["six.tnum.1", null, null, "#ebf6c8"]
 , ["seven", 55, "DIGIT SEVEN", "#e2f4ea"]
-, ["seven.tnum", null, null, "#ebf6c8"]
 , ["six.tnum", null, null, "#ebf6c8"]
+, ["seven.tnum", null, null, "#ebf6c8"]
 , ["eight", 56, "DIGIT EIGHT", "#e2f4ea"]
 , ["nine", 57, "DIGIT NINE", "#e2f4ea"]
 , ["nine.1", null, null, "#ccf6ca"]
@@ -615,8 +617,8 @@
 , ["uni02E7_uni02E5", null, null, "#dddddd"]
 , ["uni02E7_uni02E6", null, null, "#dddddd"]
 , ["tildesubnosp_uni1ABD", null, null, "#dddddd"]
-, ["uniA794.cn", null, null, "#c4f2c1"]
 , ["romantwelve", 8555, "ROMAN NUMERAL TWELVE", "#e2f4ea"]
+, ["uniA794.cn", null, null, "#c4f2c1"]
 , ["ringacute", null, null, "#dddddd"]
 , ["ubar", 649, "LATIN SMALL LETTER U BAR"]
 , ["uni2C7A.cn", null, null, "#c4f2c1"]
@@ -804,8 +806,8 @@
 , ["uni037B", 891, "GREEK SMALL REVERSED LUNATE SIGMA SYMBOL"]
 , ["uni037D", 893, "GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL"]
 , ["uni03FD.cn", null, null, "#c4f2c1"]
-, ["srthook.cn", null, null, "#c4f2c1"]
 , ["uniA684", 42628, "CYRILLIC CAPITAL LETTER ZHWE"]
+, ["srthook.cn", null, null, "#c4f2c1"]
 , ["interrobang", 8253, "INTERROBANG", "#efefef"]
 , ["primemod", 697, "MODIFIER LETTER PRIME"]
 , ["uni213B", 8507, "FACSIMILE SIGN", "#cceff2"]
@@ -813,8 +815,8 @@
 , ["uniA674", 42612, "COMBINING CYRILLIC LETTER UKRAINIAN IE", "#f9e2e2"]
 , ["uniA677", 42615, "COMBINING CYRILLIC LETTER U", "#f9e2e2"]
 , ["uniA676", 42614, "COMBINING CYRILLIC LETTER YI", "#f9e2e2"]
-, ["erev", 600, "LATIN SMALL LETTER REVERSED E"]
 , ["uni27EA", 10218, "MATHEMATICAL LEFT DOUBLE ANGLE BRACKET", "#efefef"]
+, ["erev", 600, "LATIN SMALL LETTER REVERSED E"]
 , ["uniA670", 42608, "COMBINING CYRILLIC TEN MILLIONS SIGN", "#f9e2e2"]
 , ["uniA673", 42611, "SLAVONIC ASTERISK", "#efefef"]
 , ["uniA672", 42610, "COMBINING CYRILLIC THOUSAND MILLIONS SIGN", "#f9e2e2"]
@@ -1023,8 +1025,8 @@
 , ["uni03D7", 983, "GREEK KAI SYMBOL"]
 , ["uni0504", 1284, "CYRILLIC CAPITAL LETTER KOMI ZJE"]
 , ["uni27EF", 10223, "MATHEMATICAL RIGHT FLATTENED PARENTHESIS", "#efefef"]
-, ["finaltsadi", 693, "MODIFIER LETTER SMALL TURNED R WITH HOOK"]
 , ["rdescend", 636, "LATIN SMALL LETTER R WITH LONG LEG"]
+, ["finaltsadi", 693, "MODIFIER LETTER SMALL TURNED R WITH HOOK"]
 , ["uni27EE", 10222, "MATHEMATICAL LEFT FLATTENED PARENTHESIS", "#efefef"]
 , ["uni27ED", 10221, "MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET", "#efefef"]
 , ["uniA769", 42857, "LATIN SMALL LETTER VEND"]
@@ -1037,8 +1039,8 @@
 , ["uni02E5_uni02E8", null, null, "#dddddd"]
 , ["lbelt", 620, "LATIN SMALL LETTER L WITH BELT"]
 , ["uni0359", 857, "COMBINING ASTERISK BELOW", "#f9e2e2"]
-, ["uni0358", 856, "COMBINING DOT ABOVE RIGHT", "#f9e2e2"]
 , ["uni02E9_uni02E7_uni02E7", null, null, "#dddddd"]
+, ["uni0358", 856, "COMBINING DOT ABOVE RIGHT", "#f9e2e2"]
 , ["epsilon1revclosed", 606, "LATIN SMALL LETTER CLOSED REVERSED OPEN E"]
 , ["uni0355", 853, "COMBINING RIGHT ARROWHEAD BELOW", "#f9e2e2"]
 , ["uni0354", 852, "COMBINING LEFT ARROWHEAD BELOW", "#f9e2e2"]
@@ -1104,8 +1106,8 @@
 , ["rhotichookmod", 734, "MODIFIER LETTER RHOTIC HOOK", "#cceff2"]
 , ["uniA669", 42601, "CYRILLIC SMALL LETTER MONOCULAR O"]
 , ["uni1DD6", 7638, "COMBINING LATIN SMALL LETTER AV", "#f9e2e2"]
-, ["uni1DD7", 7639, "COMBINING LATIN SMALL LETTER C CEDILLA", "#f9e2e2"]
 , ["uni1DCE", 7630, "COMBINING OGONEK ABOVE", "#f9e2e2"]
+, ["uni1DD7", 7639, "COMBINING LATIN SMALL LETTER C CEDILLA", "#f9e2e2"]
 , ["uniAB36.cn", null, null, "#c4f2c1"]
 , ["uni051F", 1311, "CYRILLIC SMALL LETTER ALEUT KA"]
 , ["oneeighth", 8539, "VULGAR FRACTION ONE EIGHTH", "#e2f4ea"]
@@ -1141,8 +1143,8 @@
 , ["uni02E6_uni02E5_uni02E8", null, null, "#dddddd"]
 , ["uni02E6_uni02E5_uni02E6", null, null, "#dddddd"]
 , ["uniA73F.cn", null, null, "#c4f2c1"]
-, ["spaceopenbox", 9251, "OPEN BOX", "#cceff2"]
 , ["uni02E6_uni02E5_uni02E7", null, null, "#dddddd"]
+, ["spaceopenbox", 9251, "OPEN BOX", "#cceff2"]
 , ["uni02E8_uni02E7_uni02E7", null, null, "#dddddd"]
 , ["uni02E9_uni02E9_uni02E8", null, null, "#dddddd"]
 , ["uni02E8_uni02E7_uni02E5", null, null, "#dddddd"]
@@ -1189,8 +1191,8 @@
 , ["glottalstopreversedsuperior", 740, "MODIFIER LETTER SMALL REVERSED GLOTTAL STOP"]
 , ["six.sup", null, null, "#dddddd"]
 , ["tonebarhighmod", 742, "MODIFIER LETTER HIGH TONE BAR", "#cceff2"]
-, ["tonebarmidmod", 743, "MODIFIER LETTER MID TONE BAR", "#cceff2"]
 , ["schwa", 601, "LATIN SMALL LETTER SCHWA"]
+, ["tonebarmidmod", 743, "MODIFIER LETTER MID TONE BAR", "#cceff2"]
 , ["tonebarlowmod", 744, "MODIFIER LETTER LOW TONE BAR", "#cceff2"]
 , ["tonebarextralowmod", 745, "MODIFIER LETTER EXTRA-LOW TONE BAR", "#cceff2"]
 , ["Fturn", 8498, "TURNED CAPITAL F"]
@@ -1213,8 +1215,8 @@
 , ["uni1DC4", 7620, "COMBINING MACRON-ACUTE", "#f9e2e2"]
 , ["babygamma", 612, "LATIN SMALL LETTER RAMS HORN"]
 , ["Vcursive", 434, "LATIN CAPITAL LETTER V WITH HOOK"]
-, ["careof", 8453, "CARE OF", "#cceff2"]
 , ["uni02E6_uni02E7", null, null, "#dddddd"]
+, ["careof", 8453, "CARE OF", "#cceff2"]
 , ["phi1", 981, "GREEK PHI SYMBOL"]
 , ["uni02E5_uni02E5_uni02E8", null, null, "#dddddd"]
 , ["uni02E5_uni02E5_uni02E9", null, null, "#dddddd"]
@@ -1231,8 +1233,8 @@
 , ["uni0503", 1283, "CYRILLIC SMALL LETTER KOMI DJE"]
 , ["wynn", 447, "LATIN LETTER WYNN"]
 , ["uni0505", 1285, "CYRILLIC SMALL LETTER KOMI ZJE"]
-, ["uni0506", 1286, "CYRILLIC CAPITAL LETTER KOMI DZJE"]
 , ["uni0502", 1282, "CYRILLIC CAPITAL LETTER KOMI DJE"]
+, ["uni0506", 1286, "CYRILLIC CAPITAL LETTER KOMI DZJE"]
 , ["uni0507", 1287, "CYRILLIC SMALL LETTER KOMI DZJE"]
 , ["uni0508", 1288, "CYRILLIC CAPITAL LETTER KOMI LJE"]
 , ["uni0509", 1289, "CYRILLIC SMALL LETTER KOMI LJE"]
@@ -1378,8 +1380,8 @@
 , ["Gsmallcap", 610, "LATIN LETTER SMALL CAPITAL G"]
 , ["Esh", 425, "LATIN CAPITAL LETTER ESH"]
 , ["uni1D2D", 7469, "MODIFIER LETTER CAPITAL AE"]
-, ["uni1D2E", 7470, "MODIFIER LETTER CAPITAL B"]
 , ["uni1ABC", 6844, "COMBINING DOUBLE PARENTHESES ABOVE", "#f9e2e2"]
+, ["uni1D2E", 7470, "MODIFIER LETTER CAPITAL B"]
 , ["uni1D2F", 7471, "MODIFIER LETTER CAPITAL BARRED B"]
 , ["uni1D2A", 7466, "GREEK LETTER SMALL CAPITAL PSI"]
 , ["uni1D2B", 7467, "CYRILLIC LETTER SMALL CAPITAL EL"]
@@ -1487,14 +1489,14 @@
 , ["uni1DCF", 7631, "COMBINING ZIGZAG BELOW", "#f9e2e2"]
 , ["uni1DCD", 7629, "COMBINING DOUBLE CIRCUMFLEX ABOVE", "#f9e2e2"]
 , ["uni1DCC", 7628, "COMBINING MACRON-BREVE", "#f9e2e2"]
-, ["uni1DCB", 7627, "COMBINING BREVE-MACRON", "#f9e2e2"]
 , ["uniE004", 57348, "[private use E004]"]
+, ["uni1DCB", 7627, "COMBINING BREVE-MACRON", "#f9e2e2"]
 , ["uni1DCA", 7626, "COMBINING LATIN SMALL LETTER R BELOW", "#f9e2e2"]
 , ["Nhook", 413, "LATIN CAPITAL LETTER N WITH LEFT HOOK"]
 , ["tildemacroncomb.lc", null, null, "#dddddd"]
 , ["iota1", 617, "LATIN SMALL LETTER IOTA"]
-, ["uni02E6_uni02E8", null, null, "#dddddd"]
 , ["uniE001", 57345, "[private use E001]"]
+, ["uni02E6_uni02E8", null, null, "#dddddd"]
 , ["uni02E6_uni02E9", null, null, "#dddddd"]
 , ["uni1DC9", 7625, "COMBINING ACUTE-GRAVE-ACUTE", "#f9e2e2"]
 , ["uni1DC8", 7624, "COMBINING GRAVE-ACUTE-GRAVE", "#f9e2e2"]
@@ -1709,8 +1711,8 @@
 , ["uni02E5_uni02E8_uni02E5", null, null, "#dddddd"]
 , ["uni02E5_uni02E8_uni02E7", null, null, "#dddddd"]
 , ["uni02E5_uni02E8_uni02E6", null, null, "#dddddd"]
-, ["d.cn", null, null, "#c4f2c1"]
 , ["uni1DE4", 7652, "COMBINING LATIN SMALL LETTER S", "#f9e2e2"]
+, ["d.cn", null, null, "#c4f2c1"]
 , ["uni035A", 858, "COMBINING DOUBLE RING BELOW", "#f9e2e2"]
 , ["uni02E5_uni02E8_uni02E9", null, null, "#dddddd"]
 , ["uni02E5_uni02E8_uni02E8", null, null, "#dddddd"]
@@ -1928,8 +1930,8 @@
 , ["uni2C71", 11377, "LATIN SMALL LETTER V WITH RIGHT HOOK"]
 , ["uni2C70", 11376, "LATIN CAPITAL LETTER TURNED ALPHA"]
 , ["uni2C73", 11379, "LATIN SMALL LETTER W WITH HOOK"]
-, ["uni2189", 8585, "VULGAR FRACTION ZERO THIRDS", "#e2f4ea"]
 , ["uni1FEF", 8175, "GREEK VARIA", "#cceff2"]
+, ["uni2189", 8585, "VULGAR FRACTION ZERO THIRDS", "#e2f4ea"]
 , ["uni2C74", 11380, "LATIN SMALL LETTER V WITH CURL"]
 , ["uni2C77", 11383, "LATIN SMALL LETTER TAILLESS PHI"]
 , ["uni2C76", 11382, "LATIN SMALL LETTER HALF H"]
@@ -2218,7 +2220,6 @@
 , ["uniE000", 57344, "[Private_Use]", "#f7f2d3"]
 , ["uniE002", 57346, "[private use E002]"]
 , ["uniE003", 57347, "[private use E003]"]
-, [".notdef", null, null, "#dddddd"]
 , ["circleblack", 9679, "BLACK CIRCLE"]
 , ["circlewhite", 9675, "WHITE CIRCLE"]
 , ["Eth", 208, "LATIN CAPITAL LETTER ETH", "<derived>"]
diff --git a/src/glyphorder.txt b/src/glyphorder.txt
index ceb6640c0..549eed481 100644
--- a/src/glyphorder.txt
+++ b/src/glyphorder.txt
@@ -1,61 +1,63 @@
 .null
+.notdef
 space
 A
+AE
 Lambda
 B
+Delta
 C
 Chook
 D
-E
 Dzcaron_
+E
+OE
 F
 G
+Gbar
 H
 Hcedilla
-Gbar
 Hbar
 I
+Enhookcyrillic
 Idieresisacute
+Endescendercyrillic
 Itildebelow
-Enhookcyrillic
+uni04C9
 J
-Endescendercyrillic
+Enghecyrillic
 K
-uni04C9
+Kacyr
 L
-Enghecyrillic
 Lslash
 M
 N
+Kabashkircyrillic
 afii10026
+Kadescendercyrillic
 uni048A
 O
-Kabashkircyrillic
 Oslash
-Kadescendercyrillic
 Ohorn
+uni04CD
+Theta
 P
 Q
 R
-uni04CD
 S
 Germandbls
 T
 U
+uni048E
 Uhorn
 V
 W
+response
 X
-uni048E
 Y
 Z
-AE
-response
-OE
 Thorn
 Gamma
-Delta
-Theta
 Xi
 Pi
 Sigma
@@ -274,18 +276,18 @@ one.tnum
 two
 two.tnum
 three
-four
 three.tnum
+four
 four.1
 four.tnum.1
 five
 six
-six.1
 five.tnum
+six.1
 six.tnum.1
 seven
-seven.tnum
 six.tnum
+seven.tnum
 eight
 nine
 nine.1
@@ -612,8 +614,8 @@ uni02E7_uni02E8
 uni02E7_uni02E5
 uni02E7_uni02E6
 tildesubnosp_uni1ABD
-uniA794.cn
 romantwelve
+uniA794.cn
 ringacute
 ubar
 uni2C7A.cn
@@ -801,8 +803,8 @@ uni037C
 uni037B
 uni037D
 uni03FD.cn
-srthook.cn
 uniA684
+srthook.cn
 interrobang
 primemod
 uni213B
@@ -810,8 +812,8 @@ uniA675
 uniA674
 uniA677
 uniA676
-erev
 uni27EA
+erev
 uniA670
 uniA673
 uniA672
@@ -1020,8 +1022,8 @@ thook
 uni03D7
 uni0504
 uni27EF
-finaltsadi
 rdescend
+finaltsadi
 uni27EE
 uni27ED
 uniA769
@@ -1034,8 +1036,8 @@ uni02E5_uni02E9
 uni02E5_uni02E8
 lbelt
 uni0359
-uni0358
 uni02E9_uni02E7_uni02E7
+uni0358
 epsilon1revclosed
 uni0355
 uni0354
@@ -1101,8 +1103,8 @@ carondotcomb
 rhotichookmod
 uniA669
 uni1DD6
-uni1DD7
 uni1DCE
+uni1DD7
 uniAB36.cn
 uni051F
 oneeighth
@@ -1138,8 +1140,8 @@ uni02E6_uni02E5_uni02E9
 uni02E6_uni02E5_uni02E8
 uni02E6_uni02E5_uni02E6
 uniA73F.cn
-spaceopenbox
 uni02E6_uni02E5_uni02E7
+spaceopenbox
 uni02E8_uni02E7_uni02E7
 uni02E9_uni02E9_uni02E8
 uni02E8_uni02E7_uni02E5
@@ -1186,8 +1188,8 @@ Khook
 glottalstopreversedsuperior
 six.sup
 tonebarhighmod
-tonebarmidmod
 schwa
+tonebarmidmod
 tonebarlowmod
 tonebarextralowmod
 Fturn
@@ -1210,8 +1212,8 @@ uni1DC6
 uni1DC4
 babygamma
 Vcursive
-careof
 uni02E6_uni02E7
+careof
 phi1
 uni02E5_uni02E5_uni02E8
 uni02E5_uni02E5_uni02E9
@@ -1228,8 +1230,8 @@ uni27EB
 uni0503
 wynn
 uni0505
-uni0506
 uni0502
+uni0506
 uni0507
 uni0508
 uni0509
@@ -1375,8 +1377,8 @@ uni012F.ccmp
 Gsmallcap
 Esh
 uni1D2D
-uni1D2E
 uni1ABC
+uni1D2E
 uni1D2F
 uni1D2A
 uni1D2B
@@ -1484,14 +1486,14 @@ uni1D36
 uni1DCF
 uni1DCD
 uni1DCC
-uni1DCB
 uniE004
+uni1DCB
 uni1DCA
 Nhook
 tildemacroncomb.lc
 iota1
-uni02E6_uni02E8
 uniE001
+uni02E6_uni02E8
 uni02E6_uni02E9
 uni1DC9
 uni1DC8
@@ -1706,8 +1708,8 @@ uni035D
 uni02E5_uni02E8_uni02E5
 uni02E5_uni02E8_uni02E7
 uni02E5_uni02E8_uni02E6
-d.cn
 uni1DE4
+d.cn
 uni035A
 uni02E5_uni02E8_uni02E9
 uni02E5_uni02E8_uni02E8
@@ -1925,8 +1927,8 @@ uniA7FF
 uni2C71
 uni2C70
 uni2C73
-uni2189
 uni1FEF
+uni2189
 uni2C74
 uni2C77
 uni2C76
@@ -2216,7 +2218,6 @@ uniE000
 uniE002
 uniE003
 placeofinterestsign.specz.medium
-.notdef
 circleblack
 circlewhite
 cyrillicbreve