xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 May 2011

3 files changed, 885 insertions, 888 deletions

diff --git a/xorg-server/doc/dtrace/Xserver-DTrace.xml b/xorg-server/doc/dtrace/Xserver-DTrace.xml
index e0425c8ee..72b8f4fa6 100644
--- a/xorg-server/doc/dtrace/Xserver-DTrace.xml
+++ b/xorg-server/doc/dtrace/Xserver-DTrace.xml
@@ -576,4 +576,3 @@ Xserver$1:::client-disconnect
   </sect1>

 

 </article>

-

diff --git a/xorg-server/hw/xfree86/doc/README.DRIcomp b/xorg-server/hw/xfree86/doc/README.DRIcomp
index 89f40a759..617897949 100644
--- a/xorg-server/hw/xfree86/doc/README.DRIcomp
+++ b/xorg-server/hw/xfree86/doc/README.DRIcomp
@@ -1,556 +1,554 @@
-                            DRI Compilation Guide
-
-          VA Linux Systems, Inc. Professional Services - Graphics.
-
-                                21 April 2001
-
-1.  Preamble
-
-1.1  Copyright
-
-Copyright 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.
-
-Permission is granted to make and distribute verbatim copies of this document
-provided the copyright notice and this permission notice are preserved on all
-copies.
-
-1.2  Trademarks
-
-OpenGL is a registered trademark and SGI is a trademark of Silicon Graphics,
-Inc.  Unix is a registered trademark of The Open Group.  The `X' device and X
-Window System are trademarks of The Open Group.  XFree86 is a trademark of
-The XFree86 Project.  Linux is a registered trademark of Linus Torvalds.
-Intel is a registered trademark of Intel Corporation.  3Dlabs, GLINT, and
-Oxygen are either registered trademarks or trademarks of 3Dlabs Inc. Ltd.
-3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of 3dfx Inter-
-active, Incorporated.  Matrox is a registered trademark of Matrox Electronic
-Systems Ltd.  ATI Rage and Radeon is a registered trademark of ATI Technolo-
-gies, Inc.  All other trademarks mentioned are the property of their respec-
-tive owners.
-
-2.  Introduction
-
-This document describes how to download, compile and install the DRI.  The
-DRI provides 3D graphics hardware acceleration for the XFree86 project.  This
-information is intended for experienced Linux developers.  Beginners are
-probably better off installing precompiled packages.
-
-Edits, corrections and updates to this document may be mailed to <brian@tung-
-stengraphics.com>.
-
-Last updated on 13 February 2002 by Brian Paul.
-
-3.  Prerequisites
-
-You'll need the following:
-
-   o An installation of XFree86 4.1 or later.  The DRI tree has been pruned
-     down to minimize its size.  But in order to build the DRI tree you need
-     to have recent X header files, etc. already installed.  If you don't
-     have XFree86 4.1 (or later) installed you can probably install it from
-     RPMs (or another package format).  Or, you can download XFree86 as
-     sources and compile/install it yourself.
-
-   o At least 200MB of free disk space.  If you compile for debugging (the -g
-     option) then you'll need about 600MB.
-
-   o GCC compiler and related tools.
-
-   o ssh (secure shell) if you're a DRI developer and don't want to use
-     anonymous CVS download.
-
-   o A 2.4.x Linux Kernel.  See below for details.
-
-   o FreeBSD support is not currently being maintained and may not work.
-
-The DRI 3D drivers generally work on systems with Intel or AMD CPUs.  How-
-ever, limited support for Alpha and PowerPC support is underway.
-
-For 3dfx Voodoo hardware, you'll also need the Glide3 runtime library
-(libglide3-v3.so for Voodoo3 or libglide3-v5.so for Voodoo4/5).  These can be
-downloaded from the DRI website.  You can compile them yourself, but it's
-often a painful process.
-
-For Matrox G200/G400, Intel i810/i830 or ATI Rage128/Radeon hardware, you'll
-also need AGP support in your Linux kernel, either built-in or as a loadable
-module.
-
-4.  Linux Kernel Preparation
-
-Only the Linux 2.4.x kernels are currently supported by the DRI hardware
-drivers.  2.5.x kernels may work, but aren't tested.
-
-Most of the DRI drivers require AGP support and using Intel Pentium III SSE
-optimizations also requires an up-to-date Linux kernel.  Configuring your
-kernel correctly is very important, as features such as SSE optimizations
-will be disabled if your kernel does not support them.  Thus, if you have a
-Pentium III processor, you must configure your kernel for the Pentium III
-processor family.
-
-Building a new Linux kernel can be difficult for beginners but there are
-resources on the Internet to help.  This document assumes experience with
-configuring, building and installing Linux kernels.
-
-Linux kernels can be downloaded from www.kernel.org
-
-Here are the basic steps for kernel setup.
-
-   o Download the needed kernel and put it in /usr/src.  Create a directory
-     for the source and unpack it.  For example:
-
-                    cd /usr/src
-                    rm -f linux
-                    mkdir linux-2.4.x
-                    ln -s linux-2.4.x linux
-                    bzcat linux-2.4.x.tar.bz2 | tar xf -
-
-     It is critical that /usr/src/linux point to your new kernel sources,
-     otherwise the kernel headers will not be used when building the DRI.
-     This will almost certainly cause compilation problems.
-
-   o Read /usr/src/linux/Documentation/Changes.  This file lists the minimum
-     requirements for all software packages required to build the kernel.
-     You must upgrade at least gcc, make, binutils and modutils to at least
-     the versions specified in this file.  The other packages may not be
-     needed.  If you are upgrading from Linux 2.2.x you must upgrade your
-     modutils package for Linux 2.4.x.
-
-   o Configure your kernel.  You might, for example, use make menuconfig and
-     do the following:
-
-        o Go to Code maturity level options
-
-        o Enable Prompt for development and/or incomplete code/drivers
-
-        o hit ESC to return to the top-level menu
-
-        o Go to Processor type and features
-
-        o Select your processor type from Processor Family
-
-        o hit ESC to return to the top-level menu
-
-        o Go to Character devices
-
-        o Disable Direct Rendering Manager (XFree86 DRI support) since we'll
-          use the DRI code from the XFree86/DRI tree and will compile it
-          there.
-
-        o Go to /dev/agpgart (AGP Support) (EXPERIMENTAL) (NEW)
-
-        o Hit SPACE twice to build AGP support into the kernel
-
-        o Enable all chipsets' support for AGP
-
-        o It's recommended that you turn on MTRRs under Processor type and
-          Features, but not required.
-
-   o Configure the rest of the kernel as required for your system (i.e. Eth-
-     ernet, SCSI, etc)
-
-   o Exit, saving your kernel configuration.
-
-   o Edit your /etc/lilo.conf file.  Make sure you have an image entry as
-     follows (or similar):
-
-                      image=/boot/vmlinuz
-                            label=linux.2.4.x
-                            read-only
-                            root=/dev/hda1
-
-     The important part is that you have /boot/vmlinuz without a trailing
-     version number.  If this is the first entry in your /etc/lilo.conf AND
-     you haven't set a default, then this will be your default kernel.
-
-   o Compile the new kernel.
-
-                    cd /usr/src/linux-2.4.x
-                    make dep
-                    make bzImage
-                    make modules
-                    make modules_install
-                    make install
-
-     Note that last make command will automatically run lilo for you.
-
-   o Now reboot to use the new kernel.
-
-5.  CPU Architectures
-
-In general, nothing special has to be done to use the DRI on different CPU
-architectures.  There are, however, a few optimizations that are CPU-depen-
-dent.  Mesa will determine at runtime which CPU-dependent optimizations
-should be used and enable them where appropriate.
-
-5.1  Intel Pentium III Features
-
-The Pentium III SSE instructions are used in optimized vertex transformation
-functions in the Mesa-based DRI drivers.  On Linux, SSE requires a recent
-kernel (such as 2.4.0-test11 or later) both at compile time and runtime.
-
-5.2  AMD 3DNow! Features
-
-AMD's 3DNow! instructions are used in optimized vertex transformation func-
-tions in the Mesa-based DRI drivers.  3DNow! is supported in most versions of
-Linux.
-
-5.3  Alpha Features
-
-On newer Alpha processors a significant performance increase can be seen with
-the addition of the -mcpu= option to GCC.  This option is dependent on the
-architecture of the processor.  For example, -mcpu=ev6 will build specifi-
-cally for the EV6 based AXP's, giving both byte and word alignment access to
-the DRI/Mesa drivers.
-
-To enable this optimization edit your xc/config/host.def file and add the
-line:
-
-#define DefaultGcc2AxpOpt -O2 -mcpu=ev6
-
-Additional speed improvements to 3D rendering can be achieved by installing
-Compaq's Math Libraries (CPML) which can be obtained from http://www.sup-
-port.compaq.com/alpha-tools/software/index.html
-
-Once installed, you can add this line to your host.def to build with the CPML
-libraries:
-
-#define UseCompaqMathLibrary YES
-
-The host.def file is explained below.
-
-6.  Downloading the XFree86/DRI CVS Sources
-
-The DRI project is hosted by SourceForge.  The DRI source code, which is a
-subset of the XFree86 source tree, is kept in a CVS repository there.
-
-The DRI CVS sources may be accessed either anonymously or as a registered
-SourceForge user.  It's recommended that you become a registered SourceForge
-user so that you may submit non-anonymous bug reports and can participate in
-the mailing lists.
-
-6.1  Anonymous CVS download:
-
-  1.  Create a directory to store the CVS files:
-
-                       cd ~
-                       mkdir DRI-CVS
-
-      You could put your CVS directory in a different place but we'll use
-      ~/DRI-CVS/ here.
-
-  2.  Check out the CVS sources:
-
-                       cd ~/DRI-CVS
-                       cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login
-                         (hit ENTER when prompted for a password)
-                       cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc
-
-      The -z3 flag causes compression to be used in order to reduce the down-
-      load time.
-
-6.2  Registered CVS download:
-
-  1.  Create a directory to store the CVS files:
-
-                       cd ~
-                       mkdir DRI-CVS
-
-      You could put your CVS directory in a different place but we'll use
-      ~/DRI-CVS/ here.
-
-  2.  Set the CVS_RSH environment variable:
-
-                       setenv CVS_RSH ssh      // if using csh or tcsh
-                       export CVS_RSH=ssh      // if using sh or bash
-
-  3.  Check out the CVS sources:
-
-                       cd ~/DRI-CVS
-                       cvs -z3 -d:ext:YOURID@cvs.dri.sourceforge.net:/cvsroot/dri co xc
-
-      Replace YOURID with your CVS login name.  You'll be prompted to enter
-      your sourceforge password.
-
-      The -z3 flag causes compression to be used in order to reduce the down-
-      load time.
-
-6.3  Updating your CVS sources
-
-In the future you'll want to occasionally update your local copy of the DRI
-source code to get the latest changes.  This can be done with:
-
-                cd ~/DRI-CVS
-                cvs -z3 update -dA xc
-
-The -d flag causes any new subdirectories to be created and -A causes most
-recent trunk sources to be fetched, not branch sources.
-
-7.  Mesa
-
-Most of the DRI 3D drivers are based on Mesa (the free implementation of the
-OpenGL API).  The relevant files from Mesa are already included in the
-XFree86/DRI source tree.  There is no need to download or install the Mesa
-source files separately.
-
-Sometimes a newer version of Mesa will be available than the version included
-in XFree86/DRI.  Upgrading Mesa within XFree86/DRI is not always straightfor-
-ward.  It can be an error-prone undertaking, especially for beginners, and is
-not generally recommended.  The DRI developers will upgrade Mesa when appro-
-priate.
-
-8.  Compiling the XFree86/DRI tree
-
-8.1  Make a build tree
-
-Rather than placing object files and library files right in the source tree,
-they're instead put into a parallel build tree.  The build tree is made with
-the lndir command:
-
-                 cd ~/DRI-CVS
-                 ln -s xc XFree40
-                 mkdir build
-                 cd build
-                 lndir -silent -ignorelinks ../XFree40
-
-The build tree will be populated with symbolic links which point back into
-the CVS source tree.
-
-Advanced users may have several build trees for compiling and testing with
-different options.
-
-8.2  Edit the host.def file
-
-The ~/DRI-CVS/build/xc/config/cf/host.def file is used to configure the
-XFree86 build process.  You can change it to customize your build options or
-make adjustments for your particular system configuration
-
-The default host.def file will look something like this:
-
-                 #define DefaultCCOptions -Wall
-     (i386)      #define DefaultGcc2i386Opt -O2
-     (Alpha)     #define DefaultGcc2AxpOpt -O2 -mcpu=ev6 (or similar)
-                 #define LibraryCDebugFlags -O2
-                 #define BuildServersOnly YES
-                 #define XF86CardDrivers vga tdfx mga ati i810
-                 #define LinuxDistribution LinuxRedHat
-                 #define DefaultCCOptions -ansi GccWarningOptions -pipe
-                 #define BuildXF86DRI YES
-                 /* Optionally turn these on for debugging */
-                 /* #define GlxBuiltInTdfx YES */
-                 /* #define GlxBuiltInMga YES */
-                 /* #define GlxBuiltInR128 YES */
-                 /* #define GlxBuiltInRadeon YES */
-                 /* #define DoLoadableServer NO */
-                 #define SharedLibFont NO
-
-The ProjectRoot variable specifies where the XFree86 files will be installed.
-We recommend installing the DRI files over your existing XFree86 installation
-- it's generally safe to do and less error-prone.  This policy is different
-than what we used to recommend.
-
-If XFree86 4.x is not installed in /usr/X11R6/ you'll have to add the follow-
-ing to the host.def file:
-
-                 #define ProjectRoot pathToYourXFree86installation
-
-Note the XF86CardDrivers line to be sure your card's driver is listed.
-
-If you want to enable 3DNow! optimizations in Mesa and the DRI drivers, you
-should add the following:
-
-                 #define MesaUse3DNow YES
-
-You don't have to be using an AMD processor in order to enable this option.
-The DRI will look for 3DNow! support and runtime and only enable it if appli-
-cable.
-
-If you want to enable SSE optimizations in Mesa and the DRI drivers, you must
-upgrade to a Linux 2.4.x kernel.  Mesa will verify that SSE is supported by
-both your processor and your operating system, but to build Mesa inside the
-DRI you need to have the Linux 2.4.x kernel headers in /usr/src/linux.  If
-you enable SSE optimizations with an earlier version of the Linux kernel in
-/usr/src/linux, Mesa will not compile.  You have been warned.  If you do have
-a 2.4.x kernel, you should add the following:
-
-                 #define MesaUseSSE YES
-
-If you want to build the DRM kernel modules as part of the full build pro-
-cess, add the following:
-
-                 #define BuildXF86DRM YES
-
-Otherwise, you'll need to build them separately as described below.
-
-8.3  Compilation
-
-To compile the complete DRI tree:
-
-                 cd ~/DRI-CVS/build/xc/
-                 make World >& world.log
-
-Or if you want to watch the compilation progress:
-
-                 cd ~/DRI-CVS/build/xc/
-                 make World >& world.log &
-                 tail -f world.log
-
-With the default compilation flags it's normal to get a lot of warnings dur-
-ing compilation.
-
-Building will take some time so you may want to go check your email or visit
-slashdot.
-
-WARNING: do not use the -j option with make.  It's reported that it does not
-work with XFree86/DRI.
-
-8.4  Check for compilation errors
-
-Using your text editor, examine world.log for errors by searching for the
-pattern ***.
-
-After fixing the errors, run make World again.  Later, you might just compile
-parts of the source tree but it's important that the whole tree will build
-first.
-
-If you edited your host.def file to enable automatic building of the DRI ker-
-nel module(s), verify that they were built:
-
-               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
-               ls
-
-Otherwise, build them now by running
-
-               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
-               make -f Makefile.linux
-
-For the 3dfx Voodoo, you should see tdfx.o.  For the Matrox G200/G400, you
-should see mga.o.  For the ATI Rage 128, you should see r128.o.  For the ATI
-Radeon, you should see radeon.o.  For the Intel i810, you should see i810.o.
-
-If the DRI kernel module(s) failed to build you should verify that you're
-using the right version of the Linux kernel.  The most recent kernels are not
-always supported.
-
-If your build machine is running a different version of the kernel than your
-target machine (i.e. 2.2.x vs. 2.4.x), make will select the wrong kernel
-source tree. This can be fixed by explicitly setting the value of LINUXDIR.
-If the path to your kernel source is /usr/src/linux-2.4.x,
-
-               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
-               make -f Makefile.linux LINUXDIR=/usr/src/linux-2.4.x
-
-or alternatively, edit Makefile.linux to set LINUXDIR before the ifndef LIN-
-UXDIR line.
-
-8.5  DRI kernel module installation
-
-The DRI kernel modules will be in ~/DRI-CVS/build/xc/pro-
-grams/Xserver/hw/xfree86/os-support/linux/drm/kernel/.
-
-To load the appropriate DRM module in your running kernel you can either use
-ismod and restart your X server or copy the kernel module to /lib/mod-
-ules/2.4.x/kernel/drivers/char/drm/ then run depmod and restart your X
-server.
-
-Make sure you first unload any older DRI kernel modules that might be already
-loaded.
-
-Note that some DRM modules require that the agpgart module be loaded first.
-
-9.  Normal Installation and Configuration
-
-Most users will want to install the new X server and use it in place of their
-old X server.  This section explains how to do that.
-
-Developers, on the other hand, may just want to test the X server without
-actually installing it as their default server.  If you want to do that, skip
-to the next section.
-
-9.1  Installation
-
-Here are the installation commands:
-
-                su
-                cd ~/DRI-CVS/build/xc
-                make install
-
-9.2  Update the XF86Config File
-
-You may need to edit your XF86Config file to enable the DRI.  The config file
-is usually installed as /etc/X11/XF86Config-4.  See the DRI User Guide for
-details, but basically, you need to load the "glx" and "dri" modules and add
-a "DRI" section.
-
-On the DRI web site, in the resources section, you'll find example XF86Config
-files for a number of graphics cards.  These configuration files also setup
-DRI options so it's highly recommended that you look at these examples.
-
-The XFree86 4.x server can generate a basic configuration file itself.  Sim-
-ply do this:
-
-                  cd /usr/X11R6/bin
-                  ./XFree86 -configure
-
-A file named /root/XF86Config.new will be created.  It should allow you to
-try your X server but you'll almost certainly have to edit it.  For example,
-you should add HorizSync and VertRefresh options to the Monitor section and
-Modes options to the Screen section.  Also, the ModulePath option in the
-Files section should be set to /usr/X11R6/lib/modules.
-
-9.3  Start the New X Server
-
-The new X server should be ready to use now.  Start your X server in your
-usual manner.  Often times the startx command is used:
-
-                  startx
-
-10.  Testing the Server Without Installing It
-
-As mentioned at the start of section 9, developers may want to simply run the
-X server without installing it.  This can save some time and allow you to
-keep a number of X servers available for testing.
-
-10.1  Configuration
-
-As described in the preceding section, you'll need to create a configuration
-file for the new server.  Put the XF86Config file in your ~/DRI-
-CVS/build/xc/programs/Xserver directory.
-
-Be sure the ModulePath option in your XF86Config file is set correctly.
-
-10.2  A Startup Script
-
-A simple shell script can be used to start the X server.  Here's an example.
-
-             #!/bin/sh
-             export DISPLAY=:0
-             ./XFree86 -xf86config XF86Config & \
-             sleep 2
-             fvwm2 &
-             xset b off
-             xmodmap -e "clear mod4"
-             xsetroot -solid "#00306f"
-             xterm -geometry 80x40+0+0
-
-You might name this script start-dri.  Put it in your ~/DRI-CVS/build/xc/pro-
-grams/Xserver directory.
-
-To test the server run the script:
-
-                  cd ~/DRI-CVS/build/xc/programs/Xserver
-                  ./start-dri
-
-For debugging, you may also want to capture the log messages printed by the
-server in a file.  If you're using the C-shell:
-
-                  ./start-dri >& log
-
-11.  Where To Go From Here
-
-At this point your X server should be up and running with hardware-acceler-
-ated direct rendering.  Please read the DRI User Guide for information about
-trouble shooting and how to use the DRI-enabled X server for 3D applications.
-
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.19 dawes Exp $
-
-
+                            DRI Compilation Guide

+

+          VA Linux Systems, Inc. Professional Services - Graphics.

+

+                                21 April 2001

+

+1.  Preamble

+

+1.1  Copyright

+

+Copyright 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.

+

+Permission is granted to make and distribute verbatim copies of this document

+provided the copyright notice and this permission notice are preserved on all

+copies.

+

+1.2  Trademarks

+

+OpenGL is a registered trademark and SGI is a trademark of Silicon Graphics,

+Inc.  Unix is a registered trademark of The Open Group.  The `X' device and X

