head	1.2;
access;
symbols
	netbsd-5-2-3-RELEASE:1.1.1.1.2.1
	netbsd-5-1-5-RELEASE:1.1.1.1.2.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base:1.2
	netbsd-5-2-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-4-RELEASE:1.1.1.1.2.1
	netbsd-5-2-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-3-RELEASE:1.1.1.1.2.1
	netbsd-5-2:1.1.1.1.2.1.0.4
	netbsd-5-2-RELEASE:1.1.1.1.2.1
	netbsd-5-2-RC1:1.1.1.1.2.1
	netbsd-5-1-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1:1.1.1.1.2.1.0.2
	netbsd-5-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-RC4:1.1.1.1.2.1
	netbsd-5-1-RC3:1.1.1.1.2.1
	netbsd-5-1-RC2:1.1.1.1.2.1
	netbsd-5-1-RC1:1.1.1.1.2.1
	netbsd-5-0-2-RELEASE:1.1.1.1
	netbsd-5-0-1-RELEASE:1.1.1.1
	xkeyboard-config-1-4:1.1.1.2
	netbsd-5-0:1.1.1.1.0.4
	netbsd-5-0-RELEASE:1.1.1.1
	netbsd-5-0-RC4:1.1.1.1
	netbsd-5-0-RC3:1.1.1.1
	netbsd-5-0-RC2:1.1.1.1
	netbsd-5-0-RC1:1.1.1.1
	netbsd-5:1.1.1.1.0.2
	netbsd-5-base:1.1.1.1
	xkeyboard-config-1-3:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2010.05.28.10.01.08;	author ghen;	state dead;
branches;
next	1.1;

1.1
date	2008.08.30.09.12.20;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2008.08.30.09.12.20;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2009.06.10.09.33.36;	author mrg;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2009.09.17.03.34.42;	author snj;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Resolve conflicts.
@
text
@// $XKeyboardConfig: xkeyboard-config/symbols/braille,v 1.2 2007/06/26 08:11:06 svu Exp $

// 10-dot patterns on the home row + v and n
partial default alphanumeric_keys
xkb_symbols "home_row" {
    include "braille(keypad)"

    name[Group1]="Braille";

    key <AC04>	{ [ braille_dot_1 ] };
    key <AC03>	{ [ braille_dot_2 ] };
    key <AC02>	{ [ braille_dot_3 ] };
    key <AC07>	{ [ braille_dot_4 ] };
    key <AC08>	{ [ braille_dot_5 ] };
    key <AC09>	{ [ braille_dot_6 ] };
    key <AC01>	{ [ braille_dot_7 ] };
    key <AC10>	{ [ braille_dot_8 ] };
    key <AB04>	{ [ braille_dot_9 ] };
    key <AB06>	{ [ braille_dot_10 ] };
};

// 6-dot patterns for the left hand
partial alphanumeric_keys
xkb_symbols "left_hand" {
    include "braille(keypad)"

    name[Group1]="Braille - Left hand";

    key <AC03>	{ [ braille_dot_1 ] };
    key <AC02>	{ [ braille_dot_2 ] };
    key <AC01>	{ [ braille_dot_3 ] };
    key <AC04>	{ [ braille_dot_4 ] };
    key <AB05>	{ [ braille_dot_5 ] };
    key <AB04>	{ [ braille_dot_6 ] };
};

// 6-dot patterns for the right hand
partial alphanumeric_keys
xkb_symbols "right_hand" {
    include "braille(keypad)"

    name[Group1]="Braille - Right hand";

    key <AC07>	{ [ braille_dot_1 ] };
    key <AB05>	{ [ braille_dot_2 ] };
    key <AB06>	{ [ braille_dot_3 ] };
    key <AC08>	{ [ braille_dot_4 ] };
    key <AC09>	{ [ braille_dot_5 ] };
    key <AC10>	{ [ braille_dot_6 ] };
};

// 6-dot patterns on the keypad
partial hidden keypad_keys
xkb_symbols "keypad" {
    key <KP4>	{ [ braille_dot_1 ] };
    key <KP1>	{ [ braille_dot_2 ] };
    key <KP0>	{ [ braille_dot_3 ] };
    key <KP5>	{ [ braille_dot_4 ] };
    key <KP6>	{ [ braille_dot_5 ] };
    key <KPAD>	{ [ braille_dot_6 ] };
};

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of xkeyboard-config-1.3
@
text
@@


1.1.1.1.2.1
log
@Apply patch (requested by mrg in ticket #958):
Bring over X.Org updates from HEAD.
@
text
@d1 1
a1 1
// $XKeyboardConfig$
@


1.1.1.2
log
@initial import of xkeyboard-config-1.4
@
text
@d1 1
a1 1
// $XKeyboardConfig$
@