temporarily partially reverting b.fd.o#13277

diff --git a/ChangeLog b/ChangeLog
index 5bef3a7..adcd856 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-31  Sergey Udaltsov
+
+       * symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+       temporarily (partially) reverting
+       https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
 2007-12-27  Sergey Udaltsov
 
        * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: adding xkb

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 6edd8a9..834c0db 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2774,14 +2774,14 @@
       <variantList>
         <variant>
           <configItem>
-            <name>cedilla</name>
-            <_description>Cedilla below</_description>
+            <name>comma</name>
+            <_description>Comma below</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>std</name>
-            <_description>Standard</_description>
+            <name>std_comma</name>
+            <_description>Standard (Comma below)</_description>
           </configItem>
         </variant>
         <variant>

diff --git a/rules/compat/variantRename.lst b/rules/compat/variantRename.lst
index 884a896..6d62270 100644 (file)
--- a/rules/compat/variantRename.lst
+++ b/rules/compat/variantRename.lst
@@ -24,9 +24,9 @@ ogham is434           ie      ogam_is434
 ogham  is434laptop     ie      ogam_is434
 ori    basic           in      ori
 ro     de              ro      winkeys
-ro     us              ro      std
-ro     comma           ro      cedilla
-ro     academic        ro      std_cedilla
+ro     us              ro      std_comma
+ro     std             ro      std_cedilla
+ro     academic        ro      std_comma
 sapmi  basic           no      smi
 sapmi  nodeadkeys      no      smi_nodeadkeys
 sapmi  sefi            fi      smi

diff --git a/symbols/ro b/symbols/ro
index c374313..c764fd0 100644 (file)
--- a/symbols/ro
+++ b/symbols/ro
@@ -15,7 +15,6 @@
 // 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-2006.
-// Updated by Alexandru Szasz, <alexxed@gmail.com>
 // v 1.2
 
 
@@ -46,13 +45,13 @@ xkb_symbols "basic" {
     key <AD01> { [ q,                      Q,  acircumflex,   Acircumflex ] };
     key <AD02> { [ w,                      W,  ssharp                    ] };
     key <AD03> { [ e,                      E,  EuroSign                  ] };
-    key <AD05> { [ t,                     T,  0x100021b,       0x100021a ] };
+    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,  0x1000219,       0x1000218 ] };
+    key <AC02> { [ s,                      S,  scedilla,        Scedilla ] };
     key <AC03> { [ d,                      D,  dstroke,          Dstroke ] };
     key <AC09> { [ l,                      L,  lstroke,          Lstroke ] };
     key <LSGT> { [ backslash,            bar                              ] };
@@ -64,20 +63,22 @@ xkb_symbols "basic" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "cedilla" {
-    // Variant of the basic layout with cedilla below for historical reference only
-    // Implements the old wrong S and T with cedilla
+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).
 
     include "ro(basic)"
 
-    name[Group1]="Romania - Cedilla below";
-    
-    key <AC02> { [ s,                      S,  scedilla,        Scedilla ] };
-    key <AD05> { [ t,                      T,  tcedilla,        Tcedilla ] };
+    name[Group1]="Romania - Comma below";
+
+    key <AD05> { [ t,                     T,  0x100021b,       0x100021a ] };
+    key <AC02> { [ s,                     S,  0x1000219,       0x1000218 ] };
 };
 
 partial alphanumeric_keys
-xkb_symbols "std" {
+xkb_symbols "std_cedilla" {
     // 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
@@ -85,7 +86,7 @@ xkb_symbols "std" {
 
     include "us"
 
-    name[Group1]="Romania - Standard";
+    name[Group1]="Romania - Standard (Cedilla below)";
 
     key <TLDE> { [ doublelowquotemark, rightdoublequotemark, grave, asciitilde ] };
     key <AE01> { [ 1,                 exclam,  dead_tilde                ] };
@@ -108,8 +109,8 @@ xkb_symbols "std" {
     key <AC02> { [ s,                     S,  ssharp                     ] };
     key <AC03> { [ d,                      D,  dstroke,          Dstroke ] };
     key <AC09> { [ l,                      L,  lstroke,          Lstroke ] };
-    key <AC10> { [ 0x1000219,     0x1000218,  semicolon,           colon ] };
-    key <AC11> { [ 0x100021b,     0x100021a,  apostrophe,       quotedbl ] };
+    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 ] };
@@ -122,17 +123,18 @@ xkb_symbols "std" {
 
 
 partial alphanumeric_keys
-xkb_symbols "std_cedilla" {
-    // Academic variant of the standard layout with WRONG cedilla below for historical reference
-    // Implements old S and T with cedilla below
+xkb_symbols "std_comma" {
+    // Academic variant of the standard layout with comma bellow.
+    // Implements S and T with comma bellow as in ISO-8859-16.
+    // Hopefully these should become mainstream in a few years.
+    // For now it's the oddest variant (although the perfect one).
 
-    include "ro(std)"
+    include "ro(std_cedilla)"
 
-    name[Group1]="Romania - Standard (Cedilla below)";
+    name[Group1]="Romania - Standard (Comma below)";
 
-    
-    key <AC10> { [ scedilla,       Scedilla,  semicolon,           colon ] };
-    key <AC11> { [ tcedilla,       Tcedilla,  apostrophe,       quotedbl ] };
+    key <AC10> { [ 0x1000219,     0x1000218 ] };
+    key <AC11> { [ 0x100021b,     0x100021a ] };
 };