And the first bug has already been found, though it was found by one of the Debian maintainers with the changes I pushed upstream - I'd pushed up the "correction" of the masculine -> ordmasculine from Sun's compose files, but it turns out that's actually a bug in Sun's compose files, as <X11/keysymdef.h> defines the key name as XK_masculine, even though the companion key is XK_ordfeminine. I'll apply this patch from upstream to our builds to fix this in ours:
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=fd62d3318c846cd43d66a505946e94704d7d83dc -- -Alan Coopersmith- alan.coopersmith at sun.com Sun Microsystems, Inc. - X Window System Engineering
