From 5ae81f0f0ebd5ee6129e5a84db1aa4c7464f168a Mon Sep 17 00:00:00 2001
From: "Anton V. Boyarshinov" <boyarsh@altlinux.org>
Date: Tue, 14 Feb 2012 17:17:20 +0400
Subject: [PATCH] russian layouts for 'touch' and 'fullscrean' added

---
 data/layouts/fullscale/Makefile.am |    1 +
 data/layouts/fullscale/ru.xml.in   |  140 ++++++++++++++++++++++++++++
 data/layouts/touch/Makefile.am     |    3 +-
 data/layouts/touch/ru.xml.in       |  104 +++++++++++++++++++++
 4 files changed, 247 insertions(+), 1 deletions(-)
 create mode 100644 data/layouts/fullscale/ru.xml.in
 create mode 100644 data/layouts/touch/ru.xml.in

diff --git a/data/layouts/fullscale/Makefile.am b/data/layouts/fullscale/Makefile.am
index c560f7b..a524118 100644
--- a/data/layouts/fullscale/Makefile.am
+++ b/data/layouts/fullscale/Makefile.am
@@ -1,5 +1,6 @@
 fullscalelayoutsdir = $(datadir)/caribou/layouts/fullscale
 fullscalelayouts_in_files =\
+    ru.xml.in \
     us.xml.in
 fullscalelayouts_DATA = $(fullscalelayouts_in_files:.xml.in=.xml)
 
