diff --git a/packages/font-glyphs/src/meta/unicode-knowledge.ptl b/packages/font-glyphs/src/meta/unicode-knowledge.ptl
index 482ccdcd7..30bf7693d 100644
--- a/packages/font-glyphs/src/meta/unicode-knowledge.ptl
+++ b/packages/font-glyphs/src/meta/unicode-knowledge.ptl
@@ -219,95 +219,103 @@ export : define ccmpCombinations : list
 	########## Data from L2/24-021
 
 	# Tilde overlays
-	list {0x004C 0x0334} 0x2C62
-	list {0x0062 0x0334} 0x1D6C
-	list {0x0064 0x0334} 0x1D6D
-	list {0x0066 0x0334} 0x1D6E
-	list {0x006C 0x0334} 0x026B
-	list {0x006D 0x0334} 0x1D6F
-	list {0x006E 0x0334} 0x1D70
-	list {0x0070 0x0334} 0x1D71
-	list {0x0072 0x0334} 0x1D72
-	list {0x0073 0x0334} 0x1D74
-	list {0x0074 0x0334} 0x1D75
-	list {0x007A 0x0334} 0x1D76
-	list {0x0279 0x0334} 0xAB68
-	list {0x027E 0x0334} 0x1D73
-	list {0x02E1 0x0334} 0xAB5E
+	list {0x004C 0x0334} 0x2C62     # L
+	list {0x0062 0x0334} 0x1D6C     # b
+	list {0x0064 0x0334} 0x1D6D     # d
+	list {0x0066 0x0334} 0x1D6E     # f
+	list {0x006C 0x0334} 0x026B     # l
+	list {0x006D 0x0334} 0x1D6F     # m
+	list {0x006E 0x0334} 0x1D70     # n
+	list {0x0070 0x0334} 0x1D71     # p
+	list {0x0072 0x0334} 0x1D72     # r
+	list {0x0073 0x0334} 0x1D74     # s
+	list {0x0074 0x0334} 0x1D75     # t
+	list {0x007A 0x0334} 0x1D76     # z
+	list {0x0279 0x0334} 0xAB68     # ɹ
+	list {0x027E 0x0334} 0x1D73     # ɾ
+	list {0x02E1 0x0334} 0xAB5E     # ˡ
 
 	# Palatal hooks