+Window System are trademarks of The Open Group.  XFree86 is a trademark of

+The XFree86 Project.  Linux is a registered trademark of Linus Torvalds.

+Intel is a registered trademark of Intel Corporation.  3Dlabs, GLINT, and

+Oxygen are either registered trademarks or trademarks of 3Dlabs Inc. Ltd.

+3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of 3dfx Inter-

+active, Incorporated.  Matrox is a registered trademark of Matrox Electronic

+Systems Ltd.  ATI Rage and Radeon is a registered trademark of ATI Technolo-

+gies, Inc.  All other trademarks mentioned are the property of their respec-

+tive owners.

+

+2.  Introduction

+

+This document describes how to download, compile and install the DRI.  The

+DRI provides 3D graphics hardware acceleration for the XFree86 project.  This

+information is intended for experienced Linux developers.  Beginners are

+probably better off installing precompiled packages.

+

+Edits, corrections and updates to this document may be mailed to <brian@tung-

+stengraphics.com>.

+

+Last updated on 13 February 2002 by Brian Paul.

+

+3.  Prerequisites

+

+You'll need the following:

+

+   o An installation of XFree86 4.1 or later.  The DRI tree has been pruned

+     down to minimize its size.  But in order to build the DRI tree you need

+     to have recent X header files, etc. already installed.  If you don't