diff --git a/data/layouts/fullscale/ru.xml.in b/data/layouts/fullscale/ru.xml.in
new file mode 100644
index 0000000..1264d84
--- /dev/null
+++ b/data/layouts/fullscale/ru.xml.in
@@ -0,0 +1,140 @@
+<?xml version="1.0" ?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude">
+  <level mode="default" name="level1">
+    <row>
+      <key name="Esc"/>
+      <key name="Cyrillic_io"/>
+      <key name="F1"/>
+      <key name="F2"/>
+      <key name="F3"/>
+      <key name="F4"/>
+      <key name="F5"/>
+      <key name="F6"/>
+      <key name="F7"/>
+      <key name="F8"/>
+      <key name="F9"/>
+      <key name="F10"/>
+      <key name="F11"/>
+      <key name="F12"/>
+    </row>
+    <row align="right">
+      <key name="Tab" width="1.5"/>
+      <key name="Cyrillic_shorti"/>
+      <key name="Cyrillic_tse"/>
+      <key name="Cyrillic_u"/>
+      <key name="Cyrillic_ka"/>
+      <key name="Cyrillic_ie"/>
+      <key name="Cyrillic_en"/>
+      <key name="Cyrillic_ghe"/>
+      <key name="Cyrillic_sha"/>
+      <key name="Cyrillic_shcha"/>
+      <key name="Cyrillic_ze"/>
+      <key name="Cyrillic_ha"/>
+      <key name="Cyrillic_hardsign"/>
+      <key name="BackSpace"/>
+    </row>
+    <row align="right">
+      <key name="Cyrillic_ef"/>
+      <key name="Cyrillic_yeru"/>
+      <key name="Cyrillic_ve"/>
+      <key name="Cyrillic_a"/>
+      <key name="Cyrillic_pe"/>
+      <key name="Cyrillic_er"/>
+      <key name="Cyrillic_o"/>
+      <key name="Cyrillic_el"/>
+      <key name="Cyrillic_de"/>
+      <key name="Cyrillic_zhe"/>
+      <key name="Cyrillic_e"/>
+      <key name="Return" width="2.0"/>
+    </row>
+    <row>
+      <key name="Caribou_ShiftUp" width="2.5" toggle="level2"/>
+      <key name="Cyrillic_ya"/>
+      <key name="Cyrillic_che"/>
+      <key name="Cyrillic_es"/>
+      <key name="Cyrillic_em"/>
+      <key name="Cyrillic_i"/>
+      <key name="Cyrillic_te"/>
+      <key name="Cyrillic_softsign"/>
+      <key name="Cyrillic_be"/>
+      <key name="Cyrillic_yu"/>
+    </row>
+    <row>
+      <key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key align="left" name="Control_L" width="1.5"/>
+      <key align="left" name="Alt_L" width="1.5"/>
+      <key align="left" name="space" width="8.0"/>
+      <key align="right" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="latched" name="level2">
+    <row>
+      <key name="Esc"/>
+      <key name="Cyrillic_IO"/>
+      <key name="F1"/>
+      <key name="F2"/>
+      <key name="F3"/>
+      <key name="F4"/>
+      <key name="F5"/>
+      <key name="F6"/>
+      <key name="F7"/>
+      <key name="F8"/>
+      <key name="F9"/>
+      <key name="F10"/>
+      <key name="F11"/>
+      <key name="F12"/>
+    </row>
+    <row align="right">
+      <key name="Tab" width="1.5"/>
+      <key name="Cyrillic_SHORTI"/>
+      <key name="Cyrillic_TSE"/>
+      <key name="Cyrillic_U"/>
+      <key name="Cyrillic_KA"/>
+      <key name="Cyrillic_IE"/>
+      <key name="Cyrillic_EN"/>
+      <key name="Cyrillic_GHE"/>
+      <key name="Cyrillic_SHA"/>
+      <key name="Cyrillic_SHCHA"/>
+      <key name="Cyrillic_ZE"/>
+      <key name="Cyrillic_HA"/>
+      <key name="Cyrillic_HARDSIGN"/>
+      <key name="BackSpace"/>
+    </row>
+    <row align="right">
+      <key name="Cyrillic_EF"/>
+      <key name="Cyrillic_YERU"/>
+      <key name="Cyrillic_VE"/>
+      <key name="Cyrillic_A"/>
+      <key name="Cyrillic_PE"/>
+      <key name="Cyrillic_ER"/>
+      <key name="Cyrillic_O"/>
+      <key name="Cyrillic_EL"/>
+      <key name="Cyrillic_DE"/>
+      <key name="Cyrillic_ZHE"/>
+      <key name="Cyrillic_E"/>
+      <key name="Return" width="2.0"/>
+    </row>
+    <row>
+      <key name="Caribou_ShiftUp" width="2.5" toggle="level2"/>
+      <key name="Cyrillic_YA"/>
+      <key name="Cyrillic_CHE"/>
+      <key name="Cyrillic_ES"/>
+      <key name="Cyrillic_EM"/>
+      <key name="Cyrillic_I"/>
+      <key name="Cyrillic_TE"/>
+      <key name="Cyrillic_SOFTSIGN"/>
+      <key name="Cyrillic_BE"/>
+      <key name="Cyrillic_YU"/>
+    </row>
+    <row>
+      <key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key align="left" name="Control_L" width="1.5"/>
+      <key align="left" name="Alt_L" width="1.5"/>
+      <key align="left" name="space" width="8.0"/>
+      <key align="right" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols1'])"/>
+  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols2'])"/>
+</layout>
+
diff --git a/data/layouts/touch/Makefile.am b/data/layouts/touch/Makefile.am
index a3389d8..2afd0d1 100644
--- a/data/layouts/touch/Makefile.am
+++ b/data/layouts/touch/Makefile.am
@@ -2,6 +2,7 @@ touchlayoutsdir = $(datadir)/caribou/layouts/touch
 touchlayouts_in_files =\
     ara.xml.in \
     il.xml.in \
+    ru.xml.in \
     us.xml.in
 touchlayouts_DATA = $(touchlayouts_in_files:.xml.in=.xml)
 
@@ -17,4 +18,4 @@ common_files = \
 
 EXTRA_DIST = $(touchlayouts_in_files) $(common_files)
 