-	list {0x0043 0x0321} 0xA7C4
-	list {0x005A 0x0321} 0xA7C6
-	list {0x0062 0x0321} 0x1D80
-	list {0x0063 0x0321} 0xA794
-	list {0x0064 0x0321} 0x1D81
-	list {0x0066 0x0321} 0x1D82
-	list {0x0068 0x0321} 0xA795
-	list {0x006B 0x0321} 0x1D84
-	list {0x006C 0x0321} 0x1D85
-	list {0x006D 0x0321} 0x1D86
-	list {0x006E 0x0321} 0x1D87
-	list {0x0070 0x0321} 0x1D88
-	list {0x0072 0x0321} 0x1D89
-	list {0x0073 0x0321} 0x1D8A
-	list {0x0074 0x0321} 0x01AB
-	list {0x0076 0x0321} 0x1D8C
-	list {0x0078 0x0321} 0x1D8D
-	list {0x007A 0x0321} 0x1D8E
-	list {0x014B 0x0321} 0x1DF14
-	list {0x0261 0x0321} 0x1D83
-	list {0x026C 0x0321} 0x1DF13
-	list {0x0279 0x0321} 0x1DF15
-	list {0x027E 0x0321} 0x1DF16
-	list {0x0283 0x0321} 0x1D8B
-	list {0x0292 0x0321} 0x1DF18
-	list {0x02A4 0x0321} 0x1DF12
-	list {0x02A7 0x0321} 0x1DF17
-	list {0x02E1 0x0321} 0x1DAA
-	list {0x1D57 0x0321} 0x1DB5
+	list {0x0043 0x0321} 0xA7C4     # C
+	list {0x005A 0x0321} 0xA7C6     # Z
+	list {0x0062 0x0321} 0x1D80     # b
+	list {0x0063 0x0321} 0xA794     # c
+	list {0x0064 0x0321} 0x1D81     # d
+	list {0x0066 0x0321} 0x1D82     # f
+	list {0x0068 0x0321} 0xA795     # h
+	list {0x006B 0x0321} 0x1D84     # k
+	list {0x006C 0x0321} 0x1D85     # l
+	list {0x006D 0x0321} 0x1D86     # m
+	list {0x006E 0x0321} 0x1D87     # n
+	list {0x0070 0x0321} 0x1D88     # p
+	list {0x0072 0x0321} 0x1D89     # r
+	list {0x0073 0x0321} 0x1D8A     # s
+	list {0x0074 0x0321} 0x01AB     # t
+	list {0x0076 0x0321} 0x1D8C     # v
+	list {0x0078 0x0321} 0x1D8D     # x
+	list {0x007A 0x0321} 0x1D8E     # z
+	list {0x014B 0x0321} 0x1DF14    # ŋ
+	list {0x0261 0x0321} 0x1D83     # ɡ
+	list {0x026C 0x0321} 0x1DF13    # ɬ
+	list {0x0279 0x0321} 0x1DF15    # ɹ
+	list {0x027E 0x0321} 0x1DF16    # ɾ
+	list {0x0283 0x0321} 0x1D8B     # ʃ
+	list {0x0292 0x0321} 0x1DF18    # ʒ
+	list {0x02A4 0x0321} 0x1DF12    # ʤ
+	list {0x02A7 0x0321} 0x1DF17    # ʧ
+	list {0x02E1 0x0321} 0x1DAA     # ˡ
+	list {0x1D57 0x0321} 0x1DB5     # ᵗ
 
 	# Retroflex hooks
