more unken

1 files changed, 52 insertions, 51 deletions

diff --git a/src/cmd/dict/utils.c b/src/cmd/dict/utils.c
index 6916d549..0920dc27 100644
--- a/src/cmd/dict/utils.c
+++ b/src/cmd/dict/utils.c
@@ -170,61 +170,62 @@ struct Lig {
 	Rune	pairs[100];		/* <char,accented version> pairs */
 };
 
+/* keep in sync with dict.h */
 static Lig ligtab[Nligs] = {
-[LACU-LIGS]	{0xb4,	{0x41, 0xc1, 0x61, 0xe1, 0x43, 0x106, 0x63, 0x107, 0x45, 0xc9, 0x65, 0xe9, 0x67, 0x123, 0x49, 0xcd, 0x69, 0xed, 0x131, 0xed, 0x4c, 0x139, 0x6c, 0x13a, 0x4e, 0x143, 0x6e, 0x144, 0x4f, 0xd3, 0x6f, 0xf3, 0x52, 0x154, 0x72, 0x155, 0x53, 0x15a, 0x73, 0x15b, 0x55, 0xda, 0x75, 0xfa, 0x59, 0xdd, 0x79, 0xfd, 0x5a, 0x179, 0x7a, 0x17a, 0}},
-[LGRV-LIGS]	{0x2cb,	{0x41, 0xc0, 0x61, 0xe0, 0x45, 0xc8, 0x65, 0xe8, 0x49, 0xcc, 0x69, 0xec, 0x131, 0xec, 0x4f, 0xd2, 0x6f, 0xf2, 0x55, 0xd9, 0x75, 0xf9, 0}},
-[LUML-LIGS]	{0xa8,	{0x41, 0xc4, 0x61, 0xe4, 0x45, 0xcb, 0x65, 0xeb, 0x49, 0xcf, 0x69, 0xef, 0x4f, 0xd6, 0x6f, 0xf6, 0x55, 0xdc, 0x75, 0xfc, 0x59, 0x178, 0x79, 0xff, 0}},
-[LCED-LIGS]	{0xb8,	{0x43, 0xc7, 0x63, 0xe7, 0x47, 0x122, 0x4b, 0x136, 0x6b, 0x137, 0x4c, 0x13b, 0x6c, 0x13c, 0x4e, 0x145, 0x6e, 0x146, 0x52, 0x156, 0x72, 0x157, 0x53, 0x15e, 0x73, 0x15f, 0x54, 0x162, 0x74, 0x163, 0}},
-[LTIL-LIGS]	{0x2dc,	{0x41, 0xc3, 0x61, 0xe3, 0x49, 0x128, 0x69, 0x129, 0x131, 0x129, 0x4e, 0xd1, 0x6e, 0xf1, 0x4f, 0xd5, 0x6f, 0xf5, 0x55, 0x168, 0x75, 0x169, 0}},
-[LBRV-LIGS]	{0x2d8,	{0x41, 0x102, 0x61, 0x103, 0x45, 0x114, 0x65, 0x115, 0x47, 0x11e, 0x67, 0x11f, 0x49, 0x12c, 0x69, 0x12d, 0x131, 0x12d, 0x4f, 0x14e, 0x6f, 0x14f, 0x55, 0x16c, 0x75, 0x16d, 0}},
-[LRNG-LIGS]	{0x2da,	{0x41, 0xc5, 0x61, 0xe5, 0x55, 0x16e, 0x75, 0x16f, 0}},
-[LDOT-LIGS]	{0x2d9,	{0x43, 0x10a, 0x63, 0x10b, 0x45, 0x116, 0x65, 0x117, 0x47, 0x120, 0x67, 0x121, 0x49, 0x130, 0x4c, 0x13f, 0x6c, 0x140, 0x5a, 0x17b, 0x7a, 0x17c, 0}},
-[LDTB-LIGS]	{0x2e,	{0}},
-[LFRN-LIGS]	{0x2322,	{0x41, 0xc2, 0x61, 0xe2, 0x43, 0x108, 0x63, 0x109, 0x45, 0xca, 0x65, 0xea, 0x47, 0x11c, 0x67, 0x11d, 0x48, 0x124, 0x68, 0x125, 0x49, 0xce, 0x69, 0xee, 0x131, 0xee, 0x4a, 0x134, 0x6a, 0x135, 0x4f, 0xd4, 0x6f, 0xf4, 0x53, 0x15c, 0x73, 0x15d, 0x55, 0xdb, 0x75, 0xfb, 0x57, 0x174, 0x77, 0x175, 0x59, 0x176, 0x79, 0x177, 0}},
-[LFRB-LIGS]	{0x32f,	{0}},
-[LOGO-LIGS]	{0x2db,	{0x41, 0x104, 0x61, 0x105, 0x45, 0x118, 0x65, 0x119, 0x49, 0x12e, 0x69, 0x12f, 0x131, 0x12f, 0x55, 0x172, 0x75, 0x173, 0}},
-[LMAC-LIGS]	{0xaf,	{0x41, 0x100, 0x61, 0x101, 0x45, 0x112, 0x65, 0x113, 0x49, 0x12a, 0x69, 0x12b, 0x131, 0x12b, 0x4f, 0x14c, 0x6f, 0x14d, 0x55, 0x16a, 0x75, 0x16b, 0}},
-[LHCK-LIGS]	{0x2c7,	{0x43, 0x10c, 0x63, 0x10d, 0x44, 0x10e, 0x64, 0x10f, 0x45, 0x11a, 0x65, 0x11b, 0x4c, 0x13d, 0x6c, 0x13e, 0x4e, 0x147, 0x6e, 0x148, 0x52, 0x158, 0x72, 0x159, 0x53, 0x160, 0x73, 0x161, 0x54, 0x164, 0x74, 0x165, 0x5a, 0x17d, 0x7a, 0x17e, 0}},
-[LASP-LIGS]	{0x2bd,	{0}},
-[LLEN-LIGS]	{0x2bc,	{0}},
-[LBRB-LIGS]	{0x32e,	{0}}
+	{0xb4,	{0x41, 0xc1, 0x61, 0xe1, 0x43, 0x106, 0x63, 0x107, 0x45, 0xc9, 0x65, 0xe9, 0x67, 0x123, 0x49, 0xcd, 0x69, 0xed, 0x131, 0xed, 0x4c, 0x139, 0x6c, 0x13a, 0x4e, 0x143, 0x6e, 0x144, 0x4f, 0xd3, 0x6f, 0xf3, 0x52, 0x154, 0x72, 0x155, 0x53, 0x15a, 0x73, 0x15b, 0x55, 0xda, 0x75, 0xfa, 0x59, 0xdd, 0x79, 0xfd, 0x5a, 0x179, 0x7a, 0x17a, 0}},
+	{0x2cb,	{0x41, 0xc0, 0x61, 0xe0, 0x45, 0xc8, 0x65, 0xe8, 0x49, 0xcc, 0x69, 0xec, 0x131, 0xec, 0x4f, 0xd2, 0x6f, 0xf2, 0x55, 0xd9, 0x75, 0xf9, 0}},
+	{0xa8,	{0x41, 0xc4, 0x61, 0xe4, 0x45, 0xcb, 0x65, 0xeb, 0x49, 0xcf, 0x69, 0xef, 0x4f, 0xd6, 0x6f, 0xf6, 0x55, 0xdc, 0x75, 0xfc, 0x59, 0x178, 0x79, 0xff, 0}},
+	{0xb8,	{0x43, 0xc7, 0x63, 0xe7, 0x47, 0x122, 0x4b, 0x136, 0x6b, 0x137, 0x4c, 0x13b, 0x6c, 0x13c, 0x4e, 0x145, 0x6e, 0x146, 0x52, 0x156, 0x72, 0x157, 0x53, 0x15e, 0x73, 0x15f, 0x54, 0x162, 0x74, 0x163, 0}},
+	{0x2dc,	{0x41, 0xc3, 0x61, 0xe3, 0x49, 0x128, 0x69, 0x129, 0x131, 0x129, 0x4e, 0xd1, 0x6e, 0xf1, 0x4f, 0xd5, 0x6f, 0xf5, 0x55, 0x168, 0x75, 0x169, 0}},
+	{0x2d8,	{0x41, 0x102, 0x61, 0x103, 0x45, 0x114, 0x65, 0x115, 0x47, 0x11e, 0x67, 0x11f, 0x49, 0x12c, 0x69, 0x12d, 0x131, 0x12d, 0x4f, 0x14e, 0x6f, 0x14f, 0x55, 0x16c, 0x75, 0x16d, 0}},
+	{0x2da,	{0x41, 0xc5, 0x61, 0xe5, 0x55, 0x16e, 0x75, 0x16f, 0}},
+	{0x2d9,	{0x43, 0x10a, 0x63, 0x10b, 0x45, 0x116, 0x65, 0x117, 0x47, 0x120, 0x67, 0x121, 0x49, 0x130, 0x4c, 0x13f, 0x6c, 0x140, 0x5a, 0x17b, 0x7a, 0x17c, 0}},
+	{0x2e,	{0}},
+	{0x2322,	{0x41, 0xc2, 0x61, 0xe2, 0x43, 0x108, 0x63, 0x109, 0x45, 0xca, 0x65, 0xea, 0x47, 0x11c, 0x67, 0x11d, 0x48, 0x124, 0x68, 0x125, 0x49, 0xce, 0x69, 0xee, 0x131, 0xee, 0x4a, 0x134, 0x6a, 0x135, 0x4f, 0xd4, 0x6f, 0xf4, 0x53, 0x15c, 0x73, 0x15d, 0x55, 0xdb, 0x75, 0xfb, 0x57, 0x174, 0x77, 0x175, 0x59, 0x176, 0x79, 0x177, 0}},
+	{0x32f,	{0}},
+	{0x2db,	{0x41, 0x104, 0x61, 0x105, 0x45, 0x118, 0x65, 0x119, 0x49, 0x12e, 0x69, 0x12f, 0x131, 0x12f, 0x55, 0x172, 0x75, 0x173, 0}},
+	{0xaf,	{0x41, 0x100, 0x61, 0x101, 0x45, 0x112, 0x65, 0x113, 0x49, 0x12a, 0x69, 0x12b, 0x131, 0x12b, 0x4f, 0x14c, 0x6f, 0x14d, 0x55, 0x16a, 0x75, 0x16b, 0}},
+	{0x2c7,	{0x43, 0x10c, 0x63, 0x10d, 0x44, 0x10e, 0x64, 0x10f, 0x45, 0x11a, 0x65, 0x11b, 0x4c, 0x13d, 0x6c, 0x13e, 0x4e, 0x147, 0x6e, 0x148, 0x52, 0x158, 0x72, 0x159, 0x53, 0x160, 0x73, 0x161, 0x54, 0x164, 0x74, 0x165, 0x5a, 0x17d, 0x7a, 0x17e, 0}},
+	{0x2bd,	{0}},
+	{0x2bc,	{0}},
+	{0x32e,	{0}}
 };
 
 Rune multitab[Nmulti][5] = {
-[MAAS-MULTI]	{0x2bd, 0x3b1, 0},
-[MALN-MULTI]	{0x2bc, 0x3b1, 0},
-[MAND-MULTI]	{0x61, 0x6e, 0x64, 0},
-[MAOQ-MULTI]	{0x61, 0x2f, 0x71, 0},
-[MBRA-MULTI]	{0x3c, 0x7c, 0},
-[MDD-MULTI]	{0x2e, 0x2e, 0},
-[MDDD-MULTI]	{0x2e, 0x2e, 0x2e, 0},
-[MEAS-MULTI]	{0x2bd, 0x3b5, 0},
-[MELN-MULTI]	{0x2bc, 0x3b5, 0},
-[MEMM-MULTI]	{0x2014, 0x2014, 0},
-[MHAS-MULTI]	{0x2bd, 0x3b7, 0},
-[MHLN-MULTI]	{0x2bc, 0x3b7, 0},
-[MIAS-MULTI]	{0x2bd, 0x3b9, 0},
-[MILN-MULTI]	{0x2bc, 0x3b9, 0},
-[MLCT-MULTI]	{0x63, 0x74, 0},
-[MLFF-MULTI]	{0x66, 0x66, 0},
-[MLFFI-MULTI]	{0x66, 0x66, 0x69, 0},
-[MLFFL-MULTI]	{0x66, 0x66, 0x6c, 0},
-[MLFL-MULTI]	{0x66, 0x6c, 0},
-[MLFI-MULTI]	{0x66, 0x69, 0},
-[MLLS-MULTI]	{0x26b, 0x26b, 0},
-[MLST-MULTI]	{0x73, 0x74, 0},
-[MOAS-MULTI]	{0x2bd, 0x3bf, 0},
-[MOLN-MULTI]	{0x2bc, 0x3bf, 0},
-[MOR-MULTI]	{0x6f, 0x72, 0},
-[MRAS-MULTI]	{0x2bd, 0x3c1, 0},
-[MRLN-MULTI]	{0x2bc, 0x3c1, 0},
-[MTT-MULTI]	{0x7e, 0x7e, 0},
-[MUAS-MULTI]	{0x2bd, 0x3c5, 0},
-[MULN-MULTI]	{0x2bc, 0x3c5, 0},
-[MWAS-MULTI]	{0x2bd, 0x3c9, 0},
-[MWLN-MULTI]	{0x2bc, 0x3c9, 0},
-[MOE-MULTI]	{0x6f, 0x65, 0},
-[MES-MULTI]	{0x20, 0x20, 0},
+	{0x2bd, 0x3b1, 0},
+	{0x2bc, 0x3b1, 0},
+	{0x61, 0x6e, 0x64, 0},
+	{0x61, 0x2f, 0x71, 0},
+	{0x3c, 0x7c, 0},
+	{0x2e, 0x2e, 0},
+	{0x2e, 0x2e, 0x2e, 0},
+	{0x2bd, 0x3b5, 0},
+	{0x2bc, 0x3b5, 0},
+	{0x2014, 0x2014, 0},
+	{0x2bd, 0x3b7, 0},
+	{0x2bc, 0x3b7, 0},
+	{0x2bd, 0x3b9, 0},
+	{0x2bc, 0x3b9, 0},
+	{0x63, 0x74, 0},
+	{0x66, 0x66, 0},
+	{0x66, 0x66, 0x69, 0},
+	{0x66, 0x66, 0x6c, 0},
+	{0x66, 0x6c, 0},
+	{0x66, 0x69, 0},
+	{0x26b, 0x26b, 0},
+	{0x73, 0x74, 0},
+	{0x2bd, 0x3bf, 0},
+	{0x2bc, 0x3bf, 0},
+	{0x6f, 0x72, 0},
+	{0x2bd, 0x3c1, 0},
+	{0x2bc, 0x3c1, 0},
+	{0x7e, 0x7e, 0},
+	{0x2bd, 0x3c5, 0},
+	{0x2bc, 0x3c5, 0},
+	{0x2bd, 0x3c9, 0},
+	{0x2bc, 0x3c9, 0},
+	{0x6f, 0x65, 0},
+	{0x20, 0x20, 0},
 };
 
 #define	risupper(r)	(0x41 <= (r) && (r) <= 0x5a)