-CLEANFILES = $(touchlayouts_DATA) $(touchlayouts_in_files:.xml.in=.xsl)
\ No newline at end of file
+CLEANFILES = $(touchlayouts_DATA) $(touchlayouts_in_files:.xml.in=.xsl)
diff --git a/data/layouts/touch/ru.xml.in b/data/layouts/touch/ru.xml.in
new file mode 100644
index 0000000..1be99a2
--- /dev/null
+++ b/data/layouts/touch/ru.xml.in
@@ -0,0 +1,104 @@
+<?xml version="1.0" ?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude">
+  <level mode="default" name="level1">
+    <row align="right">
+      <key name="Cyrillic_io"/>
+      <key name="Cyrillic_shorti"/>
+      <key name="Cyrillic_tse"/>
+      <key name="Cyrillic_u"/>
+      <key name="Cyrillic_ka"/>
+      <key name="Cyrillic_ie"/>
+      <key name="Cyrillic_en"/>
+      <key name="Cyrillic_ghe"/>
+      <key name="Cyrillic_sha"/>
+      <key name="Cyrillic_shcha"/>
+      <key name="Cyrillic_ze"/>
+      <key name="Cyrillic_ha"/>
+      <key name="Cyrillic_hardsign"/>
+      <key name="BackSpace"/>
+    </row>
+    <row align="right">
+      <key name="Cyrillic_ef"/>
+      <key name="Cyrillic_yeru"/>
+      <key name="Cyrillic_ve"/>
+      <key name="Cyrillic_a"/>
+      <key name="Cyrillic_pe"/>
+      <key name="Cyrillic_er"/>
+      <key name="Cyrillic_o"/>
+      <key name="Cyrillic_el"/>
+      <key name="Cyrillic_de"/>
+      <key name="Cyrillic_zhe"/>
+      <key name="Cyrillic_e"/>
+      <key name="Return" width="2.0"/>
+    </row>
+    <row>
+      <key name="Caribou_ShiftUp" width="2.0" toggle="level2"/>
+      <key name="Cyrillic_ya"/>
+      <key name="Cyrillic_che"/>
+      <key name="Cyrillic_es"/>
+      <key name="Cyrillic_em"/>
+      <key name="Cyrillic_i"/>
+      <key name="Cyrillic_te"/>
+      <key name="Cyrillic_softsign"/>
+      <key name="Cyrillic_be"/>
+      <key name="Cyrillic_yu"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" align="left" toggle="symbols1" width="2.0"/>
+      <key name="space" width="8.0" align="center"/>
+      <key name="Caribou_Prefs" align="right"/>
+    </row>
+  </level>
+  <level mode="latched" name="level2">
+    <row align="right">
+      <key name="Cyrillic_IO"/>
+      <key name="Cyrillic_SHORTI"/>
+      <key name="Cyrillic_TSE"/>
+      <key name="Cyrillic_U"/>
+      <key name="Cyrillic_KA"/>
+      <key name="Cyrillic_IE"/>
+      <key name="Cyrillic_EN"/>
+      <key name="Cyrillic_GHE"/>
+      <key name="Cyrillic_SHA"/>
+      <key name="Cyrillic_SHCHA"/>
+      <key name="Cyrillic_ZE"/>
+      <key name="Cyrillic_HA"/>
+      <key name="Cyrillic_HARDSIGN"/>
+      <key name="BackSpace"/>
+    </row>
+    <row align="right">
+      <key name="Cyrillic_EF"/>
+      <key name="Cyrillic_YERU"/>
+      <key name="Cyrillic_VE"/>
+      <key name="Cyrillic_A"/>
+      <key name="Cyrillic_PE"/>
+      <key name="Cyrillic_ER"/>
+      <key name="Cyrillic_O"/>
+      <key name="Cyrillic_EL"/>
+      <key name="Cyrillic_DE"/>
+      <key name="Cyrillic_ZHE"/>
+      <key name="Cyrillic_E"/>
+      <key name="Return" width="2.0"/>
+    </row>
+    <row>
+      <key name="Caribou_ShiftUp" width="2.0" toggle="level2"/>
+      <key name="Cyrillic_YA"/>
+      <key name="Cyrillic_CHE"/>
+      <key name="Cyrillic_ES"/>
+      <key name="Cyrillic_EM"/>
+      <key name="Cyrillic_I"/>
+      <key name="Cyrillic_TE"/>
+      <key name="Cyrillic_SOFTSIGN"/>
+      <key name="Cyrillic_BE"/>
+      <key name="Cyrillic_YU"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" align="left" toggle="symbols1" width="2.0"/>
+      <key name="space" width="8.0" align="center"/>
+      <key name="Caribou_Prefs" align="right"/>
+    </row>
+  </level>
+  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols1'])"/>
+  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols2'])"/>
+</layout>
+
-- 
1.7.5.4