From fd62d3318c846cd43d66a505946e94704d7d83dc Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 8 Apr 2009 19:42:25 -0700 Subject: [PATCH] Revert "Change masculine to ordmasculine in Compose file comments" This reverts commit 892b401d5acc055803a20e349ede0d64490f2230. 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. --- nls/el_GR.UTF-8/Compose.pre | 8 ++++---- nls/en_US.UTF-8/Compose.pre | 8 ++++---- nls/fi_FI.UTF-8/Compose.pre | 8 ++++---- nls/iso8859-1/Compose.pre | 16 ++++++++-------- nls/iso8859-15/Compose.pre | 8 ++++---- nls/iso8859-9/Compose.pre | 8 ++++---- nls/iso8859-9e/Compose.pre | 8 ++++---- nls/pt_BR.UTF-8/Compose.pre | 8 ++++---- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/nls/el_GR.UTF-8/Compose.pre b/nls/el_GR.UTF-8/Compose.pre index d96b00d1..8d296848 100644 --- a/nls/el_GR.UTF-8/Compose.pre +++ b/nls/el_GR.UTF-8/Compose.pre @@ -127,10 +127,10 @@ XCOMM Special Character : "ª" ordfeminine : "ª" ordfeminine : "ª" ordfeminine - : "º" ordmasculine - : "º" ordmasculine - : "º" ordmasculine - : "º" ordmasculine + : "º" masculine + : "º" masculine + : "º" masculine + : "º" masculine : "«" guillemotleft : "»" guillemotright <0> : "°" degree diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index 04eccf41..7c46ddbd 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -483,10 +483,10 @@ XCOMM Part 3 <1> : "¹" onesuperior # SUPERSCRIPT ONE : "¹" onesuperior # SUPERSCRIPT ONE : "¹" onesuperior # SUPERSCRIPT ONE - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS diff --git a/nls/fi_FI.UTF-8/Compose.pre b/nls/fi_FI.UTF-8/Compose.pre index 5c5ba0b4..91858960 100644 --- a/nls/fi_FI.UTF-8/Compose.pre +++ b/nls/fi_FI.UTF-8/Compose.pre @@ -479,10 +479,10 @@ XCOMM Part 3 <1> : "¹" onesuperior # SUPERSCRIPT ONE : "¹" onesuperior # SUPERSCRIPT ONE : "¹" onesuperior # SUPERSCRIPT ONE - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS diff --git a/nls/iso8859-1/Compose.pre b/nls/iso8859-1/Compose.pre index 3b259564..cbdf9cc1 100644 --- a/nls/iso8859-1/Compose.pre +++ b/nls/iso8859-1/Compose.pre @@ -104,10 +104,10 @@ XCOMM Special Character : "\252" ordfeminine : "\252" ordfeminine : "\252" ordfeminine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine + : "\272" masculine + : "\272" masculine + : "\272" masculine + : "\272" masculine : "\253" guillemotleft : "\273" guillemotright <0> : "\260" degree @@ -570,10 +570,10 @@ Ctrl : "\252" ordfeminine Ctrl : "\252" ordfeminine Ctrl : "\252" ordfeminine Ctrl : "\252" ordfeminine -Ctrl : "\272" ordmasculine -Ctrl : "\272" ordmasculine -Ctrl : "\272" ordmasculine -Ctrl : "\272" ordmasculine +Ctrl : "\272" masculine +Ctrl : "\272" masculine +Ctrl : "\272" masculine +Ctrl : "\272" masculine Ctrl : "\253" guillemotleft Ctrl : "\273" guillemotright Ctrl <0> : "\260" degree diff --git a/nls/iso8859-15/Compose.pre b/nls/iso8859-15/Compose.pre index 9aaeab8e..9f80d88b 100644 --- a/nls/iso8859-15/Compose.pre +++ b/nls/iso8859-15/Compose.pre @@ -100,10 +100,10 @@ XCOMM Special Character : "\252" ordfeminine : "\252" ordfeminine : "\252" ordfeminine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine + : "\272" masculine + : "\272" masculine + : "\272" masculine + : "\272" masculine : "\253" guillemotleft : "\273" guillemotright <0> : "\260" degree diff --git a/nls/iso8859-9/Compose.pre b/nls/iso8859-9/Compose.pre index 76cc9676..f5d67d0c 100644 --- a/nls/iso8859-9/Compose.pre +++ b/nls/iso8859-9/Compose.pre @@ -98,10 +98,10 @@ XCOMM Special Character : "\252" ordfeminine : "\252" ordfeminine : "\252" ordfeminine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine + : "\272" masculine + : "\272" masculine + : "\272" masculine + : "\272" masculine : "\253" guillemotleft : "\273" guillemotright <0> : "\260" degree diff --git a/nls/iso8859-9e/Compose.pre b/nls/iso8859-9e/Compose.pre index 523583ae..2bbb2bdb 100644 --- a/nls/iso8859-9e/Compose.pre +++ b/nls/iso8859-9e/Compose.pre @@ -97,10 +97,10 @@ XCOMM Special Character : "\252" ordfeminine : "\252" ordfeminine : "\252" ordfeminine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine - : "\272" ordmasculine + : "\272" masculine + : "\272" masculine + : "\272" masculine + : "\272" masculine : "\253" guillemotleft : "\273" guillemotright <0> : "\260" degree diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre index 70036448..79618938 100644 --- a/nls/pt_BR.UTF-8/Compose.pre +++ b/nls/pt_BR.UTF-8/Compose.pre @@ -447,10 +447,10 @@ XCOMM group 1: cluster jamos made of three basic jamos <1> : "¹" onesuperior # SUPERSCRIPT ONE : "¹" onesuperior # SUPERSCRIPT ONE : "¹" onesuperior # SUPERSCRIPT ONE - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR - : "º" ordmasculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR + : "º" masculine # MASCULINE ORDINAL INDICATOR <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS