Only in uim-chewing-0.0.2: ChangeLog diff -urP uim-chewing-0.0.2/Makefile.am uim-chewing-0.0.2.new/Makefile.am --- uim-chewing-0.0.2/Makefile.am 2006-12-04 17:13:18.000000000 +0900 +++ uim-chewing-0.0.2.new/Makefile.am 2007-01-14 17:13:19.166192750 +0900 @@ -1 +1,16 @@ SUBDIRS = src scm + +ChangeLog : FORCE + @cd $(top_srcdir); \ + svn log | $(top_srcdir)/tools/gnuify-changelog.pl > ChangeLog.tmpl; \ + if test -s ChangeLog.tmpl; then \ + mv ChangeLog.tmpl ChangeLog; \ + echo "ChangeLog updated successfully."; \ + else \ + echo "ChangeLog: Failed to update ChangeLog."; \ + $(RM) -f ChangeLog.tmpl; \ + fi + +.PHONY: FORCE + +FORCE: Only in uim-chewing-0.0.2: Makefile.in Only in uim-chewing-0.0.2: aclocal.m4 diff -urP uim-chewing-0.0.2/autogen.sh uim-chewing-0.0.2.new/autogen.sh --- uim-chewing-0.0.2/autogen.sh 1970-01-01 09:00:00.000000000 +0900 +++ uim-chewing-0.0.2.new/autogen.sh 2007-01-14 17:13:19.166192750 +0900 @@ -0,0 +1,9 @@ +#!/bin/sh + +# Notice: Automake 1.8.3 or later is required. + +aclocal \ + && libtoolize --force --copy \ + && autoheader \ + && automake --add-missing --foreign --copy \ + && autoconf Only in uim-chewing-0.0.2: compile Only in uim-chewing-0.0.2: config.guess Only in uim-chewing-0.0.2: config.h.in Only in uim-chewing-0.0.2: config.sub Only in uim-chewing-0.0.2: configure diff -urP uim-chewing-0.0.2/configure.ac uim-chewing-0.0.2.new/configure.ac --- uim-chewing-0.0.2/configure.ac 2006-12-08 05:15:38.000000000 +0900 +++ uim-chewing-0.0.2.new/configure.ac 2007-01-14 17:13:19.162192500 +0900 @@ -8,7 +8,7 @@ AC_PROG_CC AC_PROG_LIBTOOL -PKG_CHECK_MODULES(CHEWING, [chewing >= 0.3.0]) +PKG_CHECK_MODULES(CHEWING, [chewing >= 0.3.091]) CHEWING_DATADIR=`$PKG_CONFIG chewing --variable=datadir` AC_DEFINE_UNQUOTED(CHEWING_DATADIR, "$CHEWING_DATADIR", [Chewing data dir]) Only in uim-chewing-0.0.2: depcomp Only in uim-chewing-0.0.2: install-sh Only in uim-chewing-0.0.2: ltmain.sh Only in uim-chewing-0.0.2: missing Only in uim-chewing-0.0.2/scm: Makefile.in diff -urP uim-chewing-0.0.2/scm/chewing-custom.scm uim-chewing-0.0.2.new/scm/chewing-custom.scm --- uim-chewing-0.0.2/scm/chewing-custom.scm 2006-12-08 13:18:25.000000000 +0900 +++ uim-chewing-0.0.2.new/scm/chewing-custom.scm 2007-01-14 17:13:18.322140000 +0900 @@ -51,7 +51,7 @@ (define-custom 'chewing-phrase-forward? #f '(chewing) '(boolean) - (_ "Phase forward") + (_ "Phrase forward") (_ "long description will be here.")) (define-custom 'chewing-space-as-selection? #t @@ -64,7 +64,7 @@ '(chewing candwin) (list 'choice (list 'chewing-cand-selection-numkey (_ "num key") (_ "Selection by number key")) - (list 'chewing-cand-selection-asdfghjkl (_ "asdfghjkl\073") (_ "Selection by asdfghjkl\073"))) + (list 'chewing-cand-selection-asdfghjkl (_ "asdfghjkl;") (_ "Selection by asdfghjkl;"))) (_ "Candidate selection style") (_ "long description will be here.")) diff -urP uim-chewing-0.0.2/scm/chewing.scm uim-chewing-0.0.2.new/scm/chewing.scm --- uim-chewing-0.0.2/scm/chewing.scm 2006-12-08 12:51:41.000000000 +0900 +++ uim-chewing-0.0.2.new/scm/chewing.scm 2007-01-14 17:13:18.318139750 +0900 @@ -104,11 +104,12 @@ (N_ "Half shape") (N_ "Half Shape Mode"))) (lambda (mc) - (if (= (chewing-lib-get-shape-mode - (chewing-context-mc-id mc)) - 0) + (let ((mode (chewing-lib-get-shape-mode + (chewing-context-mc-id mc)))) + (if (or (not mode) + (= mode 0)) #t - #f)) + #f))) (lambda (mc) (chewing-lib-set-shape-mode (chewing-context-mc-id mc) chewing-halfshape-mode))) @@ -121,11 +122,13 @@ (N_ "Full shape") (N_ " Full Shape Mode"))) (lambda (mc) - (if (= (chewing-lib-get-shape-mode - (chewing-context-mc-id mc)) - 1) + (let ((mode (chewing-lib-get-shape-mode + (chewing-context-mc-id mc)))) + (if (and + mode + (= mode 1)) #t - #f)) + #f))) (lambda (mc) (chewing-lib-set-shape-mode (chewing-context-mc-id mc) chewing-fullshape-mode))) @@ -140,9 +143,7 @@ (actions-new chewing-input-mode-actions)) (register-widget 'widget_chewing_shape_mode (activity-indicator-new chewing-shape-mode-actions) - (actions-new chewing-shape-mode-actions)) - - )) + (actions-new chewing-shape-mode-actions)))) (define chewing-context-rec-spec (append @@ -164,7 +165,7 @@ (set! chewing-lib-initialized? (chewing-lib-init))) (if chewing-lib-initialized? (begin - (chewing-context-set-mc-id! mc (chewing-lib-alloc-context name)) + (chewing-context-set-mc-id! mc (chewing-lib-alloc-context)) (set! chewing-context-alist (alist-replace (list (chewing-context-mc-id mc) mc) chewing-context-alist)))) @@ -254,7 +255,7 @@ (if (chewing-press-key mc key key-state #t) #f (if (chewing-off-key? key key-state) - (begin + (begin (chewing-reset-handler mc) (im-clear-preedit mc) (im-deactivate-candidate-selector mc) Only in uim-chewing-0.0.2/src: Makefile.in diff -urP uim-chewing-0.0.2/src/chewing.c uim-chewing-0.0.2.new/src/chewing.c --- uim-chewing-0.0.2/src/chewing.c 2006-12-08 15:04:22.000000000 +0900 +++ uim-chewing-0.0.2.new/src/chewing.c 2007-01-14 17:13:19.150191750 +0900 @@ -137,7 +137,7 @@ int i, style; uim_lisp phrase_forward, esc_clean, space_as_selection, sel_style; - config.selectAreaLen = 40; + config.candPerPage = 10; config.maxChiSymbolLen = 16; phrase_forward = uim_scm_eval_c_string("chewing-phrase-forward?"); @@ -472,6 +472,12 @@ chewing_handle_Capslock(cc); break; #endif + case UKey_Prior: + chewing_handle_PageUp(cc); + break; + case UKey_Next: + chewing_handle_PageDown(cc); + break; default: if (ukey > 32 && ukey < 127) { chewing_handle_Default(cc, ukey); @@ -723,7 +729,7 @@ ucc = get_chewing_context(id); if (!ucc) - return uim_scm_make_int(mode); + return uim_scm_f(); mode = chewing_get_ShapeMode(ucc->cc); diff -urP uim-chewing-0.0.2/tools/gnuify-changelog.pl uim-chewing-0.0.2.new/tools/gnuify-changelog.pl --- uim-chewing-0.0.2/tools/gnuify-changelog.pl 1970-01-01 09:00:00.000000000 +0900 +++ uim-chewing-0.0.2.new/tools/gnuify-changelog.pl 2007-01-14 17:13:16.878049750 +0900 @@ -0,0 +1,44 @@ +#!/usr/bin/perl -w + +# a script to munge the output of 'svn log' into something approaching the +# style of a GNU ChangeLog. +# +# to use this, just fill in the 'hackers' hash with the usernames and +# name/emails of the people who work on your project, go to the top level +# of your working copy, and run: +# +# $ svn log | /path/to/gnuify-changelog.pl > ChangeLog + +%hackers = ( "tkng" => 'TOKUNAGA Hiroyuki <tkng@xem.jp>', + "yusuke" => 'Yusuke TABATA <yusuke@w5.dion.ne.jp>', + "yamaken" => 'YAMAMOTO Kengo / YamaKen <yamaken@bp.iij4u.or.jp>', + "omote" => 'Masahito Omote <omote@utyuuzin.net>', + "kzk" => 'kzk <mover@hct.zaq.ne.jp>', + "makeinu" => 'Takuro Ashie <ashie@homa.ne.jp>', + "ekato" => 'Etsushi Kato <ek.kato@gmail.com>', + "yamamoto" => 'Masanari Yamamoto <h013177b@ice.nuie.nagoya-u.ac.jp>', + "jun0" => 'Jun Inoue <jun.lambda@gmail.com>', + "nosuke" => 'Konosuke Watanabe <sasugaanija@gmail.com>', + "jhpark" => 'Jae-hyeon Park <jhyeon@gmail.com>', +); + +$parse_next_line = 0; + +while (<>) { + # axe windows style line endings, since we should try to be consistent, and + # the repos has both styles in it's log entries. + $_ =~ s/\r\n$/\n/; + + if (/^-+$/) { + # we're at the start of a log entry, so we need to parse the next line + $parse_next_line = 1; + } elsif ($parse_next_line) { + # transform from svn style to GNU style + $parse_next_line = 0; + + @parts = split (/ /, $_); + print "$parts[4] $hackers{$parts[2]}\n"; + } else { + print "\t$_"; + } +}