[dasher: 34/38] Merge branches 'chinese' and 'iphone' into everything

[Patrick Welche <pwelche src gnome org>]

commit 7156ed0703fe6d7efa8e4b67da8bb03db537d779
Merge: 8ff9826 b4d1050 ae4d7bd
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Mon Jan 2 10:35:05 2012 +0000

    Merge branches 'chinese' and 'iphone' into everything

 Data/alphabets/Makefile.am                         |   11 +-
 Data/alphabets/alphabet.bopoDict.xml               | 4945 -
 Data/alphabets/alphabet.bopoTrad.xml               |17853 ++++
 Data/alphabets/alphabet.cangjie.xml                |96493 ++++++++++++++++++++
 Data/alphabets/alphabet.pinyin.xml                 |  103 -
 Data/alphabets/alphabet.spyDict.xml                | 4971 -
 ...lphabet.chineseRuby.xml => alphabet.spyNew.xml} | 4046 +-
 Data/alphabets/alphabet.spyToneMarks.xml           | 4586 -
 Data/alphabets/alphabet.spyTones2.xml              | 4959 -
 ...t.chineseRuby.xml => alphabet.spyTones2New.xml} |10796 ++-
 ...et.chineseRuby.xml => alphabet.spyTonesNew.xml} |11999 ++--
 Data/alphabets/bopo.py                             |  108 -
 Data/alphabets/bpmf-pinyin.txt                     |  418 -
 Data/alphabets/cj.cin                              |17609 ++++
 Data/alphabets/combine_conv.py                     |   68 +
 Data/alphabets/conv-cj.py                          |  132 +
 Data/bpmf-trad-mand.cin                            |14199 +++
 Data/bpmf-trad-mand.py                             |  109 +
 Data/training/Makefile.am                          |    2 +-
 Data/training/training_spyDict.txt                 |    1 -
 Data/training/training_spyNew.txt                  |    1 +
 Data/training/training_spyNew_fullyAnnotated.txt   |    1 +
 Src/DasherCore/AbstractXMLParser.cpp               |   13 +-
 Src/DasherCore/AbstractXMLParser.h                 |    2 +-
 Src/DasherCore/Alphabet/AlphIO.cpp                 |   54 +-
 Src/DasherCore/Alphabet/AlphInfo.cpp               |   60 +-
 Src/DasherCore/Alphabet/AlphInfo.h                 |   69 +-
 Src/DasherCore/Alphabet/GroupInfo.h                |   15 +
 Src/DasherCore/AlphabetManager.cpp                 |  260 +-
 Src/DasherCore/AlphabetManager.h                   |   86 +-
 Src/DasherCore/ControlManager.h                    |    2 +-
 Src/DasherCore/ConversionManager.h                 |    2 +-
 Src/DasherCore/ConvertingAlphMgr.cpp               |    6 +-
 Src/DasherCore/DasherInterfaceBase.cpp             |    2 +-
 Src/DasherCore/DasherNode.h                        |    2 +-
 Src/DasherCore/DasherViewSquare.cpp                |   12 +-
 Src/DasherCore/GameModule.cpp                      |   33 +-
 .../LanguageModelling/DictLanguageModel.cpp        |    2 +-
 Src/DasherCore/LanguageModelling/Makefile.am       |    2 +
 .../LanguageModelling/MixtureLanguageModel.h       |    2 +-
 .../LanguageModelling/RoutingPPMLanguageModel.cpp  |  205 +
 .../LanguageModelling/RoutingPPMLanguageModel.h    |   93 +
 .../LanguageModelling/WordLanguageModel.cpp        |    2 +-
 Src/DasherCore/Makefile.am                         |    2 +
 Src/DasherCore/MandarinAlphMgr.cpp                 |  364 +-
 Src/DasherCore/MandarinAlphMgr.h                   |  206 +-
 Src/DasherCore/Messages.cpp                        |    7 +
 Src/DasherCore/Messages.h                          |    5 +
 Src/DasherCore/NodeCreationManager.cpp             |   13 +-
 Src/DasherCore/RoutingAlphMgr.cpp                  |  193 +
 Src/DasherCore/RoutingAlphMgr.h                    |  117 +
 Src/DasherCore/Trainer.cpp                         |   80 +-
 Src/DasherCore/Trainer.h                           |   47 +-
 Src/MacOSX/Dasher.xcodeproj/project.pbxproj        |   68 +-
 Src/iPhone/Classes/DasherAppDelegate.mm            |    3 +
 55 files changed, 162404 insertions(+), 33035 deletions(-)
---