[dasher] Make the alphabet's dtd match the parser more closely. ("note" is ignored)

[Patrick Welche <pwelche src gnome org>]

commit 2c9b064260c0ff188bf9664ef0ea0eaa468bf7e7
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Jul 9 11:41:54 2009 +0100

    Make the alphabet's dtd match the parser more closely. ("note" is ignored)
    Wonder why some alphabets have "visible" as an attribute to s, and why
    say VietNam exists as an encoding, yet most are set to Western. (encoding
    doesn't seem useful).

 Data/alphabets/alphabet.dtd                      |   36 +++++++++++++++++++---
 Src/DasherCore/LanguageModelling/LanguageModel.h |    2 +-
 Src/DasherCore/NodeCreationManager.h             |    2 +-
 3 files changed, 33 insertions(+), 7 deletions(-)
---
diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 8be9763..b60d21a 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -4,7 +4,8 @@ how those symbols may be used. -->
 
 <!ELEMENT alphabets (alphabet*)>
 
-<!ELEMENT alphabet (orientation, encoding, train, paragraph, space, control, group*)>
+<!ELEMENT alphabet (orientation, encoding, palette, train, paragraph,
+	space, control, conversionmode?, group*)>
 <!ATTLIST alphabet name CDATA #REQUIRED>
 
 <!-- Left-Right, Right-Left, Top-Bottom or Bottom-Top?
@@ -21,7 +22,24 @@ should do what it thinks best given the vague group Dasher
 has put the alphabet into. If this doesn't work out, the user
 can over-ride the alphabet anyway. -->
 <!ELEMENT encoding EMPTY>
-<!ATTLIST encoding type CDATA #REQUIRED>
+<!ATTLIST encoding type (
+	Arabic |
+	Baltic |
+	CentralEurope |
+	ChineseSimplified |
+	ChineseTraditional |
+	Cyrillic |
+	Greek |
+	Hebrew |
+	Japanese |
+	Korean |
+	Thai |
+	Turkish |
+	VietNam |
+	Western ) #REQUIRED>
+
+<!-- Colour palette -->
+<!ELEMENT palette (#PCDATA)>
 
 <!-- Default training file for this alphabet -->
 <!ELEMENT train (#PCDATA)>
@@ -40,19 +58,27 @@ others. Can set both d (display) and t (text) to "" to disable. -->
 <!ATTLIST space t CDATA #REQUIRED>
 <!ATTLIST space f CDATA #IMPLIED>
 <!ATTLIST space b CDATA #IMPLIED>
+<!ATTLIST space note CDATA #IMPLIED>
 
 <!-- The control character is special, and not part of the main alphabet. -->
-
 <!ELEMENT control EMPTY>
 <!ATTLIST control d CDATA #REQUIRED>
 <!ATTLIST control t CDATA #REQUIRED>
 <!ATTLIST control f CDATA #IMPLIED>
 <!ATTLIST control b CDATA #IMPLIED>
 
+<!-- Conversion mode sets the way selected characters are converted into
+a new one. In essence, set this to 1 for Japanese and 2 for Chinese. 0 is
+the default, i.e., no conversion. -->
+<!ELEMENT conversionmode EMPTY>
+<!ATTLIST conversionmode id CDATA #REQUIRED>
+
 <!-- Logical groups of symbols, eg name="Lower case letters" -->
 <!ELEMENT group (s*)>
-<!ATTLIST group name CDATA #REQUIRED>
-<!ATTLIST group b CDATA #IMPLIED>
+<!ATTLIST group name    CDATA #REQUIRED>
+<!ATTLIST group label   CDATA #IMPLIED>
+<!ATTLIST group visible CDATA #IMPLIED>
+<!ATTLIST group b       CDATA #IMPLIED>
 
 <!-- Symbols Dasher can use. It shows text d in the nodes and sends
 text t to the edit box -->
diff --git a/Src/DasherCore/LanguageModelling/LanguageModel.h b/Src/DasherCore/LanguageModelling/LanguageModel.h
index 4575cac..949a52d 100644
--- a/Src/DasherCore/LanguageModelling/LanguageModel.h
+++ b/Src/DasherCore/LanguageModelling/LanguageModel.h
@@ -105,7 +105,7 @@ public:
   /// @}
 
   /// @name Status reporting
-  /// Return information usful for debgging purposes
+  /// Return information useful for debugging purposes
   /// @{
 
   /// Get some measure of the memory usage for diagnostic
diff --git a/Src/DasherCore/NodeCreationManager.h b/Src/DasherCore/NodeCreationManager.h
index bb5f6a5..3ad0a0b 100644
--- a/Src/DasherCore/NodeCreationManager.h
+++ b/Src/DasherCore/NodeCreationManager.h
@@ -35,7 +35,7 @@ class CNodeCreationManager : public Dasher::CDasherComponent {
   Dasher::CDasherNode *GetRoot(int iType, Dasher::CDasherNode *pParent, int iLower, int iUpper, void *pUserData);
 
   ///
-  /// Resgister a control node 
+  /// Register a control node 
   ///
 
   void RegisterNode( int iID, const std::string &strLabel, int iColour );