diff -Naur cmigemo-1.2/LICENSE cmigemo-1.2.fink/LICENSE --- cmigemo-1.2/LICENSE Thu Jan 1 09:00:00 1970 +++ cmigemo-1.2.fink/LICENSE Sun Jun 27 22:04:54 2004 @@ -0,0 +1,56 @@ +This translation is informal, and *not* officially approved by The Maintainer +as valid. To be completely sure of what is permitted, refer to the original +Japanese license file in @PREFIX@/share/doc/cmigemo/LICENSE_j.txt. + +TERMS AND CONDITIONS OF USE + The meanings of each term are defined as following. + This Software : C/Migemo (including binary files and source code, + excluding data of dictionaries) + Illegal Actions : Actions which are different from descriptions in + document or which are not in document + The Maintainer : An individual who posses This Software + (The Creator, The Copyright Holder) + (At the time when these conditions are created: + MURAOKA Taro ) + End User : An individual who uses or used This Software + Third Parties : Other individuals who do not correspond to neither + The Maintainer nor End User + (Especially including creators and copyright holders + of data of dictionaries) + + The use of This Software is permitted to only those who accept the following + conditions. If End User does not agree to them, he must stop using This + Software and must delete related files from his storage media. + + (Conditions concerning to The Maintainer) + The Maintainer has the right to change these conditions. + + The Maintainer has the following rights concerning to This Software. + - The right to modify this software + - The right to distribute This Software + - The right to permit use of This Software + - The right to transfer some or all of the above rights + + The Maintainer has the obligation to correct Illegal Actions of This + Software. + + The Maintainer is immuned from the loss which End Users had or the damage + which End Users suffered. + + (Conditions according to End Users) + End Users have the following obligations when using This Software. + - The obligation to pay charge according to the regulations laid + down separately. + - The obligation to protect the rights of The Maintainer + - The obligation to protect the rights of Third Parties + + End Users have the right to use This Software for any purpose as long as + there is no contradiction to other conditions. + + (Condition according to royalty) + The charge for using This Software is laid down as following: + - zero Yen + + (End Of Conditions) + If End User does not agree to the above conditions, he must stop using This + Software. diff -Naur cmigemo-1.2/compile/Make_osx.mak cmigemo-1.2.fink/compile/Make_osx.mak --- cmigemo-1.2/compile/Make_osx.mak Sun Oct 19 15:45:15 2003 +++ cmigemo-1.2.fink/compile/Make_osx.mak Sun Jun 27 22:01:19 2004 @@ -26,7 +26,7 @@ # $(libmigemo_LIB): $(libmigemo_DSO) $(libmigemo_DSO): $(libmigemo_OBJ) - $(CC) -dynamiclib -install_name $@ -o $(libmigemo_LIB) $(libmigemo_OBJ) + $(CC) -dynamiclib -install_name @PREFIX@/lib/$@ -o $(libmigemo_LIB) $(libmigemo_OBJ) $(RM) $@ $(libmigemo) ln -s $(libmigemo_LIB) $@ ln -s $(libmigemo_LIB) $(libmigemo) diff -Naur cmigemo-1.2/compile/unix.mak cmigemo-1.2.fink/compile/unix.mak --- cmigemo-1.2/compile/unix.mak Wed Oct 29 13:20:05 2003 +++ cmigemo-1.2.fink/compile/unix.mak Sun Jun 27 22:01:19 2004 @@ -58,7 +58,7 @@ install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dict install-lib $(INSTALL_DATA) $(srcdir)migemo.h $(incdir) - $(INSTALL_DATA) doc/README_j.txt $(docdir) + #$(INSTALL_DATA) doc/README_j.txt $(docdir) $(INSTALL_PROGRAM) $(outdir)cmigemo$(EXEEXT) $(bindir) ############################################################################## diff -Naur cmigemo-1.2/doc/README_j.txt cmigemo-1.2.fink/doc/README_j.txt --- cmigemo-1.2/doc/README_j.txt Mon Dec 29 02:03:18 2003 +++ cmigemo-1.2.fink/doc/README_j.txt Sun Jun 27 22:01:19 2004 @@ -2,7 +2,7 @@ Since: 15-Aug-2001 Version: 1.2.0 Author: MURAOKA Taro (KoRoN) - Last Change: 29-Dec-2003. + Last Change: 24-Mar-2004. 説明 C/MigemoはMigemo(Ruby/Migemo)をC言語で実装したものです。C/Migemoライブラリを @@ -120,7 +120,7 @@ # make osx-install # make osx-uninstall インストールにより辞書ファイルは - /usr/local/share/migemo/{エンコード名} + @PREFIX@/share/migemo/{エンコード名} に置かれます。 (GNU/gcc:Linux他) @@ -138,7 +138,7 @@ # make gcc-install # make gcc-uninstall インストールにより辞書ファイルは - /usr/local/share/migemo/{エンコード名} + @PREFIX@/local/share/migemo/{エンコード名} に置かれます。 利用許諾条件 diff -Naur cmigemo-1.2/tools/migemo.vim cmigemo-1.2.fink/tools/migemo.vim --- cmigemo-1.2/tools/migemo.vim Tue Jan 7 22:57:59 2003 +++ cmigemo-1.2.fink/tools/migemo.vim Sun Jun 27 22:01:19 2004 @@ -13,6 +13,14 @@ finish endif +function! s:SearchStandardDict(enc) + let dict = '@PREFIX@/share/migemo/'.a:enc.'/migemo-dict' + if !filereadable(dict) + let dict = '' + endif + return matchstr(dict, "^[^\]*") +endfunction + function! s:SearchDict() let path = $VIM . ',' . &runtimepath let dict = globpath(path, "dict/migemo-dict") @@ -20,10 +28,19 @@ let dict = globpath(path, "migemo-dict") endif if dict == '' - let dict = '/usr/local/share/migemo/'.&encoding.'/migemo-dict' - if !filereadable(dict) - let dict = '' - endif + let dict = s:SearchStandardDict(&encoding) + let g:migemoenc = &encoding + endif + if dict == '' + let dict = s:SearchStandardDict("cp932") + let g:migemoenc = 'cp932' + endif + if dict == '' + let dict = s:SearchStandardDict("euc-jp") + let g:migemoenc = 'euc-jp' + endif + if dict == '' + let g:migemoenc = '' endif return matchstr(dict, "^[^\]*") endfunction @@ -59,9 +76,15 @@ if retval == '' return endif + if strlen(g:migemoenc) && strlen(&encoding) && &encoding != g:migemoenc + let retval = iconv(retval, &encoding, g:migemoenc) + endif let retval = system('cmigemo -v -w "'.retval.'" -d "'.g:migemodict.'"') if retval == '' return + endif + if strlen(g:migemoenc) && strlen(&encoding) && &encoding != g:migemoenc + let retval = iconv(retval, g:migemoenc, &encoding) endif let @/ = retval let v:errmsg = ''