From: handa <handa>
Date: Tue, 26 Sep 2006 06:36:52 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: XML-base~33
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=064fd1eaad8494b7f61c0904329d3048690134fa;p=m17n%2Fm17n-docs.git

*** empty log message ***
---

diff --git a/Makefile.am b/Makefile.am
index 2057184..f82cc65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,8 @@
 
 ## Process this file with Automake to create Makefile.in
 
+SUBDIRS = utils
+
 pkgdata_DATA = \
 	usr/html/index.html \
 	usr/latex/m17n-lib.dvi usr/latex/m17n-lib.ps \
@@ -224,7 +226,8 @@ doxyfile-man%.usr: doxyfile-man%
 data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
 	utils/exprog.sh ${EXAMPLE_PROGS} > $@
 
-data/dbdata.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.dir utils/dbdata.awk utils/dbdata.sh
+data/dbdata.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.dir utils/dbdata.awk utils/dbdata.sh utils/imdoc.c
+	(cd utils; make)
 	@AWK@ -f utils/dbdata.awk @M17NDB@/mdb.dir > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
@@ -252,7 +255,7 @@ data/m17n-db.txt: @M17NDB@/m17n-db.in
 	cd `dirname $@`; rm -f *_8c* *_8h* *_8txt* dirs.tex dir_* files.tex
 
 %/latex/m17n-lib.dvi: %/latex/refman.tex styles/m17n-lib.sty utils/latex.sh
-	utils/latex.sh `dirname $@` latex
+	-utils/latex.sh `dirname $@` latex
 
 %/latex/m17n-lib.ps: %/latex/m17n-lib.dvi utils/dvips.sh
 	utils/dvips.sh `dirname $@` dvips
diff --git a/configure.ac b/configure.ac
index ad455ed..6c68e62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(m17n-docs, 1.3.0, bugs-m17n-lib@m17n.org)
-AM_INIT_AUTOMAKE(m17n-docs, 1.3.0)
+AC_INIT(m17n-docs, 1.3.4, bugs-m17n-lib@m17n.org)
+AM_INIT_AUTOMAKE(m17n-docs, 1.3.4)
 
 AM_MAINTAINER_MODE
 
 # Checks for programs.
+AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_AWK
 
@@ -44,6 +45,10 @@ else :
 fi
 AC_SUBST(M17NDB)
 
+PKG_CHECK_MODULES(M17N, m17n-shell)
+AC_SUBST(M17N_CFLAGS)
+AC_SUBST(M17N_LIBS)
+
 AC_CHECK_PROG(HAVEDOXYGEN, doxygen, yes, no)
 AC_CHECK_PROG(RUBY, ruby, yes, no)
 AC_CHECK_PROG(LATEX, latex, yes, no)
@@ -72,7 +77,7 @@ fi
 
 fi
 
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES([Makefile utils/Makefile])
 AC_OUTPUT
 
 # Print configuration message.
diff --git a/utils/dbdata.sh b/utils/dbdata.sh
index bb744db..d3125fb 100755
--- a/utils/dbdata.sh
+++ b/utils/dbdata.sh
@@ -1,23 +1,33 @@
 #!/bin/sh
 
+IMDOC=`pwd`/utils/imdoc
+
 cd $1
 set `ls $2`
 FILE=$1
 while shift 1; do
-    sed -n -e '/^(input-method/s/(input-method \([^ ]*\) \([^ )]*\)\( \([^)]*\)\)*)/\1 \2 \4/p' $FILE | (read LANG NAME EXTRA
-	if test -z "NAME"; then
-	    NAME=$EXTRA
-	fi
-	if test "$LANG" = "t"; then
-	    LANG=generic
-	fi
-	if test "$NAME" = "nil"; then
-	    echo "<li> $FILE (extra-name:$EXTRA, only for inclusion)"
+    IM=`grep '^(input-method' $FILE`
+    if test -n "$IM"; then
+	sed -n -e '/^(input-method/s/(input-method \([^ ]*\) \([^ )]*\)\( \([^)]*\)\)*)/\1 \2 \4/p' $FILE | (read LANG NAME EXTRA
+	    if test -z "NAME"; then
+		NAME=$EXTRA
+	    fi
+	    if test "$LANG" = "t"; then
+		LANG=generic
+	    fi
+	    if test "$NAME" = "nil"; then
+		echo "<li> $FILE (extra-name:$EXTRA, only for inclusion)"
+	    else
+		echo "<li> $FILE (language:$LANG name:$NAME)"
+	    fi)
+	if grep -q '^;;;' $FILE; then
+            sed -n -e '/^;;;/ p' $FILE | sed -e '/^[^;]/ s/$/<br>/' -e '/^;;;/ s/^;;; *//' | sed -e 's,^||,<tr><td align="center">,' -e 's,||$,</td></tr>,' -e 's,|,</td><td align="center">,g'
 	else
-	    echo "<li> $FILE (language:$LANG name:$NAME)"
+	    $IMDOC $FILE "$IM"
 	fi
-    )
-    echo
-    sed -n -e '/^;;;/ p' -e '/^(description "/,/^")/ s/^(description "\|^")\|\\\|$//gp' $FILE | sed -e '/^[^;]/ s/$/<br>/' -e '/^;;;/ s/^;;; *//'
+    else
+	echo
+	sed -n -e '/^;;;/ p' $FILE | sed -e '/^[^;]/ s/$/<br>/' -e '/^;;;/ s/^;;; *//'
+    fi
     FILE=$1
 done
diff --git a/utils/imdoc.c b/utils/imdoc.c
index 8265e6c..3226417 100644
--- a/utils/imdoc.c
+++ b/utils/imdoc.c
@@ -50,7 +50,7 @@ main (int argc, char **argv)
     printf ("<li> %s (extra-name:%s, only for inclusion)\n", file, argv[4]);
 #endif
   printf ("@verbatim\n");
-  mconv_encode_stream (msymbol ("euc-jp"), mt, stdout);
+  mconv_encode_stream (msymbol ("utf-8"), mt, stdout);
   printf ("\n@endverbatim\n");
 
   M17N_FINI ();