Attachment 3166 Details for Bug 371 – Unified patch for the Romanian layout (includes updated descriptions for base.xml.in)

[patch] Unified patch for the Romanian layout (includes updated descriptions for base.xml.in)

xkbdesc_ro.patch (text/plain), 14.42 KB, created by dumol on 2005-09-04 11:55:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dumol

Created: 2005-09-04 11:55:24 UTC

Size: 14.42 KB

patch

obsolete

>diff -Naur xkbdesc.orig/rules/base.xml.in xkbdesc/rules/base.xml.in
>--- xkbdesc.orig/rules/base.xml.in	2005-08-26 00:53:43.000000000 +0300
>+++ xkbdesc/rules/base.xml.in	2005-09-04 21:18:15.000000000 +0300
>@@ -1763,13 +1763,13 @@
>         <variant>
>           <configItem>
>             <name>us</name>
>-            <_description>US keyboard with Romanian letters</_description>
>+            <_description>Romanian standard keyboard</_description>
>           </configItem>
>         </variant>
>         <variant>
>           <configItem>
>             <name>de</name>
>-            <_description>Romanian keyboard with German letters</_description>
>+            <_description>Romanian keyboard with MS layout</_description>
>           </configItem>
>         </variant>
>       </variantList>
>diff -Naur xkbdesc.orig/symbols/ro xkbdesc/symbols/ro
>--- xkbdesc.orig/symbols/ro	2005-08-01 01:59:03.000000000 +0300
>+++ xkbdesc/symbols/ro	2005-09-04 21:36:42.000000000 +0300
>@@ -1,100 +1,194 @@
> // $XKeyboardConfig: xkbdesc/symbols/ro,v 1.8 2005/07/31 22:59:03 svu Exp $
> // $XFree86: xc/programs/xkbcomp/symbols/ro,v 1.6 2003/09/08 13:12:51 pascal Exp $
>+//
>+// Complete set of Romanian keyboards as described in the new Romanian standard
>+// SR 13392:2004 adopted in December 2004 by ASRO, "Asociatia de Standardizare 
>+// din Romania".
>+// 
>+// The default mapping is the RO_US/Programmers layout because of the lack of 
>+// Romanian hardware keyboards. The primary standard layout is implemented as 
>+// the "standard" variant. If you're determined to get commas bellow as in 
>+// ISO-8859-16 (and not cedillas as in ISO-8859-2) use the already defined 
>+// variants: "comma" for the default layout or "academic" for the standard one.
>+// MS compatible layout included (use the "ms" variant).
>+// 
>+// Created by Cristian Gafton, <gafton@redhat.com> (C) 2000
>+// Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001
>+// Completed by Misu Moldovan, <dumol@gnome.ro> (C) 2001, 2004, 2005.
>+// 
>+
> 
> default partial alphanumeric_keys
>-xkb_symbols "basic" {
> 
>-    // Describes the differences between a very simple US/ASCII
>-    // keyboard and a very simple Romanian keybaord
>-    // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003
>+xkb_symbols "basic" {
>+// This RO_US/Programmers layout, although the secondary layout in the 
>+// Romanian standard, has always been the "de facto" standard in the 
>+// Linux/Unix world. It is implemented here as the default layout and it's
>+// fully compatible with an US keyboard (Euro on AltGr+5 doesn't count).
> 
>-    include "latin"
>+    include "us"
> 
>     name[Group1]="Romania";
> 
>-    // Alphanumeric section
>-    key <TLDE> { [ bracketright, bracketleft		]	};
>+    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
>+    key <AE02> { [ 2,                     at,  dead_caron		  ] };
>+    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };
>+    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };
>+    key <AE05> { [ 5,                percent,  dead_abovering		  ] };
>+    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };
>+    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };
>+    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };
>+    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };
>+    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };
>+    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };
>+    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };
>+    key <AD01> { [ q,                      Q,  acircumflex,   Acircumflex ] };
>+    key <AD02> { [ w,                      W,  ssharp	 	          ] };
>+    key <AD03> { [ e,                      E,  EuroSign  	          ] };
>+    key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };
>+    key <AD08> { [ i,                      I,  icircumflex,   Icircumflex ] };
>+    key <AD10> { [ p,                      P,  section 			  ] };
>+    key <AD11> { [ bracketleft,    braceleft,  doublelowquotemark 	  ] };
>+    key <AD12> { [ bracketright,  braceright,  rightdoublequotemark 	  ] };
>+    key <AC01> { [ a,                      A,  abreve,             Abreve ] };
>+    key <AC02> { [ s,                      S,  scedilla,	 Scedilla ] };
>+    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };
>+    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };
>+    key <LSGT> { [ backslash,            bar                              ] };
>+    key <AB03> { [ c,                      C,  copyright 	       	  ] };
>+    key <AB08> { [ comma, 	        less,  guillemotleft	          ] };
>+    key <AB09> { [ period, 	     greater,  guillemotright 	          ] };
> 
>-    key <AE01> { [            1,      exclam,  asciitilde, asciitilde	] };
>-    key <AE02> { [	      2,    quotedbl,          at,         at	] };
>-    key <AE03> { [	      3,  numbersign, asciicircum,asciicircum	] };
>-    key <AE04> { [	      4,    currency		]	};
>-    key <AE05> { [	      5,     percent,      degree,     degree	] };
>-    key <AE06> { [	      6,   ampersand		]	};
>-    key <AE07> { [	      7,       slash,       grave,      grave	] };
>-    key <AE08> { [	      8,   parenleft		]	};
>-    key <AE09> { [	      9,  parenright		]	};
>-    key <AE10> { [	      0,       equal		]	};
>-    key <AE11> { [         plus,    question		]	};
>-    key <AE12> { [   apostrophe,    asterisk		]	};
>-
>-    key <AD01> { [	     q,	          Q,    backslash,  backslash	] };
>-    key <AD02> { [           w,           W,          bar,        bar	] };
>-    key <AD03> { [	     e,	          E,     EuroSign,   EuroSign	] };
>-    key <AD05> { [	     t,	          T		]	};
>-    key <AD06> { [	     z,	          Z		]	};
>-    key <AD07> { [	     u,	          U		]	};
>-    key <AD08> { [	     i,	          I		]	};
>-    key <AD11> { [      abreve,	     Abreve,     division,   division	] };
>-    key <AD12> { [ icircumflex,	Icircumflex,     multiply,   multiply	] };
>-
>-    key <AC04> { [	     f,	          F		]	};
>-    key <AC05> { [	     g,           G		]	};
>-    key <AC10> { [    scedilla,    Scedilla,       dollar,     dollar	] };
>-    key <AC11> { [    tcedilla,    Tcedilla,       ssharp,     ssharp	] };
>-
>-    key <AB01> { [	     y,	          Y 		]	};
>-    key <AB05> { [           b,           B,    braceleft,  braceleft	] };
>-    key <AB06> { [           n,           N,   braceright, braceright	] };
>-    key <AB07> { [           m,           M,      section,    section	] };
>-    key <AB08> { [       comma,	  semicolon,         less,       less	] };
>-    key <AB09> { [      period,	      colon,      greater,    greater	] };
>-    key <AB10> { [       minus,	 underscore		]	};
>+    include "level3(ralt_switch)"
>+};
> 
>-    key <BKSL> { [ acircumflex,	Acircumflex		]	};
>+partial alphanumeric_keys
>+xkb_symbols "comma" {
>+    // Variant of the basic layout with comma below.
>+    // Implements S and T with comma bellow as in ISO-8859-16.
>+    // Hopefully these should become mainstream in the near future.
>+    // For now it's just an odd variant (although the correct one).
> 
>-    // End alphanumeric section, begin "Keypad"
>-    include "keypad(comma)"
>-    // End "Keypad" section
>+    include "ro(basic)"
> 
>-    include "level3(ralt_switch)"
>+    key <AD05>	{ [ t,                     T,  0x100021b,       0x100021a ] };
>+    key <AC02>	{ [ s,          	   S,  0x1000219,       0x1000218 ] };
> };
> 
>-// based on a keyboard
>-// Created by Cristian Gafton, <gafton@redhat.com> (C) 2000
>-// Modified by Miºu Moldovan, <dumol@go.ro> (C) 2001
>-// Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001
>-//
> partial alphanumeric_keys
>-xkb_symbols "us" {
>+xkb_symbols "standard" {
>+    // Primary layout in the new Romanian standard.
>+    // Implemented here as a variant because of the lack of hardware 
>+    // Romanian keyboards and because of the predilection of Romanian
>+    // X users towards the secondary layout from the new standard.
>+
>+    include "us"
>+
>+    name[Group1]="Romania - Romanian standard keyboard";
>+
>+    key <TLDE> { [ doublelowquotemark, rightdoublequotemark, grave, asciitilde ] };
>+    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
>+    key <AE02> { [ 2,                     at,  dead_caron		  ] };
>+    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };
>+    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };
>+    key <AE05> { [ 5,                percent,  dead_abovering		  ] };
>+    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };
>+    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };
>+    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };
>+    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };
>+    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };
>+    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };
>+    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };
>+    key <AD03> { [ e,                      E,  EuroSign  	          ] };
>+    key <AD10> { [ p,                      P,  section 			  ] };
>+    key <AD11> { [ abreve, 	      Abreve,  bracketleft,     braceleft ] };
>+    key <AD12> { [ icircumflex,  Icircumflex,  bracketright,   braceright ] };
>+    key <BKSL> { [ acircumflex,  Acircumflex,  backslash,             bar ] };
>+    key <AC02> { [ s, 			   S,  ssharp			  ] };
>+    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };
>+    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };
>+    key <AC10> { [ scedilla, 	    Scedilla,  semicolon, 	    colon ] };
>+    key <AC11> { [ tcedilla, 	    Tcedilla,  apostrophe, 	 quotedbl ] };
>+    key <LSGT> { [ backslash,            bar                              ] };
>+    key <AB03> { [ c,                      C,  copyright 	       	  ] };
>+    key <AB08> { [ comma, 	   semicolon,  less, 	    guillemotleft ] };
>+    key <AB09> { [ period,             colon,  greater,    guillemotright ] };
> 
>-    include "latin"
>+    key <KPDL> { [ KP_Delete,   KP_Separator ] };
>+
>+    include "level3(ralt_switch)"
>+};
> 
>-    name[Group1]="Romania - US keyboard with Romanian letters";
> 
>-    key <AD01>	{ [         q,          Q,  acircumflex,  Acircumflex ]	};
>-    key <AD05>	{ [         t,          T,     tcedilla,     Tcedilla ]	};
>-    key <AD08>	{ [         i,          I,  icircumflex,  Icircumflex ]	};
>+partial alphanumeric_keys
>+xkb_symbols "academic" {
>+    // Academic variant of the standard layout with comma bellow.
>+    // Implements S and T with comma bellow as in ISO-8859-16.
>+    // Hopefully these diacritics should become mainstream in a few years.
>+    // For now it's the oddest variant (although the perfect one).
> 
>-    key <AC01>	{ [         a,          A,       abreve,       Abreve ]	};
>-    key <AC02>	{ [         s,          S,     scedilla,     Scedilla ]	};
>+    include "ro(standard)"
> 
>-    include "level3(ralt_switch)"
>+    key <AC10> { [ 0x1000219,	   0x1000218 ] };
>+    key <AC11> { [ 0x100021b,	   0x100021a ] };
> };
> 
>-// Romanian keyboard with access to German umlauts";
>-// Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003
>-// German umlauts are accessible with <AltGr> and a, o , u, s (+shift for capital letters)
>-//
>+
> partial alphanumeric_keys
>-xkb_symbols "de" {
>+xkb_symbols "ms" {
>+    // Describes the differences between a very simple US/ASCII
>+    // keyboard and a very simple Romanian keybaord
>+    // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003
> 
>-    include "ro(basic)"
>+    include "latin"
>+
>+    name[Group1]="Romania - Romanian keyboard with MS layout";
>+
>+    // Alphanumeric section
>+    key <TLDE> { [ bracketright, bracketleft            ]       };
>+
>+    key <AE01> { [            1,      exclam,  asciitilde, asciitilde   ] };
>+    key <AE02> { [            2,    quotedbl,          at,         at   ] };
>+    key <AE03> { [            3,  numbersign, asciicircum,asciicircum   ] };
>+    key <AE04> { [            4,    currency            ]       };
>+    key <AE05> { [            5,     percent,      degree,     degree   ] };
>+    key <AE06> { [            6,   ampersand            ]       };
>+    key <AE07> { [            7,       slash,       grave,      grave   ] };
>+    key <AE08> { [            8,   parenleft            ]       };
>+    key <AE09> { [            9,  parenright            ]       };
>+    key <AE10> { [            0,       equal            ]       };
>+    key <AE11> { [         plus,    question            ]       };
>+    key <AE12> { [   apostrophe,    asterisk            ]       };
>+
>+    key <AD01> { [           q,           Q,    backslash,  backslash   ] };
>+    key <AD02> { [           w,           W,          bar,        bar   ] };
>+    key <AD03> { [           e,           E,     EuroSign,   EuroSign   ] };
>+    key <AD05> { [           t,           T             ]       };
>+    key <AD06> { [           z,           Z             ]       };
>+    key <AD07> { [           u,           U             ]       };
>+    key <AD08> { [           i,           I             ]       };
>+    key <AD11> { [      abreve,      Abreve,     division,   division   ] };
>+    key <AD12> { [ icircumflex, Icircumflex,     multiply,   multiply   ] };
>+
>+    key <AC04> { [           f,           F             ]       };
>+    key <AC05> { [           g,           G             ]       };
>+    key <AC10> { [    scedilla,    Scedilla,       dollar,     dollar   ] };
>+    key <AC11> { [    tcedilla,    Tcedilla,       ssharp,     ssharp   ] };
>+
>+    key <AB01> { [           y,           Y             ]       };
>+    key <AB05> { [           b,           B,    braceleft,  braceleft   ] };
>+    key <AB06> { [           n,           N,   braceright, braceright   ] };
>+    key <AB07> { [           m,           M,      section,    section   ] };
>+    key <AB08> { [       comma,   semicolon,         less,       less   ] };
>+    key <AB09> { [      period,       colon,      greater,    greater   ] };
>+    key <AB10> { [       minus,  underscore             ]       };
>+
>+    key <BKSL> { [ acircumflex, Acircumflex             ]       };
> 
>-    name[Group1]="Romania - Romanian keyboard with German letters";
>+    // End alphanumeric section, begin "Keypad"
>+    include "keypad(comma)"
>+    // End "Keypad" section
>+
>+    include "level3(ralt_switch)"
> 
>-    key <AD07> { [          u,   U,     udiaeresis,     Udiaeresis  ] };
>-    key <AD09> { [          o,   O,     odiaeresis,     Odiaeresis  ] };
>-    key <AC01> { [          a,   A,     adiaeresis,     Adiaeresis  ] };
>-    key <AC02> { [          s,   S,     ssharp    ,     ssharp      ] };
> };

Actions: View | Splinter Review

Attachments on bug 371: 3166

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.