xkbdesc/rules base.lists.part, 1.21, 1.22 base.xml.in, 1.130, 1.131 xkb.dtd, 1.1, 1.2

Committed by: svu

Update of /cvs/xlibs/xkbdesc/rules
In directory kemper:/tmp/cvs-serv8335/rules

Modified Files:
	base.lists.part base.xml.in xkb.dtd 
Log Message:
2 new layouts, b.fd.o#7325

Index: base.lists.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.lists.part,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- base.lists.part	25 Jun 2006 17:00:46 -0000	1.21
+++ base.lists.part	25 Jun 2006 21:00:24 -0000	1.22
@@ -14,15 +14,18 @@
 ! $azerty = be fr
 ! $qwertz = al cz de hr hu ro si sk 
 
-! $inetkbds = a4techKB21 a4techKBS8 acer_ferrari4k acer_tm_800 acpi airkey azonaRF2300 \
+! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+              acer_ferrari4k acer_tm_800 acpi airkey armada azonaRF2300 \
               brother \
-              btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090\
+              btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 \
               cherryblue cherrybluea cherryblueb cherrycyboard \
               chicony chicony9885 \
-              compaqeak8 compaqik7 compaqik13 compaqik18 cymotionlinux \
-              armada presario ipaq \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              cymotionlinux \
+              presario ipaq \
               dell inspiron dellusbmm dtk2000 \
-              dexxa diamond genius geniuscomfy geniuscomfy2 \
+              dexxa diamond \
+              genius geniuscomfy geniuscomfy2 genius_kb19e_nb \
               emachines ennyah_dkb1008 gyration \
               hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
               hp500fa hp5xx hp5185 \

Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- base.xml.in	25 Jun 2006 17:53:48 -0000	1.130
+++ base.xml.in	25 Jun 2006 21:00:24 -0000	1.131
@@ -88,6 +88,12 @@
     </model>
     <model>
       <configItem>
+        <name>a4_rfkb23</name>
+        <_description>A4Tech Wireless Desktop RFKB-23</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>abnt2</name>
         <_description>Brazilian ABNT2</_description>
       </configItem>
@@ -304,6 +310,12 @@
     </model>
     <model>
       <configItem>
+        <name>genius_kb19e_nb</name>
+        <_description>Genius KB-19e NB</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>gyration</name>
         <_description>Gyration</_description>
       </configItem>

Index: xkb.dtd
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/xkb.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xkb.dtd	10 Apr 2004 02:08:52 -0000	1.1
+++ xkb.dtd	25 Jun 2006 21:00:24 -0000	1.2
@@ -9,6 +9,9 @@
 
 <!ELEMENT xkbConfigRegistry (modelList,layoutList,optionList)>
 
+<!ATTLIST xkbConfigRegistry 
+          version CDATA "1.0">
+
 <!ELEMENT modelList (model*)>
 
 <!ELEMENT model (configItem)>
@@ -29,14 +32,26 @@
 
 <!ELEMENT option (configItem)>
 
-<!ELEMENT configItem (name,shortDescription*,description*)>
+<!ELEMENT configItem (name,shortDescription*,description*,countryList?,languageList?)>
+
+<!ATTLIST configItem
+          popularity (standard|exotic) "standard">
 
 <!ELEMENT name (#PCDATA)>
 
 <!ELEMENT shortDescription (#PCDATA)>
 <!ATTLIST shortDescription
-          lang CDATA #IMPLIED>
+          xml:lang CDATA #IMPLIED>
 
 <!ELEMENT description (#PCDATA)>
 <!ATTLIST description
-          lang CDATA #IMPLIED>
+          xml:lang CDATA #IMPLIED>
+
+<!ELEMENT countryList (iso3166Id+)>
+
+<!ELEMENT iso3166Id (#PCDATA)>
+
+<!ELEMENT languageList (iso639Id+)>
+
+<!ELEMENT iso639Id (#PCDATA)>
+