Hiroyuki Komatsu
komat****@users*****
2004年 12月 31日 (金) 15:23:32 JST
Index: prime/missing diff -u prime/missing:1.2 prime/missing:1.3 --- prime/missing:1.2 Mon Feb 2 17:43:39 2004 +++ prime/missing Fri Dec 31 15:23:32 2004 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2004-09-07.08 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinar****@iro*****>, 1996. # This program is free software; you can redistribute it and/or modify @@ -38,18 +42,24 @@ configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-a****@gnu*****>." + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit 0 ;; -*) @@ -87,14 +101,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,14 +185,9 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." @@ -185,7 +209,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,13 +281,8 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -284,10 +298,6 @@ tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -323,8 +333,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +344,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: prime/configure.in diff -u prime/configure.in:1.25 prime/configure.in:1.26 --- prime/configure.in:1.25 Sat Dec 18 17:02:53 2004 +++ prime/configure.in Fri Dec 31 15:23:32 2004 @@ -1,5 +1,5 @@ dnl configure.in: Creates a configure script for prime of PRIME. -dnl $Id: configure.in,v 1.25 2004/12/18 08:02:53 komatsu Exp $ +dnl $Id: configure.in,v 1.26 2004/12/31 06:23:32 komatsu Exp $ dnl dnl Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****> dnl All rights reserved. @@ -9,14 +9,14 @@ dnl the GNU General Public License version 2. # Process this file with autoconf to produce a configure script. -AC_INIT(prime, 0.8.5.2, komat****@taiya*****, +AC_INIT(prime, 0.8.6, komat****@taiya*****, [PRIME - PRedictive Input Method Editor (Server)]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) # AM_MAINTAINER_MODE AC_INIT_DEFAULT_VALUES -AC_SUBST(DATE, "2004-12-18") +AC_SUBST(DATE, "2004-12-31") MY_AC_PROG_RUBY Index: prime/acinclude.m4 diff -u prime/acinclude.m4:1.3 prime/acinclude.m4:1.4 --- prime/acinclude.m4:1.3 Fri Mar 26 02:19:47 2004 +++ prime/acinclude.m4 Fri Dec 31 15:23:32 2004 @@ -1,5 +1,5 @@ dnl acinclude.m4: m4 macros for Autoconf -dnl $Id: acinclude.m4,v 1.3 2004/03/25 17:19:47 komatsu Exp $ +dnl $Id: acinclude.m4,v 1.4 2004/12/31 06:23:32 komatsu Exp $ dnl dnl Copyright (C) 2003, 2004 Hiroyuki Komatsu <komat****@taiya*****> dnl All rights reserved. @@ -8,20 +8,20 @@ dnl You can redistribute it and/or modify it under the terms of dnl the GNU General Public License version 2. -AC_DEFUN(AC_INIT_DEFAULT_VALUES, +AC_DEFUN([AC_INIT_DEFAULT_VALUES], [ test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix ]) -AC_DEFUN(AC_VAR_EXPAND, [`eval echo $1`]) +AC_DEFUN([AC_VAR_EXPAND], [`eval echo $1`]) -AC_DEFUN(MY_AC_PROG_RUBY, +AC_DEFUN([MY_AC_PROG_RUBY], [ AC_SUBST(ruby_version, [`ruby -r rbconfig -e "puts Config::CONFIG[['ruby_version']]"`]) ]) -AC_DEFUN(AC_RUBY_SITELIBDIR, +AC_DEFUN([AC_RUBY_SITELIBDIR], ['$(libdir)/site_ruby/$(ruby_version)']) # [`ruby -r rbconfig -e "puts Config::MAKEFILE_CONFIG[['rubylibdir']]"`]) Index: prime/ChangeLog diff -u prime/ChangeLog:1.77 prime/ChangeLog:1.78 --- prime/ChangeLog:1.77 Sat Dec 18 17:02:53 2004 +++ prime/ChangeLog Fri Dec 31 15:23:32 2004 @@ -1,5 +1,43 @@ +2004-12-31 Hiroyuki Komatsu <komat****@taiya*****> + + * PRIME 0.8.6: + - Updated grammar rules. + - Added an word-annotation 'comment'. + + * lib/prime.rb: + Changed the name of character shape information, from 'annotation' to + 'form'. + + * lib/engine/engine-alphabet.rb: + Ditto. + + * lib/taiyaki.rb: + Modified an expansion of Kernel::require to handle its error. + + * lib/makedict/dictformat-skkdic.rb: + Added a routine to use annotations of SKK dict as 'comment'. + + * lib/prime.rb: + Added an annotation of word -- 'comment'. + + * grammar/prime-grammar: + Added rules for "長そうです", "下さった", "死すべし", and "生ぜしめる". + + * acinclude.m4: + Catched up with automake 1.9. + 2004-12-18 Hiroyuki Komatsu <komat****@taiya*****> + * lib/prime-japanese.rb: + Changed the number of arguments of guess_clauses. + + * lib/prime.rb + (Prime::search_overall): + Modified the behavior for speedness. + + (Prime::process_clauses): + Added the second argument 'threshold'. + * PRIME 0.8.5.2: - Fixed a bug caused from a cache file of Suikyo. Thanks for the notice from Masaki Yatsu. @@ -30,7 +68,7 @@ Thanks for the notice from Masaki Yatsu. * lib/prime.rb (PrimeWordList::PrimeWordList): - Added the new function to attache a prefix characters depend on the + Added the new function to attatch a prefix characters depend on the context to each word. 2004-12-11 Hiroyuki Komatsu <komat****@taiya*****>
