jisx0213

diff --git a/ChangeLog b/ChangeLog
index 09c63bc..b8f6ca6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-09-09  NIIBE Yutaka  <gniibe@m17n.org>
+
+       Check JIS x0213 support at compile time.
+       * check-jisx0213.el: New file.
+       * configure.in: Check if JIS X0213 is supported or not.
+       * Makefile.in (TOPSRCS): Remove egg-x0213.el.
+       (DEPS): Don't load jisx0213.el.
+       (ITSSRCS): Removed its/aynu.el.
+       (AYNU): New variable.
+
+       Bug fix.
+       * its/thai.el (its-thai-add-vowel, its-thai-add-tone): Bug fixes.
+       Just call compose-string.
+       

 2002-08-26  ISHIKAWA Mutsumi <ishikawa@linux.or.jp>, 
        Takahiro Kambe <taca@sky.yamashina.kyoto.jp>, 
        Katsumi Yamaoka  <yamaoka@jpl.org>
 2002-08-26  ISHIKAWA Mutsumi <ishikawa@linux.or.jp>, 
        Takahiro Kambe <taca@sky.yamashina.kyoto.jp>, 
        Katsumi Yamaoka  <yamaoka@jpl.org>

diff --git a/Makefile.in b/Makefile.in
index 70cb222..06ac9d1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ INSTALL_INFO = install-info
 #       ;; install files into the emacs site-lisp directory
 #       ;; ex. /usr/local/share/emacs/site-lisp/egg
 
 #       ;; install files into the emacs site-lisp directory
 #       ;; ex. /usr/local/share/emacs/site-lisp/egg
 

-DEPS   = -l $(top_srcdir)/docomp.el -l $(top_srcdir)/jisx0213.el
+DEPS   = -l $(top_srcdir)/docomp.el

 BATCHFLAGS     = -batch -q -no-site-file -no-init-file
 
 ETCS   = Makefile docomp.el \
 BATCHFLAGS     = -batch -q -no-site-file -no-init-file
 
 ETCS   = Makefile docomp.el \

@@ -52,7 +52,6 @@ TOPSRCS       = \
        egg-cnv.el \
        egg-mlh.el \
        egg-sim.el \
        egg-cnv.el \
        egg-mlh.el \
        egg-sim.el \

-       egg-x0213.el \

        menudiag.el \
        its.el \
        its-keydef.el \
        menudiag.el \
        its.el \
        its-keydef.el \

@@ -65,9 +64,10 @@ EGGSRCS      = \
        egg/anthyipc.el egg/anthy.el
 
 #
        egg/anthyipc.el egg/anthy.el
 
 #

+AYNU   = @HAVE_JISX0213@ its/aynu.el
+

 ITSSRCS        = \
        its/ascii.el \
 ITSSRCS        = \
        its/ascii.el \

-       its/aynu.el \

        its/bixing.el \
        its/erpin.el \
        its/greek.el \
        its/bixing.el \
        its/erpin.el \
        its/greek.el \

@@ -81,6 +81,7 @@ ITSSRCS       = \
        its/quanjiao.el \
        its/zenkaku.el \
        its/zhuyin.el \
        its/quanjiao.el \
        its/zenkaku.el \
        its/zhuyin.el \

+       ${AYNU}

 
 #
 ELCS   = ${SRCS:.el=.elc}
 
 #
 ELCS   = ${SRCS:.el=.elc}

@@ -93,6 +94,7 @@ ITSELCS       = ${ITSSRCS:.el=.elc}
 
 DIST   = ${ETCS} ${SRCS} ${INITELS}
 
 
 DIST   = ${ETCS} ${SRCS} ${INITELS}
 

+

 all: ${ELCS}
 
 .SUFFIXES: .el .elc
 all: ${ELCS}
 
 .SUFFIXES: .el .elc

