From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_NEUTRAL autolearn=no version=3.2.5 Message-ID: <4A6F7E7E.30207@gmail.com> Date: Wed, 29 Jul 2009 02:41:02 +0400 From: Alexey Gladkov User-Agent: Mozilla/5.0 (X11; U; Linux i686; ru; rv:1.8.1.18) Gecko/20081202 Thunderbird/2.0.0.18 Mnenhy/0.7.5.0 MIME-Version: 1.0 To: Linux console tools development discussion References: <1248436538-21478-1-git-send-email-michi@uiae.at> In-Reply-To: <1248436538-21478-1-git-send-email-michi@uiae.at> X-Enigmail-Version: 0.96a Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [kbd] [PATCH] Enable UNUMBERs in compose definitions X-BeenThere: kbd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Linux console tools development discussion List-Id: Linux console tools development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2009 22:44:13 -0000 Archived-At: List-Archive: 24.07.2009 15:55, Michael Schutte wrote: > As always, auto-conversion applies in case of XLATE mode (or no > KDSKBDIACRUC support). > > Signed-off-by: Michael Schutte > --- > src/loadkeys.y | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/src/loadkeys.y b/src/loadkeys.y > index 64cb8ee..b2ba003 100644 > --- a/src/loadkeys.y > +++ b/src/loadkeys.y > @@ -161,15 +161,16 @@ strline : STRING LITERAL EQUALS STRLITERAL EOL > addfunc(kbs_buf); > } > ; > -compline : COMPOSE CCHAR CCHAR TO CCHAR EOL > +compline : COMPOSE compsym compsym TO compsym EOL > { > compose($2, $3, $5); > } > - | COMPOSE CCHAR CCHAR TO rvalue EOL > - { > - compose($2, $3, $5); > - } > ; > +compsym : CCHAR > + { $$ = $1; } > + | UNUMBER > + { $$ = $1 ^ 0xf000; } > + ; > singleline : { mod = 0; } > modifiers KEYCODE NUMBER EQUALS rvalue EOL > { You narrowed syntax. I disagree with this incompatibility. Why you did this ? At least, three keymaps use Literal: $ grep -lri '^[[:space:]]*Compose.*to[[:space:]]\+[a-zA-Z][a-zA-Z_0-9]*' * i386/qwerty/br-latin1-abnt2.map i386/qwerty/br-latin1-us.map i386/qwerty/et.map -- Rgrds, legion