Re: [kbd] [PATCH] Enable UNUMBERs in compose definitions

[Michael Schutte <michi@uiae.at>]

[-- Attachment #1.1: Type: text/plain, Size: 509 bytes --]

Hey Alexey,

On Wed, Jul 29, 2009 at 02:41:02AM +0400, Alexey Gladkov wrote:
> 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

You’re right of course.  A corrected version of the patch is attached to
this mail.

-- 
Michael Schutte <michi@uiae.at>

[-- Attachment #1.2: 0001-Enable-UNUMBERs-in-compose-definitions.patch --]
[-- Type: text/x-diff, Size: 1183 bytes --]

From 4bf89bb1f47bdf003cb9af47363dd28c3fe82ba2 Mon Sep 17 00:00:00 2001
From: Michael Schutte <michi@uiae.at>
Date: Fri, 24 Jul 2009 12:28:27 +0200
Subject: [PATCH] Enable UNUMBERs in compose definitions

As always, auto-conversion applies in case of XLATE mode (or no
KDSKBDIACRUC support).

Signed-off-by: Michael Schutte <michi@uiae.at>
---
 src/loadkeys.y |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/loadkeys.y b/src/loadkeys.y
index c58aa03..6beba09 100644
--- a/src/loadkeys.y
+++ b/src/loadkeys.y
@@ -169,15 +169,20 @@ 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 compsym compsym TO rvalue EOL
 			{
 			    compose($2, $3, $5);
 			}
                 ;
+compsym		: CCHAR
+			{ $$ = $1; }
+		| UNUMBER
+			{ $$ = $1 ^ 0xf000; }
+		;
 singleline	:	{ mod = 0; }
 		  modifiers KEYCODE NUMBER EQUALS rvalue EOL
 			{
-- 
1.5.6.5


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 489 bytes --]