From: handa <handa>
Date: Tue, 19 Aug 2003 13:21:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: XML-base~93
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=659fee2c820e492683eddc58bf8df23f8f5c47f1;p=m17n%2Fm17n-docs.git

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

diff --git a/Makefile.am b/Makefile.am
index 3199b08..d7d8665 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,9 @@ install-pkgdataDATA: $(pkgdata_DATA)
 	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi
 	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps
 	cd usr/html; \
-	  for f in *.html; do $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; done
-	cd usr/html; \
-	  for f in *.png; do $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; done
+	  for f in *.html *.png; do \
+	    $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \
+	  done
 	cd man/man1; \
 	  for f in *.1; do $(INSTALL_DATA) $$f $(mandir)/man1/$$f; done
 	cd man/man3; \
@@ -93,11 +93,9 @@ SRCALL = \
 	mainpage.txt \
 	${MAN3} \
 	data/m17n-config.txt data/exprog.txt data/exmim.txt data/dbformat.txt \
-	data/db-mim.txt data/db-flt.txt
-
-DB_MIM = $(shell echo @M17NDB@/*.mim)
+	data/dbdata.txt
 
-DB_FLT = $(shell echo @M17NDB@/*.flt)
+DBDATA = $(shell echo @M17NDB@/*.mim @M17NDB@/*.flt)
 
 HTML_USR_TARGET = usr/html/index.html usr/html/parrot.png
 HTML_JA_TARGET = ja/html/index.html ja/html/parrot.png
@@ -134,7 +132,7 @@ html: usr-html ja-html dev-html
 latex: usr-latex ja-latex dev-latex
 man: usr-man ja-man
 
-doxyfile-html: doxyfile
+doxyfile-html: doxyfile Makefile
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${SRCALL}|' \
 	    -e 's|%GENERATE_HTML%|YES|' \
@@ -225,11 +223,8 @@ data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
 data/exmim.txt: ${EXAMPLE_MIMS} utils/exmim.sh
 	utils/exmim.sh ${EXAMPLE_MIMS} > $@
 
-data/db-mim.txt: ${DB_MIM} utils/db-mim.sh
-	utils/db-mim.sh ${DB_MIM} > $@
-
-data/db-flt.txt: ${DB_FLT} utils/db-flt.sh
-	utils/db-flt.sh ${DB_FLT} > $@
+data/dbdata.txt: ${DBDATA} utils/dbdata.sh
+	utils/dbdata.sh @M17NDB@ > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
 	utils/dbformat.sh ${DBFORMAT}/*.txt > $@
diff --git a/utils/db-flt.sh b/utils/db-flt.sh
index 645df4f..5227fda 100755
--- a/utils/db-flt.sh
+++ b/utils/db-flt.sh
@@ -11,17 +11,18 @@ databasse and their brief descriptions.  */
 M17N ¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Ä󶡤¹¤ë Font Layout Table (FLT) ¤Î¥ê¥¹¥È¤È¤½¤ì¤¾¤ì
 ¤Î´Êñ¤ÊÀâÌÀ¡£ */
 
-/*** <ul> */
+/***
+<ul>
 EOF
 
 for file in $*; do
-  echo "/***"
-  sed -n '/^;; <li>/,/^$/p' < $file
-  echo "*/"
+  sed -n '/^;; <li>/,/^$/ s/^;; *//p' < $file
+  echo
 done
 
 cat <<EOF
-/*** </ul> */
+</ul>
+*/
 EOF
 
 # Local Variables:
diff --git a/utils/db-mim.sh b/utils/db-mim.sh
index 17a7d41..7584bee 100755
--- a/utils/db-mim.sh
+++ b/utils/db-mim.sh
@@ -9,15 +9,18 @@ their brief descriptions.  */
 /***ja @page m17nDBMIM M17N ¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Ä󶡤¹¤ëÆþÎϥ᥽¥Ã¥É
 
 M17N ¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Ä󶡤¹¤ëÆþÎϥ᥽¥Ã¥É¤Î¥ê¥¹¥È¤È¤½¤ì¤¾¤ì¤Î´Êñ¤ÊÀâÌÀ¡£ */
-/*** <ul> */
+/***
+<ul>
 EOF
 
 for file in $*; do
-  sed -n '/^;; \/\*\*\*/,/^;; \*\//s/^;; *//p' < $file
+  sed -n '/^;; <li>/,/^$/ s/^;; *//p' < $file
+  echo
 done
 
 cat <<EOF
-/*** </ul> */
+</ul>
+*/
 EOF
 
 # Local Variables: