From 3b913e0be63cc45cf87b6ea2b2b501558405aea4 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Fri, 7 May 2004 18:27:21 +0000
Subject: Some small fixes made. Options are now testable as well.

---
 rules/base.xml.in    | 16 ++++++++--------
 symbols/tr           |  4 ++--
 tests/testLayouts.pl |  2 +-
 tests/testOptions.pl |  2 +-
 tests/xkbTestFunc.pm | 10 +++++++++-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 05510737..7b4d6607 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1618,7 +1618,7 @@
         <variant>
           <configItem>
             <name>yz</name>
-            <_description>Serbian Cyrillic (swap Zhe, Ze)</_description>
+            <_description>Cyrillic (swap Zhe, Ze)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1772,19 +1772,19 @@
         <variant>
           <configItem>
             <name>TSCII</name>
-            <_description>A Tamil typewrite-style keymap; TSCII encoding</_description>
+            <_description>Typewrite-style keymap; TSCII encoding</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>TAB</name>
-            <_description>A Tamil typewrite-style keymap; TAB encoding</_description>
+            <_description>Typewrite-style keymap; TAB encoding</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>UNI</name>
-            <_description>A Tamil typewrite-style keymap; Unicode encoding</_description>
+            <_description>Typewrite-style keymap; Unicode encoding</_description>
           </configItem>
         </variant>
         <variant>
@@ -1839,14 +1839,14 @@
       <variantList>
         <variant>
           <configItem>
-            <name>tr_f</name>
-            <_description>Turkish (F)</_description>
+            <name>f</name>
+            <_description>(F)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>tr_alt</name>
-            <_description>Turkish Alt-Q Layout</_description>
+            <name>alt</name>
+            <_description>Alt-Q</_description>
           </configItem>
         </variant>
       </variantList>
diff --git a/symbols/tr b/symbols/tr
index 53bd555b..5e46fb75 100644
--- a/symbols/tr
+++ b/symbols/tr
@@ -61,7 +61,7 @@ xkb_symbols "basic" {
 
 // Turkish F Layout
 partial
-xkb_symbols "tr_f" {
+xkb_symbols "f" {
 
     include "latin"
 
@@ -124,7 +124,7 @@ xkb_symbols "tr_f" {
 
 // Turkish Alt-Q Layout
 partial
-xkb_symbols "tr_alt" {
+xkb_symbols "alt" {
 
     include "latin"
 
diff --git a/tests/testLayouts.pl b/tests/testLayouts.pl
index bcb657b1..9d996a76 100755
--- a/tests/testLayouts.pl
+++ b/tests/testLayouts.pl
@@ -8,6 +8,6 @@ xkbTestFunc::backupXkbSettings();
                                                                                                                  
 xkbTestFunc::dumpXkbSettingsBackup();
 
-xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")", 1, 1 );
+xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")", 1, 1, 0 );
 
 xkbTestFunc::restoreXkbSettings();
diff --git a/tests/testOptions.pl b/tests/testOptions.pl
index c8805794..ec45a06b 100755
--- a/tests/testOptions.pl
+++ b/tests/testOptions.pl
@@ -8,6 +8,6 @@ xkbTestFunc::backupXkbSettings();
                                                                                                                  
 xkbTestFunc::dumpXkbSettingsBackup();
 
-xkbTestFunc::testLevel2( "group", "option", 4, ":", "", 0, 0 );
+xkbTestFunc::testLevel2( "group", "option", 4, ":", "", 0, 0, 1 );
 
 xkbTestFunc::restoreXkbSettings();
diff --git a/tests/xkbTestFunc.pm b/tests/xkbTestFunc.pm
index d78c16d4..8d511210 100755
--- a/tests/xkbTestFunc.pm
+++ b/tests/xkbTestFunc.pm
@@ -98,7 +98,7 @@ sub testLevel1
 
 sub testLevel2
 {
-  my ( $type, $subtype, $idx, $delim1, $delim2, $ifCheckLevel1, $ifAddLevel1 ) = @_;
+  my ( $type, $subtype, $idx, $delim1, $delim2, $ifCheckLevel1, $ifAddLevel1, $ifResetToDefault ) = @_;
 
   open ( XSLTPROC, "xsltproc --stringparam type $type listCIs.xsl ../rules/base.xml.in |" ) or
     die ( "Could not start xsltproc" );
@@ -113,6 +113,10 @@ sub testLevel2
       if ( $ifCheckLevel1 )
       {
         my @params = defaultXkbSettings();
+        if ( $ifResetToDefault )
+        {
+          setXkbSettings ( @params );
+        }
         $params[$idx] = "$paramValue";
         dumpXkbSettings ( @params );
         setXkbSettings ( @params );
@@ -130,6 +134,10 @@ sub testLevel2
           my $paramValue2=$1;
           print "  --- $subtype: [$paramValue2]\n";
           my @params = defaultXkbSettings();
+          if ( $ifResetToDefault )
+          {
+            setXkbSettings ( @params );
+          }
           if ( $ifAddLevel1 )
           {
             $params[$idx] = "$paramValue$delim1$paramValue2$delim2";
-- 
cgit v1.2.3