[dasher] Chinese alphabet updates: rm pinyin "n" and "ng" sounds

[Patrick Welche <pwelche src gnome org>]

commit 2569f29751bb7d4102d1f7474fdfa9bcc4fdaf8a
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Sat Feb 19 19:33:42 2011 +0000

    Chinese alphabet updates: rm pinyin "n" and "ng" sounds
    
    (no tones!)
    Add \u55EF under en1 and en4 instead, and \u5514 under wu3 (already under wu2)

 Data/alphabets/alphabet.chineseRuby.xml |   18 +++++++++++-------
 Data/alphabets/alphabet.spyDict.xml     |   16 +++++++++-------
 Src/DasherCore/MandarinAlphMgr.cpp      |    2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/Data/alphabets/alphabet.chineseRuby.xml b/Data/alphabets/alphabet.chineseRuby.xml
index eb20611..0d2d29c 100644
--- a/Data/alphabets/alphabet.chineseRuby.xml
+++ b/Data/alphabets/alphabet.chineseRuby.xml
@@ -1895,10 +1895,20 @@
 <s d="&#x8BF6;" t="&#x8BF6;" />
 </group>
 <group name="&#275;n (en1)" label="&#275;n"  f="113"  b="115">
+<s d="&#x55EF;" t="&#x55EF;" />
 <s d="&#x6069;" t="&#x6069;" />
 <s d="&#x84BD;" t="&#x84BD;" />
 </group>
+<!-- groups en2 and en3 have no corresponding entries in the Pinyin alphabet,
+     so won't be found: -->
+<group name="&#233;n (en2)" label="&#233;n" f="113" >
+<s d="&#x55EF;" t="&#x55EF;" />
+</group>
+<group name="&#283;n (en3)" label="&#283;n" f="113" >
+<s d="&#x55EF;" t="&#x55EF;" />
+</group>
 <group name="&#232;n (en4)" label="&#232;n"  f="113"  b="116">
+<s d="&#x55EF;" t="&#x55EF;" />
 <s d="&#x6441;" t="&#x6441;" />
 </group>
 <group name="&#233;r (er2)" label="&#233;r"  f="113"  b="117">
@@ -5321,9 +5331,6 @@
 <s d="&#x6C90;" t="&#x6C90;" />
 <s d="&#x94BC;" t="&#x94BC;" />
 </group>
-<group name="n (n)" label="n"  f="113"  b="115">
-<s d="&#x55EF;" t="&#x55EF;" />
-</group>
 <group name="n&#257; (na1)" label="n&#257;"  f="113"  b="116">
 <s d="&#x90A3;" t="&#x90A3;" />
 <s d="&#x5357;" t="&#x5357;" />
@@ -5439,10 +5446,6 @@
 <group name="n&#233;ng (neng2)" label="n&#233;ng"  f="113"  b="118">
 <s d="&#x80FD;" t="&#x80FD;" />
 </group>
-<group name="ng (ng)" label="ng"  f="113"  b="119">
-<s d="&#x5514;" t="&#x5514;" />
-<s d="&#x55EF;" t="&#x55EF;" />
-</group>
 <group name="n&#299; (ni1)" label="n&#299;"  f="113"  b="120">
 <s d="&#x59AE;" t="&#x59AE;" />
 </group>
@@ -8084,6 +8087,7 @@
 <s d="&#x6B66;" t="&#x6B66;" />
 <s d="&#x4E94;" t="&#x4E94;" />
 <s d="&#x6342;" t="&#x6342;" />
+<s d="&#x5514;" t="&#x5514;" />
 <s d="&#x5348;" t="&#x5348;" />
 <s d="&#x821E;" t="&#x821E;" />
 <s d="&#x4F0D;" t="&#x4F0D;" />
diff --git a/Data/alphabets/alphabet.spyDict.xml b/Data/alphabets/alphabet.spyDict.xml
index 7587ffd..fd28397 100644
--- a/Data/alphabets/alphabet.spyDict.xml
+++ b/Data/alphabets/alphabet.spyDict.xml
@@ -970,6 +970,15 @@
 <group name="en1" label="1" b="84" visible="yes">
 <s d="&#275;n" t="&#x6069;" b="85" visible="no"/>
 </group>
+<!-- not sure how to add en2/en3, need something for the text attribute
+     (used in training files) 
+  <group name="en2" label="2" b="84" visible="yes">
+  <s d="&#233;n" t="TODO;" b="85" visible="no"/>
+  </group>
+  <group name="en3" label="3" b="84" visible="yes">
+  <s d="&#283;n" t="TODO;" b="85" visible="no"/>
+  </group>
+-->
 <group name="en4" label="4" b="86" visible="yes">
 <s d="&#232;n" t="&#x6441;" b="87" visible="no"/>
 </group>
@@ -2487,10 +2496,6 @@
 </group>
 </group>
 <group name="n" label="n" b="61" visible="yes">
-<s d="n" t="&#x55EF;" b="62" visible="no"/>
-
-
-
 <group name="na" label="a" b="72" visible="yes">
 <group name="na1" label="1" b="73" visible="yes">
 <s d="n&#257;" t="&#x90A3;" b="74" visible="no"/>
@@ -2584,9 +2589,6 @@
 </group>
 </group>
 </group>
-<group name="ng" label="g" b="63" visible="yes">
-<s d="ng" t="&#x5514;" b="64" visible="no"/>
-</group>
 <group name="ni" label="i" b="65" visible="yes">
 <group name="ni1" label="1" b="66" visible="yes">
 <s d="n&#299;" t="&#x59AE;" b="67" visible="no"/>
diff --git a/Src/DasherCore/MandarinAlphMgr.cpp b/Src/DasherCore/MandarinAlphMgr.cpp
index a242058..d1bf063 100644
--- a/Src/DasherCore/MandarinAlphMgr.cpp
+++ b/Src/DasherCore/MandarinAlphMgr.cpp
@@ -48,7 +48,7 @@ static char THIS_FILE[] = __FILE__;
 
 //the index of the last syllable+tone symbol in the pinyin alphabet; later symbols are "punctuation"
 // and do not correspond to groups in the chinese alphabet.
-#define LAST_PY 1288
+#define LAST_PY 1286
 
 CMandarinAlphMgr::CMandarinAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet, const CAlphabetMap *pAlphMap)
   : CAlphabetManager(pInterface, pNCManager, pAlphabet, pAlphMap),