+     have XFree86 4.1 (or later) installed you can probably install it from

+     RPMs (or another package format).  Or, you can download XFree86 as

+     sources and compile/install it yourself.

+

+   o At least 200MB of free disk space.  If you compile for debugging (the -g

+     option) then you'll need about 600MB.

+

+   o GCC compiler and related tools.

+

+   o ssh (secure shell) if you're a DRI developer and don't want to use

+     anonymous CVS download.

+

+   o A 2.4.x Linux Kernel.  See below for details.

+

+   o FreeBSD support is not currently being maintained and may not work.

+

+The DRI 3D drivers generally work on systems with Intel or AMD CPUs.  How-

+ever, limited support for Alpha and PowerPC support is underway.

+

+For 3dfx Voodoo hardware, you'll also need the Glide3 runtime library

+(libglide3-v3.so for Voodoo3 or libglide3-v5.so for Voodoo4/5).  These can be

+downloaded from the DRI website.  You can compile them yourself, but it's

+often a painful process.

+

+For Matrox G200/G400, Intel i810/i830 or ATI Rage128/Radeon hardware, you'll

+also need AGP support in your Linux kernel, either built-in or as a loadable

+module.

+

+4.  Linux Kernel Preparation

+

+Only the Linux 2.4.x kernels are currently supported by the DRI hardware

+drivers.  2.5.x kernels may work, but aren't tested.

+

+Most of the DRI drivers require AGP support and using Intel Pentium III SSE

+optimizations also requires an up-to-date Linux kernel.  Configuring your

+kernel correctly is very important, as features such as SSE optimizations

+will be disabled if your kernel does not support them.  Thus, if you have a

+Pentium III processor, you must configure your kernel for the Pentium III

+processor family.

+

+Building a new Linux kernel can be difficult for beginners but there are

+resources on the Internet to help.  This document assumes experience with

+configuring, building and installing Linux kernels.

+

+Linux kernels can be downloaded from www.kernel.org

+

+Here are the basic steps for kernel setup.

+

+   o Download the needed kernel and put it in /usr/src.  Create a directory

+     for the source and unpack it.  For example:

+

+                    cd /usr/src

+                    rm -f linux

+                    mkdir linux-2.4.x

+                    ln -s linux-2.4.x linux

+                    bzcat linux-2.4.x.tar.bz2 | tar xf -

+

+     It is critical that /usr/src/linux point to your new kernel sources,

+     otherwise the kernel headers will not be used when building the DRI.

+     This will almost certainly cause compilation problems.

+

+   o Read /usr/src/linux/Documentation/Changes.  This file lists the minimum

+     requirements for all software packages required to build the kernel.

+     You must upgrade at least gcc, make, binutils and modutils to at least

+     the versions specified in this file.  The other packages may not be

+     needed.  If you are upgrading from Linux 2.2.x you must upgrade your

+     modutils package for Linux 2.4.x.

+

+   o Configure your kernel.  You might, for example, use make menuconfig and

+     do the following:

+

+        o Go to Code maturity level options

+

+        o Enable Prompt for development and/or incomplete code/drivers

+

+        o hit ESC to return to the top-level menu

+

+        o Go to Processor type and features

+

+        o Select your processor type from Processor Family

+

+        o hit ESC to return to the top-level menu

+

+        o Go to Character devices

+

+        o Disable Direct Rendering Manager (XFree86 DRI support) since we'll

+          use the DRI code from the XFree86/DRI tree and will compile it

+          there.

+

+        o Go to /dev/agpgart (AGP Support) (EXPERIMENTAL) (NEW)

+

+        o Hit SPACE twice to build AGP support into the kernel

+

+        o Enable all chipsets' support for AGP

+

+        o It's recommended that you turn on MTRRs under Processor type and

+          Features, but not required.

+

+   o Configure the rest of the kernel as required for your system (i.e. Eth-

+     ernet, SCSI, etc)

+

+   o Exit, saving your kernel configuration.

+

+   o Edit your /etc/lilo.conf file.  Make sure you have an image entry as

+     follows (or similar):

+

+                      image=/boot/vmlinuz

+                            label=linux.2.4.x

+                            read-only

+                            root=/dev/hda1

+

+     The important part is that you have /boot/vmlinuz without a trailing

+     version number.  If this is the first entry in your /etc/lilo.conf AND

+     you haven't set a default, then this will be your default kernel.

+

+   o Compile the new kernel.

+

+                    cd /usr/src/linux-2.4.x

+                    make dep

+                    make bzImage

+                    make modules

+                    make modules_install

+                    make install

+

+     Note that last make command will automatically run lilo for you.

+

+   o Now reboot to use the new kernel.

+

+5.  CPU Architectures

+

+In general, nothing special has to be done to use the DRI on different CPU

+architectures.  There are, however, a few optimizations that are CPU-depen-

+dent.  Mesa will determine at runtime which CPU-dependent optimizations

+should be used and enable them where appropriate.

+

+5.1  Intel Pentium III Features

+

+The Pentium III SSE instructions are used in optimized vertex transformation

+functions in the Mesa-based DRI drivers.  On Linux, SSE requires a recent

+kernel (such as 2.4.0-test11 or later) both at compile time and runtime.

+

+5.2  AMD 3DNow! Features

+

+AMD's 3DNow! instructions are used in optimized vertex transformation func-

+tions in the Mesa-based DRI drivers.  3DNow! is supported in most versions of

+Linux.

+

+5.3  Alpha Features

+

+On newer Alpha processors a significant performance increase can be seen with

+the addition of the -mcpu= option to GCC.  This option is dependent on the

+architecture of the processor.  For example, -mcpu=ev6 will build specifi-

+cally for the EV6 based AXP's, giving both byte and word alignment access to

+the DRI/Mesa drivers.

+

+To enable this optimization edit your xc/config/host.def file and add the

+line:

+

+#define DefaultGcc2AxpOpt -O2 -mcpu=ev6

+

+Additional speed improvements to 3D rendering can be achieved by installing

+Compaq's Math Libraries (CPML) which can be obtained from http://www.sup-

+port.compaq.com/alpha-tools/software/index.html

+

+Once installed, you can add this line to your host.def to build with the CPML

+libraries:

+

+#define UseCompaqMathLibrary YES

+

+The host.def file is explained below.

+

+6.  Downloading the XFree86/DRI CVS Sources

+

+The DRI project is hosted by SourceForge.  The DRI source code, which is a

+subset of the XFree86 source tree, is kept in a CVS repository there.

+

+The DRI CVS sources may be accessed either anonymously or as a registered

+SourceForge user.  It's recommended that you become a registered SourceForge

+user so that you may submit non-anonymous bug reports and can participate in

+the mailing lists.

+

+6.1  Anonymous CVS download:

+

+  1.  Create a directory to store the CVS files:

+

+                       cd ~

+                       mkdir DRI-CVS

+

+      You could put your CVS directory in a different place but we'll use

+      ~/DRI-CVS/ here.

+

+  2.  Check out the CVS sources:

+

+                       cd ~/DRI-CVS

+                       cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login

+                         (hit ENTER when prompted for a password)

+                       cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc

+

+      The -z3 flag causes compression to be used in order to reduce the down-

+      load time.

+

+6.2  Registered CVS download:

+

+  1.  Create a directory to store the CVS files:

+

+                       cd ~

+                       mkdir DRI-CVS

+

+      You could put your CVS directory in a different place but we'll use

+      ~/DRI-CVS/ here.

+

+  2.  Set the CVS_RSH environment variable:

+

+                       setenv CVS_RSH ssh      // if using csh or tcsh

+                       export CVS_RSH=ssh      // if using sh or bash

+

+  3.  Check out the CVS sources:

+

+                       cd ~/DRI-CVS

+                       cvs -z3 -d:ext:YOURID@cvs.dri.sourceforge.net:/cvsroot/dri co xc

+

+      Replace YOURID with your CVS login name.  You'll be prompted to enter

+      your sourceforge password.

+

+      The -z3 flag causes compression to be used in order to reduce the down-

+      load time.

+

+6.3  Updating your CVS sources

+

+In the future you'll want to occasionally update your local copy of the DRI

+source code to get the latest changes.  This can be done with:

+

+                cd ~/DRI-CVS

+                cvs -z3 update -dA xc

+

+The -d flag causes any new subdirectories to be created and -A causes most

+recent trunk sources to be fetched, not branch sources.

+

+7.  Mesa

+

+Most of the DRI 3D drivers are based on Mesa (the free implementation of the

+OpenGL API).  The relevant files from Mesa are already included in the

+XFree86/DRI source tree.  There is no need to download or install the Mesa

+source files separately.

+

+Sometimes a newer version of Mesa will be available than the version included

+in XFree86/DRI.  Upgrading Mesa within XFree86/DRI is not always straightfor-

+ward.  It can be an error-prone undertaking, especially for beginners, and is

+not generally recommended.  The DRI developers will upgrade Mesa when appro-

+priate.

+

+8.  Compiling the XFree86/DRI tree

+

+8.1  Make a build tree

+

+Rather than placing object files and library files right in the source tree,

+they're instead put into a parallel build tree.  The build tree is made with

+the lndir command:

+

+                 cd ~/DRI-CVS

+                 ln -s xc XFree40

+                 mkdir build

+                 cd build

+                 lndir -silent -ignorelinks ../XFree40

+

+The build tree will be populated with symbolic links which point back into

+the CVS source tree.

+

+Advanced users may have several build trees for compiling and testing with

+different options.

+

+8.2  Edit the host.def file

+

+The ~/DRI-CVS/build/xc/config/cf/host.def file is used to configure the

+XFree86 build process.  You can change it to customize your build options or

+make adjustments for your particular system configuration

+

+The default host.def file will look something like this:

+

+                 #define DefaultCCOptions -Wall

+     (i386)      #define DefaultGcc2i386Opt -O2

+     (Alpha)     #define DefaultGcc2AxpOpt -O2 -mcpu=ev6 (or similar)

+                 #define LibraryCDebugFlags -O2

+                 #define BuildServersOnly YES

+                 #define XF86CardDrivers vga tdfx mga ati i810

+                 #define LinuxDistribution LinuxRedHat

+                 #define DefaultCCOptions -ansi GccWarningOptions -pipe

+                 #define BuildXF86DRI YES

+                 /* Optionally turn these on for debugging */

+                 /* #define GlxBuiltInTdfx YES */

+                 /* #define GlxBuiltInMga YES */

+                 /* #define GlxBuiltInR128 YES */

+                 /* #define GlxBuiltInRadeon YES */

+                 /* #define DoLoadableServer NO */

+                 #define SharedLibFont NO

+

+The ProjectRoot variable specifies where the XFree86 files will be installed.

+We recommend installing the DRI files over your existing XFree86 installation

+- it's generally safe to do and less error-prone.  This policy is different

+than what we used to recommend.

+

+If XFree86 4.x is not installed in /usr/X11R6/ you'll have to add the follow-

+ing to the host.def file:

+

+                 #define ProjectRoot pathToYourXFree86installation

+

+Note the XF86CardDrivers line to be sure your card's driver is listed.

+

+If you want to enable 3DNow! optimizations in Mesa and the DRI drivers, you

+should add the following:

+

+                 #define MesaUse3DNow YES

+

+You don't have to be using an AMD processor in order to enable this option.

+The DRI will look for 3DNow! support and runtime and only enable it if appli-

+cable.

+

+If you want to enable SSE optimizations in Mesa and the DRI drivers, you must

+upgrade to a Linux 2.4.x kernel.  Mesa will verify that SSE is supported by

+both your processor and your operating system, but to build Mesa inside the

+DRI you need to have the Linux 2.4.x kernel headers in /usr/src/linux.  If

+you enable SSE optimizations with an earlier version of the Linux kernel in

+/usr/src/linux, Mesa will not compile.  You have been warned.  If you do have

+a 2.4.x kernel, you should add the following:

+

+                 #define MesaUseSSE YES

+

+If you want to build the DRM kernel modules as part of the full build pro-

+cess, add the following:

+

+                 #define BuildXF86DRM YES

+

+Otherwise, you'll need to build them separately as described below.

+

+8.3  Compilation

+

+To compile the complete DRI tree:

+

+                 cd ~/DRI-CVS/build/xc/

+                 make World >& world.log

+

+Or if you want to watch the compilation progress:

+

+                 cd ~/DRI-CVS/build/xc/

+                 make World >& world.log &

+                 tail -f world.log

+

+With the default compilation flags it's normal to get a lot of warnings dur-

+ing compilation.

+

+Building will take some time so you may want to go check your email or visit

+slashdot.

+

+WARNING: do not use the -j option with make.  It's reported that it does not

+work with XFree86/DRI.

+

+8.4  Check for compilation errors

+

+Using your text editor, examine world.log for errors by searching for the

+pattern ***.

+

+After fixing the errors, run make World again.  Later, you might just compile

+parts of the source tree but it's important that the whole tree will build

+first.

+

+If you edited your host.def file to enable automatic building of the DRI ker-

+nel module(s), verify that they were built:

+

+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel

+               ls

+

+Otherwise, build them now by running

+

+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel

+               make -f Makefile.linux

+

+For the 3dfx Voodoo, you should see tdfx.o.  For the Matrox G200/G400, you

+should see mga.o.  For the ATI Rage 128, you should see r128.o.  For the ATI

+Radeon, you should see radeon.o.  For the Intel i810, you should see i810.o.

+

+If the DRI kernel module(s) failed to build you should verify that you're

+using the right version of the Linux kernel.  The most recent kernels are not

+always supported.

+

+If your build machine is running a different version of the kernel than your

+target machine (i.e. 2.2.x vs. 2.4.x), make will select the wrong kernel

+source tree. This can be fixed by explicitly setting the value of LINUXDIR.

+If the path to your kernel source is /usr/src/linux-2.4.x,

+

+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel

+               make -f Makefile.linux LINUXDIR=/usr/src/linux-2.4.x

+

+or alternatively, edit Makefile.linux to set LINUXDIR before the ifndef LIN-

+UXDIR line.

+

+8.5  DRI kernel module installation

+

+The DRI kernel modules will be in ~/DRI-CVS/build/xc/pro-

+grams/Xserver/hw/xfree86/os-support/linux/drm/kernel/.

+

+To load the appropriate DRM module in your running kernel you can either use

+ismod and restart your X server or copy the kernel module to /lib/mod-

+ules/2.4.x/kernel/drivers/char/drm/ then run depmod and restart your X

+server.

+

+Make sure you first unload any older DRI kernel modules that might be already

+loaded.

+

+Note that some DRM modules require that the agpgart module be loaded first.

+

+9.  Normal Installation and Configuration

+

+Most users will want to install the new X server and use it in place of their

+old X server.  This section explains how to do that.

+

+Developers, on the other hand, may just want to test the X server without

+actually installing it as their default server.  If you want to do that, skip

+to the next section.

+

+9.1  Installation

+

+Here are the installation commands:

+

+                su

+                cd ~/DRI-CVS/build/xc

+                make install

+

+9.2  Update the XF86Config File

+

+You may need to edit your XF86Config file to enable the DRI.  The config file

+is usually installed as /etc/X11/XF86Config-4.  See the DRI User Guide for

+details, but basically, you need to load the "glx" and "dri" modules and add

+a "DRI" section.

+

+On the DRI web site, in the resources section, you'll find example XF86Config

+files for a number of graphics cards.  These configuration files also setup

+DRI options so it's highly recommended that you look at these examples.

+

+The XFree86 4.x server can generate a basic configuration file itself.  Sim-

+ply do this:

+

+                  cd /usr/X11R6/bin

+                  ./XFree86 -configure

+

+A file named /root/XF86Config.new will be created.  It should allow you to

+try your X server but you'll almost certainly have to edit it.  For example,

+you should add HorizSync and VertRefresh options to the Monitor section and

+Modes options to the Screen section.  Also, the ModulePath option in the

+Files section should be set to /usr/X11R6/lib/modules.

+

+9.3  Start the New X Server

+

+The new X server should be ready to use now.  Start your X server in your

+usual manner.  Often times the startx command is used:

+

+                  startx

+

+10.  Testing the Server Without Installing It

+

+As mentioned at the start of section 9, developers may want to simply run the

+X server without installing it.  This can save some time and allow you to

+keep a number of X servers available for testing.

+

+10.1  Configuration

+

+As described in the preceding section, you'll need to create a configuration

+file for the new server.  Put the XF86Config file in your ~/DRI-

+CVS/build/xc/programs/Xserver directory.

+

+Be sure the ModulePath option in your XF86Config file is set correctly.

+

+10.2  A Startup Script

+

+A simple shell script can be used to start the X server.  Here's an example.

+

+             #!/bin/sh

+             export DISPLAY=:0

+             ./XFree86 -xf86config XF86Config & \

+             sleep 2

+             fvwm2 &

+             xset b off

+             xmodmap -e "clear mod4"

+             xsetroot -solid "#00306f"

+             xterm -geometry 80x40+0+0

+

+You might name this script start-dri.  Put it in your ~/DRI-CVS/build/xc/pro-

+grams/Xserver directory.

+

+To test the server run the script:

+

+                  cd ~/DRI-CVS/build/xc/programs/Xserver

+                  ./start-dri

+

+For debugging, you may also want to capture the log messages printed by the

+server in a file.  If you're using the C-shell:

+

+                  ./start-dri >& log

+

+11.  Where To Go From Here

+

+At this point your X server should be up and running with hardware-acceler-

+ated direct rendering.  Please read the DRI User Guide for information about

+trouble shooting and how to use the DRI-enabled X server for 3D applications.

+

+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.19 dawes Exp $

diff --git a/xorg-server/xkeyboard-config/symbols/cm b/xorg-server/xkeyboard-config/symbols/cm
index 449bbcad3..1757ae05b 100644
--- a/xorg-server/xkeyboard-config/symbols/cm
+++ b/xorg-server/xkeyboard-config/symbols/cm
@@ -1,331 +1,331 @@
-// ========== Cameroon Keyboards ==========
-// ****** For Instructions, see "Use of Cameroon Keyboards" section	below ******
-
-
-// The XKB versions of these keyboards were developed by Matthew Lee, Jenni Beadle, and Bruce Cox of SIL Cameroon in association with Going Komputya, Uwe Yung of the Goethe Institute, Yaoundé, and Centre ANACLAC.  
-
-// Cameroon is officially a bilingual country, using French and English, but there are over 270 minority languages.  
-
-// * Cameroon Français is an exact copy of the French France keyboard intended for AZERTY users.
-// * Cameroon is an exact copy of the Basic US Keyboard. I can not currently name this "Cameroon English" due to a limitation of XKB.
-// * Cameroon QWERTY and Cameroon AZERTY are based largely on SIL Cameroon's Keyman and Microsoft keyboards of the same style already in wide use.  These keyboards are designed to allow the user to type any of Cameroon's 270+ languages and dialects that use the approved orthography.  This Approved Orthography was adopted in 1979 by the National Committee for the Unification and Harmonisation of Alphabets of Camerooninan Languages. 
-// * Cameroon Dvorak is described below.
-
-// ===== Use of Cameroon Keyboards =====
-
-// == Fonts ==
-// These keyboards are fully Unicode (5.1), so we recommend using a good unicode font for diacritics to position correctly. Recommended fonts are: ttf-sil-charis, ttf-sil-doulos, ttf-sil-gentium and ttf-sil-andika (All of which are free for Linux, Mac, and Windows).
-
-
-// == Cameroon AZERTY ==
-// Cameroon AZERTY uses the French France (AZERTY) layout, as french keyboards are widely used here. While this keyboard is designed for Cameroonian orthography, it still is possible but not recommended, to type French with minimal discomfort using this keyboard.
-// Cameroon AZERTY uses the "!" (exclamation) key as the "Cameroon" key. Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.
-// For example, press "!" then "a" and get "ɛ" (small epsilon). "!" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press the "!" key twice to get a "!".
-// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(exclamation_switch)"" and the exclamation key will return to normal.
-// All Diacritics (with the exception of French Trema and Circumflex) must be typed (in order of stacking) after the letter.
-
-
-// == Cameroon QWERTY ==
-// Cameroon QWERTY uses the US QWERTY layout, as US keyboards are also widely used here. While this keyboard is designed for Cameroonian orthography, it is possible, but not recommended, to type English with minimal discomfort using this keyboard.
-// Cameroon QWERTY uses the ";" (semicolon) key as the "Cameroon" key.	Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.
-// For example, press ";" then "a" and get "ɛ" (small epsilon). ";" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press ";" twice to get a ";", or press Shift + ; (:) twice to get a ":" (colon).
-// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(semicolon_switch)"" and the semicolon key will return to normal.
-// All Diacritics must be typed (in order of stacking) after the letter.
-
-
-// == Cameroon Dvorak ==
-// Cameroon Dvorak is uses a similar system to Cameroon QWERTY.
-
-default
-partial alphanumeric_keys
-xkb_symbols "basic" {
-
-	name[Group1]="English (Cameroon)";
-
-	// Alphanumeric section
-	key <TLDE> { [ grave, asciitilde ] };
-	key <AE01> { [ 1, exclam ] };
-	key <AE02> { [ 2, at ] };
-	key <AE03> { [ 3, numbersign ] };
-	key <AE04> { [ 4, dollar ] };
-	key <AE05> { [ 5, percent ] };
-	key <AE06> { [ 6, asciicircum ] };
-	key <AE07> { [ 7, ampersand ] };
-	key <AE08> { [ 8, asterisk ] };
-	key <AE09> { [ 9, parenleft ] };
-	key <AE10> { [ 0, parenright ] };
-	key <AE11> { [ minus, underscore ] };
-	key <AE12> { [ equal, plus ] };
-
-	key <AD01> { [ q, Q ] };
-	key <AD02> { [ w, W ] };
-	key <AD03> { [ e, E ] };
-	key <AD04> { [ r, R ] };
-	key <AD05> { [ t, T ] };
-	key <AD06> { [ y, Y ] };
-	key <AD07> { [ u, U ] };
-	key <AD08> { [ i, I ] };
-	key <AD09> { [ o, O ] };
-	key <AD10> { [ p, P ] };
-	key <AD11> { [ bracketleft, braceleft ] };
-	key <AD12> { [ bracketright, braceright ] };
-	key <AC01> { [ a, A ] };
-	key <AC02> { [ s, S ] };
-	key <AC03> { [ d, D ] };
-	key <AC04> { [ f, F ] };
-	key <AC05> { [ g, G ] };
-	key <AC06> { [ h, H ] };
-	key <AC07> { [ j, J ] };
-	key <AC08> { [ k, K ] };
-	key <AC09> { [ l, L ] };
-	key <AC10> { [ semicolon, colon ] };
-	key <AC11> { [ apostrophe, quotedbl ] };
-
-	key <AB01> { [ z, Z ] };
-	key <AB02> { [ x, X ] };
-	key <AB03> { [ c, C ] };
-	key <AB04> { [ v, V ] };
-	key <AB05> { [ b, B ] };
-	key <AB06> { [ n, N ] };
-	key <AB07> { [ m, M ] };
-	key <AB08> { [ comma, less ] };
-	key <AB09> { [ period, greater ] };
-	key <AB10> { [ slash, U003F ] };
-
-	key <BKSL> { [ backslash, bar ] };
-	// End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "french"
-{
-	name[Group1]="French (Cameroon)";
-	include "latin"
-
-	key <AE01> { [ ampersand, 1, onesuperior, exclamdown ] };
-	key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };
-	key <AE03> { [ quotedbl, 3, numbersign, sterling ] };
-	key <AE04> { [apostrophe, 4, braceleft, dollar ] };
-	key <AE05> { [ parenleft, 5, bracketleft, threeeighths ] };
-	key <AE06> { [ minus, 6, bar, fiveeighths ] };
-	key <AE07> { [ egrave, 7, grave, seveneighths ] };
-	key <AE08> { [underscore, 8, backslash, trademark ] };
-	key <AE09> { [ ccedilla, 9, asciicircum, plusminus ] };
-	key <AE10> { [ agrave, 0, at, degree ] };
-	key <AE11> { [parenright, degree, bracketright, questiondown ] };
-	key <AE12> { [ equal, plus, braceright, dead_ogonek ] };
-
-	key <AD01> { [ a, A, ae, AE ] };
-	key <AD02> { [ z, Z, guillemotleft, less ] };
-	key <AD03> { [ e, E, EuroSign, cent ] };
-	key <AD11> { [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };
-	key <AD12> { [ dollar, sterling, currency, dead_macron ] };
-
-	key <AC01> { [ q, Q, at, Greek_OMEGA ] };
-	key <AC10> { [ m, M, mu, masculine ] };
-	key <AC11> { [ ugrave, percent, dead_circumflex, dead_caron] };
-	key <TLDE> { [twosuperior, asciitilde, notsign, notsign ] };
-
-	key <BKSL> { [ asterisk, mu, dead_grave, dead_breve ] };
-	key <AB01> { [ w, W, lstroke, Lstroke ] };
-	key <AB07> { [ comma, U003F, dead_acute, dead_doubleacute ] };
-	key <AB08> { [ semicolon, period, horizconnector, multiply ] };
-	key <AB09> { [ colon, slash, periodcentered, division ] };
-	key <AB10> { [ exclam, section, dead_belowdot, dead_abovedot ] };
-
-	include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "azerty"
-{
-	name[Group1] = "French (Cameroon azerty)";
-	include "level3(ralt_switch)"
-	include "cm(basic)"
-	key <AB01> { [ w, W, U1E85, U1E84 ] };	//  SMALL LETTER W,  CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
-	key <AB02> { [ x, X, U2039, U203A ] };	// SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-	key <AB03> { [ c, C, U0327, copyright ] };	// SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN
-	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
-	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
-	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
-	key <AB07> { [ U002C, U003F, NoSymbol, U00D7 ] };	// COMMA, QUESTION MARK, , MULTIPLY
-	key <AB08> { [ semicolon, period, dead_acute, dead_grave ] };	// SEMICOLON, PERIOD
-	key <AB09> { [ colon, slash, U0323 ] };	// COLON, SLASH, COMBINING DOT BELOW
-	key <AB10> { [ exclam, U00A7 ] };	// EXCLAMATION MARK, SECTION SIGN
-	key <AC01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
-	key <AC02> { [ s, S, U201C, U201D ] };	// SMALL LETTER S, CAPITAL LETTER S, LEFT DOUBLE QUOTES, RIGHT DOUBLE QUOTES 
-	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
-	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
-	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
-	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
-	key <AC07> { [ j, J, leftarrow, U2122 ] };	//SMALL LETTER J, CAPITAL LETTER J, LEFT ARROW, TRADE MARK SIGN
-	key <AC08> { [ k, K, downarrow, uparrow ] };	// SMALL LETTER K, CAPITAL LETTER K, DOWN ARROW, UP ARROW
-	key <AC09> { [ l, L, rightarrow, U00A3 ] };	// SMALL LETTER L, CAPITAL LETTER L, RIGHT ARROW, POUND STERLING
-	key <AC10> { [ m, M, U00F9, U00B5 ] };	// SMALL LETTER M, CAPITAL LETTER M, SMALL LETTER U WITH GRAVE, MICRO SYMBOL
-	key <AC11> { [ U0300, U0302, U1DC5, U1DC4 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, COMBINING LOW-MID TONE, COMBINING MID-HIGH TONE
-	key <AD01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
-	key <AD02> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
-	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
-	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
-	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
-	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
-	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
-	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR
-	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O
-	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR
-	key <AD11> { [ U0301, U030C, dead_circumflex, dead_diaeresis ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, DEAD CIRCUMFLEX, DEAD DIAERESIS
-	key <AD12> { [ U0330, U0303, U0304, U030D ] };	// COMBINING TILDE (NASAL) BELOW, COMBINING TILDE (NASAL), COMBINING MID TONE, COMBINING VERTICAL LINE ABOVE
-	key <AE01> { [ U0026, KP_1, U00B9, U2018 ] };	// AMPERSAND, 1, SUPERSCRIPT 1, LEFT SINGLE QUOTE
-	key <AE02> { [ eacute, KP_2, asciitilde, U2019 ] };	// SMALL LETTER E WITH ACUTE, 2, TILDE, RIGHT SINGLE QUOTE
-	key <AE03> { [ U0022, KP_3, U0025 ] };	// QUOTATION MARK, 3, PERCENT SIGN
-	key <AE04> { [ U0027, KP_4, U007B ] };	// APOSTROPHE, 4, LEFT CURLY BRACKET
-	key <AE05> { [ U0028, KP_5, U005B, numbersign ] };	// LEFT PARENTHESIS, 5, LEFT SQUARE BRACKET, NUMBER SIGN
-	key <AE06> { [ U002D, KP_6, U007C ] };	// HYPHEN/MINUS, 6, BAR
-	key <AE07> { [ U00E8, KP_7, U0300 ] };	// SMALL LETTER E WITH GRAVE, 7, COMBINING GRAVE
-	key <AE08> { [ underscore, KP_8, backslash, U20D6 ] };	// UNDERSCORE, 8, BACKSLASH, COMBINING LEFT ARROW ABOVE
-	key <AE09> { [ ccedilla, KP_9, U005E] };	// SMALL LETTER C WITH CEDILLA, 9, CIRCUMFLEX
-	key <AE10> { [ U00E0, KP_0, at, U20D7 ] };	// SMALL LETTER A WITH GRAVE
-	key <AE11> { [ U0029, U00B0, U005D ] };	// RIGHT PARENTHESIS, DEGREE, RIGHT SQUARE BRACKET
-	key <AE12> { [ U003D, U002B, U007D, U00B1 ] };	// EQUAL SIGN, PLUS SIGN, RIGHT CURLY BRACKET, PLUS-MINUS SIGN
-	key <BKSL> { [ U1DC6, U1DC7, KP_Multiply, U00A4 ] };	//  COMBINING MID-LOW, COMBINING HIGH-MID, MULTIPLY, CURRENCY SIGN
-	key <LSGT> { [ U003C, U003E, U00AB, U00BB ] };	// LESS THAN, GREATER THAN, LEFT GUILLEMET, RIGHT GUILLEMET
-	key <TLDE> { [ U0024, U20AC, U00B2, U00B3 ] };	// DOLLAR, EURO, SUPERSCRIPT 2, SUPERSCRIPT 3
-	include "cm(exclamation_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "qwerty"
-{
-	name[Group1] = "English (Cameroon qwerty)";
-	include "level3(ralt_switch)"
-	include "cm(basic)"
-	key <AB01> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
-	key <AB02> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X
-	key <AB03> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT
-	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
-	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
-	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
-	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN
-	key <AB08> { [ U002C, U003C, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET
-	key <AB09> { [ U002B, U003E, U203A, U00BB ] };	// PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET
-	key <AB10> { [ U002F, U003F, U00F7, U0294 ] };	// SLASH, QUESTION MARK, DIVISION SIGN, GLOTTAL STOP
-	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
-	key <AC02> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S
-	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
-	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
-	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
-	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
-	key <AC07> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW
-	key <AC08> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID
-	key <AC09> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE
-	key <AC10> { [ U003B, U003A ] };	// SEMICOLON, COLON
-	key <AC11> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK
-	key <AD01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
-	key <AD02> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
-	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
-	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
-	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
-	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
-	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
-	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR
-	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O
-	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR
-	key <AD11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET
-	key <AD12> { [ U0327, U0308, U005D, U007D ] };	// COMBINING CEDILLA, COMBINING DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET
-	key <AE01> { [ U0031, U0021, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER
-	key <AE02> { [ U0032, U0040, U00BD ] };	//2, AT SYMBOL, ONE HALF
-	key <AE03> { [ U0033, U0023, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS
-	key <AE04> { [ U0034, U0024, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN
-	key <AE08> { [ U0038, U002A, NoSymbol, U00D7 ] };	// 8, ASTERISK, , MATH MULTIPLY
-	key <AE09> { [ U0039, U0028, U2018, U201C ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
-	key <AE10> { [ U0030, U0029, U2019, U201D ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
-	key <AE11> { [ U002D, U005F, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE, COMBINING MID TONE
-	key <AE12> { [ U003D, U002B, NoSymbol, U00B1 ] };	// EQUAL, PLUS, , PLUS-MINUS
-	key <BKSL> { [ U005C, U007C ] };	// BACKSLASH, BAR
-	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
-	include "cm(semicolon_switch)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "dvorak"
-{
-	name[Group1] = "English (Cameroon Dvorak)";
-	include "level3(ralt_switch)"
-	include "us(dvorak)"
-	key <AB01> { [ semicolon, colon ] };	// SEMICOLON, COLON
-	key <AB02> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
-	key <AB03> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW
-	key <AB04> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID
-	key <AB05> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X
-	key <AB06> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
-	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN
-	key <AB08> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
-	key <AB09> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
-	key <AB10> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
-	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
-	key <AC02> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O
-	key <AC03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
-	key <AC04> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
-	key <AC05> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR
-	key <AC06> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
-	key <AC07> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
-	key <AC08> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
-	key <AC09> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
-	key <AC10> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S
-	key <AC11> { [ minus, underscore, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE
-	key <AD01> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK
-	key <AD02> { [ comma, less, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET
-	key <AD03> { [ period, greater, U203A, U00BB ] };	// PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET
-	key <AD04> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR
-	key <AD05> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
-	key <AD06> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
-	key <AD07> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
-	key <AD08> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT
-	key <AD09> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
-	key <AD10> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE
-	key <AD11> { [ slash, U003F, U00F7, U0294 ] };	// SLASH, QUESTION MARK, DIVISION SIGN, GLOTTAL STOP
-	key <AD12> { [ equal, plus, NoSymbol, plusminus ] };	// EQUAL, PLUS, , PLUS-MINUS
-	key <AE01> { [ KP_1, exclam, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER
-	key <AE02> { [ KP_2, at, U00BD ] };	// 2, AT SYMBOL, ONE HALF
-	key <AE03> { [ KP_3, numbersign, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS
-	key <AE04> { [ KP_4, dollar, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN
-	key <AE05> { [ KP_5, percent ] };	// 5, PERCENT
-	key <AE06> { [ KP_6, asciicircum ] };	// 6, CARET
-	key <AE07> { [ KP_7, ampersand ] };	// 7, AMPERSAND
-	key <AE08> { [ KP_8, asterisk, NoSymbol, multiply ] };	// 8, ASTERISK, , MULTIPLY
-	key <AE09> { [ KP_9, parenleft, leftsinglequotemark, leftdoublequotemark ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
-	key <AE10> { [ KP_0, parenright, rightsinglequotemark, rightdoublequotemark ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
-	key <AE11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET
-	key <AE12> { [ U0327, dead_diaeresis, U005D, braceright ] };	// COMBINING CEDILLA, DEAD DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET
-	key <BKSL> { [ backslash, bar ] };	// BACKSLASH, BAR
-	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
-	include "cm(semicolon_switch_dvorak)"
-};
-
-// The following code creates the "Cameroon key" phenomenon.
-
-partial modifier_keys
-xkb_symbols "semicolon_switch" {
-	key <AC10> {
-	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]};
-	modifier_map Mod5	{ ISO_Level3_Latch };
-};
-
-partial modifier_keys
-xkb_symbols "exclamation_switch" {
-	key <AB10> {
-	symbols[Group1] = [ ISO_Level3_Latch,	U00A7,	exclam,	U00A7 ]
-	};
-	modifier_map Mod5	{ ISO_Level3_Latch };
-};
-
-partial modifier_keys
-xkb_symbols "semicolon_switch_dvorak" {
-	key <AB01> {
-	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]
-	};
-modifier_map Mod5	{ ISO_Level3_Latch };
-};
-
+// ========== Cameroon Keyboards ==========

+// ****** For Instructions, see "Use of Cameroon Keyboards" section	below ******

+

+

+// The XKB versions of these keyboards were developed by Matthew Lee, Jenni Beadle, and Bruce Cox of SIL Cameroon in association with Going Komputya, Uwe Yung of the Goethe Institute, Yaoundé, and Centre ANACLAC.  

+

+// Cameroon is officially a bilingual country, using French and English, but there are over 270 minority languages.  

+

+// * Cameroon Français is an exact copy of the French France keyboard intended for AZERTY users.

+// * Cameroon is an exact copy of the Basic US Keyboard. I can not currently name this "Cameroon English" due to a limitation of XKB.

+// * Cameroon QWERTY and Cameroon AZERTY are based largely on SIL Cameroon's Keyman and Microsoft keyboards of the same style already in wide use.  These keyboards are designed to allow the user to type any of Cameroon's 270+ languages and dialects that use the approved orthography.  This Approved Orthography was adopted in 1979 by the National Committee for the Unification and Harmonisation of Alphabets of Camerooninan Languages. 

+// * Cameroon Dvorak is described below.

+

+// ===== Use of Cameroon Keyboards =====

+

+// == Fonts ==

+// These keyboards are fully Unicode (5.1), so we recommend using a good unicode font for diacritics to position correctly. Recommended fonts are: ttf-sil-charis, ttf-sil-doulos, ttf-sil-gentium and ttf-sil-andika (All of which are free for Linux, Mac, and Windows).

+

+

+// == Cameroon AZERTY ==

+// Cameroon AZERTY uses the French France (AZERTY) layout, as french keyboards are widely used here. While this keyboard is designed for Cameroonian orthography, it still is possible but not recommended, to type French with minimal discomfort using this keyboard.

+// Cameroon AZERTY uses the "!" (exclamation) key as the "Cameroon" key. Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.

+// For example, press "!" then "a" and get "ɛ" (small epsilon). "!" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press the "!" key twice to get a "!".

+// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(exclamation_switch)"" and the exclamation key will return to normal.

+// All Diacritics (with the exception of French Trema and Circumflex) must be typed (in order of stacking) after the letter.

+

+

+// == Cameroon QWERTY ==

+// Cameroon QWERTY uses the US QWERTY layout, as US keyboards are also widely used here. While this keyboard is designed for Cameroonian orthography, it is possible, but not recommended, to type English with minimal discomfort using this keyboard.

+// Cameroon QWERTY uses the ";" (semicolon) key as the "Cameroon" key.	Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.

+// For example, press ";" then "a" and get "ɛ" (small epsilon). ";" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press ";" twice to get a ";", or press Shift + ; (:) twice to get a ":" (colon).

+// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(semicolon_switch)"" and the semicolon key will return to normal.

+// All Diacritics must be typed (in order of stacking) after the letter.

+

+

+// == Cameroon Dvorak ==

+// Cameroon Dvorak is uses a similar system to Cameroon QWERTY.

+

+default

+partial alphanumeric_keys

+xkb_symbols "basic" {

+

+	name[Group1]="English (Cameroon)";

+

+	// Alphanumeric section

+	key <TLDE> { [ grave, asciitilde ] };

+	key <AE01> { [ 1, exclam ] };

+	key <AE02> { [ 2, at ] };

+	key <AE03> { [ 3, numbersign ] };

+	key <AE04> { [ 4, dollar ] };

+	key <AE05> { [ 5, percent ] };

+	key <AE06> { [ 6, asciicircum ] };

+	key <AE07> { [ 7, ampersand ] };

+	key <AE08> { [ 8, asterisk ] };

+	key <AE09> { [ 9, parenleft ] };

+	key <AE10> { [ 0, parenright ] };

+	key <AE11> { [ minus, underscore ] };

+	key <AE12> { [ equal, plus ] };

+

+	key <AD01> { [ q, Q ] };

+	key <AD02> { [ w, W ] };

+	key <AD03> { [ e, E ] };

+	key <AD04> { [ r, R ] };

+	key <AD05> { [ t, T ] };

+	key <AD06> { [ y, Y ] };

+	key <AD07> { [ u, U ] };

+	key <AD08> { [ i, I ] };

+	key <AD09> { [ o, O ] };

+	key <AD10> { [ p, P ] };

+	key <AD11> { [ bracketleft, braceleft ] };

+	key <AD12> { [ bracketright, braceright ] };

+	key <AC01> { [ a, A ] };

+	key <AC02> { [ s, S ] };

+	key <AC03> { [ d, D ] };

+	key <AC04> { [ f, F ] };

+	key <AC05> { [ g, G ] };

+	key <AC06> { [ h, H ] };

+	key <AC07> { [ j, J ] };

+	key <AC08> { [ k, K ] };

+	key <AC09> { [ l, L ] };

+	key <AC10> { [ semicolon, colon ] };

+	key <AC11> { [ apostrophe, quotedbl ] };

+

+	key <AB01> { [ z, Z ] };

+	key <AB02> { [ x, X ] };

+	key <AB03> { [ c, C ] };

+	key <AB04> { [ v, V ] };

+	key <AB05> { [ b, B ] };

+	key <AB06> { [ n, N ] };

+	key <AB07> { [ m, M ] };

+	key <AB08> { [ comma, less ] };

+	key <AB09> { [ period, greater ] };

+	key <AB10> { [ slash, U003F ] };

+

+	key <BKSL> { [ backslash, bar ] };

+	// End alphanumeric section

+};

+

+partial alphanumeric_keys

+xkb_symbols "french"

+{

+	name[Group1]="French (Cameroon)";

+	include "latin"

+

+	key <AE01> { [ ampersand, 1, onesuperior, exclamdown ] };

+	key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };

+	key <AE03> { [ quotedbl, 3, numbersign, sterling ] };

+	key <AE04> { [apostrophe, 4, braceleft, dollar ] };

+	key <AE05> { [ parenleft, 5, bracketleft, threeeighths ] };

+	key <AE06> { [ minus, 6, bar, fiveeighths ] };

+	key <AE07> { [ egrave, 7, grave, seveneighths ] };

+	key <AE08> { [underscore, 8, backslash, trademark ] };

+	key <AE09> { [ ccedilla, 9, asciicircum, plusminus ] };

+	key <AE10> { [ agrave, 0, at, degree ] };

+	key <AE11> { [parenright, degree, bracketright, questiondown ] };

+	key <AE12> { [ equal, plus, braceright, dead_ogonek ] };

+

+	key <AD01> { [ a, A, ae, AE ] };

+	key <AD02> { [ z, Z, guillemotleft, less ] };

+	key <AD03> { [ e, E, EuroSign, cent ] };

+	key <AD11> { [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };

+	key <AD12> { [ dollar, sterling, currency, dead_macron ] };

+

+	key <AC01> { [ q, Q, at, Greek_OMEGA ] };

+	key <AC10> { [ m, M, mu, masculine ] };

+	key <AC11> { [ ugrave, percent, dead_circumflex, dead_caron] };

+	key <TLDE> { [twosuperior, asciitilde, notsign, notsign ] };

+

+	key <BKSL> { [ asterisk, mu, dead_grave, dead_breve ] };

+	key <AB01> { [ w, W, lstroke, Lstroke ] };

+	key <AB07> { [ comma, U003F, dead_acute, dead_doubleacute ] };

+	key <AB08> { [ semicolon, period, horizconnector, multiply ] };

+	key <AB09> { [ colon, slash, periodcentered, division ] };

+	key <AB10> { [ exclam, section, dead_belowdot, dead_abovedot ] };

+

+	include "level3(ralt_switch)"

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "azerty"

+{

+	name[Group1] = "French (Cameroon azerty)";

+	include "level3(ralt_switch)"

+	include "cm(basic)"

+	key <AB01> { [ w, W, U1E85, U1E84 ] };	//  SMALL LETTER W,  CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS

+	key <AB02> { [ x, X, U2039, U203A ] };	// SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

+	key <AB03> { [ c, C, U0327, copyright ] };	// SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN

+	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER

+	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK

+	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG

+	key <AB07> { [ U002C, U003F, NoSymbol, U00D7 ] };	// COMMA, QUESTION MARK, , MULTIPLY

+	key <AB08> { [ semicolon, period, dead_acute, dead_grave ] };	// SEMICOLON, PERIOD

+	key <AB09> { [ colon, slash, U0323 ] };	// COLON, SLASH, COMBINING DOT BELOW

+	key <AB10> { [ exclam, U00A7 ] };	// EXCLAMATION MARK, SECTION SIGN

+	key <AC01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH

+	key <AC02> { [ s, S, U201C, U201D ] };	// SMALL LETTER S, CAPITAL LETTER S, LEFT DOUBLE QUOTES, RIGHT DOUBLE QUOTES 

+	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK

+	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE

+	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)

+	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA

+	key <AC07> { [ j, J, leftarrow, U2122 ] };	//SMALL LETTER J, CAPITAL LETTER J, LEFT ARROW, TRADE MARK SIGN

+	key <AC08> { [ k, K, downarrow, uparrow ] };	// SMALL LETTER K, CAPITAL LETTER K, DOWN ARROW, UP ARROW

+	key <AC09> { [ l, L, rightarrow, U00A3 ] };	// SMALL LETTER L, CAPITAL LETTER L, RIGHT ARROW, POUND STERLING

+	key <AC10> { [ m, M, U00F9, U00B5 ] };	// SMALL LETTER M, CAPITAL LETTER M, SMALL LETTER U WITH GRAVE, MICRO SYMBOL

+	key <AC11> { [ U0300, U0302, U1DC5, U1DC4 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, COMBINING LOW-MID TONE, COMBINING MID-HIGH TONE

+	key <AD01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E

+	key <AD02> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER

+	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA

+	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN

+	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE

+	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK

+	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR

+	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR

+	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O

+	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR

+	key <AD11> { [ U0301, U030C, dead_circumflex, dead_diaeresis ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, DEAD CIRCUMFLEX, DEAD DIAERESIS

+	key <AD12> { [ U0330, U0303, U0304, U030D ] };	// COMBINING TILDE (NASAL) BELOW, COMBINING TILDE (NASAL), COMBINING MID TONE, COMBINING VERTICAL LINE ABOVE

+	key <AE01> { [ U0026, KP_1, U00B9, U2018 ] };	// AMPERSAND, 1, SUPERSCRIPT 1, LEFT SINGLE QUOTE

+	key <AE02> { [ eacute, KP_2, asciitilde, U2019 ] };	// SMALL LETTER E WITH ACUTE, 2, TILDE, RIGHT SINGLE QUOTE

+	key <AE03> { [ U0022, KP_3, U0025 ] };	// QUOTATION MARK, 3, PERCENT SIGN

+	key <AE04> { [ U0027, KP_4, U007B ] };	// APOSTROPHE, 4, LEFT CURLY BRACKET

+	key <AE05> { [ U0028, KP_5, U005B, numbersign ] };	// LEFT PARENTHESIS, 5, LEFT SQUARE BRACKET, NUMBER SIGN

+	key <AE06> { [ U002D, KP_6, U007C ] };	// HYPHEN/MINUS, 6, BAR

+	key <AE07> { [ U00E8, KP_7, U0300 ] };	// SMALL LETTER E WITH GRAVE, 7, COMBINING GRAVE

+	key <AE08> { [ underscore, KP_8, backslash, U20D6 ] };	// UNDERSCORE, 8, BACKSLASH, COMBINING LEFT ARROW ABOVE

+	key <AE09> { [ ccedilla, KP_9, U005E] };	// SMALL LETTER C WITH CEDILLA, 9, CIRCUMFLEX

+	key <AE10> { [ U00E0, KP_0, at, U20D7 ] };	// SMALL LETTER A WITH GRAVE

+	key <AE11> { [ U0029, U00B0, U005D ] };	// RIGHT PARENTHESIS, DEGREE, RIGHT SQUARE BRACKET

+	key <AE12> { [ U003D, U002B, U007D, U00B1 ] };	// EQUAL SIGN, PLUS SIGN, RIGHT CURLY BRACKET, PLUS-MINUS SIGN

+	key <BKSL> { [ U1DC6, U1DC7, KP_Multiply, U00A4 ] };	//  COMBINING MID-LOW, COMBINING HIGH-MID, MULTIPLY, CURRENCY SIGN

+	key <LSGT> { [ U003C, U003E, U00AB, U00BB ] };	// LESS THAN, GREATER THAN, LEFT GUILLEMET, RIGHT GUILLEMET

+	key <TLDE> { [ U0024, U20AC, U00B2, U00B3 ] };	// DOLLAR, EURO, SUPERSCRIPT 2, SUPERSCRIPT 3

+	include "cm(exclamation_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "qwerty"

+{

+	name[Group1] = "English (Cameroon qwerty)";

+	include "level3(ralt_switch)"

+	include "cm(basic)"

+	key <AB01> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER

+	key <AB02> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X

+	key <AB03> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT

+	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER

+	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK

+	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG

+	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN

+	key <AB08> { [ U002C, U003C, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET

+	key <AB09> { [ U002E, U003E, U203A, U00BB ] };    // PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET

+	key <AB10> { [ U002F, U003F, U00F7 ] };    // SLASH, QUESTION MARK, DIVISION SIGN

+	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E

+	key <AC02> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S

+	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK

+	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE

+	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)

+	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA

+	key <AC07> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW

+	key <AC08> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID

+	key <AC09> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE

+	key <AC10> { [ U003B, U003A ] };	// SEMICOLON, COLON

+	key <AC11> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK

+	key <AD01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH

+	key <AD02> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS

+	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA

+	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN

+	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE

+	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK

+	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR

+	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR

+	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O

+	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR

+	key <AD11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET

+	key <AD12> { [ U0327, U0308, U005D, U007D ] };	// COMBINING CEDILLA, COMBINING DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET

+	key <AE01> { [ U0031, U0021, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER

+	key <AE02> { [ U0032, U0040, U00BD ] };	//2, AT SYMBOL, ONE HALF

+	key <AE03> { [ U0033, U0023, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS

+	key <AE04> { [ U0034, U0024, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN

+	key <AE08> { [ U0038, U002A, NoSymbol, U00D7 ] };	// 8, ASTERISK, , MATH MULTIPLY

+	key <AE09> { [ U0039, U0028, U2018, U201C ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

+	key <AE10> { [ U0030, U0029, U2019, U201D ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

+	key <AE11> { [ U002D, U005F, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE, COMBINING MID TONE

+	key <AE12> { [ U003D, U002B, NoSymbol, U00B1 ] };	// EQUAL, PLUS, , PLUS-MINUS

+	key <BKSL> { [ U005C, U007C ] };	// BACKSLASH, BAR

+	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE

+	include "cm(semicolon_switch)"

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "dvorak"

+{

+	name[Group1] = "English (Cameroon Dvorak)";

+	include "level3(ralt_switch)"

+	include "us(dvorak)"

+	key <AB01> { [ semicolon, colon ] };	// SEMICOLON, COLON

+	key <AB02> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH

+	key <AB03> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW

+	key <AB04> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID

+	key <AB05> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X

+	key <AB06> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK

+	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN

+	key <AB08> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS

+	key <AB09> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER

+	key <AB10> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER

+	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E

+	key <AC02> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O

+	key <AC03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA

+	key <AC04> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR

+	key <AC05> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR

+	key <AC06> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK

+	key <AC07> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA

+	key <AC08> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE

+	key <AC09> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG

+	key <AC10> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S

+	key <AC11> { [ minus, underscore, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE

+	key <AD01> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK

+	key <AD02> { [ comma, less, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET

+	key <AD03> { [ period, greater, U203A, U00BB ] };	// PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET

+	key <AD04> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR

+	key <AD05> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK

+	key <AD06> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE

+	key <AD07> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)

+	key <AD08> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT

+	key <AD09> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN

+	key <AD10> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE

+	key <AD11> { [ slash, U003F, U00F7, U0294 ] };	// SLASH, QUESTION MARK, DIVISION SIGN, GLOTTAL STOP

+	key <AD12> { [ equal, plus, NoSymbol, plusminus ] };	// EQUAL, PLUS, , PLUS-MINUS

+	key <AE01> { [ KP_1, exclam, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER

+	key <AE02> { [ KP_2, at, U00BD ] };	// 2, AT SYMBOL, ONE HALF

+	key <AE03> { [ KP_3, numbersign, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS

+	key <AE04> { [ KP_4, dollar, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN

+	key <AE05> { [ KP_5, percent ] };	// 5, PERCENT

+	key <AE06> { [ KP_6, asciicircum ] };	// 6, CARET

+	key <AE07> { [ KP_7, ampersand ] };	// 7, AMPERSAND

+	key <AE08> { [ KP_8, asterisk, NoSymbol, multiply ] };	// 8, ASTERISK, , MULTIPLY

+	key <AE09> { [ KP_9, parenleft, leftsinglequotemark, leftdoublequotemark ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

+	key <AE10> { [ KP_0, parenright, rightsinglequotemark, rightdoublequotemark ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

+	key <AE11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET

+	key <AE12> { [ U0327, dead_diaeresis, U005D, braceright ] };	// COMBINING CEDILLA, DEAD DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET

+	key <BKSL> { [ backslash, bar ] };	// BACKSLASH, BAR

+	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE

+	include "cm(semicolon_switch_dvorak)"

+};

+

+// The following code creates the "Cameroon key" phenomenon.

+

+partial modifier_keys

+xkb_symbols "semicolon_switch" {

+	key <AC10> {

+	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]};

+	modifier_map Mod5	{ ISO_Level3_Latch };

+};

+

+partial modifier_keys

+xkb_symbols "exclamation_switch" {

+	key <AB10> {

+	symbols[Group1] = [ ISO_Level3_Latch,	U00A7,	exclam,	U00A7 ]

+	};

+	modifier_map Mod5	{ ISO_Level3_Latch };

+};

+

+partial modifier_keys

+xkb_symbols "semicolon_switch_dvorak" {

+	key <AB01> {

+	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]

+	};

+modifier_map Mod5	{ ISO_Level3_Latch };

+};

+