rm -f U-*.h chartable.h misc/u-*
misc/gen-basic
misc/table2h _U_cat byte <misc/u-cat >U-cat.h
-misc/table2h _U_lower word <misc/u-lower >U-lower.h
-misc/table2h _U_upper word <misc/u-upper >U-upper.h
-misc/gen-unacc >misc/u-unacc
-misc/table2h _U_unaccent word <misc/u-unacc >U-unacc.h
+misc/table2h _U_lower u16 <misc/u-lower >U-lower.h
+misc/table2h _U_upper u16 <misc/u-upper >U-upper.h
+( cat misc/user_unacc && misc/gen-unacc ) >misc/u-unacc
+misc/table2h _U_unaccent u16 <misc/u-unacc >U-unacc.h
+misc/gen-ligatures >U-ligatures.h
misc/gen-charconv <misc/chartable.in >chartable.h