keyboardlayouteditor

commit 0d14f7b59998bef3173c564c215a40bc20081d93
parent 3f7ffd346cd9b9614a95962e10c365ff01db09a2
Author: simos.lists <simos.lists@70737e48-4f4a-0410-8df8-290828ad50c4>
Date:   Fri, 20 Jun 2008 14:45:07 +0000

Minor updates

git-svn-id: http://keyboardlayouteditor.googlecode.com/svn/trunk@51 70737e48-4f4a-0410-8df8-290828ad50c4

Diffstat:
M
XKBGrammar/parse_xkb_to_xml.py
 | 
3
+++
M
XKBGrammar/xkb.rng
 | 
21
++++++++++++---------
M
XKBGrammar/xkbsample.xml
 | 
2
+-

3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/XKBGrammar/parse_xkb_to_xml.py b/XKBGrammar/parse_xkb_to_xml.py
@@ -172,6 +172,9 @@ for symbols in result.tree.getChildren():
 			# sys.exit(-2)
 
 fout = open(os.path.basename(xkbfilename) + ".xml", "w")
+fout.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
+# fout.write("  xmlns=\"http://relaxng.org/ns/structure/1.0\"\n")
+# fout.write("  xmlns:xlink=\"http://www.w3.org/1999/xlink\"?>\n")
 fout.write(etree.tostring(layout, pretty_print=True))
 fout.close()
 
diff --git a/XKBGrammar/xkb.rng b/XKBGrammar/xkb.rng
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" 
+	 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" 
+	 xmlns:xlink="http://www.w3.org/1999/xlink"
+	 datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <element name="layout">
       <attribute name="layoutname"/>
@@ -34,7 +37,7 @@
     </optional>
     <optional>
       <oneOrMore>
-        <element name="tokenkeytype">
+        <element name="tokentype">
 	  <text/>
         </element>
       </oneOrMore>
@@ -87,13 +90,6 @@
       </optional>
       <optional>
         <element name="keysymgroup">
-          <optional>
-            <oneOrMore>
-              <element name="typegroup">
-                <attribute name="value"/>
-              </element>
-            </oneOrMore>
-          </optional>
           <oneOrMore>
             <element name="symbolsgroup">
               <oneOrMore>
@@ -103,6 +99,13 @@
               </oneOrMore>
             </element>
           </oneOrMore>
+          <optional>
+            <oneOrMore>
+              <element name="typegroup">
+                <attribute name="value"/>
+              </element>
+            </oneOrMore>
+          </optional>
         </element>
       </optional>
       <optional>
diff --git a/XKBGrammar/xkbsample.xml b/XKBGrammar/xkbsample.xml
@@ -9,7 +9,7 @@
     <mapname>basic</mapname>
     <mapmaterial>
       <tokenname name="Group1">Greece</tokenname>
-      <tokeninclude>gr(bare)</tokeninclude>
+      <tokeninclude xlink:href="gr.xml" xlink:type="simple" xlink:title="bare"/>
       <tokenkeytype>THREE_LEVEL</tokenkeytype>
       <tokenkey override="False">
         <keycodename>TLDE</keycodename>