[PATCH v3] Compose: add rouble currency

[Mihail Konev]

v2 was assigning 'Compose Equals p/P' to rouble currency sign "₽".

Currencies also have a "canonical" form 'dead_currency ...';
in particular 'dead_currency P' results in pesetta sign "₧".

Assign the 'dead_currency Minus p/P' to pesetta,
and 'dead_currency Equals p/P' to rouble.

-------------- next part --------------
>From ae1bf2fbd2c3893366198a80aed8743af656ee88 Mon Sep 17 00:00:00 2001
From: Victor Kustov <coyote at bks.tv>
Date: Mon, 17 Oct 2016 19:44:36 +0000
Subject: [PATCH 1/4] Compose: add rouble currency sequence

Signed-off-by: Victor Kustov <coyote at bks.tv>
Reviewed-by: Mihail Konev <k.mvc at ya.ru>
---
 nls/en_US.UTF-8/Compose.pre | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index adc24fb5b5c2..d7dc74140989 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -190,6 +190,10 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
 <Multi_key> <equal> <Cyrillic_ES>	: "€"   EuroSign # EURO SIGN
 <Multi_key> <Cyrillic_IE> <equal>	: "€"   EuroSign # EURO SIGN
 <Multi_key> <equal> <Cyrillic_IE>	: "€"   EuroSign # EURO SIGN
+<Multi_key> <equal> <P>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <equal> <p>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <P> <equal>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <p> <equal>          	: "₽"   U20bd # ROUBLE SIGN
 XCOMM "₭" U20ad KIP SIGN
 XCOMM "₮" U20ae TUGRIK SIGN
 XCOMM "₯" U20af DRACHMA SIGN
-- 
2.9.2

-------------- next part --------------
>From 88e2d4489be56bfb828cf18c56629ef1b9c1f415 Mon Sep 17 00:00:00 2001
From: Mihail Konev <k.mvc at ya.ru>
Date: Mon, 17 Oct 2016 20:17:31 +0000
Subject: [PATCH 2/4] Compose: cyrillic rouble sequence

Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
 nls/en_US.UTF-8/Compose.pre | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index d7dc74140989..a25d40446162 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -194,6 +194,10 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
 <Multi_key> <equal> <p>          	: "₽"   U20bd # ROUBLE SIGN
 <Multi_key> <P> <equal>          	: "₽"   U20bd # ROUBLE SIGN
 <Multi_key> <p> <equal>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_ER>	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_er>	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ER> <equal>	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_er> <equal>	: "₽"   U20bd # ROUBLE SIGN
 XCOMM "₭" U20ad KIP SIGN
 XCOMM "₮" U20ae TUGRIK SIGN
 XCOMM "₯" U20af DRACHMA SIGN
-- 
2.9.2

-------------- next part --------------
>From 4ada138513a537e830e48cefe7d688b3eda02694 Mon Sep 17 00:00:00 2001
From: Mihail Konev <k.mvc at ya.ru>
Date: Fri, 4 Nov 2016 05:48:31 +0500
Subject: [PATCH 3/4] Compose: add dead_currency rouble sequences

Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
 nls/en_US.UTF-8/Compose.pre | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index a25d40446162..9b28d6f4375b 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -5323,6 +5323,14 @@ XCOMM
 <dead_currency> <w> 		      : "₩"   WonSign             # WON SIGN
 <dead_currency> <Y> 		      : "円"   U5186              # YEN
 <dead_currency> <y> 		      : "¥"   yen                 # YEN SIGN
+<dead_currency> <equal> <P>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <equal> <p>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <P> <equal>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <p> <equal>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <equal> <Cyrillic_ER> : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <equal> <Cyrillic_er> : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <Cyrillic_ER> <equal> : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <Cyrillic_er> <equal> : "₽"   U20bd               # ROUBLE SIGN
 <dead_currency> <dead_currency>       : "¤"   currency            # CURRENCY SIGN
 <dead_currency> <nobreakspace> 	      : "¤"   currency            # CURRENCY SIGN
 <dead_currency> <space> 	      : "¤"   currency            # CURRENCY SIGN
-- 
2.9.2

-------------- next part --------------
>From 014d553d9a4c9243c0056af62ded9aedefe7a7ab Mon Sep 17 00:00:00 2001
From: Mihail Konev <k.mvc at ya.ru>
Date: Fri, 4 Nov 2016 05:49:24 +0500
Subject: [PATCH 4/4] Compose: pesetta sign consistency with rouble

Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
 nls/en_US.UTF-8/Compose.pre | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 9b28d6f4375b..c7f3f221aef9 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -5323,6 +5323,10 @@ XCOMM
 <dead_currency> <w> 		      : "₩"   WonSign             # WON SIGN
 <dead_currency> <Y> 		      : "円"   U5186              # YEN
 <dead_currency> <y> 		      : "¥"   yen                 # YEN SIGN
+<dead_currency> <minus> <P>	      : "₧"   PesetaSign          # PESETA SIGN
+<dead_currency> <minus> <p>	      : "₧"   PesetaSign          # PESETA SIGN
+<dead_currency> <P> <minus>	      : "₧"   PesetaSign          # PESETA SIGN
+<dead_currency> <p> <minus>	      : "₧"   PesetaSign          # PESETA SIGN
 <dead_currency> <equal> <P>	      : "₽"   U20bd               # ROUBLE SIGN
 <dead_currency> <equal> <p>	      : "₽"   U20bd               # ROUBLE SIGN
 <dead_currency> <P> <equal>	      : "₽"   U20bd               # ROUBLE SIGN
-- 
2.9.2