From d1e6e1e68c49329a24b2fd4380d58f05151c9d58 Mon Sep 17 00:00:00 2001 From: svu Date: Sat, 26 Jun 2004 00:50:11 +0000 Subject: [PATCH] hopefully fixed Latvian layout --- BUGS | 9 ++++ rules/base.xml.in | 27 +++++++++- symbols/lv | 134 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 147 insertions(+), 23 deletions(-) diff --git a/BUGS b/BUGS index 4045137..1b152ca 100644 --- a/BUGS +++ b/BUGS @@ -1,3 +1,5 @@ +-- Freedesktop.ORG + http://freedesktop.org/bugzilla/show_bug.cgi?id=320 http://bugs.xfree86.org/show_bug.cgi?id=1155 @@ -56,3 +58,10 @@ http://freedesktop.org/bugzilla/show_bug.cgi?id=743 http://freedesktop.org/bugzilla/show_bug.cgi?id=744 DONE: Model a4techKB21 added + +-- GNOME + +http://bugzilla.gnome.org/show_bug.cgi?id=144646 +http://bugs.xfree86.org/show_bug.cgi?id=1415 + + DONE: Fixed, thanks to Dmitry diff --git a/rules/base.xml.in b/rules/base.xml.in index 491a976..de1e75b 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -1450,7 +1450,32 @@ <_shortDescription>Lva <_description>Latvian - + + + + basic + <_description>Latvian Basic (RALT) variant + + + + + apostrophe + <_description>Latvian Apostrophe (') variant + + + + + tilde + <_description>Latvian Tilde (~) variant + + + + + fkey + <_description>Latvian F-letter (F) variant + + + diff --git a/symbols/lv b/symbols/lv index af3874e..311fc71 100644 --- a/symbols/lv +++ b/symbols/lv @@ -1,34 +1,124 @@ - -// based on -// Latvian keyboard map by Ilya Ketris +// Latvian keymap version 1.1 +// Copyright (C) Dmitry Golubev , 2003-2004 +// +// Reworked to get rid of dead_keys (use of which in this case +// is a dirty hack). It is now not dependent on locale settings +// and GTK_IM_MODULES in Gnome. The map is also providing some of +// ISO9995-3 alternate characters. Note that this version works +// correctly under Gnome 2.6. This is to be put into symbols/pc/ +// directory if you want to put it directly into symbols/ +// directory, or somewhere else, please correct the references +// below. // -// $XFree86: xc/programs/xkbcomp/symbols/lv,v 1.2 2002/11/22 04:03:28 dawes Exp $ +// Permission to use, copy, modify, distribute, and sell this software and its +// documentation for any purpose is hereby granted without fee, provided that +// the above copyright notice appear in all copies and that both that +// copyright notice and this permission notice appear in supporting +// documentation, and that the name of the copyright holder(s) not be used in +// advertising or publicity pertaining to distribution of the software without +// specific, written prior permission. The copyright holder(s) makes no +// representations about the suitability of this software for any purpose. It +// is provided "as is" without express or implied warranty. +// +// THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +// INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +// EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +// CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +// PERFORMANCE OF THIS SOFTWARE. partial default alphanumeric_keys modifier_keys xkb_symbols "basic" { - include "latin" + name[Group1]= "Latvian"; + + key {[grave, asciitilde, acute, asciitilde]}; + key {[1, exclam, onesuperior, exclamdown]}; + key {[2, at, twosuperior, oneeighth]}; + key {[3, numbersign, threesuperior, sterling]}; + key {[4, dollar, EuroSign, cent]}; + key {[5, percent, onehalf, threeeighths]}; + key {[6, asciicircum, threequarters, fiveeighths]}; + key {[7, ampersand, braceleft, seveneighths]}; + key {[8, asterisk, bracketleft, trademark]}; + key {[9, parenleft, bracketright, plusminus]}; + key {[0, parenright, braceright, degree]}; + key {[minus, underscore, backslash, questiondown]}; + key {[equal, plus, endash, emdash]}; + + key {[q, Q, q, Q]}; + key {[w, W, w, W]}; + key {[e, E, emacron, Emacron]}; + key {[r, R, rcedilla, Rcedilla]}; + key {[t, T, t, T]}; + key {[y, Y, y, Y]}; + key {[u, U, umacron, Umacron]}; + key {[i, I, imacron, Imacron]}; + key {[o, O, omacron, Omacron]}; + key {[p, P, p, P]}; + key {[bracketleft, braceleft, guillemotleft, leftdoublequotemark]}; + key {[bracketright, braceright, guillemotright, rightdoublequotemark]}; + + key {[a, A, amacron, Amacron]}; + key {[s, S, scaron, Scaron]}; + key {[d, D, d, D]}; + key {[f, F, f, F]}; + key {[g, G, gcedilla, Gcedilla]}; + key {[h, H, h, H]}; + key {[j, J, j, J]}; + key {[k, K, kcedilla, Kcedilla]}; + key {[l, L, lcedilla, Lcedilla]}; + key {[semicolon, colon, semicolon, colon]}; + key {[apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark]}; + + key {[z, Z, zcaron, Zcaron]}; + key {[x, X, x, X]}; + key {[c, C, ccaron, Ccaron]}; + key {[v, V, v, V]}; + key {[b, B, b, B]}; + key {[n, N, ncedilla, Ncedilla]}; + key {[m, M, m, M]}; + key {[comma, less, horizconnector, multiply]}; + key {[period, greater, periodcentered, division]}; + key {[slash, question, slash, abovedot]}; + key {[backslash, bar, grave, breve]}; + + key {[space, space, space, space]}; + key {type[Group1]="ONE_LEVEL", [ISO_Level3_Shift]}; + modifier_map Mod5 { }; + +}; + +partial alphanumeric_keys modifier_keys +xkb_symbols "apostrophe" { + + include "pc/lv(basic)" + + key {[ISO_Level3_Latch, quotedbl, apostrophe, quotedbl]}; + key {[space, space, apostrophe]}; + modifier_map Mod5 { }; + +}; + +partial alphanumeric_keys modifier_keys +xkb_symbols "tilde" { - name[Group1]="Latvian"; + include "pc/lv(basic)" - key { [ 4, dollar, EuroSign, cent ] }; + key {[ISO_Level3_Latch, asciitilde, grave, acute]}; + key {[space, space, asciitilde]}; + modifier_map Mod5 { }; + +}; - key { [ e, E, emacron, Emacron ] }; - key { [ r, R, rcedilla, Rcedilla ] }; - key { [ u, U, umacron, Umacron ] }; - key { [ i, I, imacron, Imacron ] }; - key { [ o, O, omacron, Omacron ] }; +partial alphanumeric_keys modifier_keys +xkb_symbols "fkey" { - key { [ a, A, amacron, Amacron ] }; - key { [ s, S, scaron, Scaron ] }; - key { [ g, G, gcedilla, Gcedilla ] }; - key { [ k, K, kcedilla, Kcedilla ] }; - key { [ l, L, lcedilla, Lcedilla ] }; - key { [apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark ] }; + include "pc/lv(basic)" - key { [ z, Z, zcaron, Zcaron ] }; - key { [ c, C, ccaron, Ccaron ] }; - key { [ n, N, ncedilla, Ncedilla ] }; + key {[ISO_Level3_Latch, ISO_Level3_Latch, f, F]}; + key {[space, space, f, F]}; + modifier_map Mod5 { }; - include "level3(ralt_switch_multikey)" }; -- 2.32.0.93.g670b81a890