[dasher] Chinese alphabet updates: rm pinyin "n" and "ng" sounds
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] Chinese alphabet updates: rm pinyin "n" and "ng" sounds
- Date: Tue, 15 Mar 2011 17:12:02 +0000 (UTC)
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="诶" t="诶" />
</group>
<group name="ēn (en1)" label="ēn" f="113" b="115">
+<s d="嗯" t="嗯" />
<s d="恩" t="恩" />
<s d="蒽" t="蒽" />
</group>
+<!-- groups en2 and en3 have no corresponding entries in the Pinyin alphabet,
+ so won't be found: -->
+<group name="én (en2)" label="én" f="113" >
+<s d="嗯" t="嗯" />
+</group>
+<group name="ěn (en3)" label="ěn" f="113" >
+<s d="嗯" t="嗯" />
+</group>
<group name="èn (en4)" label="èn" f="113" b="116">
+<s d="嗯" t="嗯" />
<s d="摁" t="摁" />
</group>
<group name="ér (er2)" label="ér" f="113" b="117">
@@ -5321,9 +5331,6 @@
<s d="沐" t="沐" />
<s d="钼" t="钼" />
</group>
-<group name="n (n)" label="n" f="113" b="115">
-<s d="嗯" t="嗯" />
-</group>
<group name="nā (na1)" label="nā" f="113" b="116">
<s d="那" t="那" />
<s d="南" t="南" />
@@ -5439,10 +5446,6 @@
<group name="néng (neng2)" label="néng" f="113" b="118">
<s d="能" t="能" />
</group>
-<group name="ng (ng)" label="ng" f="113" b="119">
-<s d="唔" t="唔" />
-<s d="嗯" t="嗯" />
-</group>
<group name="nī (ni1)" label="nī" f="113" b="120">
<s d="妮" t="妮" />
</group>
@@ -8084,6 +8087,7 @@
<s d="武" t="武" />
<s d="五" t="五" />
<s d="捂" t="捂" />
+<s d="唔" t="唔" />
<s d="午" t="午" />
<s d="舞" t="舞" />
<s d="伍" t="伍" />
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="ēn" t="恩" 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="én" t="TODO;" b="85" visible="no"/>
+ </group>
+ <group name="en3" label="3" b="84" visible="yes">
+ <s d="ěn" t="TODO;" b="85" visible="no"/>
+ </group>
+-->
<group name="en4" label="4" b="86" visible="yes">
<s d="èn" t="摁" b="87" visible="no"/>
</group>
@@ -2487,10 +2496,6 @@
</group>
</group>
<group name="n" label="n" b="61" visible="yes">
-<s d="n" t="嗯" 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ā" t="那" b="74" visible="no"/>
@@ -2584,9 +2589,6 @@
</group>
</group>
</group>
-<group name="ng" label="g" b="63" visible="yes">
-<s d="ng" t="唔" 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ī" t="妮" 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),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]