update class PhoneticEditor

3 files changed, 21 insertions, 3 deletions

diff --git a/src/PYPLuaTriggerCandidates.cc b/src/PYPLuaTriggerCandidates.cc
index 550a28e..41534b4 100644
--- a/src/PYPLuaTriggerCandidates.cc
+++ b/src/PYPLuaTriggerCandidates.cc
@@ -67,7 +67,7 @@ LuaTriggerCandidates::processCandidates (std::vector<EnhancedCandidate> & candid
 
     if (ibus_engine_plugin_match_input
         (m_lua_plugin, text, &lua_function_name)) {
-        ibus_engine_plugin_call(m_lua_plugin, lua_function_name, text);
+        ibus_engine_plugin_call (m_lua_plugin, lua_function_name, text);
         enhanced.m_display_string =
             ibus_engine_plugin_get_first_result (m_lua_plugin);
 
@@ -80,7 +80,7 @@ LuaTriggerCandidates::processCandidates (std::vector<EnhancedCandidate> & candid
             text = candidates[i].m_display_string.c_str ();
             if (ibus_engine_plugin_match_candidate
                 (m_lua_plugin, text, &lua_function_name)) {
-                ibus_engine_plugin_call(m_lua_plugin, lua_function_name, text);
+                ibus_engine_plugin_call (m_lua_plugin, lua_function_name, text);
                 enhanced.m_display_string =
                     ibus_engine_plugin_get_first_result (m_lua_plugin);
 
diff --git a/src/PYPPhoneticEditor.cc b/src/PYPPhoneticEditor.cc
index 8f15d1a..c7ff55d 100644
--- a/src/PYPPhoneticEditor.cc
+++ b/src/PYPPhoneticEditor.cc
@@ -34,7 +34,9 @@ PhoneticEditor::PhoneticEditor (PinyinProperties &props,
     m_pinyin_len (0),
     m_lookup_table (m_config.pageSize ()),
     m_libpinyin_candidates (this),
-    m_traditional_candidates (this)
+    m_traditional_candidates (this),
+    m_lua_trigger_candidates (this),
+    m_lua_converter_candidates (this)
 {
 }
 
@@ -215,6 +217,11 @@ PhoneticEditor::updateCandidates (void)
     if (!m_props.modeSimp ())
         m_traditional_candidates.processCandidates (m_candidates);
 
+    m_lua_trigger_candidates.processCandidates (m_candidates);
+
+    if (NULL != m_config.luaConverter ())
+        m_lua_converter_candidates.processCandidates (m_candidates);
+
     return TRUE;
 }
 
@@ -340,6 +347,12 @@ PhoneticEditor::selectCandidateInternal (EnhancedCandidate & candidate)
     case CANDIDATE_TRADITIONAL_CHINESE:
         return m_traditional_candidates.selectCandidate (candidate);
 
+    case CANDIDATE_LUA_TRIGGER:
+        return m_lua_trigger_candidates.selectCandidate (candidate);
+
+    case CANDIDATE_LUA_CONVERTER:
+        return m_lua_converter_candidates.selectCandidate (candidate);
+
     default:
         assert (FALSE);
     }
diff --git a/src/PYPPhoneticEditor.h b/src/PYPPhoneticEditor.h
index a2a0352..b49627a 100644
--- a/src/PYPPhoneticEditor.h
+++ b/src/PYPPhoneticEditor.h
@@ -29,6 +29,7 @@
 #include "PYPLibPinyinCandidates.h"
 #include "PYPTradCandidates.h"
 #include "PYPLuaTriggerCandidates.h"
+#include "PYPLuaConverterCandidates.h"
 
 
 namespace PY {
@@ -36,11 +37,13 @@ namespace PY {
 class LibPinyinCandidates;
 class TraditionalCandidates;
 class LuaTriggerCandidates;
+class LuaConverterCandidates;
 
 class PhoneticEditor : public Editor {
     friend class LibPinyinCandidates;
     friend class TraditionalCandidates;
     friend class LuaTriggerCandidates;
+    friend class LuaConverterCandidates;
 public:
     PhoneticEditor (PinyinProperties & props, Config & config);
     virtual ~PhoneticEditor ();
@@ -109,6 +112,8 @@ protected:
     /* several EnhancedCandidates providers. */
     LibPinyinCandidates m_libpinyin_candidates;
     TraditionalCandidates m_traditional_candidates;
+    LuaTriggerCandidates m_lua_trigger_candidates;
+    LuaConverterCandidates m_lua_converter_candidates;
 };
 
 };