summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvu <svu>2007-08-10 09:06:27 +0000
committersvu <svu>2007-08-10 09:06:27 +0000
commitcc0f779934d99f2676b4676b0e8adfcf579ef5e2 (patch)
tree4f0b70db6a117eae4ff10df5a342af68d7f342b1
parent59efe1a499f82c810c7e2237f366a59abbef62da (diff)
adding br(thinkpad), b.fd.o#11908
-rw-r--r--ChangeLog7
-rw-r--r--rules/base.m_g.part1
-rw-r--r--rules/base.ml1_s.part1
-rw-r--r--rules/base.ml_g.part1
-rw-r--r--rules/base.ml_s.part1
-rw-r--r--symbols/br14
6 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 77a8bd0..f9846e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-10 Sergey Udaltsov
+
+ * symbols/br, rules/base.m_g.part, rules/base.ml1_s.part,
+ rules/base.ml_g.part, rules/base.ml_s.part: Adding br(thinkpad),
+ polishing rules a bit,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11908
+
2007-08-07 Sergey Udaltsov
* symbols/ara: Patch to Arabic keyboard layout,
diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index d6d6d34..412d902 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -6,6 +6,7 @@
$pcmodels = pc(%m)
$pcgeometries = pc(%m)
everex = everex(STEPnote)
+ thinkpad = thinkpad(intl)
winbook = winbook(XP5)
pc98 = nec(pc98)
$macbooks = macintosh(%m)
diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index ff1c35c..8e0eeef 100644
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -6,4 +6,5 @@
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
$macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
+ thinkpad br = pc+%l[1](thinkpad)
* * = pc+%l[1]%(v[1])
diff --git a/rules/base.ml_g.part b/rules/base.ml_g.part
index fac6311..e66bb0b 100644
--- a/rules/base.ml_g.part
+++ b/rules/base.ml_g.part
@@ -1,2 +1 @@
thinkpad us = thinkpad(us)
- thinkpad * = thinkpad(intl)
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 5127dcc..e318c1e 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -14,5 +14,6 @@
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended)
$macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+ thinkpad br = pc+br(thinkpad)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
diff --git a/symbols/br b/symbols/br
index bc1b572..c61d163 100644
--- a/symbols/br
+++ b/symbols/br
@@ -1,6 +1,6 @@
// based on
-// "a very simple Brasilian ABNT2 keybaord
+// "a very simple Brasilian ABNT2 keyboard
// by Ricardo Y. Igarashi (iga@that.com.br)
// Adds suport for dead-keys in I18N applications
// by Conectiva (http://www.conectiva.com.br)"
@@ -63,3 +63,15 @@ xkb_symbols "nodeadkeys" {
key <AC11> { [asciitilde, asciicircum ] };
key <AB10> { [ semicolon, colon, dead_belowdot, abovedot ] };
};
+
+// ABNT2 Keyboard to IBM/Lenovo Thinkpads
+// by Piter PUNK <piterpk@terra.com.br>
+//
+partial alphanumeric_keys
+xkb_symbols "thinkpad" {
+
+ include "br(abnt2)" // for consistent naming
+ name[Group1]="Brazil";
+
+ key <RCTL> { [ slash, question, degree, questiondown ] };
+};