-	list {0x0052 0x0322} 0x2C64
-	list {0x0054 0x0322} 0x01AE
-	list {0x0061 0x0322} 0x1D8F
-	list {0x0063 0x0322} 0x1DF1D
-	list {0x0064 0x0322} 0x0256
-	list {0x0065 0x0322} 0x1D92
-	list {0x0069 0x0322} 0x1D96
-	list {0x006C 0x0322} 0x026D
-	list {0x006E 0x0322} 0x0273
-	list {0x006F 0x0322} 0x1DF1B
-	list {0x0072 0x0322} 0x027D
-	list {0x0074 0x0322} 0x0288
-	list {0x0075 0x0322} 0x1D99
-	list {0x007A 0x0322} 0x0290
-	list {0x01AD 0x0322} 0x1DF09
-	list {0x01C3 0x0322} 0x1DF0A
-	list {0x0251 0x0322} 0x1D90
-	list {0x0254 0x0322} 0x1D97
-	list {0x0257 0x0322} 0x1D91
-	list {0x0259 0x0322} 0x1D95
-	list {0x025B 0x0322} 0x1D93
-	list {0x025C 0x0322} 0x1D94
-	list {0x0268 0x0322} 0x1DF1A
-	list {0x026C 0x0322} 0xA78E
-	list {0x026E 0x0322} 0x1DF05
-	list {0x027A 0x0322} 0x1DF08
-	list {0x0283 0x0322} 0x1D98
-	list {0x0292 0x0322} 0x1D9A
-	list {0x02A3 0x0322} 0xAB66
-	list {0x02A4 0x0322} 0x1DF19
-	list {0x02A6 0x0322} 0xAB67
-	list {0x02A7 0x0322} 0x1DF1C
-	list {0x02B3 0x0322} 0x107A8
-	list {0x02E1 0x0322} 0x1DA9
-	list {0x1D48 0x0322} 0x1078B
-	list {0x1D57 0x0322} 0x107AF
-	list {0x1DBB 0x0322} 0x1DBC
-	list {0x207F 0x0322} 0x1DAF
-	list {0x10787 0x0322} 0x10788
-	list {0x1078C 0x0322} 0x1078D
-	list {0x1079B 0x0322} 0x1079D
-	list {0x1079E 0x0322} 0x1079F
-	list {0x107A6 0x0322} 0x107A7
-	list {0x107AC 0x0322} 0x107AD
+	list {0x0052 0x0322} 0x2C64     # R
+	list {0x0054 0x0322} 0x01AE     # T
+	list {0x0061 0x0322} 0x1D8F     # a
+	list {0x0063 0x0322} 0x1DF1D    # c
+	list {0x0064 0x0322} 0x0256     # d
+	list {0x0065 0x0322} 0x1D92     # e
+	list {0x0069 0x0322} 0x1D96     # i
+	list {0x006C 0x0322} 0x026D     # l
+	list {0x006E 0x0322} 0x0273     # n
+	list {0x006F 0x0322} 0x1DF1B    # o
+	list {0x0072 0x0322} 0x027D     # r
+	list {0x0074 0x0322} 0x0288     # t
+	list {0x0075 0x0322} 0x1D99     # u
+	list {0x007A 0x0322} 0x0290     # z
+	list {0x01AD 0x0322} 0x1DF09    # ƭ
+	list {0x01C3 0x0322} 0x1DF0A    # ǃ
+	list {0x0251 0x0322} 0x1D90     # ɑ
+	list {0x0254 0x0322} 0x1D97     # ɔ
+	list {0x0257 0x0322} 0x1D91     # ɗ
+	list {0x0259 0x0322} 0x1D95     # ə
+	list {0x025B 0x0322} 0x1D93     # ɛ
+	list {0x025C 0x0322} 0x1D94     # ɜ
+	list {0x0268 0x0322} 0x1DF1A    # ɨ
+	list {0x026C 0x0322} 0xA78E     # ɬ
+	list {0x026E 0x0322} 0x1DF05    # ɮ
+	list {0x027A 0x0322} 0x1DF08    # ɺ
+	list {0x0283 0x0322} 0x1D98     # ʃ
+	list {0x0292 0x0322} 0x1D9A     # ʒ
+	list {0x02A3 0x0322} 0xAB66     # ʣ
+	list {0x02A4 0x0322} 0x1DF19    # ʤ
+	list {0x02A6 0x0322} 0xAB67     # ʦ
+	list {0x02A7 0x0322} 0x1DF1C    # ʧ
+	list {0x02B3 0x0322} 0x107A8    # ʳ
+	list {0x02E1 0x0322} 0x1DA9     # ˡ
+	list {0x1D48 0x0322} 0x1078B    # ᵈ
+	list {0x1D57 0x0322} 0x107AF    # ᵗ
+	list {0x1DBB 0x0322} 0x1DBC     # ᶻ
+	list {0x207F 0x0322} 0x1DAF     # ⁿ
+	list {0x10787 0x0322} 0x10788   # 𐞇
+	list {0x1078C 0x0322} 0x1078D   # 𐞌
+	list {0x1079B 0x0322} 0x1079D   # 𐞛
+	list {0x1079E 0x0322} 0x1079F   # 𐞞
+	list {0x107A6 0x0322} 0x107A7   # 𐞦
+	list {0x107AC 0x0322} 0x107AD   # 𐞬
+	# Additional composites which cannot be inferred from L2/24-021
+	list {0x0053 0x0322} 0xA7C5     # S
+	list {0x0073 0x0322} 0x0282     # s
+	list {0x0279 0x0322} 0x027B     # ɹ
+	list {0x027F 0x0322} 0x0285     # ɿ
+	list {0x02AE 0x0322} 0x02AF     # ʮ
+	list {0x02B4 0x0322} 0x02B5     # ʴ
+	list {0x02E2 0x0322} 0x1DB3     # ˢ