xkeyboard-config/symbols Makefile.am, 1.55, 1.56 br, 1.10, 1.11 ch, 1.11, 1.12 cs, 1.6, 1.7 de, 1.16, 1.17 dk, 1.9, 1.10 ee, 1.9, 1.10 fi, 1.13, 1.14 gr, 1.9, 1.10 hu, 1.8, 1.9 it, 1.10, 1.11 keypad, 1.4, 1.5 mk, 1.12, 1.13 no, 1.12, 1.13 pl, 1.10, 1.11 ro, 1.12, 1.13 ru, 1.14, 1.15 se, 1.16, 1.17
"Sergey V. Oudaltsov" <xlibs-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xlibs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: svu
Update of /cvs/xkeyboard-config/xkeyboard-config/symbols
In directory kemper:/tmp/cvs-serv13161/symbols
Modified Files:
Makefile.am br ch cs de dk ee fi gr hu it keypad mk no pl ro
ru se
Log Message:
introducing symbols/kpdl and stuff, b.fd.o#11611
Index: Makefile.am
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Makefile.am 25 Jun 2007 21:39:09 -0000 1.55
+++ Makefile.am 15 Jul 2007 22:12:12 -0000 1.56
@@ -27,7 +27,7 @@
tj tr ua \
us uz vn \
za \
-altwin capslock compose ctrl group inet keypad level3 level5 nbsp srvr_ctrl \
+altwin capslock compose ctrl group inet keypad kpdl level3 level5 nbsp srvr_ctrl \
eurosign
include $(top_srcdir)/xkbrules.am
Index: br
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/br,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- br 20 Nov 2006 19:18:02 -0000 1.10
+++ br 15 Jul 2007 22:12:12 -0000 1.11
@@ -46,7 +46,7 @@
key <KPPT> { [ KP_Decimal ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
Index: ch
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ch 3 Oct 2006 22:47:43 -0000 1.11
+++ ch 15 Jul 2007 22:12:12 -0000 1.12
@@ -184,7 +184,7 @@
key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] };
key <BKSL> { [ dollar, sterling, paragraph, enfilledcircbullet ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
Index: cs
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cs 18 Sep 2006 14:22:30 -0000 1.6
+++ cs 15 Jul 2007 22:12:12 -0000 1.7
@@ -75,7 +75,7 @@
key <AB09> { [ period, colon, any,any ] }; //
key <AB10> { [ minus, underscore, any,any ] }; //
- include "keypad(comma)"
+ include "kpdl(comma)"
};
partial hidden alphanumeric_keys
Index: de
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/de,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- de 9 Jul 2007 22:15:04 -0000 1.16
+++ de 15 Jul 2007 22:12:12 -0000 1.17
@@ -29,7 +29,7 @@
key <BKSL> { [numbersign, apostrophe, dead_grave, dead_breve ] };
key <AB01> { [ y, Y, guillemotleft, less ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
Index: dk
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/dk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dk 3 Oct 2006 22:47:43 -0000 1.9
+++ dk 15 Jul 2007 22:12:12 -0000 1.10
@@ -23,7 +23,7 @@
key <LSGT> { [ less, greater, backslash, notsign ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
@@ -55,7 +55,7 @@
key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
key <AB10> { [ minus, underscore, hyphen, macron ] };
- include "keypad(dot)"
+ include "kpdl(dot)"
};
Index: ee
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ee,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ee 16 Mar 2006 22:58:05 -0000 1.9
+++ ee 15 Jul 2007 22:12:12 -0000 1.10
@@ -75,5 +75,5 @@
key <AB10> { [ z, Z, zcaron, Zcaron ] };
include "level3(ralt_switch)"
- include "keypad(comma)"
+ include "kpdl(comma)"
};
Index: fi
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/fi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fi 11 Jan 2007 22:57:32 -0000 1.13
+++ fi 15 Jul 2007 22:12:12 -0000 1.14
@@ -56,7 +56,7 @@
key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
// End alphanumeric section, begin "Keypad"
- include "keypad(comma)"
+ include "kpdl(comma)"
// End "Keypad" section
include "level3(ralt_switch)"
@@ -179,7 +179,7 @@
key <AB09> { [ period, colon, dead_belowdot, dead_abovedot ] };
key <AB10> { [ minus, underscore, endash, dead_abovedot ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
Index: gr
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/gr,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gr 2 May 2007 21:48:13 -0000 1.9
+++ gr 15 Jul 2007 22:12:12 -0000 1.10
@@ -41,7 +41,7 @@
key <AB10> { [ slash, question ] };
key <BKSL> { [ backslash, bar ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
};
hidden partial alphanumeric_keys alternate_group
Index: hu
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/hu,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hu 21 Dec 2005 00:40:06 -0000 1.8
+++ hu 15 Jul 2007 22:12:12 -0000 1.9
@@ -60,7 +60,7 @@
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_dead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -76,7 +76,7 @@
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_nodead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -124,7 +124,7 @@
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_dead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -140,7 +140,7 @@
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_nodead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -188,7 +188,7 @@
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_dead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -204,7 +204,7 @@
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_nodead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -252,7 +252,7 @@
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_dead)"
include "hu(def_common)"
include "level3(ralt_switch)"
@@ -268,7 +268,7 @@
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
- include "keypad(comma)"
+ include "kpdl(comma)"
include "hu(def_nodead)"
include "hu(def_common)"
include "level3(ralt_switch)"
Index: it
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/it,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- it 15 Oct 2006 21:17:04 -0000 1.10
+++ it 15 Jul 2007 22:12:12 -0000 1.11
@@ -126,7 +126,7 @@
// End alphanumeric section
- include "keypad(dot)"
+ include "kpdl(dot)"
include "level3(ralt_switch)"
};
Index: keypad
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/keypad,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- keypad 24 Sep 2006 20:07:00 -0000 1.4
+++ keypad 15 Jul 2007 22:12:12 -0000 1.5
@@ -126,54 +126,56 @@
key <KPDL> { [ KP_Delete, KP_Decimal ] };
};
-// Some national standards use comma on the keypad instead of decimal dot
-partial keypad_keys
-xkb_symbols "comma" {
- key <KPDL> { [ KP_Delete, KP_Separator ] };
-};
-
-// Default is decimal dot
-partial keypad_keys
-xkb_symbols "dot" {
- key <KPDL> { [ KP_Delete, KP_Decimal ] };
-};
-
// Legacy PC keypad definition
-// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
keypad_keys
xkb_symbols "legacy" {
include "keypad(core)"
include "keypad(legacymath)"
include "keypad(legacynumber)"
+ include "kpdl(dot)"
};
// Complete new keypad definition
-// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
keypad_keys
xkb_symbols "oss" {
include "keypad(core)"
include "keypad(ossmath)"
include "keypad(ossnumber)"
+ include "kpdl(dotoss)"
};
// Latin9 restriction of new keypad definition
-// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
keypad_keys
xkb_symbols "oss_latin9" {
include "keypad(core)"
include "keypad(ossmath_latin9)"
include "keypad(legacynumber)"
+ include "kpdl(dotoss_latin9)"
+};
- key <KPDL> { type="FOUR_LEVEL_MIXED_KEYPAD",
- [ KP_Delete, period, comma, nobreakspace ] }; // <delete> . , ⍽ (no-break space)
+
+// Forward-looking keypad definition
+// Won't work with applications that make ASCII assumptions
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "future" {
+
+ include "keypad(core)"
+ include "keypad(futuremath)"
+ include "keypad(ossnumber)"
+ include "kpdl(commaoss)"
};
+
// Keypad keys nobody changes
// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
partial keypad_keys
@@ -241,6 +243,33 @@
};
+// Keypad math area with non-CS operators in first levels
+// As demanded by users not interested in legacy pre-unicode junk
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ┏━━━━━┱─────┬─────┬─────┐
+// ┃Num ┃ / ₁ │ * ₂ │ - ₃ │ ₁ <XF86_Ungrab>
+// ┃Lock⇭┃ ∕ ÷ │ . × │ − − │ ₂ <XF86_ClearGrab>
+// ┡━━━━━╃─────┼─────┼─────┤ ₃ <XF86_Prev_VMode>
+// │ + ₄ │ ₄ <XF86_Next_VMode>
+// │ │
+// ┤ │ 1 None
+// │ │ 2 Level3 ⇮
+// │ + + │ 3 Shift+Level3 ⇧⇮
+// ╆━━━━━┪ 4 Ctrl+Alt
+partial keypad_keys
+xkb_symbols "futuremath" {
+
+ key.type[Group1]="FOUR_LEVEL_X" ;
+
+ key <KPDV> { [ 0x1002215, KP_Divide, 0x10000F7, XF86_Ungrab ] }; // ∕ / ÷ <XF86_Ungrab>
+ key <KPMU> { [ 0x10022C5, KP_Multiply, 0x10000D7, XF86_ClearGrab ] }; // ⋅ * × <XF86_ClearGrab>
+ key <KPSU> { [ 0x1002212, KP_Subtract, 0x1002212, XF86_Prev_VMode ] }; // − - − <XF86_Prev_VMode>
+
+ key <KPAD> { [ 0x100002B, KP_Add, 0x100002B, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
+};
+
+
// Keypad math area with non-CS operators, restricted to latin9
// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
//
@@ -279,13 +308,13 @@
// ├─────┼─────┼─────┤ ␥ Delete
// │ 4 │ 5 │ 6 │ ⇦⇧⇨⇩ Directions
// │ ⇦ │ │ ⇨ │
-// ├─────┼─────┼─────╆━━━━━┪
-// │ 1 │ 2 │ 3 ┃Enter┃
-// │ ⇲ │ ⇩ │ ⇟ ┃ ⎆ ┃ 1 None
-// ├─────┴─────┼─────┨ ┃ 2 Num Lock ⇭
-// │ 0 │ . ┃ ┃
-// │ ⎀ │ ␥ ┃ ┃
-// └───────────┴─────┺━━━━━┛
+// ├─────┼─────┼─────╆
+// │ 1 │ 2 │ 3 ┃
+// │ ⇲ │ ⇩ │ ⇟ ┃ 1 None
+// ├─────┴─────┼─────┨ 2 Num Lock ⇭
+// │ 0 │
+// │ ⎀ │
+// └───────────┴
partial keypad_keys
xkb_symbols "legacynumber" {
@@ -304,7 +333,6 @@
key <KP3> { [ KP_Next, KP_3 ] }; // <next> 3
key <KP0> { [ KP_Insert, KP_0 ] }; // <insert> 0
- key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> .
};
@@ -320,13 +348,13 @@
// ├─────┼─────┼─────┤ ␥ Delete
// │ 4 ⇐ │ 5 ⇔ │ 6 ⇗ │ ⇦⇧⇨⇩ Directions
// │ ⇦ ← │ ↔ │ ⇨ ↗ │ ⍽ narrow no-break space
-// ├─────┼─────┼─────╆━━━━━┪
-// │ 1 ⇙ │ 2 ⇓ │ 3 ⇘ ┃Enter┃
-// │ ⇲ ↙ │ ⇩ ↓ │ ⇟ ↘ ┃ ⎆ ┃ 1 None
-// ├─────┴─────┼─────┨ ┃ 2 Num Lock ⇭
-// │ 0 ⇕ │ . ⍽ ┃ ┃ 3 Level3 ⇮
-// │ ⎀ ↕ │ ␥ , ┃ ┃ 4 Shift+Level3 ⇧⇮
-// └───────────┴─────┺━━━━━┛
+// ├─────┼─────┼─────╆
+// │ 1 ⇙ │ 2 ⇓ │ 3 ⇘ ┃
+// │ ⇲ ↙ │ ⇩ ↓ │ ⇟ ↘ ┃ 1 None
+// ├─────┴─────┼─────┨ 2 Num Lock ⇭
+// │ 0 ⇕ │ 3 Level3 ⇮
+// │ ⎀ ↕ │ 4 Shift+Level3 ⇧⇮
+// └───────────┴
partial keypad_keys
xkb_symbols "ossnumber" {
@@ -345,7 +373,4 @@
key <KP3> { [ KP_Next, KP_3, 0x1002198, 0x10021D8 ] }; // <next> 3 ↘ ⇘
key <KP0> { [ KP_Insert, KP_0, 0x1002195, 0x10021D5 ] }; // <insert> 0 ↕ ⇕
- // We could use KP_Decimal and KP_Separator but we do not want the locale
- // decimal and separator symbol but locale-insensitive dot and comma
- key <KPDL> { [ KP_Delete, period, comma, 0x100202F ] }; // <delete> . , ⍽ (narrow no-break space)
};
Index: mk
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/mk,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mk 20 Sep 2005 21:10:47 -0000 1.12
+++ mk 15 Jul 2007 22:12:12 -0000 1.13
@@ -56,7 +56,7 @@
key <AB09> { [ period, colon ] };
key <AB10> { [ slash, question ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
};
partial alphanumeric_keys
Index: no
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/no,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- no 3 Oct 2006 22:47:43 -0000 1.12
+++ no 15 Jul 2007 22:12:12 -0000 1.13
@@ -26,7 +26,7 @@
key <BKSL> { [apostrophe, asterisk, dead_doubleacute, multiply ] };
key <LSGT> { [ less, greater, onehalf, threequarters] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
Index: pl
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pl 30 Jul 2006 19:28:56 -0000 1.10
+++ pl 15 Jul 2007 22:12:12 -0000 1.11
@@ -22,7 +22,7 @@
key <AB03> { [ c, C, cacute, Cacute ] };
key <AB06> { [ n, N, nacute, Nacute ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
@@ -66,7 +66,7 @@
key <AB03> { [ c, C, cent, copyright ] };
key <AB10> { [ minus, underscore, dead_belowdot, dead_abovedot ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
@@ -97,7 +97,7 @@
key <AB09> { [ v, V, zacute, Zacute ] };
key <AB10> { [ z, Z, zabovedot, Zabovedot ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
// this to allow writing ALL CAPS with a Shift key
include "level3(ralt_switch)"
@@ -151,7 +151,7 @@
key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
key <AB06> { [ n, N, nacute, Nacute ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
Index: ro
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ro,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ro 2 Jul 2006 21:05:20 -0000 1.12
+++ ro 15 Jul 2007 22:12:12 -0000 1.13
@@ -186,7 +186,7 @@
key <BKSL> { [ acircumflex, Acircumflex ] };
// End alphanumeric section, begin "Keypad"
- include "keypad(comma)"
+ include "kpdl(comma)"
// End "Keypad" section
include "level3(ralt_switch)"
Index: ru
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ru,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ru 15 Jun 2007 20:39:29 -0000 1.14
+++ ru 15 Jul 2007 22:12:12 -0000 1.15
@@ -65,7 +65,7 @@
key.type[group1]="TWO_LEVEL";
- include "keypad(comma)"
+ include "kpdl(comma)"
};
partial alphanumeric_keys
Index: se
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/se,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- se 31 May 2007 22:20:45 -0000 1.16
+++ se 15 Jul 2007 22:12:12 -0000 1.17
@@ -28,7 +28,7 @@
key <SPCE> { [ space, space, space, nobreakspace ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
@@ -203,7 +203,7 @@
key <AD12> { [ diaeresis, asciicircum, asciitilde ] };
key <BKSL> { [ apostrophe, asterisk, at ] };
- include "keypad(comma)"
+ include "kpdl(comma)"
include "level3(ralt_switch)"
};
_______________________________________________
xlibs-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xlibs-commit