From 7e0efefa1e4beeb4d022af82ae64289228dec9f4 Mon Sep 17 00:00:00 2001 From: svu Date: Thu, 6 May 2004 00:15:24 +0000 Subject: Makedonian problem fixed - and BOTH tests are OK --- configure.in | 2 +- symbols/mk | 8 +++++++- tests/testLayouts.pl | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 105870ce..83539ab5 100644 --- a/configure.in +++ b/configure.in @@ -38,7 +38,7 @@ AC_PROG_INTLTOOL AC_SUBST(xkb_base) AC_SUBST(xkb_rules_symlink) -AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile +AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile Makefile compat/Makefile compiled/Makefile diff --git a/symbols/mk b/symbols/mk index eaf04787..2dc79b5d 100644 --- a/symbols/mk +++ b/symbols/mk @@ -62,6 +62,12 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "pc104" { include "mk(basic)" - // include "mk(win)" + include "mk(win)" }; +partial alphanumeric_keys +xkb_symbols "win" { + key { [ ISO_Next_Group ] }; + key { [ Multi_key ] }; + key { [ Mode_switch ] }; +}; diff --git a/tests/testLayouts.pl b/tests/testLayouts.pl index f172ebfa..bf7478f7 100755 --- a/tests/testLayouts.pl +++ b/tests/testLayouts.pl @@ -4,10 +4,10 @@ use strict; use warnings; use xkbTestFunc; -backupXkbSettings(); +xkbTestFunc::backupXkbSettings(); -dumpXkbSettingsBackup(); +xkbTestFunc::dumpXkbSettingsBackup(); -testLevel2( "layout", "variant", 2, "(", ")" ); +xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")" ); -restoreXkbSettings(); +xkbTestFunc::restoreXkbSettings(); -- cgit v1.2.3