[PATCH v6 libX11] Compose sequences for rouble sign

[Mihail Konev]

Cyrillic combinations mirror the Qwerty-Jcuken keyboard layout.
Also add Cyrillic sequences for hryvnia sign.

Submitted-by: Victor V. Kustov <coyote at bks.tv>
Reviewed-by: Victor V. Kustov <coyote at bks.tv>
Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
v6:
 Follow Victor's suggestions:

 Change "=" to "-".
 Do not touch peseta (this was font-induced).
 Use the common-layout Cyrillic equvivalent instead of phonetical one.

 Add hryvnia sign.
 As it corresponds to handwritten, but not typeset "Cyr_ge",
 there is nothing to map it to in Qwerty.
 Use "2" as the visually nearest symbol.
 For dead_currency dead key, use "Cyr_ge", as hryvnia is already present
 on "h".

 nls/en_US.UTF-8/Compose.pre | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index adc24fb5b5c2..ce874141f926 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -190,6 +190,14 @@ 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> <P> <minus>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <p> <minus>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <minus> <P>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <minus> <p>          	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ZE> <minus>	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ze> <minus>	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <minus> <Cyrillic_ZE>	: "₽"   U20bd # ROUBLE SIGN
+<Multi_key> <minus> <Cyrillic_ze>	: "₽"   U20bd # ROUBLE SIGN
 XCOMM "₭" U20ad KIP SIGN
 XCOMM "₮" U20ae TUGRIK SIGN
 XCOMM "₯" U20af DRACHMA SIGN
@@ -203,6 +211,8 @@ XCOMM "₵" U20b5 CEDI SIGN
 <Multi_key> <equal> <R>          	: "₹" U20b9 # INDIAN RUPEE SIGN
 <Multi_key> <r> <equal>          	: "₹" U20b9 # INDIAN RUPEE SIGN
 <Multi_key> <equal> <r>          	: "₹" U20b9 # INDIAN RUPEE SIGN
+<Multi_key> <2> <equal>          	: "₴" U20b4 # HRYVNIA SIGN
+<Multi_key> <equal> <2>          	: "₴" U20b4 # HRYVNIA SIGN
 
 <Multi_key> <C> <bar>            	: "¢"   cent # CENT SIGN
 <Multi_key> <bar> <C>			: "¢"   cent # CENT SIGN
@@ -5315,6 +5325,16 @@ XCOMM
 <dead_currency> <w> 		      : "₩"   WonSign             # WON SIGN
 <dead_currency> <Y> 		      : "円"   U5186              # YEN
 <dead_currency> <y> 		      : "¥"   yen                 # YEN SIGN
+<dead_currency> <Cyrillic_ge>	      : "₴"   U20b4               # HRYVNIA SIGN
+<dead_currency> <Cyrillic_GE>	      : "₴"   U20b4               # HRYVNIA SIGN
+<dead_currency> <minus> <P>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <minus> <p>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <P> <minus>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <p> <minus>	      : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <minus> <Cyrillic_ZE> : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <minus> <Cyrillic_ze> : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <Cyrillic_ZE> <minus> : "₽"   U20bd               # ROUBLE SIGN
+<dead_currency> <Cyrillic_ze> <minus> : "₽"   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