From ca65bc0f734a70704122234afc0269a72503f45d Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Sun, 2 May 2004 23:05:57 +0000
Subject: [PATCH] at least variants pass ok with tests

---
 rules/base.xml.in   | 114 ++++++++++++++++++--------------------------
 symbols/ch          |   2 +-
 symbols/mk          |   2 +-
 tests/testModels.pl |   7 +++
 4 files changed, 55 insertions(+), 70 deletions(-)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 8bfffab..c813ed4 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1163,128 +1163,127 @@
       <variantList>
         <variant>
           <configItem>
-            <name>l2_101_qwerty_comma</name>
-            <_description>l2/101/qwerty/comma</_description>
+            <name>standard</name>
+            <_description>Standard</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>l2_101_qwerty_dot</name>
-            <_description>l2/101/qwerty/dot</_description>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>l2_101_qwertz_comma</name>
-            <_description>l2/101/qwertz/comma</_description>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
           </configItem>
         </variant>
+
+        <!-- 101 keys -->
         <variant>
           <configItem>
-            <name>l2_101_qwertz_dot</name>
-            <_description>l2/101/qwertz/dot</_description>
+            <name>101_qwertz_comma_dead</name>
+            <_description>101/qwertz/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>l2_102_qwerty_comma</name>
-            <_description>l2/102/qwerty/comma</_description>
+            <name>101_qwertz_comma_nodead</name>
+            <_description>101/qwertz/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>l2_102_qwerty_dot</name>
-            <_description>l2/102/qwerty/dot</_description>
+            <name>101_qwertz_dot_dead</name>
+            <_description>101/qwertz/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>l2_102_qwertz_comma</name>
-            <_description>l2/102/qwertz/comma</_description>
+            <name>101_qwertz_dot_nodead</name>
+            <_description>101/qwertz/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>l2_102_qwertz_dot</name>
-            <_description>l2/102/qwertz/dot</_description>
+            <name>101_qwerty_comma_dead</name>
+            <_description>101/qwerty/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <name>101_qwerty_comma_nodead</name>
+            <_description>101/qwerty/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>standard</name>
-            <_description>Standard</_description>
+            <name>101_qwerty_dot_dead</name>
+            <_description>101/qwerty/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <name>101_qwerty_dot_nodead</name>
+            <_description>101/qwerty/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
+
+
+        <!-- 102 keys -->
         <variant>
           <configItem>
-            <name>uni_101_qwerty_comma</name>
-            <_description>uni/101/qwerty/comma</_description>
+            <name>102_qwertz_comma_dead</name>
+            <_description>102/qwertz/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>uni_101_qwerty_dot</name>
-            <_description>uni/101/qwerty/dot</_description>
+            <name>102_qwertz_comma_nodead</name>
+            <_description>102/qwertz/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>uni_101_qwertz_comma</name>
-            <_description>uni/101/qwertz/comma</_description>
+            <name>102_qwertz_dot_dead</name>
+            <_description>102/qwertz/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>uni_101_qwertz_dot</name>
-            <_description>uni/101/qwertz/dot</_description>
+            <name>102_qwertz_dot_nodead</name>
+            <_description>102/qwertz/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>uni_102_qwerty_comma</name>
-            <_description>uni/102/qwerty/comma</_description>
+            <name>102_qwerty_comma_dead</name>
+            <_description>102/qwerty/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>uni_102_qwerty_dot</name>
-            <_description>uni/102/qwerty/dot</_description>
+            <name>102_qwerty_comma_nodead</name>
+            <_description>102/qwerty/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>uni_102_qwertz_comma</name>
-            <_description>uni/102/qwertz/comma</_description>
+            <name>102_qwerty_dot_dead</name>
+            <_description>102/qwerty/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>uni_102_qwertz_dot</name>
-            <_description>uni/102/qwertz/dot</_description>
+            <name>102_qwerty_dot_nodead</name>
+            <_description>102/qwerty/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
+
+
       </variantList>
     </layout>
-    <layout>
-      <configItem>
-        <name>hu_qwerty</name>
-        <_shortDescription>Hun</_shortDescription>
-        <_description>Hungarian (qwerty)</_description>
-      </configItem>
-      <variantList/>
-    </layout>
     <layout>
       <configItem>
         <name>is</name>
@@ -1422,27 +1421,6 @@
         </variant>
       </variantList>
     </layout>
-    <!--<layout>
-      <configItem>
-        <name>lt_std</name>
-        <_shortDescription>Ltu</_shortDescription>
-        <_description>Lithuanian azerty standard</_description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>-->
     <layout>
       <configItem>
         <name>lv</name>
@@ -1682,7 +1660,7 @@
         </variant>
         <variant>
           <configItem>
-            <name>bksl_qwerty</name>
+            <name>qwerty_bksl</name>
             <_description>qwerty, extended Backslash</_description>
           </configItem>
         </variant>
diff --git a/symbols/ch b/symbols/ch
index 20dcbbb..84bb9df 100644
--- a/symbols/ch
+++ b/symbols/ch
@@ -86,7 +86,7 @@ xkb_symbols "de_Sundeadkeys" {
 
 partial alphanumeric_keys 
 xkb_symbols "de_sundeadkeys" {
-    include "ch(Sundeadkeys)"
+    include "ch(de_Sundeadkeys)"
 };
 
 partial alphanumeric_keys 
diff --git a/symbols/mk b/symbols/mk
index d6c5d20..eaf0478 100644
--- a/symbols/mk
+++ b/symbols/mk
@@ -62,6 +62,6 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "pc104" {
     include "mk(basic)"
-    include "mk(win)"	
+    // include "mk(win)"	
 };
 
diff --git a/tests/testModels.pl b/tests/testModels.pl
index 7a7cdba..aaed2a8 100644
--- a/tests/testModels.pl
+++ b/tests/testModels.pl
@@ -101,6 +101,13 @@ sub testLevel2
       my $paramValue=$1;
       print "--- scanning $type: [$paramValue]\n";
 
+      my @params = defaultXkbSettings();
+      @params[$idx] = "$paramValue";
+      dumpXkbSettings ( @params );
+      setXkbSettings ( @params );
+      #print "--- dump:\n";
+      #dumpXkbSettings( getXkbSettings() );
+
       open ( XSLTPROC2, "xsltproc --stringparam type $subtype --stringparam parentId $paramValue listCI2.xsl ../rules/base.xml.in |" ) or
         die ( "Could not start xsltproc" );
       while (<XSLTPROC2>)
-- 
2.32.0.93.g670b81a890