added misc:typo, b.fd.o#14022

diff --git a/ChangeLog b/ChangeLog
index f1752e3..e31202c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-13  Sergey Udaltsov
+
+       * symbols/typo, rules/base.l1o_s.part, rules/base.l2o_s.part,
+       rules/base.l3o_s.part, rules/base.l4o_s.part, rules/base.lo_s.part,
+       rules/base.xml.in, symbols/Makefile.am: added (inactive so far)
+       misc:typo option, first step to close
+       https://bugs.freedesktop.org/show_bug.cgi?id=14022
+
 2009-01-12  Sergey Udaltsov
 
        * rules/Makefile.am, rules/merge.sh: fix the build (thanks to Oswald

diff --git a/rules/base.l1o_s.part b/rules/base.l1o_s.part
index 5544d53..592fab2 100644 (file)
--- a/rules/base.l1o_s.part
+++ b/rules/base.l1o_s.part
@@ -1 +1,2 @@
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+  *                    misc:typo       = +typo(base):1

diff --git a/rules/base.l2o_s.part b/rules/base.l2o_s.part
index 3ffd6a8..aac680e 100644 (file)
--- a/rules/base.l2o_s.part
+++ b/rules/base.l2o_s.part
@@ -1 +1,2 @@
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+  *                    misc:typo       = +typo(base):2

diff --git a/rules/base.l3o_s.part b/rules/base.l3o_s.part
index aa327eb..1010e2e 100644 (file)
--- a/rules/base.l3o_s.part
+++ b/rules/base.l3o_s.part
@@ -1 +1,2 @@
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+  *                    misc:typo       = +typo(base):3

diff --git a/rules/base.l4o_s.part b/rules/base.l4o_s.part
index 7968250..49650ad 100644 (file)
--- a/rules/base.l4o_s.part
+++ b/rules/base.l4o_s.part
@@ -1 +1,2 @@
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+  *                    misc:typo       = +typo(base):4

diff --git a/rules/base.lo_s.part b/rules/base.lo_s.part
index c491f07..dee7b6d 100644 (file)
--- a/rules/base.lo_s.part
+++ b/rules/base.lo_s.part
@@ -1 +1,2 @@
   $threelevellayouts   grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+  *                    misc:typo       = +typo(base)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index b284e37..19ae34a 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4751,6 +4751,12 @@
           <_description>Shift cancels CapsLock</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>misc:typo</name>
+          <_description>Adding typographic layout</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->

diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 371d1aa..e65ff62 100644 (file)
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -30,7 +30,7 @@ tj tr \
 ua us uz vn \
 za \
 altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
 
 dir_data = $(dist_symbols_DATA)
 

diff --git a/symbols/typo b/symbols/typo
new file mode 100644 (file)
index 0000000..46d8440
--- /dev/null
+++ b/symbols/typo
@@ -0,0 +1,57 @@
+// $XKeyboardConfig$
+
+// typographic keyboard
+// Sergei Stolyarov <sergei@regolit.com>
+//
+
+// default layout
+default partial
+xkb_symbols "base" {
+// 1st keyboard row
+    key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
+    key <AE01> { [NoSymbol, NoSymbol, onesuperior, NoSymbol] };
+    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] };
+    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] };
+    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] };
+    key <AE05> { [NoSymbol, NoSymbol, 0x01002030, NoSymbol] };
+    key <AE07> { [NoSymbol, NoSymbol, ampersand] };
+    key <AE08> { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] };
+    key <AE11> { [NoSymbol, NoSymbol, emdash, hyphen] };
+    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] };
+
+// 2nd keyboard row
+    key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
+    key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
+    key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
+    key <AD06> { [NoSymbol, NoSymbol, yen, NoSymbol] }; // "y"
+    key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
+    key <AD11> { [ NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [
+    key <AD12> { [ NoSymbol, NoSymbol, bracketright, braceright ] }; // ]
+
+// 3rd keyboard row
+    key <AC01> { [NoSymbol, NoSymbol, 0x1000301, NoSymbol] }; // "a" // 
+    key <AC02> { [NoSymbol, NoSymbol, section]}; // "s"
+    key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
+    key <AC04> { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f"
+    key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
+    key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
+    key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
+    key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"
+    key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"
+
+// 4th keyboard row
+    key <AB02> { [NoSymbol, NoSymbol, multiply, 0x010022C5] }; // "x"
+    key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
+    key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
+    key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
+    key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"
+
+// the last keyboard row
+    key <SPCE> { [space, space, nobreakspace] };
+
+// arrow keys
+    key <LEFT> { [Left, Left, 0x1002190, 0x10021D0] };
+    key <UP> { [Up, Up, 0x1002191, 0x10021D1] };
+    key <RGHT> { [Right, Right, 0x1002192, 0x10021D2] };
+    key <DOWN> { [Down, Down, 0x1002193, 0x10021D3] };
+};