Hello community,
here is the log from the commit of package scim-pinyin
checked in at Wed Jul 5 14:35:00 CEST 2006.
--------
--- scim-pinyin/scim-pinyin.changes 2006-02-23 16:44:02.000000000 +0100
+++ scim-pinyin/scim-pinyin.changes 2006-07-05 14:17:46.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jul 05 12:57:18 CEST 2006 - mfabian@suse.de
+
+- update to 0.5.91.20060705
+ (fix-include-hints.diff is now included).
+- fix build for autoconf 2.60.
+
+-------------------------------------------------------------------
Old:
----
fix-include-hints.diff
scim-pinyin-0.5.91.20050815.tar.bz2
New:
----
build-fix.patch
scim-pinyin-0.5.91.20060705.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim-pinyin.spec ++++++
--- /var/tmp/diff_new_pack.MTOKiJ/_old 2006-07-05 14:34:43.000000000 +0200
+++ /var/tmp/diff_new_pack.MTOKiJ/_new 2006-07-05 14:34:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package scim-pinyin (Version 0.5.91.20050815)
+# spec file for package scim-pinyin (Version 0.5.91.20060705)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,8 +12,8 @@
Name: scim-pinyin
BuildRequires: gtk2-devel kdelibs3-devel scim-devel skim
-Version: 0.5.91.20050815
-Release: 7
+Version: 0.5.91.20060705
+Release: 1
License: GPL
Group: System/I18n/Chinese
Autoreqprov: on
@@ -23,11 +23,11 @@
Provides: scim-chinese
URL: http://www.scim-im.org/
# CVS repository:
-# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim login
-# cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim co scim-pinyin
-Source0: scim-pinyin-0.5.91.20050815.tar.bz2
+# cvs -d:pserver:anonymous@scim.cvs.sourceforge.net:/cvsroot/scim login
+# cvs -z3 -d:pserver:anonymous@scim.cvs.sourceforge.net:/cvsroot/scim co scim-pinyin
+Source0: scim-pinyin-0.5.91.20060705.tar.bz2
Patch0: gcc4.patch
-Patch1: fix-include-hints.diff
+Patch1: build-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Intelligent Pinyin input module for Smart Chinese/Common Input Method platform
@@ -59,7 +59,7 @@
%prep
%setup -q -n %{name}-%{version}
#%patch0 -p1
-%patch1
+%patch1 -p1
%build
./bootstrap
@@ -120,6 +120,10 @@
/opt/kde3/%{_lib}/kde3/*
%changelog -n scim-pinyin
+* Wed Jul 05 2006 - mfabian@suse.de
+- update to 0.5.91.20060705
+ (fix-include-hints.diff is now included).
+- fix build for autoconf 2.60.
* Thu Feb 23 2006 - mfabian@suse.de
- add "Provides: locale(skim:zh)" to scim-pinyin-skim sub-
package.
++++++ build-fix.patch ++++++
scim-pinyin-0.5.91.20060705/skim/admin/CVSだけに発見: Base
scim-pinyin-0.5.91.20060705/skim/admin/CVSだけに発見: Baserev
diff -ru scim-pinyin-0.5.91.20060705.orig/skim/admin/cvs.sh scim-pinyin-0.5.91.20060705/skim/admin/cvs.sh
--- scim-pinyin-0.5.91.20060705.orig/skim/admin/cvs.sh 2005-04-01 21:23:07.000000000 +0200
+++ scim-pinyin-0.5.91.20060705/skim/admin/cvs.sh 2006-07-05 14:12:21.000000000 +0200
@@ -32,6 +32,7 @@
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
+ Autoconf*2.6* | autoconf*2.6* ) : ;;
Autoconf*2.5* | autoconf*2.5* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
@@ -47,6 +48,7 @@
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
+ Autoconf*2.6* | autoheader*2.6* ) : ;;
Autoconf*2.5* | autoheader*2.5* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
++++++ scim-pinyin-0.5.91.20050815.tar.bz2 -> scim-pinyin-0.5.91.20060705.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/de.po new/scim-pinyin-0.5.91.20060705/po/de.po
--- old/scim-pinyin-0.5.91.20050815/po/de.po 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/de.po 2006-07-05 12:35:21.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: James Su \n"
-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
+"POT-Creation-Date: 2005-08-23 09:09+0800\n"
"PO-Revision-Date: 2005-06-25 14:31+0200\n"
"Last-Translator: Jan Hefti \n"
"Language-Team: German \n"
@@ -46,6 +46,10 @@
msgid "Full/Half Punct"
msgstr "Satzzeichen in voller/halber Breite"
+#: src/scim_pinyin_imengine.cpp:435 src/scim_pinyin_imengine_setup.cpp:67
+msgid "Smart Pinyin"
+msgstr "Intelligentes Pinyin"
+
#: src/scim_pinyin_imengine.cpp:550
msgid "Copyright (C) 2002, 2003 James Su "
msgstr "Copyright (c) 2002, 2003 James Su "
@@ -159,10 +163,6 @@
" lesen Sie bitte\n"
" /usr/share/scim/pinyin/special_table"
-#: src/scim_pinyin_imengine_setup.cpp:67
-msgid "Smart Pinyin"
-msgstr "Intelligentes Pinyin"
-
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
msgstr "Ein Eingabemodul für Chinesisch mittels Pinyin."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/fr.po new/scim-pinyin-0.5.91.20060705/po/fr.po
--- old/scim-pinyin-0.5.91.20050815/po/fr.po 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/fr.po 2006-07-05 12:35:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: scim-chinese\n"
"Report-Msgid-Bugs-To: James Su \n"
-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
+"POT-Creation-Date: 2005-08-23 09:09+0800\n"
"PO-Revision-Date: 2004-11-06 14:08+0100\n"
"Last-Translator: Damien Menanteau \n"
"Language-Team: French\n"
@@ -42,6 +42,10 @@
msgid "Full/Half Punct"
msgstr "Ponctuation Entière/Partielle"
+#: src/scim_pinyin_imengine.cpp:435 src/scim_pinyin_imengine_setup.cpp:67
+msgid "Smart Pinyin"
+msgstr "Smart Pinyin"
+
#: src/scim_pinyin_imengine.cpp:550
msgid "Copyright (C) 2002, 2003 James Su "
msgstr "Copyright (C) 2002, 2003 James Su "
@@ -154,10 +158,6 @@
" se référer au fichier :\n"
" /usr/share/scim/chinese/special_table"
-#: src/scim_pinyin_imengine_setup.cpp:67
-msgid "Smart Pinyin"
-msgstr "Smart Pinyin"
-
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
msgstr "Un module moteur de saisie de caractères chinois à partir du Pinyin."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/it.po new/scim-pinyin-0.5.91.20060705/po/it.po
--- old/scim-pinyin-0.5.91.20050815/po/it.po 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/it.po 2006-07-05 12:35:22.000000000 +0200
@@ -1,20 +1,22 @@
+# translation of it.po to Italian
# translation of scim-chinese.po to Italian
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR James Su .
-# Federico Zenith , 2004.
+# Federico Zenith , 2004, 2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: scim-chinese\n"
+"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: James Su \n"
"POT-Creation-Date: 2005-08-07 00:00+0800\n"
-"PO-Revision-Date: 2004-11-28 17:53+0100\n"
+"PO-Revision-Date: 2005-12-13 01:54+0100\n"
"Last-Translator: Federico Zenith \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/scim_pinyin_imengine.cpp:120
msgid "The status of the current input method. Click to change it."
@@ -31,8 +33,7 @@
msgstr "Lettera piena/mezza"
#: src/scim_pinyin_imengine.cpp:123
-msgid ""
-"The input mode of the puncutations. Click to toggle between half and full."
+msgid "The input mode of the puncutations. Click to toggle between half and full."
msgstr ""
"Il metodo di inserimento della punteggiatura. Fai clic per commutare tra "
"mezza e piena."
@@ -75,8 +76,7 @@
#: src/scim_pinyin_imengine.cpp:583
msgid " Switch between full/half width punctuation mode."
-msgstr ""
-" Commuta tra le modalità a larghezza della punteggiatura piena o mezza."
+msgstr " Commuta tra le modalità a larghezza della punteggiatura piena o mezza."
#: src/scim_pinyin_imengine.cpp:585
msgid " Switch between Simplified/Traditional Chinese mode."
@@ -127,7 +127,6 @@
" la stringa fornita e uscire da questa modalità."
#: src/scim_pinyin_imengine.cpp:600
-#, fuzzy
msgid ""
"\n"
"\n"
@@ -151,7 +150,7 @@
" simboli matematici comuni.\n"
" Per maggiori informazioni su\n"
" questa modalità, riferisciti a\n"
-" /usr/share/scim/chinese/special_table"
+" /usr/share/scim/pinyin/special_table"
#: src/scim_pinyin_imengine_setup.cpp:67
msgid "Smart Pinyin"
@@ -159,8 +158,7 @@
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
-msgstr ""
-"Un modulo IMEngine per il cinese che usa il metodo di inserimento pinyin."
+msgstr "Un modulo IMEngine per il cinese che usa il metodo di inserimento pinyin."
#: src/scim_pinyin_imengine_setup.cpp:147
msgid "A_mbiguities"
@@ -211,14 +209,12 @@
msgstr "Seleziona i tasti per la punteggiatura a larghezza piena"
#: src/scim_pinyin_imengine_setup.cpp:171
-#, fuzzy
msgid ""
"The key events to switch full/half width punctuation input mode. Click on "
"the button on the right to edit it."
msgstr ""
"Le combinazioni di tasti per commutare le modalità di punteggiatura a "
-"larghezza piena o mezza. Le combinazioni multiple dovrebbero essere separate "
-"da virgole."
+"larghezza piena o mezza. Fai clic sul pulsante a destra per modificarla."
#: src/scim_pinyin_imengine_setup.cpp:184
msgid "Full width _letter:"
@@ -229,14 +225,12 @@
msgstr "Seleziona i tasti delle lettere a larghezza piena"
#: src/scim_pinyin_imengine_setup.cpp:188
-#, fuzzy
msgid ""
"The key events to switch full/half width letter input mode. Click on the "
"button on the right to edit it."
msgstr ""
-"Le combinazioni di tasti per commutare le modalità delle lettere a larghezza "
-"piena o mezza. Le combinazioni multiple dovrebbero essere separate da "
-"virgole."
+"Le combinazioni di tasti per passare tra le modalità delle lettere a larghezza "
+"piena o mezza. Fai clic sul pulsante a destra per modificarla."
#: src/scim_pinyin_imengine_setup.cpp:201
msgid "_Mode switch:"
@@ -247,13 +241,12 @@
msgstr "Seleziona i tasti per il cambio di modalità"
#: src/scim_pinyin_imengine_setup.cpp:205
-#, fuzzy
msgid ""
"The key events to change current input mode. Click on the button on the "
"right to edit it."
msgstr ""
-"Le combinazioni di tasti per commutare le modalità di inserimento attuale. "
-"Le combinazioni multiple dovrebbero essere separate da virgole."
+"Le combinazioni di tasti per cambiare la modalità di inserimento attuale. "
+"Fai clic sul pulsante a destra per modificarla."
#: src/scim_pinyin_imengine_setup.cpp:221
msgid "_Chinese mode switch:"
@@ -264,13 +257,12 @@
msgstr "Tasti per selezionare la modalità cinese"
#: src/scim_pinyin_imengine_setup.cpp:225
-#, fuzzy
msgid ""
"The key events to change current Chinese input mode. .Click on the button on "
"the right to edit it"
msgstr ""
-"Le combinazioni di tasti per cambiare il metodo di inserimento cinese "
-"attuale. Le combinazioni multiple dovrebbero essere separate da virgole."
+"Le combinazioni di tasti per cambiare la modalità di inserimento cinese "
+"attuale. Fai clic sul pulsante a destra per modificarla."
#: src/scim_pinyin_imengine_setup.cpp:238
msgid "Page _up:"
@@ -281,13 +273,12 @@
msgstr "Seleziona i tasti per salire di una pagina"
#: src/scim_pinyin_imengine_setup.cpp:242
-#, fuzzy
msgid ""
"The key events to page up the lookup table. Click on the button on the right "
"to edit it."
msgstr ""
"Le combinazioni di tasti per salire di una pagina nella tabella di "
-"riferimento. Le combinazioni multiple dovrebbero essere separate da virgole."
+"riferimento. Fai clic sul pulsante a destra per modificarla."
#: src/scim_pinyin_imengine_setup.cpp:255
msgid "Page dow_n:"
@@ -298,13 +289,12 @@
msgstr "Seleziona i tasti per scendere di una pagina"
#: src/scim_pinyin_imengine_setup.cpp:259
-#, fuzzy
msgid ""
"The key events to page down the lookup table. Click on the button on the "
"right to edit it."
msgstr ""
"Le combinazioni di tasti per scendere di una pagina nella tabella di "
-"riferimento. Le combinazioni multiple dovrebbero essere separate da virgole."
+"riferimento. Fai clic sul pulsante a destra per modificarla."
#: src/scim_pinyin_imengine_setup.cpp:272
msgid "_Disable phrase:"
@@ -315,13 +305,12 @@
msgstr "Seleziona i tasti per disattivare le frasi"
#: src/scim_pinyin_imengine_setup.cpp:276
-#, fuzzy
msgid ""
"The key events to disable the currently selected user defined phrase. Click "
"on the button on the right to edit it."
msgstr ""
"Le combinazioni di tasti per disattivare la frase dell'utente attualmente "
-"selezionata. Le combinazioni multiple dovrebbero essere separate da virgole."
+"definita. Fai clic sul pulsante a destra per modificarla."
#: src/scim_pinyin_imengine_setup.cpp:398
msgid "Input"
@@ -520,3 +509,4 @@
msgstr ""
"Le opzioni seguenti controllano il comportamento ambiguo dell'algoritmo di "
"corrispondenza pinyin. Attivale, se vuoi, se non riesci a distinguerli."
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/ja.po new/scim-pinyin-0.5.91.20060705/po/ja.po
--- old/scim-pinyin-0.5.91.20050815/po/ja.po 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/ja.po 2006-07-05 12:35:22.000000000 +0200
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: ja\n"
"Report-Msgid-Bugs-To: James Su \n"
-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
+"POT-Creation-Date: 2005-08-23 09:09+0800\n"
"PO-Revision-Date: 2005-01-09 14:00+0900\n"
"Last-Translator: Yukiko Bando \n"
"Language-Team: Japanese \n"
@@ -35,6 +35,10 @@
msgid "Full/Half Punct"
msgstr "全角/半角句読点"
+#: src/scim_pinyin_imengine.cpp:435 src/scim_pinyin_imengine_setup.cpp:67
+msgid "Smart Pinyin"
+msgstr "智能ピンイン"
+
#: src/scim_pinyin_imengine.cpp:550
msgid "Copyright (C) 2002, 2003 James Su "
msgstr "Copyright (C) 2002, 2003 James Su "
@@ -145,10 +149,6 @@
" 参照して下さい。\n"
" /usr/share/scim/pinyin/special_table"
-#: src/scim_pinyin_imengine_setup.cpp:67
-msgid "Smart Pinyin"
-msgstr "智能ピンイン"
-
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
msgstr "ピンイン入力による中国語IMエンジンモジュール"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/ko.po new/scim-pinyin-0.5.91.20060705/po/ko.po
--- old/scim-pinyin-0.5.91.20050815/po/ko.po 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/ko.po 2006-07-05 12:35:22.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ko\n"
"Report-Msgid-Bugs-To: James Su \n"
-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
+"POT-Creation-Date: 2005-08-23 09:09+0800\n"
"PO-Revision-Date: 2004-08-16 04:17+0800\n"
"Last-Translator: 김기태 \n"
"Language-Team: Korean\n"
@@ -38,6 +38,10 @@
msgid "Full/Half Punct"
msgstr "전/반각 구두점"
+#: src/scim_pinyin_imengine.cpp:435 src/scim_pinyin_imengine_setup.cpp:67
+msgid "Smart Pinyin"
+msgstr "똑똑한 평음"
+
#: src/scim_pinyin_imengine.cpp:550
msgid "Copyright (C) 2002, 2003 James Su "
msgstr "Copyright (C) 2002, 2003 제임스 수 "
@@ -147,10 +151,6 @@
" 이 모드에 대한 정보는 다음을 참고 하세요.\n"
" /usr/share/scim/chinese/special_tabl"
-#: src/scim_pinyin_imengine_setup.cpp:67
-msgid "Smart Pinyin"
-msgstr "똑똑한 평음"
-
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
msgstr "평음 방식의 중국어 입력 IM엔진 모듈"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/scim-pinyin.pot new/scim-pinyin-0.5.91.20060705/po/scim-pinyin.pot
--- old/scim-pinyin-0.5.91.20050815/po/scim-pinyin.pot 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/scim-pinyin.pot 2006-07-05 12:35:22.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: James Su \n"
-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
+"POT-Creation-Date: 2005-08-23 09:09+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -37,6 +37,10 @@
msgid "Full/Half Punct"
msgstr ""
+#: src/scim_pinyin_imengine.cpp:435 src/scim_pinyin_imengine_setup.cpp:67
+msgid "Smart Pinyin"
+msgstr ""
+
#: src/scim_pinyin_imengine.cpp:550
msgid "Copyright (C) 2002, 2003 James Su "
msgstr ""
@@ -123,10 +127,6 @@
" /usr/share/scim/pinyin/special_table"
msgstr ""
-#: src/scim_pinyin_imengine_setup.cpp:67
-msgid "Smart Pinyin"
-msgstr ""
-
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/zh_CN.po new/scim-pinyin-0.5.91.20060705/po/zh_CN.po
--- old/scim-pinyin-0.5.91.20050815/po/zh_CN.po 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/zh_CN.po 2006-07-05 12:35:22.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: scim-chinese 0.2.1\n"
"Report-Msgid-Bugs-To: James Su \n"
-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
+"POT-Creation-Date: 2005-08-23 09:09+0800\n"
"PO-Revision-Date: 2003-05-26 17:16+0800\n"
"Last-Translator: James Su\n"
"Language-Team: James Su"
msgstr "版权所有 (C) 2002, 2003 James Su "
@@ -140,10 +144,6 @@
" 要了解该模式的详细信息,请参阅:\n"
" /usr/share/scim/chinese/special_table"
-#: src/scim_pinyin_imengine_setup.cpp:67
-msgid "Smart Pinyin"
-msgstr "智能拼音"
-
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
msgstr "一个使用拼音作为输入法的中文服务模块."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/po/zh_TW.po new/scim-pinyin-0.5.91.20060705/po/zh_TW.po
--- old/scim-pinyin-0.5.91.20050815/po/zh_TW.po 2005-08-06 19:03:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/po/zh_TW.po 2006-07-05 12:35:22.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: scim-chinese 0.2.1\n"
"Report-Msgid-Bugs-To: James Su \n"
-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
+"POT-Creation-Date: 2005-08-23 09:09+0800\n"
"PO-Revision-Date: 2003-05-26 17:16+0800\n"
"Last-Translator: James Su\n"
"Language-Team: James Su\n"
@@ -35,6 +35,10 @@
msgid "Full/Half Punct"
msgstr "全/半角標點"
+#: src/scim_pinyin_imengine.cpp:435 src/scim_pinyin_imengine_setup.cpp:67
+msgid "Smart Pinyin"
+msgstr "智能拼音"
+
#: src/scim_pinyin_imengine.cpp:550
msgid "Copyright (C) 2002, 2003 James Su "
msgstr "版權所有 (C) 2002, 2003 James Su "
@@ -140,10 +144,6 @@
" 要了解該模式的詳細信息,請參閱:\n"
" /usr/share/scim/chinese/special_table"
-#: src/scim_pinyin_imengine_setup.cpp:67
-msgid "Smart Pinyin"
-msgstr "智能拼音"
-
#: src/scim_pinyin_imengine_setup.cpp:72
msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
msgstr "一個使用拼音作為輸入法的中文服務模塊."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/skim/configure.in.bot new/scim-pinyin-0.5.91.20060705/skim/configure.in.bot
--- old/scim-pinyin-0.5.91.20050815/skim/configure.in.bot 1970-01-01 01:00:00.000000000 +0100
+++ new/scim-pinyin-0.5.91.20060705/skim/configure.in.bot 2006-02-06 08:26:53.000000000 +0100
@@ -0,0 +1,11 @@
+AC_MSG_RESULT([
+skim Support Build options:
+ Version $VERSION
+ Version of libscim $SCIM_VERSION
+ Version of libskim $SKIM_VERSION
+ Install prefix $prefix
+ Build shared libs $enable_shared
+ Build static libs $enable_static
+ Enable debug $scim_debug
+])
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/skim/configure.in.in new/scim-pinyin-0.5.91.20060705/skim/configure.in.in
--- old/scim-pinyin-0.5.91.20050815/skim/configure.in.in 2005-08-15 19:00:08.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/skim/configure.in.in 2006-07-05 12:35:22.000000000 +0200
@@ -73,14 +73,3 @@
else
AC_MSG_ERROR([skim library is not available or the version is too old!])
fi
-
-AC_MSG_RESULT([
-skim Support Build options:
- Version $VERSION
- Version of libscim $SCIM_VERSION
- Version of libskim $SKIM_VERSION
- Install prefix $prefix
- Build shared libs $enable_shared
- Build static libs $enable_static
- Enable debug $scim_debug
-])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/skim/setupui/skimplugin_scim_smartpinyin_config.desktop new/scim-pinyin-0.5.91.20060705/skim/setupui/skimplugin_scim_smartpinyin_config.desktop
--- old/scim-pinyin-0.5.91.20050815/skim/setupui/skimplugin_scim_smartpinyin_config.desktop 2005-04-27 19:14:55.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/skim/setupui/skimplugin_scim_smartpinyin_config.desktop 2006-07-05 12:35:23.000000000 +0200
@@ -14,6 +14,7 @@
Name[it]=Pinyin intelligente
Name[ja]=智能ピンイン
Name[ko]=똑똑한 평음
+Name[pa]=ਚੁਸਤ Pinyin
Name[zh_CN]=智能拼音
Name[zh_TW]=智能拼音
Comment=Configure plugin for Smart Pinyin IMEngine
@@ -22,5 +23,6 @@
Comment[it]=Plugin di configurazione per il motore di inserimento Pinyin intelligente
Comment[ja]=智能ピンインIMエンジンの設定
Comment[ko]=똑똑한 평음 IM엔진 설정 플러그인
+Comment[pa]=ਸਮਾਟ Pinyin IMEngine ਲਈ ਸੰਰਚਨਾ ਪਲੱਗਿੰਨ
Comment[zh_CN]=智能拼音输入法引擎配置界面
Comment[zh_TW]=智能拼音輸入法引擎設定介面
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/skim/setupui/smartpinyinui.ui new/scim-pinyin-0.5.91.20060705/skim/setupui/smartpinyinui.ui
--- old/scim-pinyin-0.5.91.20050815/skim/setupui/smartpinyinui.ui 2005-03-23 19:45:03.000000000 +0100
+++ new/scim-pinyin-0.5.91.20060705/skim/setupui/smartpinyinui.ui 2006-07-05 12:35:23.000000000 +0200
@@ -864,19 +864,6 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>skimeditshortcutbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>skimeditshortcutbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>skimeditshortcutbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>skimeditshortcutbutton.h</includehint>
- <includehint>skimeditshortcutbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>skimeditshortcutbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>skimeditshortcutbutton.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>
</UI>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/src/make_pinyin.cpp new/scim-pinyin-0.5.91.20060705/src/make_pinyin.cpp
--- old/scim-pinyin-0.5.91.20050815/src/make_pinyin.cpp 2005-01-06 14:30:53.000000000 +0100
+++ new/scim-pinyin-0.5.91.20060705/src/make_pinyin.cpp 2006-07-05 12:35:23.000000000 +0200
@@ -275,7 +275,7 @@
for (int i = 0; i<=SCIM_PINYIN_AmbLast; i++)
custom.use_ambiguities [i] = false;
- validator = new PinyinValidator (custom);
+ validator = new PinyinValidator ();
pinyin_table = new PinyinTable (custom, validator);
if (!pinyin_table->load_table (argv [1])) {
@@ -283,7 +283,7 @@
return -1;
}
- validator->initialize (custom, pinyin_table);
+ validator->initialize (pinyin_table);
if (corpusfile != NULL) {
std::cout << "Adjusting char ages...\n";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/src/make_pinyin_phrase.cpp new/scim-pinyin-0.5.91.20060705/src/make_pinyin_phrase.cpp
--- old/scim-pinyin-0.5.91.20050815/src/make_pinyin_phrase.cpp 2005-01-06 14:30:58.000000000 +0100
+++ new/scim-pinyin-0.5.91.20060705/src/make_pinyin_phrase.cpp 2006-07-05 12:35:23.000000000 +0200
@@ -255,7 +255,7 @@
for (int i = 0; i<=SCIM_PINYIN_AmbLast; i++)
custom.use_ambiguities [i] = false;
- validator = new PinyinValidator (custom);
+ validator = new PinyinValidator ();
pinyin_table = new PinyinTable (custom, validator);
std::cout << "Memory info before loading pinyin table:\n";
@@ -266,7 +266,7 @@
return -1;
}
- validator->initialize (custom, pinyin_table);
+ validator->initialize (pinyin_table);
pinyin_phrase_lib = new PinyinPhraseLib (custom, validator, pinyin_table);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/src/scim_pinyin.cpp new/scim-pinyin-0.5.91.20060705/src/scim_pinyin.cpp
--- old/scim-pinyin-0.5.91.20050815/src/scim_pinyin.cpp 2005-08-08 15:57:15.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/src/scim_pinyin.cpp 2006-07-05 12:35:23.000000000 +0200
@@ -7,7 +7,7 @@
*
* Copyright (c) 2005 James Su
*
- * $Id: scim_pinyin.cpp,v 1.3 2005/08/08 06:11:16 suzhe Exp $
+ * $Id: scim_pinyin.cpp,v 1.4 2006/01/13 06:31:46 suzhe Exp $
*
*/
@@ -131,22 +131,22 @@
{"ian", {0x3127,0x3122,0}, 3, 2},
{"iang",{0x3127,0x3124,0}, 4, 2},
{"iao", {0x3127,0x3120,0}, 3, 2},
- {"ie", {0x3127,0x311c,0}, 2, 2},
+ {"ie", {0x3127,0x311d,0}, 2, 2},
{"in", {0x3127,0x3123,0}, 2, 2},
{"ing", {0x3127,0x3125,0}, 3, 2},
{"iong",{0x3129,0x3125,0}, 4, 2},
{"iou", {0x3127,0x3121,0}, 3, 2},
{"iu", {0x3127,0x3121,0}, 2, 2},
- {"ng", {0x312b,0}, 2, 1},
+ {"ng", {0x3123,0}, 2, 1},
{"o", {0x311b,0}, 1, 1},
- {"ong", {0x3128,0x3123,0}, 3, 2},
+ {"ong", {0x3128,0x3125,0}, 3, 2},
{"ou", {0x3121,0}, 2, 1},
{"u", {0x3128,0}, 1, 1},
{"ua", {0x3128,0x311a,0}, 2, 2},
{"uai", {0x3128,0x311e,0}, 3, 2},
{"uan", {0x3128,0x3122,0}, 3, 2},
{"uang",{0x3128,0x3124,0}, 4, 2},
- {"ue", {0x3129,0x311c,0}, 2, 2},
+ {"ue", {0x3129,0x311d,0}, 2, 2},
{"uei", {0x3128,0x311f,0}, 3, 2},
{"uen", {0x3128,0x3123,0}, 3, 2},
{"ueng",{0x3128,0x3125,0}, 4, 2},
@@ -166,7 +166,7 @@
{"2", {0x302B,0}, 1, 1},
{"3", {0x302C,0}, 1, 1},
{"4", {0x302D,0}, 1, 1},
- {"5", {0}, 0, 0}
+ {"5", {0x02D9,0}, 1, 1}
};
static const PinyinTokenIndex scim_pinyin_initials_index[] =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_imengine.cpp new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_imengine.cpp
--- old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_imengine.cpp 2005-08-15 19:01:31.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_imengine.cpp 2006-07-05 12:35:23.000000000 +0200
@@ -7,7 +7,7 @@
*
* Copyright (c) 2005 James Su
*
- * $Id: scim_pinyin_imengine.cpp,v 1.7 2005/08/15 08:56:00 suzhe Exp $
+ * $Id: scim_pinyin_imengine.cpp,v 1.8 2006/06/12 01:31:14 suzhe Exp $
*
*/
@@ -117,10 +117,10 @@
uint32 scim_imengine_module_init (const ConfigPointer &config)
{
- _status_property.set_tip (_("The status of the current input method. Click to change it."));
- _letter_property.set_tip (_("The input mode of the letters. Click to toggle between half and full."));
+ _status_property.set_tip (_("Current input method state. Click to change it."));
+ _letter_property.set_tip (_("Input mode of the letters. Click to toggle between half and full."));
_letter_property.set_label (_("Full/Half Letter"));
- _punct_property.set_tip (_("The input mode of the puncutations. Click to toggle between half and full."));
+ _punct_property.set_tip (_("Input mode of the puncutations. Click to toggle between half and full."));
_punct_property.set_label (_("Full/Half Punct"));
_status_property.set_label ("英");
@@ -603,7 +603,7 @@
" string of the current date.\n"
" Input \"imath\" will give you the\n"
" common mathematic symbols.\n"
- " For more informat about this mode,\n"
+ " For more information about this mode,\n"
" please refer to\n"
" /usr/share/scim/pinyin/special_table"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_imengine_setup.cpp new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_imengine_setup.cpp
--- old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_imengine_setup.cpp 2005-03-04 00:53:27.000000000 +0100
+++ new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_imengine_setup.cpp 2006-07-05 12:35:23.000000000 +0200
@@ -7,7 +7,7 @@
*
* Copyright (c) 2005 James Su
*
- * $Id: scim_pinyin_imengine_setup.cpp,v 1.2 2005/03/03 23:53:27 suzhe Exp $
+ * $Id: scim_pinyin_imengine_setup.cpp,v 1.3 2006/06/12 01:31:14 suzhe Exp $
*
*/
@@ -69,7 +69,7 @@
String scim_setup_module_get_description (void)
{
- return String (_("An IMEngine Module for Chinese which utilizes pinyin input method."));
+ return String (_("An IMEngine module for Chinese which utilizes the pinyin input method."));
}
void scim_setup_module_load_config (const ConfigPointer &config)
@@ -168,8 +168,8 @@
// title
N_("Select full width puncutation keys"),
// tooltip
- N_("The key events to switch full/half width punctuation input mode. "
- "Click on the button on the right to edit it."),
+ N_("Key events to switch full/half width punctuation input mode. "
+ "Click on the right button edit."),
// entry
NULL,
// button
@@ -185,8 +185,8 @@
// title
N_("Select full width letter keys"),
// tooltip
- N_("The key events to switch full/half width letter input mode. "
- "Click on the button on the right to edit it."),
+ N_("Key events to switch full/half width letter input mode. "
+ "Click on the right button edit."),
// entry
NULL,
// button
@@ -202,7 +202,7 @@
// title
N_("Select mode switch keys"),
// tooltip
- N_("The key events to change current input mode. "
+ N_("Key events to change the current input mode. "
"Click on the button on the right to edit it."),
// entry
NULL,
@@ -222,8 +222,8 @@
// title
N_("Select Chinese mode switch keys"),
// tooltip
- N_("The key events to change current Chinese input mode. "
- ".Click on the button on the right to edit it"),
+ N_("Key events to change the current Chinese input mode. "
+ "Click on the right button edit."),
// entry
NULL,
// button
@@ -239,8 +239,8 @@
// title
N_("Select page up keys"),
// tooltip
- N_("The key events to page up the lookup table. "
- "Click on the button on the right to edit it."),
+ N_("Key events to page up the lookup table. "
+ "Click on the right button edit."),
// entry
NULL,
// button
@@ -256,8 +256,8 @@
// title
N_("Select page down keys"),
// tooltip
- N_("The key events to page down the lookup table. "
- "Click on the button on the right to edit it."),
+ N_("Key events to page down the lookup table. "
+ "Click on the right button edit."),
// entry
NULL,
// button
@@ -273,8 +273,8 @@
// title
N_("Select disable phrase keys"),
// tooltip
- N_("The key events to disable the currently selected user defined phrase. "
- "Click on the button on the right to edit it."),
+ N_("Key events to disable the currently selected user defined phrase. "
+ "Click on the right button edit."),
// entry
NULL,
// button
@@ -773,88 +773,75 @@
// Set all tooltips.
gtk_tooltips_set_tip (__widget_tooltips, __widget_user_data_binary,
- _("If this option is checked, "
- "the user pinyin and phrase data will be stored "
- "in binary format. "
- "This will increase the loading speed."), NULL);
+ _("Store the user pinyin and phrase data in binary format, "
+ "this will increase the loading speed."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_combine_phrase,
- _("If this option is checked, "
- "the inputed phrases will be combined to one longer "
- "phrase automatically."), NULL);
+ _("Combine inputed phrases into one longer phrase automatically."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_fill_preedit,
- _("If this option is checked, "
- "the preedit string will be filled up automatically, "
- "by a kind of smart matching algorithm."), NULL);
+ _("Fill the preedit string automatically "
+ "by a smart matching algorithm."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_match_longer_phrase,
- _("If this option is checked, "
- "the phrases which are longer than the inputed keys "
- "can also be matched. "
- "This option is valid only when "
+ _("Phrases which are longer than the inputed keys "
+ "can also be matched, this option is valid when "
"\"Auto combine phrase\" is checked."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_always_show_lookup,
- _("If this option is checked, "
- "the lookup table will be always shown "
+ _("Lookup table will be always shown "
"when there are any candidate phrases."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_show_all_keys,
- _("If this option is checked, "
- "all inputed keys will be shown. "
- "This option is valid only when "
+ _("All inputed keys will be shown, "
+ "this option is only valid when "
"\"Auto fill preedit\" is checked."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_dynamic_adjust,
- _("If this option is checked, "
- "the phrase library will be adjusted dynamically "
+ _("Phrase library will be adjusted dynamically "
"according to the inputed contents. "
"The changed part of the phrase library will be "
- "stored into local files owned by the user."), NULL);
+ "stored in the user's local files."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_max_user_phrase_length,
- _("The maxmium length of the custom phrases created "
- "by user. Those phrases will be created automatically "
+ _("Maxmium length of the custom phrases created "
+ "by user. These phrases will be created automatically "
"when user inputs text."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_max_preedit_length,
- _("The maxmium length of the preedit string."), NULL);
+ _("Maxmium length of the preedit string."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_smart_match_level,
- _("The level of the smart matching algorithm. "
- "The larger the more accurate but slower."), NULL);
+ _("Level of the smart matching algorithm. "
+ "The larger the level the more accurate "
+ "the algorithm, but also slower."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_burst_stack_size,
- _("The size of the burst stack. "
- "Newly inputed phrases will be put into the "
+ _("Size of the burst stack. "
+ "Newly inputed phrases will be placed onto the "
"burst stack. The phrases in this stack "
"have higher priority than others."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_dynamic_sensitivity,
- _("The sensitivity of the "
- "dynamic adjusting algorithm. "
- "The larger the more sensitive."), NULL);
+ _("Sensitivity of the dynamic adjusting algorithm, "
+ "the higher the more sensitive."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_save_period,
- _("The period in seconds to "
+ _("Time period, in seconds, to "
"save the user data."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_tone,
- _("If this option is checked, "
- "the tone information will be used "
- "in matching pinyin key."), NULL);
+ _("Tone information will be used "
+ "in matching the pinyin key."), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_incomplete,
- _("If this option is checked, "
- "the pinyin keys which only have initial part (Sheng Mu) "
+ _("Pinyin keys which only have the initial part (Sheng Mu) "
"will be allowed. "), NULL);
gtk_tooltips_set_tip (__widget_tooltips, __widget_ambiguities [0],
_("The following options control the ambiguous "
- "behaviour of the pinyin matching algorithm. "
- "Turn on them as you wish, if you can't "
- "distinguish between them."), NULL);
+ "behaviour of the pinyin matching algorithm, "
+ "useful if the user cannot distinguish between them."), NULL);
for (i = 0; __config_keyboards [i].key; ++ i) {
gtk_tooltips_set_tip (__widget_tooltips, __config_keyboards [i].entry,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_phrase.cpp new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_phrase.cpp
--- old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_phrase.cpp 2005-08-06 14:06:49.000000000 +0200
+++ new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_phrase.cpp 2006-07-05 12:35:23.000000000 +0200
@@ -7,7 +7,7 @@
*
* Copyright (c) 2005 James Su
*
- * $Id: scim_pinyin_phrase.cpp,v 1.2 2005/08/06 12:06:49 suzhe Exp $
+ * $Id: scim_pinyin_phrase.cpp,v 1.3 2006/01/13 06:31:46 suzhe Exp $
*
*/
#define Uses_STL_FUNCTIONAL
@@ -897,24 +897,33 @@
void
PinyinPhraseLib::dump_content (std::ostream &os, int minlen, int maxlen)
{
- PinyinPhrasePinyinLessThanByOffset less_op (this, m_pinyin_key_less);
- if (minlen < 2) minlen = 2;
+ PinyinPhraseLessThanByOffset less_op (this, m_pinyin_key_less);
+ if (minlen < 1) minlen = 1;
if (maxlen > SCIM_PHRASE_MAX_LENGTH) maxlen = SCIM_PHRASE_MAX_LENGTH;
for (int i = minlen; i <= maxlen; ++ i) {
- for (PinyinPhraseTable::iterator tit = m_phrases [i-1].begin ();
- tit != m_phrases [i-1].end (); ++ tit) {
+ PinyinPhraseOffsetVector offsets;
+ for (PinyinPhraseTable::iterator tit = m_phrases [i-1].begin (); tit != m_phrases [i-1].end (); ++ tit) {
PinyinPhraseOffsetVector::iterator begin = tit->get_vector ().begin ();
PinyinPhraseOffsetVector::iterator end = tit->get_vector ().end ();
- std::sort (begin, end, less_op);
- for (PinyinPhraseOffsetVector::iterator oit = begin; oit != end; ++ oit) {
- os << get_phrase (oit->first).frequency () << "\t";
- os << utf8_wcstombs (get_phrase (oit->first).get_content ());
- os << " =";
- for (unsigned int j = 0; j < get_phrase (oit->first).length (); ++ j)
- os << " " << get_pinyin_key (oit->second + j);
- os << "\n";
- }
+ offsets.insert (offsets.end (), begin, end);
+ }
+
+ std::sort (offsets.begin (), offsets.end (), less_op);
+
+ for (PinyinPhraseOffsetVector::iterator oit = offsets.begin (); oit != offsets.end (); ++ oit) {
+ bool before = false, after = false;
+
+ os << get_phrase (oit->first).frequency () << "\t";
+ if (oit > offsets.begin () && get_phrase ((oit-1)->first) == get_phrase (oit->first)) before = true;
+ if (oit < offsets.end () - 1 && get_phrase ((oit+1)->first) == get_phrase (oit->first)) after = true;
+ if (before || after) os << "+";
+ else os << "-";
+ os << utf8_wcstombs (get_phrase (oit->first).get_content ());
+ os << " =";
+ for (unsigned int j = 0; j < get_phrase (oit->first).length (); ++ j)
+ os << " " << get_pinyin_key (oit->second + j);
+ os << "\n";
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_phrase.h new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_phrase.h
--- old/scim-pinyin-0.5.91.20050815/src/scim_pinyin_phrase.h 2005-01-06 14:31:00.000000000 +0100
+++ new/scim-pinyin-0.5.91.20060705/src/scim_pinyin_phrase.h 2006-07-05 12:35:23.000000000 +0200
@@ -7,7 +7,7 @@
*
* Copyright (c) 2005 James Su
*
- * $Id: scim_pinyin_phrase.h,v 1.1.1.1 2005/01/06 13:31:00 suzhe Exp $
+ * $Id: scim_pinyin_phrase.h,v 1.2 2006/01/13 06:31:46 suzhe Exp $
*
*/
@@ -98,6 +98,9 @@
PinyinPhraseLessThan (const PinyinCustomSettings &custom)
: m_less (custom) {}
+ PinyinPhraseLessThan (const PinyinKeyLessThan &le)
+ : m_less (le) {}
+
bool operator () (const PinyinPhrase &lhs, const PinyinPhrase &rhs) const;
};
@@ -109,6 +112,9 @@
PinyinPhraseEqualTo (const PinyinCustomSettings &custom)
: m_equal (custom) {}
+ PinyinPhraseEqualTo (const PinyinKeyEqualTo &eq)
+ : m_equal (eq) {}
+
bool operator () (const PinyinPhrase &lhs, const PinyinPhrase &rhs) const;
};
@@ -123,6 +129,10 @@
const PinyinCustomSettings &custom)
: m_lib (lib), m_less (custom) { }
+ PinyinPhraseLessThanByOffset (PinyinPhraseLib *lib,
+ const PinyinKeyLessThan &le)
+ : m_lib (lib), m_less (le) { }
+
bool operator () (const std::pair & lhs,
const std::pair & rhs) const;
};
@@ -138,6 +148,10 @@
const PinyinCustomSettings &custom)
: m_lib (lib), m_equal (custom) { }
+ PinyinPhraseEqualToByOffset (PinyinPhraseLib *lib,
+ const PinyinKeyEqualTo &eq)
+ : m_lib (lib), m_equal (eq) { }
+
bool operator () (const std::pair & lhs,
const std::pair & rhs) const;
};
@@ -153,6 +167,23 @@
const PinyinKeyLessThan &le)
: m_lib (lib), m_less (le) { }
+ PinyinPhrasePinyinLessThanByOffset (PinyinPhraseLib *lib,
+ const PinyinCustomSettings &custom)
+ : m_lib (lib), m_less (custom) { }
+
+ bool operator () (const std::pair & lhs,
+ const std::pair & rhs) const;
+};
+
+class PinyinPhrasePhraseLessThanByOffset
+ : public std::binary_function < std::pair ,
+ std::pair , bool >
+{
+ PinyinPhraseLib *m_lib;
+public:
+ PinyinPhrasePhraseLessThanByOffset (PinyinPhraseLib *lib)
+ : m_lib (lib) { }
+
bool operator () (const std::pair & lhs,
const std::pair & rhs) const;
};
@@ -254,6 +285,7 @@
friend class PinyinPhraseEqualToByOffsetSP;
friend class PinyinPhrasePinyinLessThanByOffset;
+ friend class PinyinPhrasePhraseLessThanByOffset;
public:
PinyinPhraseLib (const PinyinCustomSettings &custom,
const PinyinValidator *validator,
@@ -348,7 +380,7 @@
Phrase append (const Phrase &phrase, const PinyinKeyVector &keys);
Phrase append (const WideString &phrase, const PinyinKeyVector &keys);
- void dump_content (std::ostream &os, int minlen = 2, int maxlen = SCIM_PHRASE_MAX_LENGTH);
+ void dump_content (std::ostream &os, int minlen = 1, int maxlen = SCIM_PHRASE_MAX_LENGTH);
void set_burst_stack_size (uint32 size) {
m_phrase_lib.set_burst_stack_size (size);
@@ -580,6 +612,13 @@
return m_lib->get_phrase (lhs.first) < m_lib->get_phrase (rhs.first);
}
+inline bool
+PinyinPhrasePhraseLessThanByOffset::operator () (const std::pair & lhs,
+ const std::pair & rhs) const
+{
+ return m_lib->get_phrase (lhs.first) < m_lib->get_phrase (rhs.first);
+}
+
//Implementation of some PinyinPhraseLib members.
template<class T> void
PinyinPhraseLib::for_each_phrase (T &op)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org