From c7eacc7de905edd605fef55953fc19ad4e3b0caa Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Tue, 25 Dec 2007 23:26:12 +0000
Subject: [PATCH] adding eurosign(4)

---
 ChangeLog           |  6 ++++++
 rules/base.o_s.part |  3 ++-
 rules/base.xml.in   | 14 ++++++++++----
 symbols/eurosign    | 17 ++++++++++++-----
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 974bf63..23ebd08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+2007-12-25  Sergey Udaltsov
+
+	* symbols/eurosign, rules/base.xml.in, rules/base.o_s.part: add
+	eurosign(4)
+
 2007-12-23  Sergey Udaltsov
 
 	* symbols/inet, rules/base.xml.in: add logiultrax model,
 	https://bugs.freedesktop.org/show_bug.cgi?id=13028
 	* symbols/me, rules/base.xml.in: use Latin as default Montenegro
 	variant, https://bugs.freedesktop.org/show_bug.cgi?id=13777
+	* symbols/inet, keycodes/evdev: Kill off the I211 key in evdev
 
 2007-12-17  Sergey Udaltsov
 
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 79adedc..49de74a 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -57,8 +57,9 @@
   compose:caps      =   +compose(caps)
   srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
   eurosign:e		=	+eurosign(e)
-  eurosign:5		=	+eurosign(5)
   eurosign:2		=	+eurosign(2)
+  eurosign:4		=	+eurosign(4)
+  eurosign:5		=	+eurosign(5)
   keypad:oss            =       +keypad(oss)
   keypad:legacy         =	+keypad(legacy)
   keypad:legacy_wang         =	+keypad(legacy_wang)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index ecc9ce1..dcac48b 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4105,14 +4105,20 @@
       </option>
       <option>
         <configItem>
-          <name>eurosign:5</name>
-          <_description>Add the EuroSign to the 5 key.</_description>
+          <name>eurosign:2</name>
+          <_description>Add the EuroSign to the 2 key.</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>eurosign:2</name>
-          <_description>Add the EuroSign to the 2 key.</_description>
+          <name>eurosign:4</name>
+          <_description>Add the EuroSign to the 4 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:5</name>
+          <_description>Add the EuroSign to the 5 key.</_description>
         </configItem>
       </option>
     </group>
diff --git a/symbols/eurosign b/symbols/eurosign
index 4a299e8..9458cea 100644
--- a/symbols/eurosign
+++ b/symbols/eurosign
@@ -6,14 +6,21 @@ xkb_symbols "e" {
     key <AD03>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
 };
 
+// Many Apple keyboards have the EuroSign engraved on the 2 key
+partial
+xkb_symbols "2" {
+    key <AE02>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
+};
+
+// Some keyboards have the EuroSign engraved on the 4 key
+partial
+xkb_symbols "4" {
+    key <AE04>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
+};
+
 // Many keyboards have the EuroSign engraved on the 5 key
 partial
 xkb_symbols "5" {
     key <AE05>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
 };
 
-// Many Apple keyboards have the EuroSign engraved on the 2 key
-partial
-xkb_symbols "2" {
-    key <AE02>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
-};
-- 
2.32.0.93.g670b81a890