From 4995569efc39890cbd07872b1ff0954bf2380933 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Sun, 18 Nov 2007 11:42:54 +0000
Subject: [PATCH] ro(comma), ro(academic) --> ro(cedilla), ro(std_cedilla),
 b.fd.o#13277

---
 ChangeLog                      |  6 ++++++
 rules/base.xml.in              |  8 ++++----
 rules/compat/variantRename.lst |  2 ++
 symbols/ro                     | 40 +++++++++++++++++++---------------------
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7b310e..0539a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-18  Sergey Udaltsov
+
+	* symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+	ro(comma), ro(academic) --> ro(cedilla), ro(std_cedilla),
+	https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
 2007-11-17  Sergey Udaltsov
 
 	* symbols/ua, rules/base.xml.in: added ua(unicode)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 1bf08ae..c22bb8c 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2736,8 +2736,8 @@
       <variantList>
         <variant>
           <configItem>
-            <name>comma</name>
-            <_description>Commabelow</_description>
+            <name>cedilla</name>
+            <_description>Cedilla below</_description>
           </configItem>
         </variant>
         <variant>
@@ -2748,8 +2748,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>academic</name>
-            <_description>Standard (Commabelow)</_description>
+            <name>std_cedilla</name>
+            <_description>Standard (Cedilla below)</_description>
           </configItem>
         </variant>
         <variant>
diff --git a/rules/compat/variantRename.lst b/rules/compat/variantRename.lst
index 2e26caa..884a896 100644
--- a/rules/compat/variantRename.lst
+++ b/rules/compat/variantRename.lst
@@ -25,6 +25,8 @@ 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
 sapmi	basic		no	smi
 sapmi	nodeadkeys	no	smi_nodeadkeys
 sapmi	sefi		fi	smi
diff --git a/symbols/ro b/symbols/ro
index b15a343..c374313 100644
--- a/symbols/ro
+++ b/symbols/ro
@@ -15,6 +15,7 @@
 // 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
 
 
@@ -45,13 +46,13 @@ xkb_symbols "basic" {
     key <AD01> { [ q,                      Q,  acircumflex,   Acircumflex ] };
     key <AD02> { [ w,                      W,  ssharp	 	          ] };
     key <AD03> { [ e,                      E,  EuroSign  	          ] };
-    key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };
+    key <AD05> { [ t,                     T,  0x100021b,       0x100021a ] };
     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 <AC02> { [ s,          	   S,  0x1000219,       0x1000218 ] };
     key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };
     key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };
     key <LSGT> { [ backslash,            bar                              ] };
@@ -63,18 +64,16 @@ xkb_symbols "basic" {
 };
 
 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).
+xkb_symbols "cedilla" {
+    // Variant of the basic layout with cedilla below for historical reference only
+    // Implements the old wrong S and T with cedilla
 
     include "ro(basic)"
 
-    name[Group1]="Romania - Commabelow";
-
-    key <AD05>	{ [ t,                     T,  0x100021b,       0x100021a ] };
-    key <AC02>	{ [ s,          	   S,  0x1000219,       0x1000218 ] };
+    name[Group1]="Romania - Cedilla below";
+    
+    key <AC02> { [ s,                      S,  scedilla,	 Scedilla ] };
+    key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };
 };
 
 partial alphanumeric_keys
@@ -109,8 +108,8 @@ xkb_symbols "std" {
     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 <AC10> { [ 0x1000219,	   0x1000218,  semicolon, 	    colon ] };
+    key <AC11> { [ 0x100021b,	   0x100021a,  apostrophe, 	 quotedbl ] };
     key <LSGT> { [ backslash,            bar                              ] };
     key <AB03> { [ c,                      C,  copyright 	       	  ] };
     key <AB08> { [ comma, 	   semicolon,  less, 	    guillemotleft ] };
@@ -123,18 +122,17 @@ xkb_symbols "std" {
 
 
 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 should become mainstream in a few years.
-    // For now it's the oddest variant (although the perfect one).
+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
 
     include "ro(std)"
 
-    name[Group1]="Romania - Standard (Commabelow)";
+    name[Group1]="Romania - Standard (Cedilla below)";
 
-    key <AC10> { [ 0x1000219,	   0x1000218 ] };
-    key <AC11> { [ 0x100021b,	   0x100021a ] };
+    
+    key <AC10> { [ scedilla, 	    Scedilla,  semicolon, 	    colon ] };
+    key <AC11> { [ tcedilla, 	    Tcedilla,  apostrophe, 	 quotedbl ] };
 };
 
 
-- 
2.7.4