diff --git a/check-jisx0213.el b/check-jisx0213.el
new file mode 100644 (file)
index 0000000..7908aff
--- /dev/null
+++ b/check-jisx0213.el
@@ -0,0 +1,3 @@
+(if (charsetp 'japanese-jisx0213-1)
+    (kill-emacs 0)
+  (kill-emacs 1))

diff --git a/configure b/configure
index a69d693..c4bbc32 100755 (executable)
--- a/configure
+++ b/configure
@@ -637,6 +637,15 @@ fi
 
 
 
 
 
 

+echo $ac_n "checking jisx0213""... $ac_c" 1>&6
+echo "configure:642: checking jisx0213" >&5
+if emacs -batch -q -no-site-file -no-init-file -l ${srcdir}/check-jisx0213.el; then
+  echo "yes"; HAVE_JISX0213=""
+else
+  echo "no"; HAVE_JISX0213="# "
+fi
+
+

 lispdir=${datadir}/emacs/site-lisp
 
 trap '' 1 2 15
 lispdir=${datadir}/emacs/site-lisp
 
 trap '' 1 2 15

@@ -788,6 +797,7 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@SET_MAKE@%$SET_MAKE%g

+s%@HAVE_JISX0213@%$HAVE_JISX0213%g

 s%@lispdir@%$lispdir%g
 
 CEOF
 s%@lispdir@%$lispdir%g
 
 CEOF

diff --git a/configure.in b/configure.in
index dde729d..8d2fa47 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,15 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
 
 
 dnl Checks for library functions.
 

+dnl check if jisx0213 is supported or not
+AC_MSG_CHECKING(jisx0213)
+if emacs -batch -q -no-site-file -no-init-file -l ${srcdir}/check-jisx0213.el; then
+  echo "yes"; HAVE_JISX0213=""
+else
+  echo "no"; HAVE_JISX0213="# "
+fi
+AC_SUBST(HAVE_JISX0213)
+

 lispdir=${datadir}/emacs/site-lisp
 AC_SUBST(lispdir)
 AC_OUTPUT(Makefile)
 lispdir=${datadir}/emacs/site-lisp
 AC_SUBST(lispdir)
 AC_OUTPUT(Makefile)

diff --git a/its/thai.el b/its/thai.el
index 91753eb..1a1f6cb 100644 (file)
--- a/its/thai.el
+++ b/its/thai.el
@@ -69,7 +69,7 @@
        (setq next-keyseq (concat keyseq (car (car vowel)))
              next-output (concat output (cdr (car vowel)))
              vowel (cdr vowel))
        (setq next-keyseq (concat keyseq (car (car vowel)))
              next-output (concat output (cdr (car vowel)))
              vowel (cdr vowel))

-        (its-defrule next-keyseq `(eval compose-string ,next-output))
+        (its-defrule next-keyseq (compose-string next-output))

        (its-thai-add-tone next-keyseq next-output tone))))
 
   (defun its-thai-add-tone (keyseq output tone)
        (its-thai-add-tone next-keyseq next-output tone))))
 
   (defun its-thai-add-tone (keyseq output tone)

@@ -78,7 +78,7 @@
        (setq next-keyseq (concat keyseq (car (car tone)))
              next-output (concat output (cdr (car tone)))
               tone (cdr tone))
        (setq next-keyseq (concat keyseq (car (car tone)))
              next-output (concat output (cdr (car tone)))
               tone (cdr tone))

-        (its-defrule next-keyseq `(eval compose-string ,next-output))))))
+        (its-defrule next-keyseq (compose-string next-output))))))

 
 ;; Thai Kesmanee keyboard support.
 
 
 ;; Thai Kesmanee keyboard support.
 

@@ -93,7 +93,7 @@
     ("4"  "\e,T@\e(B" consonant)    ("$"  "\e,Ts\e(B")
     ("5"  "\e,T6\e(B" consonant)    ("%"  "\e,Tt\e(B")
     ("6"  "\e,TX\e(B" vowel)        ("^"  "\e,TY\e(B" vowel)
     ("4"  "\e,T@\e(B" consonant)    ("$"  "\e,Ts\e(B")
     ("5"  "\e,T6\e(B" consonant)    ("%"  "\e,Tt\e(B")
     ("6"  "\e,TX\e(B" vowel)        ("^"  "\e,TY\e(B" vowel)

-    ("7"  "\e,TV\e(B" vowel)        ("&"  "\e0\e,TQi\e1\e(B" vowel)
+    ("7"  "\e,TV\e(B" vowel)        ("&"  "\e0\e,TQi\e(B\e1" vowel)

     ("8"  "\e,T$\e(B" consonant)    ("*"  "\e,Tu\e(B")
     ("9"  "\e,T5\e(B" consonant)    ("("  "\e,Tv\e(B")
     ("0"  "\e,T(\e(B" consonant)    (")"  "\e,Tw\e(B")
     ("8"  "\e,T$\e(B" consonant)    ("*"  "\e,Tu\e(B")
     ("9"  "\e,T5\e(B" consonant)    ("("  "\e,Tv\e(B")
     ("0"  "\e,T(\e(B" consonant)    (")"  "\e,Tw\e(B")