Re: [PATCH] xkeyboard-config: OLPC: add br and es bits

2007-10-08 Thread Bernardo Innocenti
Sergey Udaltsov wrote:

 The code is in CVS since Sep 26, could you please double-check?

Silly me.  The hunk was applied at a different position, so my cvs
merged it automatically and kept my local changes too.

-- 
 \___/
 |___|   Bernardo Innocenti - http://www.codewiz.org/
  \___\  One Laptop Per Child - http://www.laptop.org/
___
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel


Re: [PATCH] xkeyboard-config: OLPC: add br and es bits

2007-10-07 Thread Sergey Udaltsov
Bernardo,

The code is in CVS since Sep 26, could you please double-check?

http://webcvs.freedesktop.org/xkeyboard-config/xkeyboard-config/symbols/br?r1=1.12r2=1.13

Cheers,

Sergey

On 10/6/07, Bernardo Innocenti [EMAIL PROTECTED] wrote:
 I resynced with you and noticed that the br and es bits, that were in my
 former mega-dropbomb-patch, are still missing in CVS.

 Here they are again.

 Index: symbols/br
 ===
 RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/br,v
 retrieving revision 1.12
 diff -u -p -u -p -r1.12 br
 --- symbols/br  10 Aug 2007 09:06:27 -  1.12
 +++ symbols/br  16 Sep 2007 03:36:44 -
 @@ -64,6 +64,39 @@ xkb_symbols nodeadkeys {
  key AB10 { [ semicolon,  colon, dead_belowdot,abovedot ] };
  };

 +partial alphanumeric_keys
 +xkb_symbols olpc {
 +
 +include us(basic)
 +name[Group1]=Brazil;
 +
 +key TLDE { [   apostrophe,   quotedbl  
   ] };
 +
 +key AE01 { [   1,  exclam,   onesuperior   
   ] };
 +key AE02 { [   2,  at,   twosuperior   
   ] };
 +key AE03 { [   3,  numbersign, threesuperior   
   ] };
 +key AE04 { [   4,  dollar,  sterling   
   ] };
 +key AE05 { [   5, percent,  cent   
   ] };
 +key AE06 { [   6,  dead_diaeresis,   notsign   
   ] };
 +key AE12  { [   equal,   plus,   section   
   ] };
 +
 +key AD03 { [e,  E,  EuroSign   
   ] };
 +key AD11 { [   dead_acute,  dead_grave 
] };
 +key AD12 { [  bracketleft,   braceleft, 0x1AA  
] };
 +
 +key AC10 { [ ccedilla,   Ccedilla  
   ] };
 +key AC11 { [   dead_tilde, dead_circumflex 
   ] };
 +key BKSL { [ bracketright,  braceright, 0x1BA  
   ] };
 +
 +key AB01 { [z,  Z,   bar   
   ] };
 +key AB03 { [c,  C, 0x10020A2   
   ] };
 +key AB09 { [   period,greater, backslash   
   ] };
 +key AB10 { [semicolon,   colon 
] };
 +
 +key I219 { [slash,   question,degree, 
 ISO_Next_Group ] };
 +include level3(ralt_switch)
 +};
 +
  // ABNT2 Keyboard to IBM/Lenovo Thinkpads
  // by Piter PUNK [EMAIL PROTECTED]
  //
 Index: symbols/es
 ===
 RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/es,v
 retrieving revision 1.13
 diff -u -p -u -p -r1.13 es
 --- symbols/es  26 Jan 2007 23:02:18 -  1.13
 +++ symbols/es  16 Sep 2007 03:36:44 -
 @@ -146,5 +146,38 @@ xkb_symbols mac {

  include es
  name[Group1]= Spain - Macintosh;
 +};
 +
 +partial alphanumeric_keys
 +xkb_symbols olpc {
 +
 +include us(basic)
 +name[Group1]=Spain;
 +
 +key TLDE { [  bar, degree ] };
 +key AE02 { [2,   quotedbl,  at ] };
 +key AE03 { [3, dead_grave,  numbersign ] };
 +key AE05 { [5,   percent, dead_circumflex ] };
 +key AE06 { [6,  ampersand, notsign ] };
 +key AE07 { [7,  slash,   backslash ] };
 +key AE08 { [8,  parenleft ] };
 +key AE09 { [9, parenright ] };
 +key AE10 { [0,  equal  ] };
 +key AE11 { [   apostrophe,   question  ] };
 +key AE12 { [   exclamdown,   questiondown  ] };
 +
 +key AD03 { [e,  E,EuroSign ] };
 +key AD11 { [   dead_acute, dead_diaeresis ] };
 +key AD12 { [  bracketleft,  braceleft  ] };
 +
 +key AC10 { [   ntilde,Ntilde  ] };
 +key AC11 { [ plus,   asterisk,  dead_tilde ] };
 +key BKSL { [ bracketright, braceright  ] };
 +
 +key AB08 { [comma,  semicolon  ] };
 +key AB09 { [   period,  colon  ] };
 +key AB10 { [minus, underscore  ] };

 +key I219 { [ less,greater,  ISO_Next_Group ] };
 +include level3(ralt_switch)
  };


 --
  \___/
  |___|  Bernardo Innocenti - http://www.codewiz.org/
   \___\ One Laptop Per Child - http://www.laptop.org/

___
Devel mailing list
Devel@lists.laptop.org