Update of /cvsroot/fink/experimental/todai/ecc/main/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4298
Modified Files:
user-ja.info user-ja.patch
Log Message:
user-ja 2.3. Now supports emacs22-carbon-22.0.50.cvs20060118.
Index: user-ja.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/todai/ecc/main/finkinfo/base/user-ja.patch,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- user-ja.patch 7 Apr 2005 12:31:23 -0000 1.1.1.1
+++ user-ja.patch 7 Mar 2006 13:30:34 -0000 1.2
@@ -1,16 +1,26 @@
-diff -Nru user-ja-2.1.dummy/.cvsignore user-ja-2.1/.cvsignore
---- user-ja-2.1.dummy/.cvsignore Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/.cvsignore Mon Apr 12 00:04:37 2004
+diff -Nru user-ja-2.3.dummy/.cvsignore user-ja-2.3/.cvsignore
+--- user-ja-2.3.dummy/.cvsignore Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/.cvsignore Thu Apr 7 21:31:26 2005
@@ -0,0 +1,5 @@
+build
+semantic.cache
+user-ja-[0-9]*
+user-ja.info
+user-ja.patch
-diff -Nru user-ja-2.1.dummy/ChangeLog user-ja-2.1/ChangeLog
---- user-ja-2.1.dummy/ChangeLog Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/ChangeLog Thu Apr 7 13:44:02 2005
-@@ -0,0 +1,207 @@
+diff -Nru user-ja-2.3.dummy/ChangeLog user-ja-2.3/ChangeLog
+--- user-ja-2.3.dummy/ChangeLog Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/ChangeLog Tue Mar 7 22:29:10 2006
+@@ -0,0 +1,217 @@
++2006-03-07 AIDA Shinra <[EMAIL PROTECTED]>
++* 2.3 release
++* user-ja.info.in: fix Depends
++
++2006-03-07 AIDA Shinra <[EMAIL PROTECTED]>
++* 2.2 release
++* sedsrc/user-ja.el.in: emacs22-carbon-22.0.50.cvs20060118
++* sedsrc/utf-8m.el.in: removed as emacs22-carbon has it
++* build.sh: use "go cd"
++
+2005-04-07 AIDA Shinra <[EMAIL PROTECTED]>
+* 2.1 release
+* sedsrc/user-ja.el.in: workaround a bug of emacs21-20041117
@@ -218,10 +228,10 @@
+* Initial revision
+
+$Id$
-diff -Nru user-ja-2.1.dummy/build.sh user-ja-2.1/build.sh
---- user-ja-2.1.dummy/build.sh Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/build.sh Tue Mar 29 23:19:19 2005
-@@ -0,0 +1,255 @@
+diff -Nru user-ja-2.3.dummy/build.sh user-ja-2.3/build.sh
+--- user-ja-2.3.dummy/build.sh Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/build.sh Tue Mar 7 22:19:21 2006
+@@ -0,0 +1,251 @@
+#! /bin/sh
+# $Id$
+# vim: set sw=4:
@@ -322,8 +332,7 @@
+}
+
+doinstall() {
-+ $show cd "$builddir"
-+ cd "$builddir"
++ go cd "$builddir"
+ go $mkinstalldirscmd -m 755 "$destdir$bindir"
+ go $installcmd -m 755 user-ja-conf "$destdir$bindir"
+
@@ -343,22 +352,19 @@
+ go $installcmd -m 755 kinput2.sh
"$destdir$sysconfdir/xinitrc.d/50kinput2.sh"
+ go $installcmd -m 755 xmodmap-ja.sh
"$destdir$sysconfdir/xinitrc.d/21xmodmap-ja.sh"
+
-+ $show cd "$firstpwd"
-+ cd "$firstpwd"
-+ $show cd "$srcdir/etcmlterm"
-+ cd "$srcdir/etcmlterm"
++ go cd "$firstpwd"
++ go cd "$srcdir/etcmlterm"
+ go $mkinstalldirscmd -m 755 "$destdir$mydatadir/etcmlterm"
+ go $installcmd -m 644 font main menu "$destdir$mydatadir/etcmlterm"
+
-+ $show cd "../simple"
-+ cd "../simple"
++ go cd "../simple"
+ go $installcmd -m 644 dot.* "$destdir$mydatadir/skel"
+
+ go $installcmd -m 644 inputrc user-ja.canna "$destdir$mydatadir"
+
+ go $mkinstalldirscmd -m 755 "$destdir$sitelispdir"
-+ go $installcmd -m 644 appleotffonts-ja.el utf-8m.el "$destdir$sitelispdir"
-+
++ go $installcmd -m 644 appleotffonts-ja.el "$destdir$sitelispdir"
++
+ go $mkinstalldirscmd -m 755 "$destdir$fink_sysconfdir/gtk"
+ go $installcmd -m 644 gtkrc.ja_JP.utf8
"$destdir$fink_sysconfdir/gtk/gtkrc.ja_JP.utf8"
+ go $installcmd -m 644 gtkrc.ja_JP.eucjp
"$destdir$fink_sysconfdir/gtk/gtkrc.ja_JP.eucjp"
@@ -477,9 +483,9 @@
+ *) badarg "$mode"; exit ;;
+esac
+
-diff -Nru user-ja-2.1.dummy/doc/developers.txt user-ja-2.1/doc/developers.txt
---- user-ja-2.1.dummy/doc/developers.txt Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/doc/developers.txt Mon Apr 12 00:04:37 2004
+diff -Nru user-ja-2.3.dummy/doc/developers.txt user-ja-2.3/doc/developers.txt
+--- user-ja-2.3.dummy/doc/developers.txt Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/doc/developers.txt Thu Apr 7 21:31:26 2005
@@ -0,0 +1,42 @@
+user-jaã®éçºã«ã¤ãã¦
+
@@ -523,9 +529,9 @@
+ã§åºæ¥ä¸ããã¾ã£ããã®ãã£ã¬ã¯ããªã«ãªãã¹ãè¿ã¥ãã¾ãã
+
+$Id$
-diff -Nru user-ja-2.1.dummy/doc/user-ja.txt user-ja-2.1/doc/user-ja.txt
---- user-ja-2.1.dummy/doc/user-ja.txt Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/doc/user-ja.txt Thu Mar 31 01:23:16 2005
+diff -Nru user-ja-2.3.dummy/doc/user-ja.txt user-ja-2.3/doc/user-ja.txt
+--- user-ja-2.3.dummy/doc/user-ja.txt Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/doc/user-ja.txt Thu Apr 7 21:31:26 2005
@@ -0,0 +1,11 @@
+user-jaã®è¨å®ãã¡ã¤ã«ãã³ãã³ãé¡ã®èª¬æã§ããã¾ã æªå®æã§ãã
+
@@ -538,9 +544,9 @@
+æ±ã£ã¦çµæ§ã§ãã
+
+$Id$
-diff -Nru user-ja-2.1.dummy/etcmlterm/font user-ja-2.1/etcmlterm/font
---- user-ja-2.1.dummy/etcmlterm/font Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/etcmlterm/font Sat Mar 19 11:44:18 2005
+diff -Nru user-ja-2.3.dummy/etcmlterm/font user-ja-2.3/etcmlterm/font
+--- user-ja-2.3.dummy/etcmlterm/font Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/etcmlterm/font Thu Apr 7 21:31:26 2005
@@ -0,0 +1,27 @@
+# $Id$
+# See also: ${prefix}/share/doc/mlterm/etc/font.ja
@@ -569,9 +575,9 @@
+#ISO10646_UCS4_1_BIWIDTH =
-efont-fixed-medium-r-normal--14-*-*-*-c-140-iso10646-1
+#ISO10646_UCS4_1_BOLD = -efont-fixed-bold-r-normal--14-*-*-*-c-70-iso10646-1
+#ISO10646_UCS4_1_BIWIDTH_BOLD =
-efont-fixed-bold-r-normal--14-*-*-*-c-140-iso10646-1
-diff -Nru user-ja-2.1.dummy/etcmlterm/main user-ja-2.1/etcmlterm/main
---- user-ja-2.1.dummy/etcmlterm/main Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/etcmlterm/main Sat Mar 19 11:44:18 2005
+diff -Nru user-ja-2.3.dummy/etcmlterm/main user-ja-2.3/etcmlterm/main
+--- user-ja-2.3.dummy/etcmlterm/main Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/etcmlterm/main Thu Apr 7 21:31:26 2005
@@ -0,0 +1,12 @@
+# $Id$
+# See also: ${prefix}/share/doc/mlterm/etc/main.ja
@@ -585,9 +591,9 @@
+xim_open_in_startup=true
+use_variable_column_width=true
+iso88591_font_for_usascii=true
-diff -Nru user-ja-2.1.dummy/etcmlterm/menu user-ja-2.1/etcmlterm/menu
---- user-ja-2.1.dummy/etcmlterm/menu Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/etcmlterm/menu Wed Apr 21 01:24:07 2004
+diff -Nru user-ja-2.3.dummy/etcmlterm/menu user-ja-2.3/etcmlterm/menu
+--- user-ja-2.3.dummy/etcmlterm/menu Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/etcmlterm/menu Thu Apr 7 21:31:26 2005
@@ -0,0 +1,15 @@
+"Font Size" {
+ "Larger" "fontsize=larger"
@@ -604,14 +610,14 @@
+-
+pty_list
+"New PTY" "open_pty"
-diff -Nru user-ja-2.1.dummy/sedsrc/.cvsignore user-ja-2.1/sedsrc/.cvsignore
---- user-ja-2.1.dummy/sedsrc/.cvsignore Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/.cvsignore Mon Apr 12 00:04:37 2004
+diff -Nru user-ja-2.3.dummy/sedsrc/.cvsignore user-ja-2.3/sedsrc/.cvsignore
+--- user-ja-2.3.dummy/sedsrc/.cvsignore Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/.cvsignore Thu Apr 7 21:31:26 2005
@@ -0,0 +1 @@
+semantic.cache
-diff -Nru user-ja-2.1.dummy/sedsrc/dot.canna.in user-ja-2.1/sedsrc/dot.canna.in
---- user-ja-2.1.dummy/sedsrc/dot.canna.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/dot.canna.in Tue Apr 27 19:15:50 2004
+diff -Nru user-ja-2.3.dummy/sedsrc/dot.canna.in user-ja-2.3/sedsrc/dot.canna.in
+--- user-ja-2.3.dummy/sedsrc/dot.canna.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/dot.canna.in Thu Apr 7 21:31:26 2005
@@ -0,0 +1,7 @@
+;; $Id$
+;; gcanna(cannadic)ãå©ç¨ãããã
@@ -620,9 +626,9 @@
+;(setq use-symbolic-definition t)
+
+(load "@MYDATADIR@/user-ja.canna")
-diff -Nru user-ja-2.1.dummy/sedsrc/kinput2.sh.in
user-ja-2.1/sedsrc/kinput2.sh.in
---- user-ja-2.1.dummy/sedsrc/kinput2.sh.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/kinput2.sh.in Wed May 5 05:31:54 2004
+diff -Nru user-ja-2.3.dummy/sedsrc/kinput2.sh.in
user-ja-2.3/sedsrc/kinput2.sh.in
+--- user-ja-2.3.dummy/sedsrc/kinput2.sh.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/kinput2.sh.in Thu Apr 7 21:31:26 2005
@@ -0,0 +1,9 @@
+# $Id$
+: ${xinitrc_kinput2_enable=YES}
@@ -633,9 +639,9 @@
+ fi
+ ;;
+esac
-diff -Nru user-ja-2.1.dummy/sedsrc/user-ja-conf.in
user-ja-2.1/sedsrc/user-ja-conf.in
---- user-ja-2.1.dummy/sedsrc/user-ja-conf.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/user-ja-conf.in Wed Mar 30 16:03:31 2005
+diff -Nru user-ja-2.3.dummy/sedsrc/user-ja-conf.in
user-ja-2.3/sedsrc/user-ja-conf.in
+--- user-ja-2.3.dummy/sedsrc/user-ja-conf.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/user-ja-conf.in Thu Apr 7 21:31:26 2005
@@ -0,0 +1,80 @@
+#! /bin/sh
+# $Id$
@@ -717,9 +723,9 @@
+#defaults write com.apple.Terminal DeleteKeySendsBackspace -string "YES"
+
+trap '' 0
-diff -Nru user-ja-2.1.dummy/sedsrc/user-ja.csh.in
user-ja-2.1/sedsrc/user-ja.csh.in
---- user-ja-2.1.dummy/sedsrc/user-ja.csh.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/user-ja.csh.in Fri Mar 25 00:02:31 2005
+diff -Nru user-ja-2.3.dummy/sedsrc/user-ja.csh.in
user-ja-2.3/sedsrc/user-ja.csh.in
+--- user-ja-2.3.dummy/sedsrc/user-ja.csh.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/user-ja.csh.in Thu Apr 7 21:31:26 2005
@@ -0,0 +1,14 @@
+# $Id$
+setenv LANG ja_JP.UTF-8
@@ -735,35 +741,50 @@
+ unset nokanji
+ set dspmbyte=utf8
+endif
-diff -Nru user-ja-2.1.dummy/sedsrc/user-ja.el.in
user-ja-2.1/sedsrc/user-ja.el.in
---- user-ja-2.1.dummy/sedsrc/user-ja.el.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/user-ja.el.in Thu Apr 7 13:44:02 2005
-@@ -0,0 +1,78 @@
+diff -Nru user-ja-2.3.dummy/sedsrc/user-ja.el.in
user-ja-2.3/sedsrc/user-ja.el.in
+--- user-ja-2.3.dummy/sedsrc/user-ja.el.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/user-ja.el.in Tue Mar 7 22:19:22 2006
+@@ -0,0 +1,99 @@
+;; Language environment settings
+;; $Id$
-+(require 'utf-8m)
+
-+(set-language-environment "Japanese")
-+(setq utf-decode-to-japanese-symbol t) ;; obsolete
-+(utf-translate-cjk-mode t)
-+(custom-set-variables
-+ '(utf-fragment-on-decoding nil)
-+ '(utf-translate-cjk-unicode-range '((#x80 . #xd7a3) (#xff00 . #xffef)))
-+ '(default-input-method "japanese-yc")
-+ )
-+(set-default-coding-systems 'utf-8)
-+(set-buffer-file-coding-system 'utf-8)
-+(unless (and (boundp 'mac-access-clipboard-in-unicode)
-+ mac-access-clipboard-in-unicode)
-+ (set-clipboard-coding-system 'sjis-mac))
-+(set-terminal-coding-system 'utf-8)
-+(set-keyboard-coding-system
-+ (if (eq window-system 'mac) 'sjis-mac 'utf-8))
-+(set-file-name-coding-system 'utf-8m)
-+;; Workaround a bug of emacs21-20041117
-+(if (and (fboundp 'utf-translate-cjk-load-tables)
-+ (eq fink-emacs-flavor 'emacs21))
-+ (utf-translate-cjk-load-tables))
++;; Setup Japanese UTF-8 environment.
++;; Recent Emacs 22 (22.0.50.cvs20060118) is enough clever for us
++;; to accept most of its default configurations.
++;; We don't need even set-language-environment!
++(when (eq emacs-major-version 22)
++ (if (require 'utf-8m nil t)
++ (set-file-name-coding-system 'utf-8m))
++ (cond ((and (eq window-system 'mac)
++ (fboundp 'mac-setup-inline-input-method))
++ (mac-setup-inline-input-method))
++ ((eq current-language-environment "Japanese")
++ (custom-set-variables '(default-input-method "japanese-yc")))))
++;; For Todai Fink Team's obsolete emacs21-carbon package.
++;; As we moved utf-8m.el into emacs22-carbon, utf-8m is not available
++;; on emacs21-carbon now.
++(when (eq emacs-major-version 21)
++ (set-language-environment "Japanese")
++ (setq utf-decode-to-japanese-symbol t) ;; obsolete
++ (utf-translate-cjk-mode t)
++ (custom-set-variables
++ '(utf-fragment-on-decoding nil)
++ '(utf-translate-cjk-unicode-range '((#x80 . #xd7a3) (#xff00 . #xffef)))
++ '(default-input-method "japanese-yc")
++ )
++ (set-default-coding-systems 'utf-8)
++ (set-buffer-file-coding-system 'utf-8)
++ (unless (and (boundp 'mac-access-clipboard-in-unicode)
++ mac-access-clipboard-in-unicode)
++ (set-clipboard-coding-system 'sjis-mac))
++ (set-terminal-coding-system 'utf-8)
++ (set-keyboard-coding-system
++ (if (eq window-system 'mac) 'sjis-mac 'utf-8))
++ (set-file-name-coding-system 'utf-8)
++ ;; Workaround a bug of emacs21-20041117
++ (if (and (fboundp 'utf-translate-cjk-load-tables)
++ (eq fink-emacs-flavor 'emacs21))
++ (utf-translate-cjk-load-tables)))
+
+;; Set up the keyboard so the delete key on both the regular keyboard
+;; and the keypad delete the character under the cursor and to the right
@@ -813,13 +834,19 @@
+
+;; carbon-font or appleotffonts-ja
+(when (eq window-system 'mac)
-+ (if (require 'carbon-font nil t)
-+ (set-default-font "fontset-hiraginokaku12")
-+ (require 'appleotffonts-ja) ;; for emacs21-carbon < 20041229
-+ (set-default-font "fontset-hirakakugo14")))
-diff -Nru user-ja-2.1.dummy/sedsrc/user-ja.sh.in
user-ja-2.1/sedsrc/user-ja.sh.in
---- user-ja-2.1.dummy/sedsrc/user-ja.sh.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/user-ja.sh.in Tue Apr 27 17:51:18 2004
++ (cond ((require 'carbon-font nil t)
++ (cond ((memq
"-*-*-medium-r-normal--12-*-*-*-*-*-fontset-hiraginokaku" (fontset-list))
++ ;; for emacs22-carbon >= 22.0.50.cvs20060118
++ (set-default-font "hiraginokaku"))
++ ((memq
"-*-fixed-medium-r-normal-*-12-*-*-*-*-*-fontset-hiraginokaku12" (fontset-list))
++ ;; for emacs21-carbon >= 20041229
++ (set-default-font "fontset-hiraginokaku12"))))
++ ((require 'appleotffonts-ja nil t)
++ ;; for emacs21-carbon < 20041229
++ (set-default-font "fontset-hirakakugo14"))))
+diff -Nru user-ja-2.3.dummy/sedsrc/user-ja.sh.in
user-ja-2.3/sedsrc/user-ja.sh.in
+--- user-ja-2.3.dummy/sedsrc/user-ja.sh.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/user-ja.sh.in Thu Apr 7 21:31:26 2005
@@ -0,0 +1,9 @@
+# $Id$
+LANG=ja_JP.UTF-8; export LANG
@@ -830,9 +857,9 @@
+if [ ! -f "$HOME/.inputrc" ]; then
+ INPUTRC="@MYDATADIR@/inputrc"; export INPUTRC
+fi
-diff -Nru user-ja-2.1.dummy/sedsrc/xinitrc.in user-ja-2.1/sedsrc/xinitrc.in
---- user-ja-2.1.dummy/sedsrc/xinitrc.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/xinitrc.in Thu Jul 22 02:58:41 2004
+diff -Nru user-ja-2.3.dummy/sedsrc/xinitrc.in user-ja-2.3/sedsrc/xinitrc.in
+--- user-ja-2.3.dummy/sedsrc/xinitrc.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/xinitrc.in Thu Apr 7 21:31:26 2005
@@ -0,0 +1,8 @@
+#! /bin/sh
+# $Id$
@@ -842,9 +869,9 @@
+else
+ . @FINK_PREFIX@/bin/xinitrc.sh
+fi
-diff -Nru user-ja-2.1.dummy/sedsrc/xmodmap-ja.sh.in
user-ja-2.1/sedsrc/xmodmap-ja.sh.in
---- user-ja-2.1.dummy/sedsrc/xmodmap-ja.sh.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/sedsrc/xmodmap-ja.sh.in Wed May 5 05:31:54 2004
+diff -Nru user-ja-2.3.dummy/sedsrc/xmodmap-ja.sh.in
user-ja-2.3/sedsrc/xmodmap-ja.sh.in
+--- user-ja-2.3.dummy/sedsrc/xmodmap-ja.sh.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/sedsrc/xmodmap-ja.sh.in Thu Apr 7 21:31:26 2005
@@ -0,0 +1,8 @@
+# $Id$
+: ${xinitrc_xmodmap_ja_enable=YES}
@@ -854,16 +881,16 @@
+ xmodmap -e "keycode 66 = Meta_L" -e "remove mod1 = Mode_switch" -e "add
mod2 = Meta_L"
+ ;;
+esac
-diff -Nru user-ja-2.1.dummy/simple/Emacs.ad user-ja-2.1/simple/Emacs.ad
---- user-ja-2.1.dummy/simple/Emacs.ad Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/Emacs.ad Tue Apr 27 19:15:50 2004
+diff -Nru user-ja-2.3.dummy/simple/Emacs.ad user-ja-2.3/simple/Emacs.ad
+--- user-ja-2.3.dummy/simple/Emacs.ad Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/simple/Emacs.ad Thu Apr 7 21:31:26 2005
@@ -0,0 +1,3 @@
+! $Id$
+! XIM support is broken for now
+Emacs.UseXIM: false
-diff -Nru user-ja-2.1.dummy/simple/appleotffonts-ja.el
user-ja-2.1/simple/appleotffonts-ja.el
---- user-ja-2.1.dummy/simple/appleotffonts-ja.el Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/appleotffonts-ja.el Wed Mar 16 11:08:31 2005
+diff -Nru user-ja-2.3.dummy/simple/appleotffonts-ja.el
user-ja-2.3/simple/appleotffonts-ja.el
+--- user-ja-2.3.dummy/simple/appleotffonts-ja.el Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/simple/appleotffonts-ja.el Tue Mar 7 21:33:50 2006
@@ -0,0 +1,73 @@
+;; $Id$
+;; This configuration is obsolete. Use "carbon-font" shipped with
@@ -938,17 +965,17 @@
+ )
+
+(provide 'appleotffonts-ja)
-diff -Nru user-ja-2.1.dummy/simple/dot.vimrc user-ja-2.1/simple/dot.vimrc
---- user-ja-2.1.dummy/simple/dot.vimrc Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/dot.vimrc Tue Apr 27 19:15:50 2004
+diff -Nru user-ja-2.3.dummy/simple/dot.vimrc user-ja-2.3/simple/dot.vimrc
+--- user-ja-2.3.dummy/simple/dot.vimrc Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/simple/dot.vimrc Thu Apr 7 21:31:26 2005
@@ -0,0 +1,4 @@
+" $Id$
+se enc=utf-8
+" XXX: suspicious
+se fencs=utf-8,cp932,euc-jp,iso-2022-jp,ucs-bom,ucs-2le,ucs-2
-diff -Nru user-ja-2.1.dummy/simple/gtkrc.ja_JP.eucjp
user-ja-2.1/simple/gtkrc.ja_JP.eucjp
---- user-ja-2.1.dummy/simple/gtkrc.ja_JP.eucjp Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/gtkrc.ja_JP.eucjp Tue Apr 27 19:15:50 2004
+diff -Nru user-ja-2.3.dummy/simple/gtkrc.ja_JP.eucjp
user-ja-2.3/simple/gtkrc.ja_JP.eucjp
+--- user-ja-2.3.dummy/simple/gtkrc.ja_JP.eucjp Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/simple/gtkrc.ja_JP.eucjp Thu Apr 7 21:31:26 2005
@@ -0,0 +1,8 @@
+style "gtk-default-ja" {
+ fontset =
"-adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1,\
@@ -958,9 +985,9 @@
+}
+class "GtkWidget" style "gtk-default-ja"
+
-diff -Nru user-ja-2.1.dummy/simple/gtkrc.ja_JP.utf8
user-ja-2.1/simple/gtkrc.ja_JP.utf8
---- user-ja-2.1.dummy/simple/gtkrc.ja_JP.utf8 Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/gtkrc.ja_JP.utf8 Tue Apr 27 19:15:50 2004
+diff -Nru user-ja-2.3.dummy/simple/gtkrc.ja_JP.utf8
user-ja-2.3/simple/gtkrc.ja_JP.utf8
+--- user-ja-2.3.dummy/simple/gtkrc.ja_JP.utf8 Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/simple/gtkrc.ja_JP.utf8 Thu Apr 7 21:31:26 2005
@@ -0,0 +1,9 @@
+style "gtk-default-ja-jp-utf8" {
+ fontset = "-adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1,\
@@ -971,18 +998,18 @@
+}
+
+class "GtkWidget" style "gtk-default-ja-jp-utf8"
-diff -Nru user-ja-2.1.dummy/simple/inputrc user-ja-2.1/simple/inputrc
---- user-ja-2.1.dummy/simple/inputrc Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/inputrc Tue Apr 27 17:51:18 2004
+diff -Nru user-ja-2.3.dummy/simple/inputrc user-ja-2.3/simple/inputrc
+--- user-ja-2.3.dummy/simple/inputrc Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/simple/inputrc Thu Apr 7 21:31:26 2005
@@ -0,0 +1,5 @@
+# $Id$
+set input-meta on
+set convert-meta off
+set output-meta on
+set editing-mode emacs
-diff -Nru user-ja-2.1.dummy/simple/user-ja.canna
user-ja-2.1/simple/user-ja.canna
---- user-ja-2.1.dummy/simple/user-ja.canna Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/user-ja.canna Tue Apr 27 19:15:50 2004
+diff -Nru user-ja-2.3.dummy/simple/user-ja.canna
user-ja-2.3/simple/user-ja.canna
+--- user-ja-2.3.dummy/simple/user-ja.canna Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/simple/user-ja.canna Thu Apr 7 21:31:26 2005
@@ -0,0 +1,196 @@
+;; Based on unix.canna and use gcanna
+
@@ -1180,216 +1207,9 @@
+
+;; Help ¤¬¤Ê¤¤¿Í¤â¤¤¤ë¤Î¤Ç F1 ¤Ç¤âƱ¤¸Æ°ºî¤ò¤µ¤»¤ë¡£
+(global-set-key "\F1" 'extend-mode)
-diff -Nru user-ja-2.1.dummy/simple/utf-8m.el user-ja-2.1/simple/utf-8m.el
---- user-ja-2.1.dummy/simple/utf-8m.el Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/simple/utf-8m.el Wed Mar 16 09:57:42 2005
-@@ -0,0 +1,203 @@
-+;;; -*- coding: iso-2022-7bit -*-
-+;;; utf-8m.el --- Unicode one-way converter (NRD -> NRC)
-+;;; Based on mac-utf.el by Zenitani and modified by Todai Fink Team.
-+
-+;; Copyright (C) 2004-2005 Seiji Zenitani <[EMAIL PROTECTED]>
-+
-+;; Author: Seiji Zenitani <[EMAIL PROTECTED]>
-+;; Version: v20050129
-+;; Keywords: mac, multilingual, Unicode, UTF-8
-+;; Created: 2004-02-20
-+;; Compatibility: Mac OS X (Carbon Emacs)
-+;; URL(jp): http://macwiki.sourceforge.jp/cgi-bin/wiki.cgi?CarbonEmacs
-+
-+;; This file is free software; you can redistribute it and/or modify
-+;; it under the terms of the GNU General Public License as published by
-+;; the Free Software Foundation; either version 2, or (at your option)
-+;; any later version.
-+
-+;; This file is distributed in the hope that it will be useful,
-+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+;; GNU General Public License for more details.
-+
-+;; You should have received a copy of the GNU General Public License
-+;; along with GNU Emacs; see the file COPYING. If not, write to
-+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+;; Boston, MA 02111-1307, USA.
-+
-+;;; Commentary:
-+
-+;; This package provides post-read converter functions for Emacs.
-+;; The following characters are converted from UTF8-NRD (Normalization
-+;; form D) format to popular UTF8-NRC (Normalization form C) format.
-+;;
-+;; * Japanese kana characters with dakuten/han-dakuten signs
-+;; * Korean Hangul characters
-+;;
-+;; In order to use, add the below lines to your .emacs file
-+;; before you declare your language environment.
-+;;
-+;; (require 'utf-8m)
-+;; (set-language-environment 'Japanese) ; or 'Korean)
-+;;
-+;; Note that this code provides one-way conversion from UTF8-NRD to UTF8-NRC,
-+;; and that reverse conversion (UTF8-NRC -> UTF8-NRD) is not provided.
-+
-+;;; utf-8m $B$K$D$$$F(B
-+
-+;; Mac OS X $B$N(B HFS+ $B%U%!%$%k%7%9%F%`$N%U%!%$%kL>$rFI$`$?$a$K(B
-+;; Emacs $B$N(B Unicode $B%(%s%3!<[EMAIL PROTECTED](B
-+;; $BF|[EMAIL PROTECTED]&H>[EMAIL
PROTECTED];z$H%O%s%0%kJ8;z$KBP1~$7$F$$$^$9!#(B
-+;; $B%*%j%8%J%k$N(B mac-utf $B$O(B Mule-UCS $B$K0MB8$7$F$$$^$9$,!"(B
-+;; $B$3$N(B utf-8m $B$O(B Emacs $BAH$_9~$_$N(B Unicode
$B%5%]!<%H$K4p$E$$$F$$$^$9!#(B
-+
-+
-+;;; Code:
-+
-+(make-coding-system
-+ 'utf-8m 4 ?u
-+ "modified UTF-8 encoding for Mac OS X hfs plus volume format."
-+ '(ccl-decode-mule-utf-8 . ccl-encode-mule-utf-8)
-+ '((safe-charsets
-+ ascii
-+ eight-bit-control
-+ eight-bit-graphic
-+ latin-iso8859-1
-+ mule-unicode-0100-24ff
-+ mule-unicode-2500-33ff
-+ mule-unicode-e000-ffff)
-+ (mime-charset . utf-8)
-+ (coding-category . coding-category-utf-8)
-+ (valid-codes (0 . 255))
-+ (post-read-conversion . utf-8m-post-read-conversion) ; <== modified
-+ (translation-table-for-encode . utf-translation-table-for-encode)
-+ (dependency unify-8859-on-encoding-mode
-+ unify-8859-on-decoding-mode
-+ utf-fragment-on-decoding
-+ utf-translate-cjk)))
-+
-+
-+;; for Japanese kana characters with dakuten/han-dakuten signs
-+
-+(defvar utf-8m-fix-kana1-alist
-+ '( ?$B$+(B ?$B$-(B ?$B$/(B ?$B$1(B ?$B$3(B ?$B$5(B ?$B$7(B
?$B$9(B ?$B$;(B ?$B$=(B
-+ ?$B$?(B ?$B$A(B ?$B$D(B ?$B$F(B ?$B$H(B ?$B$O(B ?$B$R(B
?$B$U(B ?$B$X(B ?$B$[(B
-+ ?$B%+(B ?$B%-(B ?$B%/(B ?$B%1(B ?$B%3(B ?$B%5(B ?$B%7(B
?$B%9(B ?$B%;(B ?$B%=(B
-+ ?$B%?(B ?$B%A(B ?$B%D(B ?$B%F(B ?$B%H(B ?$B%O(B ?$B%R(B
?$B%U(B ?$B%X(B ?$B%[(B
-+ ?$B!3(B ?$B!5(B ))
-+(defvar utf-8m-fix-kana2-alist
-+ '( ?$B$O(B ?$B$R(B ?$B$U(B ?$B$X(B ?$B$[(B ?$B%O(B ?$B%R(B
?$B%U(B ?$B%X(B ?$B%[(B ))
-+
-+(defun utf-8m-post-read-kana-conversion (length)
-+ "Document forthcoming..."
-+ (save-excursion
-+ (while (not (eobp))
-+ (let ((ch1 (char-before))
-+ (ch2 (char-after)))
-+ (cond
-+ ((= ch2 302969)
-+ (cond
-+ ((memq ch1 utf-8m-fix-kana1-alist)
-+ (delete-char -1)
-+ (delete-char 1)
-+ (insert (+ ch1 1))
-+ (setq length (- length 1))
-+ )
-+ ((= ch1 ?$B%&(B)
-+ (delete-char -1)
-+ (delete-char 1)
-+ (insert ?$B%t(B)
-+ (setq length (- length 1))
-+ )))
-+ ((= ch2 302970)
-+ (cond
-+ ((memq ch1 utf-8m-fix-kana2-alist)
-+ (delete-char -1)
-+ (delete-char 1)
-+ (insert (+ ch1 2))
-+ (setq length (- length 1))
-+ ))))
-+ (if (not (eobp))(forward-char))
-+ )))
-+ length)
-+
-+
-+;; for Korean Hangul characters
-+;; ref. http://www.unicode.org/reports/tr15/#Hangul
-+
-+(defun utf-8m-post-read-hangul-conversion (length)
-+ "Document forthcoming..."
-+ (save-excursion
-+ (let* ((ch1 nil)
-+ (ch2 nil)
-+ (sbase #xac00)
-+ (lbase #x1100)
-+ (vbase #x1161)
-+ (tbase #x11a7)
-+ (lcount 19)
-+ (vcount 21)
-+ (tcount 28)
-+ (ncount (* vcount tcount)) ; 588
-+ (scount (* lcount ncount)) ; 11172
-+ (lindex nil)
-+ (vindex nil)
-+ (sindex nil)
-+ (tindex nil))
-+
-+ (setq ch1 (encode-char (char-after) 'ucs))
-+ (if (not (eobp))(forward-char))
-+
-+ (while (not (eobp))
-+
-+ (setq ch2 (encode-char (char-after) 'ucs))
-+; (message "ch1:%X ch2:%X" ch1 ch2)
-+ (setq lindex (- ch1 lbase))
-+ (setq vindex (- ch2 vbase))
-+ (setq sindex (- ch1 sbase))
-+ (setq tindex (- ch2 tbase))
-+
-+ (if (and (>= lindex 0)(< lindex lcount)
-+ (>= vindex 0)(< vindex vcount))
-+ (progn
-+; (message "first loop")
-+ (setq ch1 (+ sbase (* (+ (* lindex vcount) vindex) tcount)))
-+ (delete-char -1)
-+ (delete-char 1)
-+ (insert (encode-char 'ucs ch1))
-+ (setq length (- length 1))
-+ )
-+ (if (and (>= sindex 0)(< sindex scount)
-+ (= (% sindex tcount) 0)
-+ (>= tindex 0)(< tindex tcount))
-+ (progn
-+; (message "second loop")
-+ (setq ch1 (+ ch1 tindex))
-+ (delete-char -1)
-+ (delete-char 1)
-+ (insert (encode-char 'ucs ch1))
-+ (setq length (- length 1))
-+ )
-+ (progn
-+ (setq ch1 ch2)
-+ (if (not (eobp))(forward-char))
-+ )
-+ ))
-+
-+ )))
-+ length)
-+
-+
-+;; use the above functions as post-read-converter
-+
-+(defun utf-8m-post-read-conversion (length)
-+ "Document forthcoming..."
-+ (mapc (lambda (fn) (setq length (funcall fn length)))
-+ '(utf-8-post-read-conversion
-+ utf-8m-post-read-kana-conversion
-+ utf-8m-post-read-hangul-conversion))
-+ length)
-+
-+(provide 'utf-8m)
-+
-+;; utf-8m.el ends here.
-diff -Nru user-ja-2.1.dummy/user-ja.info.in user-ja-2.1/user-ja.info.in
---- user-ja-2.1.dummy/user-ja.info.in Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/user-ja.info.in Wed Mar 30 16:03:31 2005
+diff -Nru user-ja-2.3.dummy/user-ja.info.in user-ja-2.3/user-ja.info.in
+--- user-ja-2.3.dummy/user-ja.info.in Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/user-ja.info.in Tue Mar 7 22:29:10 2006
@@ -0,0 +1,13 @@
+# $Id$
+Package: user-ja
@@ -1400,12 +1220,12 @@
+Type: nosource
+License: Public Domain
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
-+Depends: fix-apple-x11 | xfree86 (>= 4.4.0-1), emacsen, appleotffonts, yc,
canna, cannadic, efont-unicode, shinonome, xinitrc
++Depends: fix-apple-x11 | xfree86 (>= 4.4.0-1) | system-xfree86 (>= 2:4.4-1) |
xorg (>= 6.8), emacsen, appleotffonts, yc, canna, cannadic, efont-unicode,
shinonome, xinitrc
+Patch: %n.patch
+CompileScript: sh ./build.sh prefix=%p build
+InstallScript: sh ./build.sh prefix=%p destdir=%d install
-diff -Nru user-ja-2.1.dummy/version user-ja-2.1/version
---- user-ja-2.1.dummy/version Thu Jan 1 09:00:00 1970
-+++ user-ja-2.1/version Thu Apr 7 13:42:25 2005
+diff -Nru user-ja-2.3.dummy/version user-ja-2.3/version
+--- user-ja-2.3.dummy/version Thu Jan 1 09:00:00 1970
++++ user-ja-2.3/version Tue Mar 7 22:26:09 2006
@@ -0,0 +1 @@
-+2.1
++2.3
Index: user-ja.info
===================================================================
RCS file: /cvsroot/fink/experimental/todai/ecc/main/finkinfo/base/user-ja.info,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- user-ja.info 7 Apr 2005 12:31:22 -0000 1.1.1.1
+++ user-ja.info 7 Mar 2006 13:30:34 -0000 1.2
@@ -1,13 +1,13 @@
-# Id: user-ja.info.in,v 1.9 2005/03/30 07:03:31 shinra Exp
+# Id: user-ja.info.in,v 1.3 2006/03/07 13:29:10 aida_s Exp
Package: user-ja
-Version: 2.1
+Version: 2.3
# Revision is always 1
Revision: 1
Description: Configuration files for Japanese UTF-8 environment
Type: nosource
License: Public Domain
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
-Depends: fix-apple-x11 | xfree86 (>= 4.4.0-1), emacsen, appleotffonts, yc,
canna, cannadic, efont-unicode, shinonome, xinitrc
+Depends: fix-apple-x11 | xfree86 (>= 4.4.0-1) | system-xfree86 (>= 2:4.4-1) |
xorg (>= 6.8), emacsen, appleotffonts, yc, canna, cannadic, efont-unicode,
shinonome, xinitrc
Patch: %n.patch
CompileScript: sh ./build.sh prefix=%p build
InstallScript: sh ./build.sh prefix=%p destdir=%d install
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
