[dasher: 21/27] Merge branch 'arcs' of Aug2010-patchqueue.bundle

[Patrick Welche <pwelche src gnome org>]

commit 40b80be2c85743f82730374f15ab6ad9487ea8e4
Merge: 115c847 fafa721
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Tue Aug 17 17:07:52 2010 +0100

    Merge branch 'arcs' of Aug2010-patchqueue.bundle

 Src/DasherCore/Alphabet/AlphIO.cpp                 |  405 +++-----
 Src/DasherCore/Alphabet/AlphIO.h                   |  101 +--
 Src/DasherCore/Alphabet/AlphInfo.cpp               |  121 +++
 Src/DasherCore/Alphabet/AlphInfo.h                 |  155 +++
 Src/DasherCore/Alphabet/Alphabet.cpp               |  326 ------
 Src/DasherCore/Alphabet/Alphabet.h                 |  224 -----
 Src/DasherCore/Alphabet/AlphabetMap.cpp            |  127 +++-
 Src/DasherCore/Alphabet/AlphabetMap.h              |   49 +-
 Src/DasherCore/AlphabetManager.cpp                 |  172 ++--
 Src/DasherCore/AlphabetManager.h                   |   34 +-
 Src/DasherCore/AlternatingDirectMode.h             |    1 -
 Src/DasherCore/BasicLog.h                          |    1 -
 Src/DasherCore/ButtonMode.h                        |    1 -
 Src/DasherCore/CannaConversionHelper.cpp           |    2 +-
 Src/DasherCore/CannaConversionHelper.h             |    2 +-
 Src/DasherCore/CompassMode.h                       |    1 -
 Src/DasherCore/ControlManager.cpp                  |    6 +-
 Src/DasherCore/ConversionHelper.cpp                |    2 +-
 Src/DasherCore/ConversionHelper.h                  |    2 +-
 Src/DasherCore/ConversionManager.cpp               |   10 +-
 Src/DasherCore/ConversionManager.h                 |    6 +-
 Src/DasherCore/ConvertingAlphMgr.cpp               |   30 +
 Src/DasherCore/ConvertingAlphMgr.h                 |   32 +
 Src/DasherCore/DasherButtons.h                     |    1 -
 Src/DasherCore/DasherInterfaceBase.cpp             |  123 +--
 Src/DasherCore/DasherInterfaceBase.h               |   36 +-
 Src/DasherCore/DasherModel.cpp                     |  206 +---
 Src/DasherCore/DasherModel.h                       |   73 +-
 Src/DasherCore/DasherNode.cpp                      |    7 +-
 Src/DasherCore/DasherNode.h                        |    2 +-
 Src/DasherCore/DasherTypes.h                       |   16 +-
 Src/DasherCore/DasherView.cpp                      |    9 +-
 Src/DasherCore/DasherView.h                        |   35 +-
 Src/DasherCore/DasherViewSquare.cpp                | 1056 ++++++++++++--------
 Src/DasherCore/DasherViewSquare.h                  |   74 +-
 Src/DasherCore/IMEConversionHelper.cpp             |    2 +-
 Src/DasherCore/IMEConversionHelper.h               |    2 +-
 .../LanguageModelling/BigramLanguageModel.cpp      |    4 +-
 .../LanguageModelling/BigramLanguageModel.h        |    2 +-
 .../LanguageModelling/CTWLanguageModel.cpp         |    4 +-
 .../LanguageModelling/CTWLanguageModel.h           |    2 +-
 .../LanguageModelling/DictLanguageModel.cpp        |   14 +-
 .../LanguageModelling/DictLanguageModel.h          |    4 +-
 .../LanguageModelling/JapaneseLanguageModel.cpp    |    4 +-
 .../LanguageModelling/JapaneseLanguageModel.h      |    2 +-
 Src/DasherCore/LanguageModelling/LanguageModel.cpp |    6 +-
 Src/DasherCore/LanguageModelling/LanguageModel.h   |   24 +-
 .../LanguageModelling/MixtureLanguageModel.h       |    9 +-
 .../LanguageModelling/PPMLanguageModel.cpp         |    4 +-
 .../LanguageModelling/PPMLanguageModel.h           |    2 +-
 .../LanguageModelling/PPMPYLanguageModel.cpp       |   15 +-
 .../LanguageModelling/PPMPYLanguageModel.h         |    5 +-
 Src/DasherCore/LanguageModelling/SymbolAlphabet.h  |   82 --
 .../LanguageModelling/WordLanguageModel.cpp        |   16 +-
 .../LanguageModelling/WordLanguageModel.h          |    4 +-
 Src/DasherCore/Makefile.am                         |    6 +-
 Src/DasherCore/MandarinAlphMgr.cpp                 |   11 +-
 Src/DasherCore/MandarinAlphMgr.h                   |    5 +-
 Src/DasherCore/NodeCreationManager.cpp             |  201 ++---
 Src/DasherCore/NodeCreationManager.h               |   30 +-
 Src/DasherCore/Parameters.h                        |   13 +-
 Src/DasherCore/PinyinParser.cpp                    |    1 -
 Src/DasherCore/PinyinParser.h                      |    1 -
 Src/DasherCore/Trainer.cpp                         |    6 +-
 Src/DasherCore/Trainer.h                           |    9 +-
 Src/DasherCore/TrainingHelper.cpp                  |    6 +-
 Src/DasherCore/TrainingHelper.h                    |   10 +-
 Src/DasherCore/UserLog.cpp                         |   23 +-
 Src/DasherCore/UserLog.h                           |    5 +-
 Src/DasherCore/UserLogBase.h                       |    1 -
 Src/DasherCore/UserLogTrial.cpp                    |   64 +-
 Src/DasherCore/UserLogTrial.h                      |    7 +-
 Src/Gtk2/GtkDasherControl.cpp                      |    6 -
 Src/Gtk2/GtkDasherControl.h                        |    1 -
 Src/MacOSX/Dasher.xcodeproj/project.pbxproj        |   36 +-
 Src/MacOSX/GLUtils.h                               |   17 +-
 Src/MacOSX/GLUtils.mm                              |   27 +-
 Src/Win32/Dasher.cpp                               |    7 +
 Src/Win32/Dasher.h                                 |    2 +
 Src/Win32/DasherWindow.cpp                         |   12 -
 Src/Win32/Dasher_vc80.vcproj                       |   24 -
 Src/Win32/Widgets/ControlPage.cpp                  |    3 +-
 Src/iPhone/Classes/DasherAppDelegate.mm            |    5 +-
 Src/iPhone/Classes/MiscSettings.mm                 |    2 +
 84 files changed, 1936 insertions(+), 2260 deletions(-)
---