Revert "Change masculine to ordmasculine in Compose file comments"

This reverts commit 892b401d5a.

As Julien Cristau correctly points out, I misread the Compose file grammar
in modules/im/ximcp/imLcPrs.c, and those are keysyms, not comments, and
the keysym is named XK_masculine in keysymdef.h.   This change is thus a
bug in the Solaris compose tables to be fixed, not an improvement to bring
upstream.
This commit is contained in:
Alan Coopersmith 2009-04-08 19:42:25 -07:00
parent eac57c77af
commit fd62d3318c
8 changed files with 36 additions and 36 deletions

View file

@ -127,10 +127,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "ª" ordfeminine
<Multi_key> <A> <underscore> : "ª" ordfeminine
<Multi_key> <underscore> <A> : "ª" ordfeminine
<Multi_key> <o> <underscore> : "º" ordmasculine
<Multi_key> <underscore> <o> : "º" ordmasculine
<Multi_key> <O> <underscore> : "º" ordmasculine
<Multi_key> <underscore> <O> : "º" ordmasculine
<Multi_key> <o> <underscore> : "º" masculine
<Multi_key> <underscore> <o> : "º" masculine
<Multi_key> <O> <underscore> : "º" masculine
<Multi_key> <underscore> <O> : "º" masculine
<Multi_key> <less> <less> : "«" guillemotleft
<Multi_key> <greater> <greater> : "»" guillemotright
<Multi_key> <0> <asciicircum> : "°" degree

View file

@ -483,10 +483,10 @@ XCOMM Part 3
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <Multi_key> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<Multi_key> <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<Multi_key> <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS

View file

@ -479,10 +479,10 @@ XCOMM Part 3
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <Multi_key> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<Multi_key> <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<Multi_key> <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS

View file

@ -104,10 +104,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
<Multi_key> <o> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <o> : "\272" ordmasculine
<Multi_key> <O> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <o> <underscore> : "\272" masculine
<Multi_key> <underscore> <o> : "\272" masculine
<Multi_key> <O> <underscore> : "\272" masculine
<Multi_key> <underscore> <O> : "\272" masculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree
@ -570,10 +570,10 @@ Ctrl<T> <a> <underscore> : "\252" ordfeminine
Ctrl<T> <underscore> <a> : "\252" ordfeminine
Ctrl<T> <A> <underscore> : "\252" ordfeminine
Ctrl<T> <underscore> <A> : "\252" ordfeminine
Ctrl<T> <o> <underscore> : "\272" ordmasculine
Ctrl<T> <underscore> <o> : "\272" ordmasculine
Ctrl<T> <O> <underscore> : "\272" ordmasculine
Ctrl<T> <underscore> <O> : "\272" ordmasculine
Ctrl<T> <o> <underscore> : "\272" masculine
Ctrl<T> <underscore> <o> : "\272" masculine
Ctrl<T> <O> <underscore> : "\272" masculine
Ctrl<T> <underscore> <O> : "\272" masculine
Ctrl<T> <less> <less> : "\253" guillemotleft
Ctrl<T> <greater> <greater> : "\273" guillemotright
Ctrl<T> <0> <asciicircum> : "\260" degree

View file

@ -100,10 +100,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
<Multi_key> <o> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <o> : "\272" ordmasculine
<Multi_key> <O> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <o> <underscore> : "\272" masculine
<Multi_key> <underscore> <o> : "\272" masculine
<Multi_key> <O> <underscore> : "\272" masculine
<Multi_key> <underscore> <O> : "\272" masculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree

View file

@ -98,10 +98,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
<Multi_key> <o> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <o> : "\272" ordmasculine
<Multi_key> <O> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <o> <underscore> : "\272" masculine
<Multi_key> <underscore> <o> : "\272" masculine
<Multi_key> <O> <underscore> : "\272" masculine
<Multi_key> <underscore> <O> : "\272" masculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree

View file

@ -97,10 +97,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
<Multi_key> <o> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <o> : "\272" ordmasculine
<Multi_key> <O> <underscore> : "\272" ordmasculine
<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <o> <underscore> : "\272" masculine
<Multi_key> <underscore> <o> : "\272" masculine
<Multi_key> <O> <underscore> : "\272" masculine
<Multi_key> <underscore> <O> : "\272" masculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree

View file

@ -447,10 +447,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <Multi_key> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <asciicircum> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<Multi_key> <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<Multi_key> <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS