From d8f81c980a46279ac619312a914b563144894512 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 13 Jul 2010 07:48:55 +0000 Subject: Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch. --- xorg-server/xkbdata.src/rules/HDR | 33 - xorg-server/xkbdata.src/rules/Makefile.am | 236 - xorg-server/xkbdata.src/rules/README | 2 - xorg-server/xkbdata.src/rules/base.extras.xml.in | 86 - xorg-server/xkbdata.src/rules/base.hdr.part | 9 - xorg-server/xkbdata.src/rules/base.l1_k.part | 3 - xorg-server/xkbdata.src/rules/base.l1o_s.part | 2 - xorg-server/xkbdata.src/rules/base.l2o_s.part | 2 - xorg-server/xkbdata.src/rules/base.l3o_s.part | 2 - xorg-server/xkbdata.src/rules/base.l4o_s.part | 2 - xorg-server/xkbdata.src/rules/base.l_k.part | 3 - xorg-server/xkbdata.src/rules/base.lists.part | 107 - xorg-server/xkbdata.src/rules/base.lo_s.part | 2 - xorg-server/xkbdata.src/rules/base.m_g.part | 26 - xorg-server/xkbdata.src/rules/base.m_k.part | 14 - xorg-server/xkbdata.src/rules/base.m_s.part | 51 - xorg-server/xkbdata.src/rules/base.m_t.part | 4 - xorg-server/xkbdata.src/rules/base.ml1_c.part | 1 - xorg-server/xkbdata.src/rules/base.ml1_s.part | 15 - xorg-server/xkbdata.src/rules/base.ml2_s.part | 3 - xorg-server/xkbdata.src/rules/base.ml3_s.part | 3 - xorg-server/xkbdata.src/rules/base.ml4_s.part | 3 - xorg-server/xkbdata.src/rules/base.ml_c.part | 4 - xorg-server/xkbdata.src/rules/base.ml_g.part | 1 - xorg-server/xkbdata.src/rules/base.ml_s.part | 40 - xorg-server/xkbdata.src/rules/base.mlv_s.part | 4 - xorg-server/xkbdata.src/rules/base.o_c.part | 6 - xorg-server/xkbdata.src/rules/base.o_k.part | 0 xorg-server/xkbdata.src/rules/base.o_s.part | 138 - xorg-server/xkbdata.src/rules/base.o_t.part | 8 - xorg-server/xkbdata.src/rules/base.xml.in | 5515 -------------------- xorg-server/xkbdata.src/rules/bin/Makefile.am | 10 - xorg-server/xkbdata.src/rules/bin/ml1_s.sh | 9 - xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh | 7 - xorg-server/xkbdata.src/rules/bin/ml1v_s.sh | 7 - xorg-server/xkbdata.src/rules/bin/ml_s.sh | 9 - xorg-server/xkbdata.src/rules/bin/mln_s.sh | 10 - xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh | 8 - xorg-server/xkbdata.src/rules/bin/mlv_s.sh | 7 - xorg-server/xkbdata.src/rules/compat/Makefile.am | 68 - .../xkbdata.src/rules/compat/base.l1v1_c.part | 1 - .../xkbdata.src/rules/compat/base.l2v2_c.part | 1 - .../xkbdata.src/rules/compat/base.l3v3_c.part | 1 - .../xkbdata.src/rules/compat/base.l4v4_c.part | 1 - .../xkbdata.src/rules/compat/base.lists.part | 2 - .../xkbdata.src/rules/compat/base.lv_c.part | 1 - xorg-server/xkbdata.src/rules/compat/base.o_s.part | 1 - .../xkbdata.src/rules/compat/layoutsMapping.lst | 27 - xorg-server/xkbdata.src/rules/compat/makefile | 53 - .../xkbdata.src/rules/compat/variantsMapping.lst | 50 - xorg-server/xkbdata.src/rules/evdev.m_k.part | 3 - xorg-server/xkbdata.src/rules/evdev.m_s.part | 3 - xorg-server/xkbdata.src/rules/extras/Makefile.am | 52 - .../xkbdata.src/rules/extras/layoutsMapping.lst | 1 - xorg-server/xkbdata.src/rules/extras/makefile | 53 - .../xkbdata.src/rules/extras/variantsMapping.lst | 5 - xorg-server/xkbdata.src/rules/makefile | 189 - xorg-server/xkbdata.src/rules/merge.py | 13 - xorg-server/xkbdata.src/rules/merge.sh | 25 - xorg-server/xkbdata.src/rules/xfree98 | 29 - xorg-server/xkbdata.src/rules/xkb.dtd | 59 - xorg-server/xkbdata.src/rules/xml2lst.pl | 288 - 62 files changed, 7318 deletions(-) delete mode 100644 xorg-server/xkbdata.src/rules/HDR delete mode 100644 xorg-server/xkbdata.src/rules/Makefile.am delete mode 100644 xorg-server/xkbdata.src/rules/README delete mode 100644 xorg-server/xkbdata.src/rules/base.extras.xml.in delete mode 100644 xorg-server/xkbdata.src/rules/base.hdr.part delete mode 100644 xorg-server/xkbdata.src/rules/base.l1_k.part delete mode 100644 xorg-server/xkbdata.src/rules/base.l1o_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.l2o_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.l3o_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.l4o_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.l_k.part delete mode 100644 xorg-server/xkbdata.src/rules/base.lists.part delete mode 100644 xorg-server/xkbdata.src/rules/base.lo_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.m_g.part delete mode 100644 xorg-server/xkbdata.src/rules/base.m_k.part delete mode 100644 xorg-server/xkbdata.src/rules/base.m_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.m_t.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml1_c.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml1_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml2_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml3_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml4_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml_c.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml_g.part delete mode 100644 xorg-server/xkbdata.src/rules/base.ml_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.mlv_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.o_c.part delete mode 100644 xorg-server/xkbdata.src/rules/base.o_k.part delete mode 100644 xorg-server/xkbdata.src/rules/base.o_s.part delete mode 100644 xorg-server/xkbdata.src/rules/base.o_t.part delete mode 100644 xorg-server/xkbdata.src/rules/base.xml.in delete mode 100644 xorg-server/xkbdata.src/rules/bin/Makefile.am delete mode 100644 xorg-server/xkbdata.src/rules/bin/ml1_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/bin/ml1v_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/bin/ml_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/bin/mln_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/bin/mlv_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/Makefile.am delete mode 100644 xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part delete mode 100644 xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part delete mode 100644 xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part delete mode 100644 xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part delete mode 100644 xorg-server/xkbdata.src/rules/compat/base.lists.part delete mode 100644 xorg-server/xkbdata.src/rules/compat/base.lv_c.part delete mode 100644 xorg-server/xkbdata.src/rules/compat/base.o_s.part delete mode 100644 xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst delete mode 100644 xorg-server/xkbdata.src/rules/compat/makefile delete mode 100644 xorg-server/xkbdata.src/rules/compat/variantsMapping.lst delete mode 100644 xorg-server/xkbdata.src/rules/evdev.m_k.part delete mode 100644 xorg-server/xkbdata.src/rules/evdev.m_s.part delete mode 100644 xorg-server/xkbdata.src/rules/extras/Makefile.am delete mode 100644 xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst delete mode 100644 xorg-server/xkbdata.src/rules/extras/makefile delete mode 100644 xorg-server/xkbdata.src/rules/extras/variantsMapping.lst delete mode 100644 xorg-server/xkbdata.src/rules/makefile delete mode 100644 xorg-server/xkbdata.src/rules/merge.py delete mode 100644 xorg-server/xkbdata.src/rules/merge.sh delete mode 100644 xorg-server/xkbdata.src/rules/xfree98 delete mode 100644 xorg-server/xkbdata.src/rules/xkb.dtd delete mode 100644 xorg-server/xkbdata.src/rules/xml2lst.pl (limited to 'xorg-server/xkbdata.src/rules') diff --git a/xorg-server/xkbdata.src/rules/HDR b/xorg-server/xkbdata.src/rules/HDR deleted file mode 100644 index 769b8fc7f..000000000 --- a/xorg-server/xkbdata.src/rules/HDR +++ /dev/null @@ -1,33 +0,0 @@ -! model = keycodes -! layout[1] = keycodes -! layout = keycodes -! option = keycodes -! model layout = geometry -! model = geometry -! model layout variant = symbols -! model layout = symbols -! model layout[1] = symbols -! model layout[1] variant[1] = symbols -! model layout[2] = symbols -! model layout[3] = symbols -! model layout[4] = symbols -! model layout[2] variant[2] = symbols -! model layout[3] variant[3] = symbols -! model layout[4] variant[4] = symbols -! model = symbols -! layout variant = compat -! layout[1] variant[1] = compat -! layout[2] variant[2] = compat -! layout[3] variant[3] = compat -! layout[4] variant[4] = compat -! model layout = compat -! model layout[1] = compat -! model = types -! layout option = symbols -! layout[1] option = symbols -! layout[2] option = symbols -! layout[3] option = symbols -! layout[4] option = symbols -! option = symbols -! option = compat -! option = types diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am deleted file mode 100644 index 6ca04e7fa..000000000 --- a/xorg-server/xkbdata.src/rules/Makefile.am +++ /dev/null @@ -1,236 +0,0 @@ -SUBDIRS = bin compat extras - -if CREATE_RULES_SYMLINK -# extra_rules_file = $(xkb_rules_symlink) -# extra_dir_file = $(extra_rules_file).xml -# extra_lst_file = $(extra_rules_file).lst - -install-data-hook: - for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \ - extra_rules_file=$$file ; \ - extra_dir_file=$$extra_rules_file.xml ; \ - extra_lst_file=$$extra_rules_file.lst ; \ - ln -sf base $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \ - ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \ - ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \ - done - -else -install-data-hook: - -endif - -if USE_COMPAT_RULES - -base_parts = base.hdr.part base.lists.part \ -compat/base.lists.part \ -HDR base.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.o_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ -HDR compat/base.ml2_s.part extras/base.ml2_s.part base.ml2_s.part \ -HDR compat/base.ml3_s.part extras/base.ml3_s.part base.ml3_s.part \ -HDR compat/base.ml4_s.part extras/base.ml4_s.part base.ml4_s.part \ -HDR compat/base.ml2v2_s.part extras/base.ml2v2_s.part \ -HDR compat/base.ml3v3_s.part extras/base.ml3v3_s.part \ -HDR compat/base.ml4v4_s.part extras/base.ml4v4_s.part \ -HDR base.m_s.part \ -HDR compat/base.lv_c.part \ -HDR compat/base.l1v1_c.part \ -HDR compat/base.l2v2_c.part \ -HDR compat/base.l3v3_c.part \ -HDR compat/base.l4v4_c.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.lo_s.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -evdev_parts = base.hdr.part base.lists.part \ -compat/base.lists.part \ -HDR evdev.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.o_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ -HDR compat/base.ml2_s.part extras/base.ml2_s.part base.ml2_s.part \ -HDR compat/base.ml3_s.part extras/base.ml3_s.part base.ml3_s.part \ -HDR compat/base.ml4_s.part extras/base.ml4_s.part base.ml4_s.part \ -HDR compat/base.ml2v2_s.part extras/base.ml2v2_s.part \ -HDR compat/base.ml3v3_s.part extras/base.ml3v3_s.part \ -HDR compat/base.ml4v4_s.part extras/base.ml4v4_s.part \ -HDR evdev.m_s.part \ -HDR compat/base.lv_c.part \ -HDR compat/base.l1v1_c.part \ -HDR compat/base.l2v2_c.part \ -HDR compat/base.l3v3_c.part \ -HDR compat/base.l4v4_c.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.lo_s.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -else - -base_parts = base.hdr.part base.lists.part \ -HDR base.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR extras/base.mlv_s.part base.mlv_s.part \ -HDR extras/base.ml_s.part base.ml_s.part \ -HDR extras/base.ml1_s.part base.ml1_s.part \ -HDR extras/base.ml1v1_s.part \ -HDR extras/base.ml2_s.part base.ml2_s.part \ -HDR extras/base.ml3_s.part base.ml3_s.part \ -HDR extras/base.ml4_s.part base.ml4_s.part \ -HDR extras/base.ml2v2_s.part \ -HDR extras/base.ml3v3_s.part \ -HDR extras/base.ml4v4_s.part \ -HDR base.m_s.part \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -evdev_parts = base.hdr.part base.lists.part \ -HDR evdev.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR extras/base.mlv_s.part base.mlv_s.part \ -HDR extras/base.ml_s.part base.ml_s.part \ -HDR extras/base.ml1_s.part base.ml1_s.part \ -HDR extras/base.ml1v1_s.part \ -HDR extras/base.ml2_s.part base.ml2_s.part \ -HDR extras/base.ml3_s.part base.ml3_s.part \ -HDR extras/base.ml4_s.part base.ml4_s.part \ -HDR extras/base.ml2v2_s.part \ -HDR extras/base.ml3v3_s.part \ -HDR extras/base.ml4v4_s.part \ -HDR evdev.m_s.part \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -endif - -all_parts_dist = HDR base.hdr.part \ -base.lists.part \ -base.m_k.part \ -base.l1_k.part \ -base.l_k.part \ -base.o_k.part \ -base.ml_g.part \ -base.m_g.part \ -base.mlv_s.part \ -base.ml_s.part \ -base.ml1_s.part \ -base.ml2_s.part \ -base.ml3_s.part \ -base.ml4_s.part \ -base.m_s.part \ -base.ml_c.part \ -base.ml1_c.part \ -base.m_t.part \ -base.lo_s.part \ -base.l1o_s.part \ -base.l2o_s.part \ -base.l3o_s.part \ -base.l4o_s.part \ -base.o_s.part \ -base.o_c.part \ -base.o_t.part \ -evdev.m_k.part \ -evdev.m_s.part - -rules_files = base evdev xfree98 - -lst_files = base.lst evdev.lst - -%.lst: %.xml - perl $(srcdir)/xml2lst.pl < $< > $@ - -base: $(base_parts) - HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts) - -evdev: $(evdev_parts) - HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts) - -dist_files = xkb.dtd README - -rules_DATA = $(rules_files) $(lst_files) $(dist_files) - -xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in -xml_DATA = $(xml_in_files:.xml.in=.xml) - -$(srcdir)/evdev.xml.in: base.xml.in - cp $< $@ - -$(srcdir)/evdev.extras.xml.in: base.extras.xml.in - cp $< $@ - -EXTRA_DIST= $(xml_in_files) xfree98 \ - $(all_parts_dist) \ - xml2lst.pl merge.sh $(dist_files) - -CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml -MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in - -rulesdir = $(xkb_base)/rules -xmldir = $(rulesdir) - -@INTLTOOL_XML_NOMERGE_RULE@ diff --git a/xorg-server/xkbdata.src/rules/README b/xorg-server/xkbdata.src/rules/README deleted file mode 100644 index bcf19ce0c..000000000 --- a/xorg-server/xkbdata.src/rules/README +++ /dev/null @@ -1,2 +0,0 @@ -This directory lists sets of rules which can be used to obtain an exact XKB -configuration. diff --git a/xorg-server/xkbdata.src/rules/base.extras.xml.in b/xorg-server/xkbdata.src/rules/base.extras.xml.in deleted file mode 100644 index a17205e54..000000000 --- a/xorg-server/xkbdata.src/rules/base.extras.xml.in +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - apl - <_shortDescription>APL - <_description>APL - eng - - - - - - ir - <_shortDescription>Iran - <_description>Iran - per - - - - - ave - <_description>Avestan - ave - - - - - - - us - <_shortDescription>USA - <_description>USA - eng - - - - - intl-unicode - <_description>International (AltGr Unicode combining) - - - - - alt-intl-unicode - <_description>International (AltGr Unicode combining, alternative) - - - - - ats - <_description>Atsina - - - - - - crd - <_description>Couer D'alene Salish - crd - - - - - - - rs - <_shortDescription>SRB - <_description>Serbia - srp - - - - - combiningkeys - <_description>Combining accents instead of dead keys - - - - - - - diff --git a/xorg-server/xkbdata.src/rules/base.hdr.part b/xorg-server/xkbdata.src/rules/base.hdr.part deleted file mode 100644 index d867c8876..000000000 --- a/xorg-server/xkbdata.src/rules/base.hdr.part +++ /dev/null @@ -1,9 +0,0 @@ -// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - -// -// Rules for resolving XKB components for use with XFree86 -// Copyright 1996 by Joseph Moss -// -// 2002 Modifier: Ivan Pascal The XFree86 Project -// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $ -// diff --git a/xorg-server/xkbdata.src/rules/base.l1_k.part b/xorg-server/xkbdata.src/rules/base.l1_k.part deleted file mode 100644 index 91b775396..000000000 --- a/xorg-server/xkbdata.src/rules/base.l1_k.part +++ /dev/null @@ -1,3 +0,0 @@ - $azerty = +aliases(azerty) - $qwertz = +aliases(qwertz) - * = +aliases(qwerty) diff --git a/xorg-server/xkbdata.src/rules/base.l1o_s.part b/xorg-server/xkbdata.src/rules/base.l1o_s.part deleted file mode 100644 index 592fab272..000000000 --- a/xorg-server/xkbdata.src/rules/base.l1o_s.part +++ /dev/null @@ -1,2 +0,0 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 - * misc:typo = +typo(base):1 diff --git a/xorg-server/xkbdata.src/rules/base.l2o_s.part b/xorg-server/xkbdata.src/rules/base.l2o_s.part deleted file mode 100644 index aac680e9d..000000000 --- a/xorg-server/xkbdata.src/rules/base.l2o_s.part +++ /dev/null @@ -1,2 +0,0 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 - * misc:typo = +typo(base):2 diff --git a/xorg-server/xkbdata.src/rules/base.l3o_s.part b/xorg-server/xkbdata.src/rules/base.l3o_s.part deleted file mode 100644 index 1010e2e03..000000000 --- a/xorg-server/xkbdata.src/rules/base.l3o_s.part +++ /dev/null @@ -1,2 +0,0 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 - * misc:typo = +typo(base):3 diff --git a/xorg-server/xkbdata.src/rules/base.l4o_s.part b/xorg-server/xkbdata.src/rules/base.l4o_s.part deleted file mode 100644 index 49650ad9c..000000000 --- a/xorg-server/xkbdata.src/rules/base.l4o_s.part +++ /dev/null @@ -1,2 +0,0 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 - * misc:typo = +typo(base):4 diff --git a/xorg-server/xkbdata.src/rules/base.l_k.part b/xorg-server/xkbdata.src/rules/base.l_k.part deleted file mode 100644 index 91b775396..000000000 --- a/xorg-server/xkbdata.src/rules/base.l_k.part +++ /dev/null @@ -1,3 +0,0 @@ - $azerty = +aliases(azerty) - $qwertz = +aliases(qwertz) - * = +aliases(qwerty) diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part deleted file mode 100644 index 4cf47331a..000000000 --- a/xorg-server/xkbdata.src/rules/base.lists.part +++ /dev/null @@ -1,107 +0,0 @@ - -// If you want non-latin layouts implicitly include the en_US layout -// uncomment lines below -//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \ -// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \ -// ru scc sy syr tel th tj tam ua uz - -// PC models -! $pcmodels = pc101 pc102 pc104 pc105 - -// Microsoft models (using MS geometry) -! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose - -// Nokia devices and keyboards -! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 - -// PC geometries - they have special geometry but symbols are mostly pc105 -! $pcgeometries = latitude - -// TypeMatrix geometries -! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 - -// Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us - -! $macbooks = macbook78 macbook79 -! $maclaptop = ibook powerbook macbook78 macbook79 -! $applealu = applealu_ansi applealu_iso applealu_jis -! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79 - -! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us - -! $azerty = be fr -! $qwertz = al cz de hr hu ro si sk - -! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ - airkey \ - apple armada azonaRF2300 \ - benqx brother \ - btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb \ - cherrycyboard cherrycmexpert \ - chicony chicony0108 chicony0420 chicony9885 \ - compalfl90 \ - compaqeak8 compaqik7 compaqik13 compaqik18 \ - creativedw7000 \ - cymotionlinux \ - dell dellm65 inspiron dellusbmm \ - emachines ennyah_dkb1008 evdev \ - genius geniuscomfy2 \ - gyration honeywell_euroboard \ - hp250x hp5xx hp500fa hpdv5 \ - hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ - ibm_spacesaver ipaq inspiron intel \ - kinesis \ - logiaccess logicda logicink \ - logiex110 logiclx300 \ - logiinkse logiinkseusb logiitc logiik \ - logitech_base itouch logiultrax \ - logitech_g15 \ - logidinovo logidinovoedge \ - microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ - microsoftoffice microsoftmult \ - mx1998 mx2500 mx2750 \ - oretec \ - pc105 \ - presario propeller \ - qtronix \ - rapidaccess rapidaccess2 thinkpad60 \ - samsung4500 samsung4510 \ - silvercrest \ - sk1300 sk2500 sk6200 sk7100 \ - sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ - unitekkb1925 yahoo - -// all layouts with 3rd and 4th groups -! $threelevellayouts = al az \ - be br bt \ - ca ch cs cz \ - de dk \ - ee es \ - fi fo fr \ - gb gr \ - hu \ - ie ir is it \ - latam \ - lk lt \ - mn mt \ - nl no \ - pl pt \ - ro \ - se sk \ - tr \ - us \ - vn \ - za - -! $evdevkbds = ibm_spacesaver - -! $thinkpads = thinkpad thinkpad60 thinkpadz60 - -! $sun_t6_custom = ara be br ca ch cz de dk \ - ee es fi fr gb gr it kr \ - lt lv nl no pl pt ro ru \ - se sk tr tw ua - diff --git a/xorg-server/xkbdata.src/rules/base.lo_s.part b/xorg-server/xkbdata.src/rules/base.lo_s.part deleted file mode 100644 index dee7b6daa..000000000 --- a/xorg-server/xkbdata.src/rules/base.lo_s.part +++ /dev/null @@ -1,2 +0,0 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) - * misc:typo = +typo(base) diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part deleted file mode 100644 index eab19eb9d..000000000 --- a/xorg-server/xkbdata.src/rules/base.m_g.part +++ /dev/null @@ -1,26 +0,0 @@ - microsoftelite = microsoft(elite) - $msmodels = microsoft(natural) - dell101 = dell(dell101) - dellm65 = dell(dellm65) - latitude = dell(latitude) - flexpro = keytronic(FlexPro) - hp6000 = hp(omnibook) - hpmini110 = hp(mini110) - hpdv5 = hp(dv5) - omnikey101 = northgate(omnikey101) - $pcmodels = pc(%m) - $pcgeometries = pc(%m) - everex = everex(STEPnote) - thinkpad = thinkpad(intl) - thinkpad60 = thinkpad(60) - thinkpadz60 = thinkpad(60) - $tmgeometries = typematrix(%m) - winbook = winbook(XP5) - pc98 = nec(pc98) - $applealu = macintosh(%m) - $macbooks = macintosh(%m) - $macs = macintosh(macintosh) - hhk = hhk(basic) - kinesis = kinesis(model100) - $nokiamodels = nokia(%m) - * = pc(pc104) diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part deleted file mode 100644 index 2c621208f..000000000 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ /dev/null @@ -1,14 +0,0 @@ - amiga = amiga(de) - ataritt = ataritt(de) - empty = empty - sun4 = sun(type4_euro) - sun5 = sun(type5_euro) - sun6 = sun(type6_usb) - sun6euro = sun(type6tuv_usb) - pc98 = xfree98(pc98) - $applealu = macintosh(alukbd) - macintosh_hhk = macintosh(hhk) - macintosh_old = macintosh(old) - $macs = macintosh - thinkpadz60 = xfree86(thinkpadz60) - * = xfree86 diff --git a/xorg-server/xkbdata.src/rules/base.m_s.part b/xorg-server/xkbdata.src/rules/base.m_s.part deleted file mode 100644 index 4bbbcce31..000000000 --- a/xorg-server/xkbdata.src/rules/base.m_s.part +++ /dev/null @@ -1,51 +0,0 @@ - a4techKB21 = +inet(media_nav_common) - a4techKBS8 = +inet(media_nav_acpi_common) - a4_rfkb23 = +inet(media_nav_acpi_common) - asus_laptop = +inet(media_common) - acer_tm_800 = +inet(acer_laptop) - benqx730 = +inet(benqx) - benqx800 = +inet(benqx) - btc5126t = +inet(nav_acpi_common) - btc9116u = +inet(btc9019u) - btc6301urf = +inet(media_nav_acpi_common) - dellsk8125 = +inet(dell) - dellsk8135 = +inet(dell) - cherrybunlim = +inet(nav_common) - dexxa = +inet(media_nav_common) - dtk2000 = +inet(media_nav_acpi_common) - fscaa1667g = +inet(media_nav_common) - geniuskb19e = +inet(media_nav_acpi_common) - geniuscomfy = +inet(media_nav_acpi_common) - geniuskkb2050hs = +inet(dellusbmm) - hpnx9020 = +inet(hpi6) - latitude = +inet(media_common) - logicd = +inet(logitech_base) - logicd_it = +inet(logitech_base) - logicd_nav = +inet(logitech_base) - logicd_opt = +inet(logitech_base) - logiultrax = +inet(logitech_base) - logiclx300 = +inet(logiex110) - logii350 = +inet(logiex110) - logimel = +inet(logiex110) - logicdit = +inet(logicd) - logicdo = +inet(logicd) - logicdp = +inet(logicd) - logicdpa = +inet(logicda) - logiciink = +inet(logicink) - ltcd = +inet(logicda) - microsoftccurve2k = +inet(microsoftprooem) - microsoftpro = +inet(media_nav_acpi_common) - precision_m = +inet(media_nav_common) - scorpius = +inet(media_nav_acpi_common) - sp_inet = +inet(media_nav_acpi_common) - targa_v811 = +inet(media_nav_acpi_common) - thinkpad = +inet(media_nav_common) - thinkpadz60 = +inet(thinkpad60) - tm2030USB-102 = +inet(media_nav_acpi_common) - tm2030USB-106 = +inet(media_nav_acpi_common) - trust_slimline = +inet(media_nav_acpi_common) - vsonku306 = +inet(microsoftprooem) - $inetkbds = +inet(%m) - $maclaptop = +inet(apple)+level3(enter_switch) - $applealu = +inet(apple) - $macs = +inet(apple) diff --git a/xorg-server/xkbdata.src/rules/base.m_t.part b/xorg-server/xkbdata.src/rules/base.m_t.part deleted file mode 100644 index 7ccbf47b9..000000000 --- a/xorg-server/xkbdata.src/rules/base.m_t.part +++ /dev/null @@ -1,4 +0,0 @@ - $macs = complete+numpad(mac) - $applealu = complete+numpad(mac) - $nokiamodels = complete+nokia - * = complete diff --git a/xorg-server/xkbdata.src/rules/base.ml1_c.part b/xorg-server/xkbdata.src/rules/base.ml1_c.part deleted file mode 100644 index f59e596d5..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml1_c.part +++ /dev/null @@ -1 +0,0 @@ - * * = complete diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part deleted file mode 100644 index efe8ae124..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml1_s.part +++ /dev/null @@ -1,15 +0,0 @@ - ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) - amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) - sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) - sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) - macintosh_old us = macintosh_vndr/us(oldmac) - macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) - macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) - applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) - $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) - $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) - $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) - nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) - nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1]) - $thinkpads br = pc+%l[1](thinkpad) - * * = pc+%l[1]%(v[1]) diff --git a/xorg-server/xkbdata.src/rules/base.ml2_s.part b/xorg-server/xkbdata.src/rules/base.ml2_s.part deleted file mode 100644 index 3c80545d5..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml2_s.part +++ /dev/null @@ -1,3 +0,0 @@ - nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2 - nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2 - * * = +%l[2]%(v[2]):2 diff --git a/xorg-server/xkbdata.src/rules/base.ml3_s.part b/xorg-server/xkbdata.src/rules/base.ml3_s.part deleted file mode 100644 index b7e669f87..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml3_s.part +++ /dev/null @@ -1,3 +0,0 @@ - nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3 - nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3 - * * = +%l[3]%(v[3]):3 diff --git a/xorg-server/xkbdata.src/rules/base.ml4_s.part b/xorg-server/xkbdata.src/rules/base.ml4_s.part deleted file mode 100644 index d8830ae34..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml4_s.part +++ /dev/null @@ -1,3 +0,0 @@ - nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4 - nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4 - * * = +%l[4]%(v[4]):4 diff --git a/xorg-server/xkbdata.src/rules/base.ml_c.part b/xorg-server/xkbdata.src/rules/base.ml_c.part deleted file mode 100644 index ec8f02291..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml_c.part +++ /dev/null @@ -1,4 +0,0 @@ - pc98 nec_vndr/jp = pc98(basic) - * jp = complete+japan - olpc * = olpc - * * = complete diff --git a/xorg-server/xkbdata.src/rules/base.ml_g.part b/xorg-server/xkbdata.src/rules/base.ml_g.part deleted file mode 100644 index e66bb0b50..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml_g.part +++ /dev/null @@ -1 +0,0 @@ - thinkpad us = thinkpad(us) diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part deleted file mode 100644 index d59c54f26..000000000 --- a/xorg-server/xkbdata.src/rules/base.ml_s.part +++ /dev/null @@ -1,40 +0,0 @@ - ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2 - ataritt * = xfree68_vndr/ataritt(us)+%l%(v) - amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 - amiga * = xfree68_vndr/amiga(usa1)+%l%(v) - classmate us = pc+%l(classmate) - empty * = empty(basic) - * empty = empty(basic) - sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 - sun4 * = latin+sun_vndr/us(type4)+%l%(v) - sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 - sun5 * = latin+sun_vndr/us(type5)+%l%(v) - sun6 us = pc+sun_vndr/us(type6) - sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) - sun6 $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) - sun6 * = pc+sun_vndr/us(type6)+%l%(v) - sun6euro us = pc+sun_vndr/us(type6) - sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) - sun6euro $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) - sun6euro * = pc+sun_vndr/us(type6)+%l%(v) - pc98 nec_vndr/jp = nec_vndr/jp(pc98) - macintosh_old us = macintosh_vndr/us(oldmac) - macintosh_old en_US = macintosh_vndr/us(oldmac) - macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v) - macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2 - macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) - applealu_jis jp = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2 - applealu_jis * = macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2 - $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) - $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) - $macs en_US = pc+macintosh_vndr/us(extended) - $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) - nokiarx44 * = nokia_vndr/rx-44(%l) - nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) - nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v) - nokiasu8w * = nokia_vndr/su-8w(%l) - olpc $olpclayouts = olpc+%l%(m) - olpc * = olpc+%l%(v) - $thinkpads br = pc+br(thinkpad) - * $nonlatin = pc+us+%l%(v):2 - * * = pc+%l%(v) diff --git a/xorg-server/xkbdata.src/rules/base.mlv_s.part b/xorg-server/xkbdata.src/rules/base.mlv_s.part deleted file mode 100644 index 1eecc55c0..000000000 --- a/xorg-server/xkbdata.src/rules/base.mlv_s.part +++ /dev/null @@ -1,4 +0,0 @@ - classmate us intl = pc+us(classmate-intl) - classmate us alt-intl = pc+us(classmate-alt-intl) - classmate us altgr-intl = pc+us(classmate-altgr-intl) - nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty) diff --git a/xorg-server/xkbdata.src/rules/base.o_c.part b/xorg-server/xkbdata.src/rules/base.o_c.part deleted file mode 100644 index 352f8b363..000000000 --- a/xorg-server/xkbdata.src/rules/base.o_c.part +++ /dev/null @@ -1,6 +0,0 @@ - grp_led:num = +lednum(group_lock) - grp_led:caps = +ledcaps(group_lock) - grp_led:scroll = +ledscroll(group_lock) - japan:kana_lock = +japan(kana_lock) - caps:shiftlock = +ledcaps(shift_lock) - diff --git a/xorg-server/xkbdata.src/rules/base.o_k.part b/xorg-server/xkbdata.src/rules/base.o_k.part deleted file mode 100644 index e69de29bb..000000000 diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part deleted file mode 100644 index f8f5e5421..000000000 --- a/xorg-server/xkbdata.src/rules/base.o_s.part +++ /dev/null @@ -1,138 +0,0 @@ - altwin:menu = +altwin(menu) - altwin:meta_alt = +altwin(meta_alt) - altwin:ctrl_win = +altwin(ctrl_win) - altwin:ctrl_alt_win = +altwin(ctrl_alt_win) - altwin:meta_win = +altwin(meta_win) - altwin:left_meta_win = +altwin(left_meta_win) - altwin:hyper_win = +altwin(hyper_win) - altwin:alt_super_win = +altwin(alt_super_win) - altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) - grp:switch = +group(switch) - grp:lswitch = +group(lswitch) - grp:win_switch = +group(win_switch) - grp:lwin_switch = +group(lwin_switch) - grp:rwin_switch = +group(rwin_switch) - grp:toggle = +group(toggle) - grp:shifts_toggle = +group(shifts_toggle) - grp:ctrls_toggle = +group(ctrls_toggle) - grp:alts_toggle = +group(alts_toggle) - grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) - grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) - grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) - grp:caps_toggle = +capslock(grouplock) - grp:caps_switch = +capslock(groupshift) - grp:shift_caps_toggle = +group(shift_caps_toggle) - grp:shift_caps_switch = +group(shift_caps_switch) - grp:win_menu_switch = +group(win_menu_switch) - grp:alt_caps_toggle = +group(alt_caps_toggle) - grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) - grp:alt_shift_toggle = +group(alt_shift_toggle) - grp:alt_space_toggle = +group(alt_space_toggle) - grp:menu_toggle = +group(menu_toggle) - grp:lwin_toggle = +group(lwin_toggle) - grp:rwin_toggle = +group(rwin_toggle) - grp:lshift_toggle = +group(lshift_toggle) - grp:rshift_toggle = +group(rshift_toggle) - grp:rctrl_switch = +group(rctrl_switch) - grp:lctrl_toggle = +group(lctrl_toggle) - grp:rctrl_toggle = +group(rctrl_toggle) - grp:lalt_toggle = +group(lalt_toggle) - grp:sclk_toggle = +group(sclk_toggle) - grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch) - lv3:switch = +level3(switch) - lv3:ralt_switch = +level3(ralt_switch) - lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) - lv3:ralt_alt = +level3(ralt_alt) - lv3:lalt_switch = +level3(lalt_switch) - lv3:alt_switch = +level3(alt_switch) - lv3:menu_switch = +level3(menu_switch) - lv3:win_switch = +level3(win_switch) - lv3:lwin_switch = +level3(lwin_switch) - lv3:rwin_switch = +level3(rwin_switch) - lv3:enter_switch = +level3(enter_switch) - caps:capslock = +capslock(capslock) - caps:numlock = +capslock(numlock) - caps:shiftlock = +capslock(shiftlock) - caps:swapescape = +capslock(swapescape) - caps:escape = +capslock(escape) - caps:backspace = +capslock(backspace) - caps:super = +capslock(super) - caps:hyper = +capslock(hyper) - caps:none = +capslock(none) - ctrl:nocaps = +ctrl(nocaps) - ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ctrl_ac = +ctrl(ctrl_ac) - ctrl:ctrl_aa = +ctrl(ctrl_aa) - ctrl:ctrl_ra = +ctrl(ctrl_ra) - ctrl:ctrl_menu = +ctrl(ctrl_menu) - compose:ralt = +compose(ralt) - compose:lwin = +compose(lwin) - compose:rwin = +compose(rwin) - compose:menu = +compose(menu) - compose:lctrl = +compose(lctrl) - compose:rctrl = +compose(rctrl) - compose:caps = +compose(caps) - compose:102 = +compose(102) - compose:paus = +compose(paus) - compose:prsc = +compose(prsc) - compose:sclk = +compose(sclk) - srvrkeys:none = +srvr_ctrl(no_srvr_keys) - eurosign:e = +eurosign(e) - eurosign:2 = +eurosign(2) - eurosign:4 = +eurosign(4) - eurosign:5 = +eurosign(5) - keypad:oss = +keypad(oss) - keypad:legacy = +keypad(legacy) - keypad:legacy_wang = +keypad(legacy_wang) - keypad:oss_wang = +keypad(oss_wang) - keypad:future = +keypad(future) - keypad:future_wang = +keypad(future_wang) - keypad:hex = +keypad(ops)+keypad(hex) - keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) - nbsp:none = +nbsp(none) - nbsp:level2 = +nbsp(level2) - nbsp:level3 = +nbsp(level3) - nbsp:level3s = +nbsp(level3s) - nbsp:level3n = +nbsp(level3n) - nbsp:level4 = +nbsp(level4) - nbsp:level4n = +nbsp(level4n) - nbsp:level4nl = +nbsp(level4nl) - japan:nicola_f_bs = +jp(nicola_f_bs) - kpdl:dot = +kpdl(dot) - kpdl:comma = +kpdl(comma) - kpdl:dotoss = +kpdl(dotoss) - kpdl:dotoss_latin9 = +kpdl(dotoss_latin9) - kpdl:commaoss = +kpdl(commaoss) - kpdl:momayyezoss = +kpdl(momayyezoss) - kpdl:kposs = +kpdl(kposs) - kpdl:semi = +kpdl(semi) - shift:breaks_caps = +shift(breaks_caps) - esperanto:qwerty = +epo(qwerty) - esperanto:dvorak = +epo(dvorak) - terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) - apple:alupckeys = +macintosh_vndr/apple(alupckeys) - shift:both_capslock = +shift(both_capslock) - shift:lshift_both_capslock = +shift(lshift_both_capslock) - shift:rshift_both_capslock = +shift(rshift_both_capslock) - shift:both_capslock_cancel = +shift(both_capslock_cancel) - shift:lshift_both_capslock_cancel = +shift(lshift_both_capslock_cancel) - shift:rshift_both_capslock_cancel = +shift(rshift_both_capslock_cancel) - shift:both_shiftlock = +shift(both_shiftlock) - shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock) - shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock) - lv3:caps_switch = +level3(caps_switch) - lv3:bksl_switch = +level3(bksl_switch) - lv3:lsgt_switch = +level3(lsgt_switch) - lv3:caps_switch_latch = +level3(caps_switch_latch) - lv3:bksl_switch_latch = +level3(bksl_switch_latch) - lv3:lsgt_switch_latch = +level3(lsgt_switch_latch) - lv5:lsgt_switch_lock = +level5(lsgt_switch_lock) - lv5:ralt_switch_lock = +level5(ralt_switch_lock) - lv5:lwin_switch_lock = +level5(lwin_switch_lock) - lv5:rwin_switch_lock = +level5(rwin_switch_lock) - lv5:lsgt_switch_lock_cancel = +level5(lsgt_switch_lock_cancel) - lv5:ralt_switch_lock_cancel = +level5(ralt_switch_lock_cancel) - lv5:lwin_switch_lock_cancel = +level5(lwin_switch_lock_cancel) - lv5:rwin_switch_lock_cancel = +level5(rwin_switch_lock_cancel) - - diff --git a/xorg-server/xkbdata.src/rules/base.o_t.part b/xorg-server/xkbdata.src/rules/base.o_t.part deleted file mode 100644 index e0d4b15ed..000000000 --- a/xorg-server/xkbdata.src/rules/base.o_t.part +++ /dev/null @@ -1,8 +0,0 @@ - caps:internal = +caps(internal) - caps:internal_nocancel = +caps(internal_nocancel) - caps:shift = +caps(shift) - caps:shift_nocancel = +caps(shift_nocancel) - numpad:pc = +numpad(pc) - numpad:mac = +numpad(mac) - numpad:microsoft = +numpad(microsoft) - numpad:shift3 = +numpad(shift3) diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in deleted file mode 100644 index 84fd69339..000000000 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ /dev/null @@ -1,5515 +0,0 @@ - - - - - - - pc101 - <_description>Generic 101-key PC - Generic - - - - - pc102 - <_description>Generic 102-key (Intl) PC - Generic - - - - - pc104 - <_description>Generic 104-key PC - Generic - - - - - pc105 - <_description>Generic 105-key (Intl) PC - Generic - - - - - dell101 - <_description>Dell 101-key PC - Dell - - - - - latitude - <_description>Dell Latitude series laptop - Dell - - - - - dellm65 - <_description>Dell Precision M65 - Dell - - - - - everex - <_description>Everex STEPnote - Everex - - - - - flexpro - <_description>Keytronic FlexPro - Keytronic - - - - - microsoft - <_description>Microsoft Natural - Microsoft Inc. - - - - - omnikey101 - <_description>Northgate OmniKey 101 - Northgate - - - - - winbook - <_description>Winbook Model XP5 - Generic - - - - - pc98 - <_description>PC-98xx Series - Generic - - - - - a4techKB21 - <_description>A4Tech KB-21 - A4Tech - - - - - a4techKBS8 - <_description>A4Tech KBS-8 - A4Tech - - - - - a4_rfkb23 - <_description>A4Tech Wireless Desktop RFKB-23 - A4Tech - - - - - airkey - <_description>Acer AirKey V - Acer - - - - - azonaRF2300 - <_description>Azona RF2300 wireless Internet Keyboard - Azona - - - - - scorpius - <_description>Advance Scorpius KI - Scorpius - - - - - brother - <_description>Brother Internet Keyboard - Brother - - - - - btc5113rf - <_description>BTC 5113RF Multimedia - BTC - - - - - btc5126t - <_description>BTC 5126T - BTC - - - - - btc6301urf - <_description>BTC 6301URF - BTC - - - - - btc9000 - <_description>BTC 9000 - BTC - - - - - btc9000a - <_description>BTC 9000A - BTC - - - - - btc9001ah - <_description>BTC 9001AH - BTC - - - - - btc5090 - <_description>BTC 5090 - BTC - - - - - btc9019u - <_description>BTC 9019U - BTC - - - - - btc9116u - <_description>BTC 9116U Mini Wireless Internet and Gaming - - - - - cherryblue - <_description>Cherry Blue Line CyBo@rd - - - - - cherryblueb - <_description>Cherry CyMotion Master XPress - Cherry - - - - - cherrybluea - <_description>Cherry Blue Line CyBo@rd (alternate option) - Cherry - - - - - cherrycyboard - <_description>Cherry CyBo@rd USB-Hub - Cherry - - - - - cherrycmexpert - <_description>Cherry CyMotion Expert - Cherry - - - - - cherrybunlim - <_description>Cherry B.UNLIMITED - Cherry - - - - - chicony - <_description>Chicony Internet Keyboard - Chicony - - - - - chicony0108 - <_description>Chicony KU-0108 - Chicony - - - - - chicony0420 - <_description>Chicony KU-0420 - Chicony - - - - - chicony9885 - <_description>Chicony KB-9885 - Chicony - - - - - compaqeak8 - <_description>Compaq Easy Access Keyboard - Compaq - - - - - compaqik7 - <_description>Compaq Internet Keyboard (7 keys) - Compaq - - - - - compaqik13 - <_description>Compaq Internet Keyboard (13 keys) - Compaq - - - - - compaqik18 - <_description>Compaq Internet Keyboard (18 keys) - Compaq - - - - - cymotionlinux - <_description>Cherry CyMotion Master Linux - Cherry - - - - - armada - <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard - Compaq - - - - - presario - <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard - Compaq - - - - - ipaq - <_description>Compaq iPaq Keyboard - Compaq - - - - - dell - <_description>Dell - Dell - - - - - dellsk8125 - <_description>Dell SK-8125 - Dell - - - - - dellsk8135 - <_description>Dell SK-8135 - Dell - - - - - dellusbmm - <_description>Dell USB Multimedia Keyboard - Dell - - - - - inspiron - <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx - Dell - - - - - precision_m - <_description>Dell Laptop/notebook Precision M series - Dell - - - - - dexxa - <_description>Dexxa Wireless Desktop Keyboard - Dexxa - - - - - diamond - <_description>Diamond 9801 / 9802 series - Diamond - - - - - dtk2000 - <_description>DTK2000 - - - - - ennyah_dkb1008 - <_description>Ennyah DKB-1008 - Ennyah - - - - - fscaa1667g - <_description>Fujitsu-Siemens Computers AMILO laptop - Fujitsu-Siemens - - - - - genius - <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910 - Genius - - - - - geniuscomfy - <_description>Genius Comfy KB-12e - Genius - - - - - geniuscomfy2 - <_description>Genius Comfy KB-21e-Scroll - Genius - - - - - geniuskb19e - <_description>Genius KB-19e NB - Genius - - - - - geniuskkb2050hs - <_description>Genius KKB-2050HS - Genius - - - - - gyration - <_description>Gyration - Gyration - - - - - kinesis - <_description>Kinesis - Kinesis - - - - - logitech_base - <_description>Logitech Generic Keyboard - Logitech - - - - - logitech_g15 - <_description>Logitech G15 extra keys via G15daemon - Logitech - - - - - hpi6 - <_description>Hewlett-Packard Internet Keyboard - Hewlett-Packard - - - - - hp250x - <_description>Hewlett-Packard SK-250x Multimedia Keyboard - Hewlett-Packard - - - - - hpxe3gc - <_description>Hewlett-Packard Omnibook XE3 GC - Hewlett-Packard - - - - - hpxe3gf - <_description>Hewlett-Packard Omnibook XE3 GF - Hewlett-Packard - - - - - hpxt1000 - <_description>Hewlett-Packard Omnibook XT1000 - Hewlett-Packard - - - - - hpdv5 - <_description>Hewlett-Packard Pavilion dv5 - Hewlett-Packard - - - - - hpzt11xx - <_description>Hewlett-Packard Pavilion ZT11xx - Hewlett-Packard - - - - - hp500fa - <_description>Hewlett-Packard Omnibook 500 FA - Hewlett-Packard - - - - - hp5xx - <_description>Hewlett-Packard Omnibook 5xx - Hewlett-Packard - - - - - hpnx9020 - <_description>Hewlett-Packard nx9020 - Hewlett-Packard - - - - - hp6000 - <_description>Hewlett-Packard Omnibook 6000/6100 - Hewlett-Packard - - - - - honeywell_euroboard - <_description>Honeywell Euroboard - Hewlett-Packard - - - - - hpmini110 - <_description>Hewlett-Packard Mini 110 Notebook - Hewlett-Packard - - - - - rapidaccess - <_description>IBM Rapid Access - Lenovo (previously IBM) - - - - - rapidaccess2 - <_description>IBM Rapid Access II - Lenovo (previously IBM) - - - - - thinkpad - <_description>IBM ThinkPad 560Z/600/600E/A22E - Lenovo (previously IBM) - - - - - thinkpad60 - <_description>IBM ThinkPad R60/T60/R61/T61 - Lenovo (previously IBM) - - - - - thinkpadz60 - <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t - Lenovo (previously IBM) - - - - - ibm_spacesaver - <_description>IBM Space Saver - Lenovo (previously IBM) - - - - - logiaccess - <_description>Logitech Access Keyboard - Logitech - - - - - logiclx300 - <_description>Logitech Cordless Desktop LX-300 - Logitech - - - - - logii350 - <_description>Logitech Internet 350 Keyboard - Logitech - - - - - logimel - <_description>Logitech Media Elite Keyboard - Logitech - - - - - logicd - <_description>Logitech Cordless Desktop - Logitech - - - - - logicd_it - <_description>Logitech Cordless Desktop iTouch - Logitech - - - - - logicd_nav - <_description>Logitech Cordless Desktop Navigator - Logitech - - - - - logicd_opt - <_description>Logitech Cordless Desktop Optical - Logitech - - - - - logicda - <_description>Logitech Cordless Desktop (alternate option) - Logitech - - - - - logicdpa2 - <_description>Logitech Cordless Desktop Pro (alternate option 2) - Logitech - - - - - logicfn - <_description>Logitech Cordless Freedom/Desktop Navigator - Logitech - - - - - logicdn - <_description>Logitech Cordless Desktop Navigator - Logitech - - - - - logiitc - <_description>Logitech iTouch Cordless Keyboard (model Y-RB6) - Logitech - - - - - logiik - <_description>Logitech Internet Keyboard - Logitech - - - - - itouch - <_description>Logitech iTouch - Logitech - - - - - logicink - <_description>Logitech Internet Navigator Keyboard - Logitech - - - - - logiex110 - <_description>Logitech Cordless Desktop EX110 - Logitech - - - - - logiinkse - <_description>Logitech iTouch Internet Navigator Keyboard SE - Logitech - - - - - logiinkseusb - <_description>Logitech iTouch Internet Navigator Keyboard SE (USB) - Logitech - - - - - logiultrax - <_description>Logitech Ultra-X Keyboard - Logitech - - - - - logiultraxc - <_description>Logitech Ultra-X Cordless Media Desktop Keyboard - Logitech - - - - - logidinovo - <_description>Logitech diNovo Keyboard - Logitech - - - - - logidinovoedge - <_description>Logitech diNovo Edge Keyboard - Logitech - - - - - mx1998 - <_description>Memorex MX1998 - Memorex - - - - - mx2500 - <_description>Memorex MX2500 EZ-Access Keyboard - Memorex - - - - - mx2750 - <_description>Memorex MX2750 - Memorex - - - - - microsoft7000 - <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000 - Microsoft Inc. - - - - - microsoftinet - <_description>Microsoft Internet Keyboard - Microsoft Inc. - - - - - microsoftpro - <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro - Microsoft Inc. - - - - - microsoftprousb - <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro - Microsoft Inc. - - - - - microsoftprooem - <_description>Microsoft Natural Keyboard Pro OEM - Microsoft Inc. - - - - - vsonku306 - <_description>ViewSonic KU-306 Internet Keyboard - ViewSonic - - - - - microsoftprose - <_description>Microsoft Internet Keyboard Pro, Swedish - Microsoft Inc. - - - - - microsoftoffice - <_description>Microsoft Office Keyboard - Microsoft Inc. - - - - - microsoftmult - <_description>Microsoft Wireless Multimedia Keyboard 1.0A - Microsoft Inc. - - - - - microsoftelite - <_description>Microsoft Natural Keyboard Elite - Microsoft Inc. - - - - - microsoftccurve2k - <_description>Microsoft Comfort Curve Keyboard 2000 - Microsoft Inc. - - - - - oretec - <_description>Ortek MCK-800 MM/Internet keyboard - Ortek - - - - - propeller - <_description>Propeller Voyager (KTEZ-1000) - KeyTronic - - - - - qtronix - <_description>QTronix Scorpius 98N+ - QTronix - - - - - samsung4500 - <_description>Samsung SDM 4500P - Samsung - - - - - samsung4510 - <_description>Samsung SDM 4510P - Samsung - - - - - sk1300 - <_description>SK-1300 - NEC - - - - - sk2500 - <_description>SK-2500 - NEC - - - - - sk6200 - <_description>SK-6200 - NEC - - - - - sk7100 - <_description>SK-7100 - NEC - - - - - sp_inet - <_description>Super Power Multimedia Keyboard - Generic - - - - - sven - <_description>SVEN Ergonomic 2500 - SVEN - - - - - sven303 - <_description>SVEN Slim 303 - SVEN - - - - - symplon - <_description>Symplon PaceBook (tablet PC) - Symplon - - - - - toshiba_s3000 - <_description>Toshiba Satellite S3000 - Toshiba - - - - - trust - <_description>Trust Wireless Keyboard Classic - Trust - - - - - trustda - <_description>Trust Direct Access Keyboard - Trust - - - - - trust_slimline - <_description>Trust Slimline - Trust - - - - - tm2020 - <_description>TypeMatrix EZ-Reach 2020 - TypeMatrix - - - - - tm2030PS2 - <_description>TypeMatrix EZ-Reach 2030 PS2 - TypeMatrix - - - - - tm2030USB - <_description>TypeMatrix EZ-Reach 2030 USB - TypeMatrix - - - - - tm2030USB-102 - <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) - TypeMatrix - - - - - tm2030USB-106 - <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode) - TypeMatrix - - - - - yahoo - <_description>Yahoo! Internet Keyboard - Yahoo! - - - - - macbook78 - <_description>MacBook/MacBook Pro - Apple - - - - - macbook79 - <_description>MacBook/MacBook Pro (Intl) - Apple - - - - - macintosh - <_description>Macintosh - Apple - - - - - macintosh_old - <_description>Macintosh Old - Apple - - - - - macintosh_hhk - <_description>Happy Hacking Keyboard for Mac - Fujitsu - - - - - acer_c300 - <_description>Acer C300 - Acer - - - - - acer_ferrari4k - <_description>Acer Ferrari 4000 - Acer - - - - - acer_laptop - <_description>Acer Laptop - Acer - - - - - asus_laptop - <_description>Asus Laptop - Asus - - - - - apple - <_description>Apple - Apple - - - - - apple_laptop - <_description>Apple Laptop - Apple - - - - - applealu_ansi - <_description>Apple Aluminium Keyboard (ANSI) - Apple - - - - - applealu_iso - <_description>Apple Aluminium Keyboard (ISO) - Apple - - - - - applealu_jis - <_description>Apple Aluminium Keyboard (JIS) - Apple - - - - - silvercrest - <_description>SILVERCREST Multimedia Wireless Keyboard - Silvercrest - - - - - emachines - <_description>Laptop/notebook eMachines m68xx - eMachines - - - - - benqx - <_description>BenQ X-Touch - BenQ - - - - - benqx730 - <_description>BenQ X-Touch 730 - BenQ - - - - - benqx800 - <_description>BenQ X-Touch 800 - BenQ - - - - - hhk - <_description>Happy Hacking Keyboard - Fujitsu - - - - - classmate - <_description>Classmate PC - Intel - - - - - olpc - <_description>OLPC - OLPC - - - - - sun6 - <_description>Sun Type 5/6 - Sun Microsystems - - - - - targa_v811 - <_description>Targa Visionary 811 - Targa - - - - - unitekkb1925 - <_description>Unitek KB-1925 - Unitek Group - - - - - compalfl90 - <_description>FL90 - Compal Electronics Inc. - - - - - creativedw7000 - <_description>Creative Desktop Wireless 7000 - Creative - - - - - - - us - <_shortDescription>USA - <_description>USA - eng - - - - - chr - <_description>Cherokee - chr - - - - - euro - <_description>With EuroSign on 5 - - - - - intl - <_description>International (with dead keys) - - - - - alt-intl - <_description>Alternative international - - - - - colemak - <_description>Colemak - - - - - dvorak - <_description>Dvorak - - - - - dvorak-intl - <_description>Dvorak international (with dead keys) - - - - - dvorak-alt-intl - <_description>Dvorak alternative international (no dead keys) - - - - - dvorak-l - <_description>Left handed Dvorak - - - - - dvorak-r - <_description>Right handed Dvorak - - - - - dvorak-classic - <_description>Classic Dvorak - - - - - dvp - <_description>Programmer Dvorak - - - - - rus - <_description>Russian phonetic - rus - - - - - mac - <_description>Macintosh - - - - - altgr-intl - <_description>International (AltGr dead keys) - eng - fra - ger - - - - - olpc2 - <_description>Layout toggle on multiply/divide key - - - - - srp - <_description>Serbian - eng - srp - - - - - - - ad - <_shortDescription>And - <_description>Andorra - cat - - - - - - af - <_shortDescription>Afg - <_description>Afghanistan - - - - - ps - <_description>Pashto - pus - - - - - uz - <_description>Southern Uzbek - uzb - - - - - olpc-ps - <_description>OLPC Pashto - pus - - - - - olpc-fa - <_description>OLPC Dari - - - - - - olpc-uz - <_description>OLPC Southern Uzbek - uzb - - - - - - - ara - <_shortDescription>Ara - <_description>Arabic - - AE - BH - DZ - EG - EH - JO - KW - LB - LY - MA - MR - OM - PS - QA - SA - SD - SY - TN - YE - - ara - - - - - azerty - <_description>azerty - - - - - azerty_digits - <_description>azerty/digits - - - - - digits - <_description>digits - - - - - qwerty - <_description>qwerty - - - - - qwerty_digits - <_description>qwerty/digits - - - - - buckwalter - <_description>Buckwalter - - - - - - - al - <_shortDescription>Alb - <_description>Albania - alb - - - - - - am - <_shortDescription>Arm - <_description>Armenia - hye - - - - - phonetic - <_description>Phonetic - - - - - phonetic-alt - <_description>Alternative Phonetic - - - - - eastern - <_description>Eastern - - - - - western - <_description>Western - - - - - eastern-alt - <_description>Alternative Eastern - - - - - - - az - <_shortDescription>Aze - <_description>Azerbaijan - aze - - - - - cyrillic - <_description>Cyrillic - - - - - - - by - <_shortDescription>Blr - <_description>Belarus - bel - - - - - legacy - <_description>Legacy - - - - - latin - <_description>Latin - - - - - - - be - <_shortDescription>Bel - <_description>Belgium - ger - nld - fra - - - - - oss - <_description>Alternative - - - - - oss_latin9 - <_description>Alternative, latin-9 only - - - - - oss_sundeadkeys - <_description>Alternative, Sun dead keys - - - - - iso-alternate - <_description>ISO Alternate - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - sundeadkeys - <_description>Sun dead keys - - - - - wang - <_description>Wang model 724 azerty - - - - - - - bd - <_shortDescription>Bgd - <_description>Bangladesh - ben - - - - - probhat - <_description>Probhat - - - - - - - in - <_shortDescription>Ind - <_description>India - - - - - ben - <_description>Bengali - ben - - - - - ben_probhat - <_description>Bengali Probhat - ben - - - - - guj - <_description>Gujarati - guj - - - - - guru - <_description>Gurmukhi - pan - - - - - jhelum - <_description>Gurmukhi Jhelum - pan - - - - - kan - <_description>Kannada - kan - - - - - mal - <_description>Malayalam - mal - - - - - mal_lalitha - <_description>Malayalam Lalitha - mal - - - - - ori - <_description>Oriya - ori - - - - - tam_unicode - <_description>Tamil Unicode - tam - - - - - tam_keyboard_with_numerals - <_description>Tamil Keyboard with Numerals - tam - - - - - tam_TAB - <_description>Tamil TAB Typewriter - tam - - - - - tam_TSCII - <_description>Tamil TSCII Typewriter - tam - - - - - tam - <_description>Tamil - tam - - - - - tel - <_description>Telugu - tel - - - - - urd-phonetic - <_description>Urdu, Phonetic - urd - - - - - urd-phonetic3 - <_description>Urdu, Alternative phonetic - urd - - - - - urd-winkeys - <_description>Urdu, Winkeys - urd - - - - - bolnagri - <_description>Hindi Bolnagri - hin - - - - - hin-wx - <_description>Hindi Wx - hin - - - - - - - ba - <_shortDescription>Bih - <_description>Bosnia and Herzegovina - bos - - - - - alternatequotes - <_description> Use guillemets for quotes - - - - - unicode - <_description>Use Bosnian digraphs - - - - - unicodeus - <_description>US keyboard with Bosnian digraphs - - - - - us - <_description>US keyboard with Bosnian letters - - - - - - - br - <_shortDescription>Bra - <_description>Brazil - por - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - dvorak - <_description>Dvorak - - - - - nativo - <_description>Nativo - - - - - nativo-us - <_description>Nativo for USA keyboards - - - - - nativo-epo - <_description>Nativo for Esperanto - epo - - - - - - - bg - <_shortDescription>Bgr - <_description>Bulgaria - bul - - - - - phonetic - <_description>Traditional phonetic - - - - - - - bas_phonetic - <_description>New phonetic - - - - - - - ma - <_description>Morocco - - - - - french - <_description>French - fra - - - - - tifinagh - <_description>Tifinagh - ber - - - - - tifinagh-alt - <_description>Tifinagh Alternative - ber - - - - - tifinagh-alt-phonetic - <_description>Tifinagh Alternative Phonetic - ber - - - - - tifinagh-extended - <_description>Tifinagh Extended - ber - - - - - tifinagh-phonetic - <_description>Tifinagh Phonetic - ber - - - - - tifinagh-extended-phonetic - <_description>Tifinagh Extended Phonetic - ber - - - - - - - mm - <_shortDescription>Mmr - <_description>Myanmar - mya - - - - - - ca - <_shortDescription>Can - <_description>Canada - fra - - - - - fr-dvorak - <_description>French Dvorak - - - - - fr-legacy - <_description>French (legacy) - - - - - multix - <_description>Multilingual - - - - - multi - <_description>Multilingual, first part - - - - - multi-2gr - <_description>Multilingual, second part - - - - - ike - <_description>Inuktitut - iku - - - - - shs - <_description>Secwepemctsin - - - - - - kut - <_description>Ktunaxa - - - - - eng - <_description>English - eng - - - - - - - cd - <_shortDescription>COD - <_description>Congo, Democratic Republic of the - fra - - - - - - cn - <_shortDescription>Chn - <_description>China - chi - - - - - tib - <_description>Tibetan - tib - - - - - tib_asciinum - <_description>Tibetan (with ASCII numerals) - tib - - - - - - - hr - <_shortDescription>Hrv - <_description>Croatia - scr - - - - - alternatequotes - <_description>Use guillemets for quotes - - - - - unicode - <_description>Use Croatian digraphs - - - - - unicodeus - <_description>US keyboard with Croatian digraphs - - - - - us - <_description>US keyboard with Croatian letters - - - - - - - cz - <_shortDescription>Cze - <_description>Czechia - cze - - - - - bksl - <_description>With <\|> key - - - - - qwerty - <_description>qwerty - - - - - qwerty_bksl - <_description>qwerty, extended Backslash - - - - - ucw - <_description>UCW layout (accented letters only) - - - - - dvorak-ucw - <_description>US Dvorak with CZ UCW support - - - - - - - dk - <_shortDescription>Dnk - <_description>Denmark - dan - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - mac - <_description>Macintosh - - - - - mac_nodeadkeys - <_description>Macintosh, eliminate dead keys - - - - - dvorak - <_description>Dvorak - - - - - - - nl - <_shortDescription>Nld - <_description>Netherlands - nld - - - - - sundeadkeys - <_description>Sun dead keys - - - - - mac - <_description>Macintosh - - - - - std - <_description>Standard - - - - - - - bt - <_shortDescription>Btn - <_description>Bhutan - dzo - - - - - ee - <_shortDescription>Est - <_description>Estonia - est - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - dvorak - <_description>Dvorak - - - - - us - <_description>US keyboard with Estonian letters - - - - - - - ir - <_shortDescription>Irn - <_description>Iran - per - - - - - pes_keypad - <_description>Persian, with Persian Keypad - - - - - ku - <_description>Kurdish, Latin Q - kur - - - - - ku_f - <_description>Kurdish, (F) - kur - - - - - ku_alt - <_description>Kurdish, Latin Alt-Q - kur - - - - - ku_ara - <_description>Kurdish, Arabic-Latin - kur - - - - - - - iq - <_shortDescription>Irq - <_description>Iraq - ara - kur - - - - - ku - <_description>Kurdish, Latin Q - kur - - - - - ku_f - <_description>Kurdish, (F) - kur - - - - - ku_alt - <_description>Kurdish, Latin Alt-Q - kur - - - - - ku_ara - <_description>Kurdish, Arabic-Latin - kur - - - - - - - fo - <_shortDescription>Fro - <_description>Faroe Islands - fao - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - - - fi - <_shortDescription>Fin - <_description>Finland - fin - - - - - classic - <_description>Classic - - - - - nodeadkeys - <_description>Classic, eliminate dead keys - - - - - smi - <_description>Northern Saami - smi - sme - - - - - mac - <_description>Macintosh - - - - - - - fr - <_shortDescription>Fra - <_description>France - fra - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - sundeadkeys - <_description>Sun dead keys - - - - - oss - <_description>Alternative - - - - - oss_latin9 - <_description>Alternative, latin-9 only - - - - - oss_nodeadkeys - <_description>Alternative, eliminate dead keys - - - - - oss_sundeadkeys - <_description>Alternative, Sun dead keys - - - - - latin9 - <_description>(Legacy) Alternative - - - - - latin9_nodeadkeys - <_description>(Legacy) Alternative, eliminate dead keys - - - - - latin9_sundeadkeys - <_description>(Legacy) Alternative, Sun dead keys - - - - - bepo - <_description>Bepo, ergonomic, Dvorak way - - - - - bepo_latin9 - <_description>Bepo, ergonomic, Dvorak way, latin-9 only - - - - - dvorak - <_description>Dvorak - - - - - mac - <_description>Macintosh - - - - - bre - <_description>Breton - - - - - oci - <_description>Occitan - oci - - - - - geo - <_description>Georgian AZERTY Tskapo - geo - - - - - - - gh - <_shortDescription>Gha - <_description>Ghana - eng - - - - - generic - <_description>Multilingual - - - - - akan - <_description>Akan - aka - - - - - ewe - <_description>Ewe - ewe - - - - - fula - <_description>Fula - ful - - - - - ga - <_description>Ga - gaa - - - - - hausa - <_description>Hausa - hau - - - - - avn - <_description>Avatime - avn - - - - - gillbt - <_description>GILLBT - - - - - - - gn - <_shortDescription>Gin - <_description>Guinea - fra - - - - - - ge - <_shortDescription>Geo - <_description>Georgia - geo - - - - - ergonomic - <_description>Ergonomic - - - - - mess - <_description>MESS - - - - - ru - <_description>Russian - rus - - - - - os - <_description>Ossetian - oss - - - - - - - de - <_shortDescription>Deu - <_description>Germany - ger - - - - - deadacute - <_description>Dead acute - - - - - deadgraveacute - <_description>Dead grave acute - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - ro - <_description>Romanian keyboard with German letters - - - - - ro_nodeadkeys - <_description>Romanian keyboard with German letters, eliminate dead keys - - - - - dvorak - <_description>Dvorak - - - - - sundeadkeys - <_description>Sun dead keys - - - - - neo - <_description>Neo 2 - - - - - mac - <_description>Macintosh - - - - - mac_nodeadkeys - <_description>Macintosh, eliminate dead keys - - - - - dsb - <_description>Lower Sorbian - dsb - - - - - dsb_qwertz - <_description>Lower Sorbian (qwertz) - dsb - - - - - qwerty - <_description>qwerty - - - - - - - gr - <_shortDescription>Grc - <_description>Greece - gre - - - - - simple - <_description>Simple - - - - - extended - <_description>Extended - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - polytonic - <_description>Polytonic - - - - - - - hu - <_shortDescription>Hun - <_description>Hungary - hun - - - - - standard - <_description>Standard - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - qwerty - <_description>qwerty - - - - - - - 101_qwertz_comma_dead - <_description>101/qwertz/comma/Dead keys - - - - - 101_qwertz_comma_nodead - <_description>101/qwertz/comma/Eliminate dead keys - - - - - 101_qwertz_dot_dead - <_description>101/qwertz/dot/Dead keys - - - - - 101_qwertz_dot_nodead - <_description>101/qwertz/dot/Eliminate dead keys - - - - - 101_qwerty_comma_dead - <_description>101/qwerty/comma/Dead keys - - - - - 101_qwerty_comma_nodead - <_description>101/qwerty/comma/Eliminate dead keys - - - - - 101_qwerty_dot_dead - <_description>101/qwerty/dot/Dead keys - - - - - 101_qwerty_dot_nodead - <_description>101/qwerty/dot/Eliminate dead keys - - - - - - - - 102_qwertz_comma_dead - <_description>102/qwertz/comma/Dead keys - - - - - 102_qwertz_comma_nodead - <_description>102/qwertz/comma/Eliminate dead keys - - - - - 102_qwertz_dot_dead - <_description>102/qwertz/dot/Dead keys - - - - - 102_qwertz_dot_nodead - <_description>102/qwertz/dot/Eliminate dead keys - - - - - 102_qwerty_comma_dead - <_description>102/qwerty/comma/Dead keys - - - - - 102_qwerty_comma_nodead - <_description>102/qwerty/comma/Eliminate dead keys - - - - - 102_qwerty_dot_dead - <_description>102/qwerty/dot/Dead keys - - - - - 102_qwerty_dot_nodead - <_description>102/qwerty/dot/Eliminate dead keys - - - - - - - is - <_shortDescription>Isl - <_description>Iceland - ice - - - - - Sundeadkeys - <_description>Sun dead keys - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - mac - <_description>Macintosh - - - - - dvorak - <_description>Dvorak - - - - - - - il - <_shortDescription>Isr - <_description>Israel - heb - - - - - lyx - <_description>lyx - - - - - phonetic - <_description>Phonetic - - - - - biblical - <_description>Biblical Hebrew (Tiro) - - - - - - - it - <_shortDescription>Ita - <_description>Italy - ita - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - mac - <_description>Macintosh - - - - - us - <_description>US keyboard with Italian letters - - - - - geo - <_description>Georgian - geo - - - - - - - jp - <_shortDescription>Jpn - <_description>Japan - jpn - - - - - kana - <_description>Kana - - - - - OADG109A - <_description>OADG 109A - - - - - mac - <_description>Macintosh - - - - - - - kg - <_shortDescription>Kgz - <_description>Kyrgyzstan - kir - - - - - phonetic - <_description>Phonetic - - - - - - - kh - <_shortDescription>Khm - <_description>Cambodia - khm - - - - - - kz - <_shortDescription>Kaz - <_description>Kazakhstan - kaz - - - - - ruskaz - <_description>Russian with Kazakh - kaz - rus - - - - - kazrus - <_description>Kazakh with Russian - kaz - rus - - - - - - - la - <_shortDescription>Lao - <_description>Laos - lao - - - - - - latam - <_shortDescription>LAm - <_description>Latin American - - AR - BO - CL - CO - CR - CU - DO - EC - GT - HN - HT - MX - NI - PA - PE - PR - PY - SV - US - UY - VE - - spa - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - deadtilde - <_description>Include dead tilde - - - - - sundeadkeys - <_description>Sun dead keys - - - - - - - lt - <_shortDescription>Ltu - <_description>Lithuania - lit - - - - - std - <_description>Standard - - - - - us - <_description>US keyboard with Lithuanian letters - - - - - ibm - <_description>IBM (LST 1205-92) - - - - - lekp - <_description>LEKP - - - - - lekpa - <_description>LEKPa - - - - - - - lv - <_shortDescription>Lva - <_description>Latvia - lav - - - - - apostrophe - <_description>Apostrophe (') variant - - - - - tilde - <_description>Tilde (~) variant - - - - - fkey - <_description>F-letter (F) variant - - - - - - - mao - <_shortDescription>Mao - <_description>Maori - mao - - - - - - me - <_shortDescription>MNE - <_description>Montenegro - srp - - - - - cyrillic - <_description>Cyrillic - - - - - cyrillicyz - <_description>Cyrillic, Z and ZHE swapped - - - - - latinunicode - <_description>Latin unicode - - - - - latinyz - <_description>Latin qwerty - - - - - latinunicodeyz - <_description>Latin unicode qwerty - - - - - cyrillicalternatequotes - <_description>Cyrillic with guillemets - - - - - latinalternatequotes - <_description>Latin with guillemets - - - - - - - mk - <_shortDescription>Mkd - <_description>Macedonia - mkd - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - - - mt - <_shortDescription>Mlt - <_description>Malta - mlt - - - - - us - <_description>Maltese keyboard with US layout - - - - - - - mn - <_shortDescription>Mng - <_description>Mongolia - mng - - - - - - no - <_shortDescription>Nor - <_description>Norway - nor - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - dvorak - <_description>Dvorak - - - - - smi - <_description>Northern Saami - sme - - - - - smi_nodeadkeys - <_description>Northern Saami, eliminate dead keys - sme - - - - - mac - <_description>Macintosh - - - - - mac_nodeadkeys - <_description>Macintosh, eliminate dead keys - - - - - - - pl - <_shortDescription>Pol - <_description>Poland - pol - - - - - qwertz - <_description>qwertz - - - - - dvorak - <_description>Dvorak - - - - - dvorak_quotes - <_description>Dvorak, Polish quotes on quotemark key - - - - - dvorak_altquotes - <_description>Dvorak, Polish quotes on key 1 - - - - - csb - <_description>Kashubian - csb - - - - - ru_phonetic_dvorak - <_description>Russian phonetic Dvorak - rus - - - - - dvp - <_description>Programmer Dvorak - - - - - - - pt - <_shortDescription>Prt - <_description>Portugal - por - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - sundeadkeys - <_description>Sun dead keys - - - - - mac - <_description>Macintosh - - - - - mac_nodeadkeys - <_description>Macintosh, eliminate dead keys - - - - - mac_sundeadkeys - <_description>Macintosh, Sun dead keys - - - - - nativo - <_description>Nativo - - - - - nativo-us - <_description>Nativo for USA keyboards - - - - - nativo-epo - <_description>Nativo for Esperanto - epo - - - - - - - ro - <_shortDescription>Rou - <_description>Romania - rum - - - - - cedilla - <_description>Cedilla - - - - - std - <_description>Standard - - - - - std_cedilla - <_description>Standard (Cedilla) - - - - - winkeys - <_description>Winkeys - - - - - crh_f - <_description>Crimean Tatar (Turkish F) - crh - - - - - crh_alt - <_description>Crimean Tatar (Turkish Alt-Q) - crh - - - - - crh_dobruca1 - <_description>Crimean Tatar (Dobruca-1 Q) - crh - - - - - crh_dobruca2 - <_description>Crimean Tatar (Dobruca-2 Q) - crh - - - - - - - ru - <_shortDescription>Rus - <_description>Russia - rus - - - - - phonetic - <_description>Phonetic - - - - - phonetic_winkeys - <_description>Phonetic Winkeys - - - - - typewriter - <_description>Typewriter - - - - - legacy - <_description>Legacy - - - - - typewriter-legacy - <_description>Typewriter, legacy - - - - - tt - <_description>Tatar - tat - - - - - os_legacy - <_description>Ossetian, legacy - oss - - - - - os_winkeys - <_description>Ossetian, Winkeys - oss - - - - - cv - <_description>Chuvash - chv - - - - - cv_latin - <_description>Chuvash Latin - chv - - - - - udm - <_description>Udmurt - udm - - - - - kom - <_description>Komi - kom - - - - - sah - <_description>Yakut - sah - - - - - xal - <_description>Kalmyk - xal - - - - - dos - <_description>DOS - - - - - srp - <_description>Serbian - rus - srp - - - - - bak - <_description>Bashkirian - bak - - - - - - - rs - <_shortDescription>SRB - <_description>Serbia - srp - - - - - yz - <_description>Z and ZHE swapped - - - - - latin - <_description>Latin - - - - - latinunicode - <_description>Latin Unicode - - - - - latinyz - <_description>Latin qwerty - - - - - latinunicodeyz - <_description>Latin Unicode qwerty - - - - - alternatequotes - <_description>With guillemets - - - - - latinalternatequotes - <_description>Latin with guillemets - - - - - rue - <_description>Pannonian Rusyn Homophonic - rue - - - - - - - si - <_shortDescription>Svn - <_description>Slovenia - slv - - - - - alternatequotes - <_description>Use guillemets for quotes - - - - - us - <_description>US keyboard with Slovenian letters - - - - - - - sk - <_shortDescription>Svk - <_description>Slovakia - slo - - - - - bksl - <_description>Extended Backslash - - - - - qwerty - <_description>qwerty - - - - - qwerty_bksl - <_description>qwerty, extended Backslash - - - - - - - es - <_shortDescription>Esp - <_description>Spain - spa - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - deadtilde - <_description>Include dead tilde - - - - - sundeadkeys - <_description>Sun dead keys - - - - - dvorak - <_description>Dvorak - - - - - ast - <_description>Asturian variant with bottom-dot H and bottom-dot L - ast - - - - - cat - <_description>Catalan variant with middle-dot L - cat - - - - - mac - <_description>Macintosh - - - - - - - se - <_shortDescription>Swe - <_description>Sweden - swe - - - - - nodeadkeys - <_description>Eliminate dead keys - - - - - dvorak - <_description>Dvorak - - - - - rus - <_description>Russian phonetic - rus - - - - - rus_nodeadkeys - <_description>Russian phonetic, eliminate dead keys - rus - - - - - smi - <_description>Northern Saami - sme - - - - - mac - <_description>Macintosh - - - - - svdvorak - <_description>Svdvorak - - - - - - - ch - <_shortDescription>Che - <_description>Switzerland - ger - gsw - - - - - legacy - <_description>Legacy - - - - - de_nodeadkeys - <_description>German, eliminate dead keys - - - - - de_sundeadkeys - <_description>German, Sun dead keys - - - - - fr - <_description>French - fra - - - - - fr_nodeadkeys - <_description>French, eliminate dead keys - fra - - - - - fr_sundeadkeys - <_description>French, Sun dead keys - fra - - - - - fr_mac - <_description>French (Macintosh) - fra - - - - - de_mac - <_description>German (Macintosh) - - - - - - - sy - <_shortDescription>Syr - <_description>Syria - syr - - - - - syc - <_description>Syriac - - - - - syc_phonetic - <_description>Syriac phonetic - - - - - ku - <_description>Kurdish, Latin Q - kur - - - - - ku_f - <_description>Kurdish, (F) - kur - - - - - ku_alt - <_description>Kurdish, Latin Alt-Q - kur - - - - - - - tj - <_shortDescription>Tjk - <_description>Tajikistan - tgk - - - - - legacy - <_description>Legacy - - - - - - - lk - <_shortDescription>Lka - <_description>Sri Lanka - sin - - - - - tam_unicode - <_description>Tamil Unicode - tam - - - - - tam_TAB - <_description>Tamil TAB Typewriter - tam - - - - - - - th - <_shortDescription>Tha - <_description>Thailand - tha - - - - - tis - <_description>TIS-820.2538 - - - - - pat - <_description>Pattachote - - - - - - - tr - <_shortDescription>Tur - <_description>Turkey - tur - - - - - f - <_description>(F) - - - - - alt - <_description>Alt-Q - - - - - sundeadkeys - <_description>Sun dead keys - - - - - ku - <_description>Kurdish, Latin Q - kur - - - - - ku_f - <_description>Kurdish, (F) - kur - - - - - ku_alt - <_description>Kurdish, Latin Alt-Q - kur - - - - - intl - <_description>International (with dead keys) - - - - - crh - <_description>Crimean Tatar (Turkish Q) - crh - - - - - crh_f - <_description>Crimean Tatar (Turkish F) - crh - - - - - crh_alt - <_description>Crimean Tatar (Turkish Alt-Q) - crh - - - - - - - ua - <_shortDescription>Ukr - <_description>Ukraine - ukr - - - - - phonetic - <_description>Phonetic - - - - - typewriter - <_description>Typewriter - - - - - winkeys - <_description>Winkeys - - - - - legacy - <_description>Legacy - - - - - rstu - - <_description>Standard RSTU - - - - - rstu_ru - - <_description>Standard RSTU on Russian layout - - - - - homophonic - <_description>Homophonic - - - - - crh - <_description>Crimean Tatar (Turkish Q) - crh - - - - - crh_f - <_description>Crimean Tatar (Turkish F) - crh - - - - - crh_alt - <_description>Crimean Tatar (Turkish Alt-Q) - crh - - - - - - - gb - <_shortDescription>GBr - <_description>United Kingdom - eng - - - - - extd - <_description>Extended - Winkeys - - - - - intl - <_description>International (with dead keys) - - - - - dvorak - <_description>Dvorak - - - - - dvorakukp - <_description>Dvorak (UK Punctuation) - - - - - mac - <_description>Macintosh - - - - - mac_intl - <_description>Macintosh (International) - - - - - colemak - <_description>Colemak - - - - - - - uz - <_shortDescription>Uzb - <_description>Uzbekistan - uzb - - - - - latin - <_description>Latin - - - - - crh - <_description>Crimean Tatar (Turkish Q) - crh - - - - - crh_f - <_description>Crimean Tatar (Turkish F) - crh - - - - - crh_alt - <_description>Crimean Tatar (Turkish Alt-Q) - crh - - - - - - - vn - <_shortDescription>Vnm - <_description>Vietnam - vie - - - - - - kr - <_shortDescription>Kor - <_description>Korea, Republic of - kor - - - - - kr104 - <_description>101/104 key Compatible - - - - - - - nec_vndr/jp - <_shortDescription>Jpn - <_description>Japan (PC-98xx Series) - JP - jpn - - - - - - ie - <_shortDescription>Irl - <_description>Ireland - eng - - - - - CloGaelach - <_description>CloGaelach - gla - - - - - UnicodeExpert - <_description>UnicodeExpert - - - - - ogam - <_description>Ogham - - - - - - ogam_is434 - <_description>Ogham IS434 - - - - - - - - pk - <_shortDescription>Pak - <_description>Pakistan - urd - - - - - urd-crulp - <_description>CRULP - urd - - - - - urd-nla - <_description>NLA - urd - - - - - ara - <_description>Arabic - ara - - - - - snd - <_description>Sindhi - sd - - - - - - - mv - <_shortDescription>Mdv - <_description>Maldives - div - - - - - - za - <_shortDescription>Zaf - <_description>South Africa - eng - - - - - epo - <_shortDescription>Epo - <_description>Esperanto - epo - - - - - legacy - <_description>displaced semicolon and quote (obsolete) - - - - - - - np - <_shortDescription>Npl - <_description>Nepal - nep - - - - - ng - <_shortDescription>Nga - <_description>Nigeria - eng - - - - - igbo - <_description>Igbo - ibo - - - - - yoruba - <_description>Yoruba - yor - - - - - hausa - <_description>Hausa - hau - - - - - - - et - <_shortDescription>Eth - <_description>Ethiopia - amh - - - - - - sn - <_shortDescription>Sen - <_description>Senegal - wol - - - - - - brai - <_shortDescription>Brl - <_description>Braille - - - - - left_hand - <_description>Left hand - - - - - right_hand - <_description>Right hand - - - - - - - tm - <_shortDescription>Tkm - <_description>Turkmenistan - tuk - - - - - alt - <_description>Alt-Q - - - - - - - ml - <_shortDescription>Mli - <_description>Mali - bam - - - - - fr-oss - <_description>Français (France Alternative) - - - - - us-mac - <_description>English (USA Macintosh) - - - - - us-intl - <_description>English (USA International) - - - - - - - tz - <_shortDescription>Tza - <_description>Tanzania - swa - - - - - ke - <_shortDescription>Ken - <_description>Kenya - swa - - - - - kik - <_description>Kikuyu - kik - - - - - - - bw - <_shortDescription>Bwa - <_description>Botswana - tsn - - - - - - - - grp - <_description>Key(s) to change layout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lv3 - <_description>Key to choose 3rd level - - - - - - - - - - - - - - - - - - - - - - - ctrl - <_description>Ctrl key position - - - - - - - - - - - - grp_led - <_description>Use keyboard LED to show alternative layout - - - - - - - - - keypad - <_description>Numeric keypad layout selection - - - - - - - - - - - - - - - kpdl - <_description>Numeric keypad delete key behaviour - - - - - - - - - - - - - - caps - <_description>Caps Lock key behavior - - - - - - - - - - - - - - - - - - - altwin - <_description>Alt/Win key behavior - - - - - - - - - - - - - - - Compose key - <_description>Compose key position - - - - - - - - - - - - - - - - compat - <_description>Miscellaneous compatibility options - - - - - - - - - - - - - - - - - eurosign - <_description>Adding EuroSign to certain keys - - - - - - - - - lv5 - <_description>Key to choose 5th level - - - - - - - - - - - - - - - - nbsp - <_description>Using space key to input non-breakable space character - - - - - - - - - - - - - - - - - - - - - japan - <_description>Japanese keyboard options - - - - - - - esperanto - <_description>Adding Esperanto circumflexes (supersigno) - - - - - - - terminate - <_description>Key sequence to kill the X server - - - - - diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.am b/xorg-server/xkbdata.src/rules/bin/Makefile.am deleted file mode 100644 index 787e34f8a..000000000 --- a/xorg-server/xkbdata.src/rules/bin/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -transform_scripts= \ -mln_s.sh \ -mlnvn_s.sh \ -ml_s.sh \ -mlv_s.sh \ -ml1_s.sh \ -ml1v_s.sh \ -ml1v1_s.sh - -EXTRA_DIST=$(transform_scripts) diff --git a/xorg-server/xkbdata.src/rules/bin/ml1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1_s.sh deleted file mode 100644 index b09459a5d..000000000 --- a/xorg-server/xkbdata.src/rules/bin/ml1_s.sh +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -set OUTFILE=base.ml1_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ if (index($2, """(""") == 0) { printf """ * %%s = pc+%%s%%%%(v[1])\n""", $1, $2; } else { printf """ * %%s = pc+%%s\n""", $1, $2; }}" < layoutsMapping.lst >> %OUTFILE% - -gawk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh deleted file mode 100644 index 4d492e02b..000000000 --- a/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -set OUTFILE=base.ml1v1_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh deleted file mode 100644 index cec1334c0..000000000 --- a/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -set OUTFILE=base.ml1v_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/ml_s.sh b/xorg-server/xkbdata.src/rules/bin/ml_s.sh deleted file mode 100644 index b7f0d9c46..000000000 --- a/xorg-server/xkbdata.src/rules/bin/ml_s.sh +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -set OUTFILE=base.ml_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s = pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE% - -gawk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/mln_s.sh b/xorg-server/xkbdata.src/rules/bin/mln_s.sh deleted file mode 100644 index 66794a4fc..000000000 --- a/xorg-server/xkbdata.src/rules/bin/mln_s.sh +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -set variant=%1 - -set OUTFILE=base.ml%variant%_s.part - -if exist %OUTFILE% del %OUTFILE% - -echo "{ if (index($2, """(""") == 0) { printf """ * %%s = +%%s%%%%(v[%variant%]):%variant%\n""", $1, $2; } else { printf """ * %%s = +%%s:%variant%\n""", $1, $2; }}" < layoutsMapping.lst >> %OUTFILE% - -gawk "{ printf """ * %%s(%%s) = +%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh b/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh deleted file mode 100644 index 8e252943b..000000000 --- a/xorg-server/xkbdata.src/rules/bin/mlnvn_s.sh +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -set variant=%1 - -set OUTFILE=base.ml%variant%v%variant%_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s %%s = +%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/mlv_s.sh b/xorg-server/xkbdata.src/rules/bin/mlv_s.sh deleted file mode 100644 index 573cb930f..000000000 --- a/xorg-server/xkbdata.src/rules/bin/mlv_s.sh +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -set OUTFILE=base.mlv_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am deleted file mode 100644 index 087263427..000000000 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ - -transform_files=layoutsMapping.lst variantsMapping.lst - -dist_parts=base.o_s.part \ -base.lv_c.part \ -base.l1v1_c.part \ -base.l2v2_c.part \ -base.l3v3_c.part \ -base.l4v4_c.part - -scripts_dir=$(srcdir)/../bin - -scripts= \ -base.ml2_s.part \ -base.ml3_s.part \ -base.ml4_s.part \ -base.ml2v2_s.part \ -base.ml3v3_s.part \ -base.ml4v4_s.part \ -base.ml_s.part \ -base.ml1_s.part \ -base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part - -if USE_COMPAT_RULES - -noinst_SCRIPTS=$(scripts) $(dist_parts) - -else - -noinst_SCRIPTS= - -endif - -base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 4 $(srcdir) - -base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 4 $(srcdir) - -base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) - sh $< $(srcdir) - -base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) - sh $< $(srcdir) - -base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) - sh $< $(srcdir) - -base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) - sh $< $(srcdir) - -EXTRA_DIST=base.lists.part $(transform_files) $(dist_parts) - -CLEANFILES=$(scripts) diff --git a/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part b/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part deleted file mode 100644 index 64ff0f2f5..000000000 --- a/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part +++ /dev/null @@ -1 +0,0 @@ - de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) diff --git a/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part b/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part deleted file mode 100644 index fea61be76..000000000 --- a/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part +++ /dev/null @@ -1 +0,0 @@ - de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 diff --git a/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part b/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part deleted file mode 100644 index 5a1fb2f8a..000000000 --- a/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part +++ /dev/null @@ -1 +0,0 @@ - de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 diff --git a/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part b/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part deleted file mode 100644 index ac8a91102..000000000 --- a/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part +++ /dev/null @@ -1 +0,0 @@ - de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 diff --git a/xorg-server/xkbdata.src/rules/compat/base.lists.part b/xorg-server/xkbdata.src/rules/compat/base.lists.part deleted file mode 100644 index f1cf7ee22..000000000 --- a/xorg-server/xkbdata.src/rules/compat/base.lists.part +++ /dev/null @@ -1,2 +0,0 @@ - -! $dvoraklayouts = br ca de ee es fr gb no pl se us diff --git a/xorg-server/xkbdata.src/rules/compat/base.lv_c.part b/xorg-server/xkbdata.src/rules/compat/base.lv_c.part deleted file mode 100644 index 64ff0f2f5..000000000 --- a/xorg-server/xkbdata.src/rules/compat/base.lv_c.part +++ /dev/null @@ -1 +0,0 @@ - de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) diff --git a/xorg-server/xkbdata.src/rules/compat/base.o_s.part b/xorg-server/xkbdata.src/rules/compat/base.o_s.part deleted file mode 100644 index 8f1e9e452..000000000 --- a/xorg-server/xkbdata.src/rules/compat/base.o_s.part +++ /dev/null @@ -1 +0,0 @@ - grp:shift_toggle = +group(shifts_toggle) diff --git a/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst deleted file mode 100644 index cecda6d8a..000000000 --- a/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst +++ /dev/null @@ -1,27 +0,0 @@ -ar ara -ben in(ben) -bs ba -cs rs -cz_qwerty cz(qwerty) -dev in(deva) -dvorak us(dvorak) -dzdwi bt -el gr -en_US latin -guj in(guj) -gur in(guru) -iu ca(ike) -lo la -kan in(kan) -mi mao -ml in(mal) -ogham ie(ogam) -ori ie(ori) -sapmi no(smi) -sr srp -syr sy(syc) -tel in(tel) -tml in(tam) -yu srp -fr-latin9 fr(latin9) -us_intl us(alt-intl) diff --git a/xorg-server/xkbdata.src/rules/compat/makefile b/xorg-server/xkbdata.src/rules/compat/makefile deleted file mode 100644 index 75610a8e9..000000000 --- a/xorg-server/xkbdata.src/rules/compat/makefile +++ /dev/null @@ -1,53 +0,0 @@ -transform_files=layoutsMapping.lst variantsMapping.lst - -scripts_dir=..\bin - -SCRIPTS= \ -base.ml2_s.part \ -base.ml3_s.part \ -base.ml4_s.part \ -base.ml2v2_s.part \ -base.ml3v3_s.part \ -base.ml4v4_s.part \ -base.ml_s.part \ -base.ml1_s.part \ -base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part - -SH=cmd /c - -base.ml2_s.part: mln_s.bat $(transform_files) - $(SH) $< 2 - -base.ml3_s.part: mln_s.bat $(transform_files) - $(SH) $< 3 - -base.ml4_s.part: mln_s.bat $(transform_files) - $(SH) $< 4 - -base.ml2v2_s.part: mlnvn_s.bat $(transform_files) - $(SH) $< 2 - -base.ml3v3_s.part: mlnvn_s.bat $(transform_files) - $(SH) $< 3 - -base.ml4v4_s.part: mlnvn_s.bat $(transform_files) - $(SH) $< 4 - -base.ml_s.part: ml_s.bat $(transform_files) - $(SH) $< - -base.ml1_s.part: ml1_s.bat $(transform_files) - $(SH) $< - -base.mlv_s.part: mlv_s.bat $(transform_files) - $(SH) $< - -base.ml1v1_s.part: ml1v1_s.bat $(transform_files) - $(SH) $< - -%.bat: $(scripts_dir)\%.sh - copy $< $@ - -all: $(SCRIPTS) diff --git a/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst deleted file mode 100644 index be2a2bc40..000000000 --- a/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst +++ /dev/null @@ -1,50 +0,0 @@ -ben basic in ben -ben probhat in ben_probhat -dev basic in deva -dvorak $dvoraklayouts %v dvorak -dvorak basic us dvorak -dvorak pl_basic pl dvorak -dvorak pl pl dvorak_quotes -dvorak pl_altquotes pl dvorak_altquotes -dzdwi basic bt basic -fi basic fi classic -ge azerty_tskapo fr geo -guj basic in guj -gur basic in guru -ie laptop ie basic -ie CloGaelachLaptop ie CloGaelach -il si1452 ie basic -in urd in urd-phonetic -iu basic ca ike -lo basic la basic -kan basic in kan -mal basic in mal -mal mlplusnum in mal -ogham basic ie ogam -ogham laptop ie ogam -ogham is434 ie ogam_is434 -ogham is434laptop ie ogam_is434 -ori basic in ori -ro de ro winkeys -ro us ro std -ro academic ro std -ro std_comma ro std -ro comma ro basic -ru os ru os_legacy -pk urd pk urd-phonetic -sapmi basic no smi -sapmi nodeadkeys no smi_nodeadkeys -sapmi sefi fi smi -sin phonetic-static in sin_phonetic -syr basic sy syc -syr phonetic sy syc_phonetic -tam INSCRIPT in tam -tam UNI in tam_unicode -tam NUMERAL-KEYBOARD in tam_keyboard_with_numerals -tam TAB in tam_TAB -tam TSCII in tam_TSCII -tel basic in tel -yu basic srp latin -yu unicode srp latinunicode -yu yz srp latinyz -yu unicodeyz srp latinunicodeyz diff --git a/xorg-server/xkbdata.src/rules/evdev.m_k.part b/xorg-server/xkbdata.src/rules/evdev.m_k.part deleted file mode 100644 index 4f1c5c30a..000000000 --- a/xorg-server/xkbdata.src/rules/evdev.m_k.part +++ /dev/null @@ -1,3 +0,0 @@ - pc98 = evdev(pc98) - applealu_jis = evdev+macintosh(jisevdev) - * = evdev diff --git a/xorg-server/xkbdata.src/rules/evdev.m_s.part b/xorg-server/xkbdata.src/rules/evdev.m_s.part deleted file mode 100644 index 1b423053c..000000000 --- a/xorg-server/xkbdata.src/rules/evdev.m_s.part +++ /dev/null @@ -1,3 +0,0 @@ - $evdevkbds = +inet(evdev)+inet(%m) - applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) - * = +inet(evdev) diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.am b/xorg-server/xkbdata.src/rules/extras/Makefile.am deleted file mode 100644 index 16119a3f0..000000000 --- a/xorg-server/xkbdata.src/rules/extras/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -transform_files=layoutsMapping.lst variantsMapping.lst - -scripts_dir=$(srcdir)/../bin - -scripts= \ -base.ml2_s.part \ -base.ml3_s.part \ -base.ml4_s.part \ -base.ml2v2_s.part \ -base.ml3v3_s.part \ -base.ml4v4_s.part \ -base.ml_s.part \ -base.ml1_s.part \ -base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part - -noinst_SCRIPTS=$(scripts) - -base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 4 $(srcdir) - -base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 4 $(srcdir) - -base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) - sh $< $(srcdir) - -base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) - sh $< $(srcdir) - -base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) - sh $< $(srcdir) - -base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) - sh $< $(srcdir) - -EXTRA_DIST=$(transform_files) - -CLEANFILES=$(scripts) diff --git a/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst b/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst deleted file mode 100644 index d75b4f44d..000000000 --- a/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst +++ /dev/null @@ -1 +0,0 @@ -apl extras/apl diff --git a/xorg-server/xkbdata.src/rules/extras/makefile b/xorg-server/xkbdata.src/rules/extras/makefile deleted file mode 100644 index 2712ec269..000000000 --- a/xorg-server/xkbdata.src/rules/extras/makefile +++ /dev/null @@ -1,53 +0,0 @@ -transform_files=layoutsMapping.lst variantsMapping.lst - -scripts_dir=..\bin - -SCRIPTS= \ -base.ml2_s.part \ -base.ml3_s.part \ -base.ml4_s.part \ -base.ml2v2_s.part \ -base.ml3v3_s.part \ -base.ml4v4_s.part \ -base.ml_s.part \ -base.ml1_s.part \ -base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part - -SH=cmd /c - -base.ml2_s.part: mln_s.bat $(transform_files) - $(SH) $< 2 - -base.ml3_s.part: mln_s.bat $(transform_files) - $(SH) $< 3 - -base.ml4_s.part: mln_s.bat $(transform_files) - $(SH) $< 4 - -base.ml2v2_s.part: mlnvn_s.bat $(transform_files) - $(SH) $< 2 - -base.ml3v3_s.part: mlnvn_s.bat $(transform_files) - $(SH) $< 3 - -base.ml4v4_s.part: mlnvn_s.bat $(transform_files) - $(SH) $< 4 - -base.ml_s.part: ml_s.bat $(transform_files) - $(SH) $< - -base.ml1_s.part: ml1_s.bat $(transform_files) - $(SH) $< - -base.mlv_s.part: mlv_s.bat $(transform_files) - $(SH) $< - -base.ml1v1_s.part: ml1v1_s.bat $(transform_files) - $(SH) $< - -%.bat: $(scripts_dir)\%.sh - copy $< $@ - -all=$(SCRIPTS) diff --git a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst deleted file mode 100644 index 36af488d1..000000000 --- a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst +++ /dev/null @@ -1,5 +0,0 @@ -rs combiningkeys extras/rs combiningkeys -ir ave extras/ir ave -us alt-intl-unicode extras/us alt-intl-unicode -us crd extras/us crd -us intl-unicode extras/us intl-unicode diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile deleted file mode 100644 index 42f962258..000000000 --- a/xorg-server/xkbdata.src/rules/makefile +++ /dev/null @@ -1,189 +0,0 @@ -ifeq ($(MAKESERVER),1) -$(error Please do not specify MAKESERVER=1) -endif - -load_makefile compat\makefile DEBUG=$(DEBUG) -load_makefile extras\makefile DEBUG=$(DEBUG) - -DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules - -BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \ -compat/base.lists.part \ -HDR base.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.o_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ -HDR compat/base.ml2_s.part extras/base.ml2_s.part base.ml2_s.part \ -HDR compat/base.ml3_s.part extras/base.ml3_s.part base.ml3_s.part \ -HDR compat/base.ml4_s.part extras/base.ml4_s.part base.ml4_s.part \ -HDR compat/base.ml2v2_s.part extras/base.ml2v2_s.part \ -HDR compat/base.ml3v3_s.part extras/base.ml3v3_s.part \ -HDR compat/base.ml4v4_s.part extras/base.ml4v4_s.part \ -HDR base.m_s.part \ -HDR compat/base.lv_c.part \ -HDR compat/base.l1v1_c.part \ -HDR compat/base.l2v2_c.part \ -HDR compat/base.l3v3_c.part \ -HDR compat/base.l4v4_c.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.lo_s.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -EVDEV_PARTS_NO_COMPAT = base.hdr.part base.lists.part \ -compat/base.lists.part \ -HDR evdev.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.o_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ -HDR compat/base.ml2_s.part extras/base.ml2_s.part base.ml2_s.part \ -HDR compat/base.ml3_s.part extras/base.ml3_s.part base.ml3_s.part \ -HDR compat/base.ml4_s.part extras/base.ml4_s.part base.ml4_s.part \ -HDR compat/base.ml2v2_s.part extras/base.ml2v2_s.part \ -HDR compat/base.ml3v3_s.part extras/base.ml3v3_s.part \ -HDR compat/base.ml4v4_s.part extras/base.ml4v4_s.part \ -HDR evdev.m_s.part \ -HDR compat/base.lv_c.part \ -HDR compat/base.l1v1_c.part \ -HDR compat/base.l2v2_c.part \ -HDR compat/base.l3v3_c.part \ -HDR compat/base.l4v4_c.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.lo_s.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -BASE_PARTS = base.hdr.part base.lists.part \ -HDR base.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR extras/base.mlv_s.part base.mlv_s.part \ -HDR extras/base.ml_s.part base.ml_s.part \ -HDR extras/base.ml1_s.part base.ml1_s.part \ -HDR extras/base.ml1v1_s.part \ -HDR extras/base.ml2_s.part base.ml2_s.part \ -HDR extras/base.ml3_s.part base.ml3_s.part \ -HDR extras/base.ml4_s.part base.ml4_s.part \ -HDR extras/base.ml2v2_s.part \ -HDR extras/base.ml3v3_s.part \ -HDR extras/base.ml4v4_s.part \ -HDR base.m_s.part \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -EVDEV_PARTS = base.hdr.part base.lists.part \ -HDR evdev.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR extras/base.mlv_s.part base.mlv_s.part \ -HDR extras/base.ml_s.part base.ml_s.part \ -HDR extras/base.ml1_s.part base.ml1_s.part \ -HDR extras/base.ml1v1_s.part \ -HDR extras/base.ml2_s.part base.ml2_s.part \ -HDR extras/base.ml3_s.part base.ml3_s.part \ -HDR extras/base.ml4_s.part base.ml4_s.part \ -HDR extras/base.ml2v2_s.part \ -HDR extras/base.ml3v3_s.part \ -HDR extras/base.ml4v4_s.part \ -HDR evdev.m_s.part \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -RULES_FILES = base evdev xfree98 - -LST_FILES = base.lst evdev.lst - -$(DESTDIR)\%.lst: $(DESTDIR)\%.xml - perl xml2lst.pl < $< > $@ - -$(DESTDIR)\base: compat\all $(BASE_PARTS_NO_COMPAT) - merge $@ $(BASE_PARTS) - -$(DESTDIR)\evdev: compat\all $(EVDEV_PARTS_NO_COMPAT) - merge $@ $(EVDEV_PARTS) - -ALL_RULES_FILES = $(RULES_FILES) $(LST_FILES) \ -xkb.dtd README - -COMPATFILES=xorg xorg.xml xorg.lst -$(DESTDIR)\xorg: $(DESTDIR)\base - copy $< $@ -$(DESTDIR)\xorg%: $(DESTDIR)\base% - copy $< $@ - -rules_DATA = $(ALL_RULES_FILES) $(COMPATFILES) - -xml_DATA = base.xml evdev.xml base.extras.xml evdev.extras.xml - -$(DESTDIR)\%.xml: %.xml.in - copy $< $@ - -$(DESTDIR)\evdev.xml: base.xml.in - cp $< $@ - -$(DESTDIR)\evdev.extras.xml: base.extras.xml.in - cp $< $@ - -DATA_FILES=$(rules_DATA:%=$(DESTDIR)\%) $(xml_DATA:%=$(DESTDIR)\%) - -include ..\xkbrules.mak diff --git a/xorg-server/xkbdata.src/rules/merge.py b/xorg-server/xkbdata.src/rules/merge.py deleted file mode 100644 index 442a866f2..000000000 --- a/xorg-server/xkbdata.src/rules/merge.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys - -pOUT=open(sys.argv[1],"wb") -pHDR=open("HDR","r") -for item in sys.argv[2:]: - if item == 'HDR': - pOUT.write("\n") - pOUT.write(pHDR.readline()) - else: - pOUT.write(open(item,"rb").read()) - -pOUT.close() - diff --git a/xorg-server/xkbdata.src/rules/merge.sh b/xorg-server/xkbdata.src/rules/merge.sh deleted file mode 100644 index b18af7c3d..000000000 --- a/xorg-server/xkbdata.src/rules/merge.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -INDIR=`dirname $0` -DEST=$1 -shift - -if [ -z "$HDR" ]; then - HDR="HDR" -fi - -basename=`basename $0` -echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST - -for i in $*; do - if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then - echo >> $DEST; - read hdr - echo "$hdr" >> $DEST - elif test -f $i; then - cat $i >> $DEST || exit 1 - else - cat $INDIR/$i >> $DEST || exit 1 - fi -done < $HDR - diff --git a/xorg-server/xkbdata.src/rules/xfree98 b/xorg-server/xkbdata.src/rules/xfree98 deleted file mode 100644 index ca7a18bf7..000000000 --- a/xorg-server/xkbdata.src/rules/xfree98 +++ /dev/null @@ -1,29 +0,0 @@ -// -// Rules for resolving XKB components for use with XFree86 -// Copyright 1996 by Joseph Moss -// -// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.5 1996/12/17 21:03:59 dawes Exp $ -// - -! model = keycodes geometry - pc98 = xfree98(pc98) nec(pc98) - jp106 = xfree98(jp106) pc(jp106) - -! model layout = symbols - pc98 nec_vndr/jp = nec_vndr/jp(pc98) - jp106 jp = jp - -! model layout = compat types - * * = complete complete - -! option = symbols - grp:switch = +group(switch) - grp:toggle = +group(toggle) - grp:shift_toggle = +group(shifts_toggle) - grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) - grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) - ctrl:nocaps = +ctrl(nocaps) - ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ctrl_ac = +ctrl(ctrl_ac) - ctrl:ctrl_aa = +ctrl(ctrl_aa) - diff --git a/xorg-server/xkbdata.src/rules/xkb.dtd b/xorg-server/xkbdata.src/rules/xkb.dtd deleted file mode 100644 index 4452712fd..000000000 --- a/xorg-server/xkbdata.src/rules/xkb.dtd +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xorg-server/xkbdata.src/rules/xml2lst.pl b/xorg-server/xkbdata.src/rules/xml2lst.pl deleted file mode 100644 index 478fce89c..000000000 --- a/xorg-server/xkbdata.src/rules/xml2lst.pl +++ /dev/null @@ -1,288 +0,0 @@ -#!/usr/bin/perl - -# converts the .xml file to the old format .lst file -# -# Usage: -# -# perl xml2lst.pl [lang] < filename.xml > filename.lst -# -# author Ivan Pascal - -if (@ARGV) { - $lang = shift @ARGV; -} else { - $lang = ''; -} - -$doc = new_document( 0, ''); -parse('', $doc); - -($reg) = node_by_name($doc, '/xkbConfigRegistry'); -@models = node_by_name($reg, 'modelList/model/configItem'); -@layouts = node_by_name($reg, 'layoutList/layout/configItem'); -@options = node_by_name($reg, 'optionList/group/configItem'); - -print "! model\n"; -for $i (@models) { - ($name) = node_by_name($i, 'name'); - @desc = node_by_name($i, 'description'); - $descr = with_attribute(\@desc, 'xml:lang='.$lang); - if (! defined $descr) { - $descr = with_attribute(\@desc, 'xml:lang='); - } - printf(" %-15s %s\n", text_child($name), text_child($descr)); -} - -print "\n! layout\n"; -for $i (@layouts) { - ($name) = node_by_name($i, 'name'); - @desc = node_by_name($i, 'description'); - $descr = with_attribute(\@desc, 'xml:lang='.$lang); - if (! defined $descr ) { - $descr = with_attribute(\@desc, 'xml:lang='); - } - printf(" %-15s %s\n", text_child($name), text_child($descr)); -} - -print "\n! variant\n"; -for $l (@layouts) { - ($lname) = node_by_name($l, 'name'); - @variants = node_by_name($l, '../variantList/variant/configItem'); - for $v (@variants) { - ($name) = node_by_name($v, 'name'); - @desc = node_by_name($v, 'description'); - $descr = with_attribute(\@desc, 'xml:lang='.$lang); - if (! defined $descr) { - $descr = with_attribute(\@desc, 'xml:lang='); - } - printf(" %-15s %s: %s\n", - text_child($name), text_child($lname), text_child($descr)); - } -} - -print "\n! option\n"; -for $g (@options) { - ($name) = node_by_name($g, 'name'); - @desc = node_by_name($g, 'description'); - $descr = with_attribute(\@desc, 'xml:lang='.$lang); - if (! defined $descr) { - $descr = with_attribute(\@desc, 'xml:lang='); - } - printf(" %-20s %s\n", text_child($name), text_child($descr)); - - @opts = node_by_name($g, '../option/configItem'); - for $o (@opts) { - ($name) = node_by_name($o, 'name'); - @desc = node_by_name($o, 'description'); - $descr = with_attribute(\@desc, 'xml:lang='.$lang); - if (! defined $descr) { - $descr = with_attribute(\@desc, 'xml:lang='); - } - printf(" %-20s %s\n", - text_child($name), text_child($descr)); - } -} - -sub with_attribute { - local ($nodelist, $attrexpr) = @_; - local ($attr, $value) = split (/=/, $attrexpr); - local ($node, $attrvalue); - if (defined $value && $value ne '') { - $value =~ s/"//g; - foreach $node (@{$nodelist}) { - $attrvalue = node_attribute($node, $attr); - if (defined $attrvalue && $attrvalue eq $value) { - return $node; - } - } - } else { - foreach $node (@{$nodelist}) { - if (! defined node_attribute($node, $attr)) { - return $node; - } - } - } - undef; -} - -# Subroutines - -sub parse { - local $intag = 0; - my (@node_stack, $parent); - $parent = @_[1]; - local ($tag, $text); - - while (<>) { - chomp; - @str = split /([<>])/; - shift @str if ($str[0] eq '' || $str[0] =~ /^[ \t]*$/); - - while (scalar @str) { - $token = shift @str; - if ($token eq '<') { - $intag = 1; - if (defined $text) { - add_text_node($parent, $text); - undef $text; - } - } elsif ($token eq '>') { - $intag = 0; - if ($tag =~ /^\/(.*)/) { # close tag - $parent = pop @node_stack; - } elsif ($tag =~ /^([^\/]*)\/$/) { - empty_tag($parent, $1); - } else { - if (defined ($node = open_tag($parent, $tag))) { - push @node_stack, $parent; - $parent = $node; - } - } - undef $tag; - } else { - if ($intag == 1) { - if (defined $tag) { - $tag .= ' '. $token; - } else { - $tag = $token; - } - } else { - if (defined $text) { - $text .= "\n" . $token; - } else { - $text = $token; - } - } - } - } - } -} - -sub new_document { - $doc = new_node( 0, '', 'DOCUMENT'); - $doc->{CHILDREN} = []; - return $doc; -} - -sub new_node { - local ($parent_node, $tag, $type) = @_; - - my %node; - $node{PARENT} = $parent_node; - $node{TYPE} = $type; - - if ($type eq 'COMMENT' || $type eq 'TEXT') { - $node{TEXT} = $tag; - $node{NAME} = $type; - return \%node; - } - - local ($tname, $attr) = split(' ', $tag, 2); - $node{NAME} = $tname; - - if (defined $attr && $attr ne '') { - my %attr_table; - local @attr_list = split ( /"/, $attr); - local ($name, $value); - while (scalar @attr_list) { - $name = shift @attr_list; - $name =~ s/[ =]//g; - next if ($name eq ''); - $value = shift @attr_list; - $attr_table{$name} =$value; - } - $node{ATTRIBUTES} = \%attr_table; - } - return \%node; -} - -sub add_node { - local ($parent_node, $node) = @_; - push @{$parent_node->{CHILDREN}}, $node; - - local $tname = $node->{NAME}; - if (defined $parent_node->{$tname}) { - push @{$parent_node->{$tname}}, $node - } else { - $parent_node->{$tname} = [ $node ]; - } -} - -sub empty_tag { - local ($parent_node, $tag) = @_; - local $node = new_node($parent_node, $tag, 'EMPTY'); - add_node($parent_node, $node); -} - -sub open_tag { - local ($parent_node, $tag) = @_; - local $node; - - if ($tag =~ /^\?.*/ || $tag =~ /^\!.*/) { - $node = new_node($parent_node, $tag, 'COMMENT'); - add_node($parent_node, $node); - undef; return; - } else { - $node = new_node($parent_node, $tag, 'NODE'); - $node->{CHILDREN} = []; - add_node($parent_node, $node); - return $node; - } -} - -sub add_text_node { - local ($parent_node, $text) = @_; - local $node = new_node($parent_node, $text, 'TEXT'); - add_node($parent_node, $node); -} - -sub node_by_name { - local ($node, $name) = @_; - local ($tagname, $path) = split(/\//, $name, 2); - - my @nodelist; - - if ($tagname eq '') { - while ($node->{PARENT} != 0) { - $node = $node->{PARENT}; - } - sublist_by_name($node, $path, \@nodelist); - } else { - sublist_by_name($node, $name, \@nodelist); - } - return @nodelist; -} - -sub sublist_by_name { - local ($node, $name, $res) = @_; - local ($tagname, $path) = split(/\//, $name, 2); - - if (! defined $path) { - push @{$res}, (@{$node->{$tagname}}); - return; - } - - if ($tagname eq '..' && $node->{PARENT} != 0) { - $node = $node->{PARENT}; - sublist_by_name($node, $path, $res); - } else { - local $n; - for $n (@{$node->{$tagname}}) { - sublist_by_name($n, $path, $res); - } - } -} - -sub node_attribute { - local $node = @_[0]; - if (defined $node->{ATTRIBUTES}) { - return $node->{ATTRIBUTES}{@_[1]}; - } - undef; -} - -sub text_child { - local ($node) = @_; - local ($child) = node_by_name($node, 'TEXT'); - return $child->{TEXT}; -} -- cgit v1.2.3