Install phrases.txt

diff --git a/configure.ac b/configure.ac
index cf91f39..db958a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 m4_define([ibus_released], [1])
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [3])
-m4_define([ibus_micro_version], [2])
+m4_define([ibus_micro_version], [3])
 m4_define(ibus_maybe_datestamp,
     m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
 

diff --git a/ibus-pinyin.spec.in b/ibus-pinyin.spec.in
index 0ed0fa9..8b7b72c 100644 (file)
--- a/ibus-pinyin.spec.in
+++ b/ibus-pinyin.spec.in
@@ -66,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README
 %{_libexecdir}/ibus-engine-pinyin
 %{_libexecdir}/ibus-setup-pinyin
+%{_datadir}/@PACKAGE@/phrases.txt
 %{_datadir}/@PACKAGE@/icons
 %{_datadir}/@PACKAGE@/setup
 %{_datadir}/@PACKAGE@/db/create_index.sql

diff --git a/src/Makefile.am b/src/Makefile.am
index ab9485c..bd3329a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -123,6 +123,10 @@ BUILT_SOURCES = \
        $(ibus_engine_built_h_sources) \
        $(NULL)
 
+pkgdata_DATA = \
+       phrases.txt \
+       $(NULL)
+
 component_DATA = \
        pinyin.xml \
        $(NULL)
@@ -130,6 +134,7 @@ componentdir = @datadir@/ibus/component
 
 EXTRA_DIST = \
        pinyin.xml.in \
+       phrases.txt \
        $(NULL)
 
 CLEANFILES = \

diff --git a/src/PinyinEditor.cc b/src/PinyinEditor.cc
index 3275469..8190950 100644 (file)
--- a/src/PinyinEditor.cc
+++ b/src/PinyinEditor.cc
@@ -695,6 +695,7 @@ PinyinEditor::selectCandidateInPage (guint i)
 inline gboolean
 PinyinEditor::resetCandidate (guint i)
 {
+    i -= m_special_phrases.size ();
     if (m_phrase_editor.resetCandidate (i)) {
         update ();
     }

diff --git a/src/phrases.txt b/src/phrases.txt
index c938555..feea9c2 100644 (file)
--- a/src/phrases.txt
+++ b/src/phrases.txt
@@ -62,6 +62,7 @@ upan=U盘
 xixi=(*^__^*) 嘻嘻……
 xshexian=X射线
 
+; 动态短语
 rq=#${year}年${month}月${day}日
 rq=#${year_cn}年${month_cn}月${day_cn}日
 rq=#${year}-${month}-${day}