From: handa Date: Mon, 31 Aug 2009 06:34:01 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: REL-1-6-2~33 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d676db43f25d2bda9955e4f8573f7df25d856b5b;p=m17n%2Fm17n-docs.git *** empty log message *** --- diff --git a/Makefile.am b/Makefile.am index bdc7b6a..cda5967 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,8 +95,8 @@ SRCALL = \ data/m17n-config.txt data/m17n-db.txt data/exprog.txt \ data/dbformat.txt data/dbdata.txt data/dbtutorial.txt fdl.txt -DBDATA = $(shell echo @M17NDB@/*.{dir,fst,tbl} @M17NDB@/MIM/*.mim @M17NDB@/FLT/*.flt @M17NDB@/LANGDATA/LANGUAGE.tbl) -DBIMAGE = $(shell echo images/*.png images/*.eps) +DBDATA = $(shell ls @M17NDB@/*.{dir,fst,tbl} @M17NDB@/MIM/*.mim @M17NDB@/FLT/*.flt @M17NDB@/LANGDATA/LANGUAGE.tbl) +DBIMAGE = $(shell ls images/*.png images/*.eps) HTML_USR_TARGET = usr/html/index.html usr/html/parrot.png HTML_JA_TARGET = ja/html/index.html ja/html/parrot.png @@ -141,7 +141,7 @@ doxyfile: Makefile -e '/^OUTPUT_DIRECTORY / s/=.*/= %USR_JA_DEV%/' \ -e '/^OUTPUT_LANGUAGE / s/=.*/= %OUTPUT_LANGUAGE%/' \ -e '/^OPTIMIZE_OUTPUT_FOR_C / s/=.*/= YES/' \ - -e '/^EXTRAXT_ALL / s/=.*/= YES/' \ + -e '/^EXTRACT_ALL / s/=.*/= NO/' \ -e '/^SHOW_INCLUDE_FILES / s/=.*/= NO/' \ -e '/^SHOW_MEMBER_DOCS / s/=.*/= NO/' \ -e '/^ENABLED_SECTIONS / s/=.*/= %ENABLED_SECTIONS%/' \ @@ -156,9 +156,8 @@ doxyfile: Makefile -e '/^ALPHABETICAL_INDEX / s/=.*/= YES/' \ -e '/^IGNORE_PREFIX / s/=.*/= m M/' \ -e '/^GENERATE_HTML / s/=.*/= %GENERATE_HTML%/' \ - -e '/^HTML_HEADER / s/=.*/= header.%USR_JA_DEV%.html/' \ -e '/^HTML_FOOTER / s/=.*/= footer.%USR_JA_DEV%.html/' \ - -e '/^DISABLE_INDEX / s/=.*/= YES/' \ + -e '/^DISABLE_INDEX / s/=.*/= NO/' \ -e '/^ENUM_VALUES_PER_LINE / s/=.*/= 1/' \ -e '/^GENERATE_LATEX / s/=.*/= %GENERATE_LATEX%/' \ -e '/^EXTRA_PACKAGES / s/=.*/= m17n-lib times/' \ @@ -285,7 +284,7 @@ data/m17n-db.txt: @M17NDB@/m17n-db.in rm -f `dirname $@`/*.html ${DOXYGEN} $< cp images/icon-*.png `dirname $@` - cd `dirname $@`; rm -f *_8c* *_8h* *_8txt* dirs.html dir_* files.html +# cd `dirname $@`; rm -f *_8c* *_8h* *_8txt* dirs.html dir_* files.html echo 'code { font-weight: bold }' >> `dirname $@`/doxygen.css %/html/parrot.png: parrot.png @@ -333,22 +332,26 @@ sample/man3/SampleGroup.3: sample.c ${DOXYGEN} doxytemp rm -rf doxytemp -man/man1/%: usr/man/man1/% sample/man3/SampleGroup.3 utils/mkman.rb +man/man1/%: usr/man/man1/% sample/man3/SampleGroup.3 utils/mkman.rb \ + utils/reform-man.sh $(mkinstalldirs) man/man1 rm -rf doxywork man/man1/* ruby utils/mkman.rb 1 usr/man/man1 man/man1 + utils/reform-man.sh man/man1/*.1 -man/man3/%: usr/man/man3/% sample/man3/SampleGroup.3 utils/mkman.rb \ - utils/reform-man3.sh utils/reform-man3.awk +man/man3/%: usr/man/man3/% sample/man3/SampleGroup.3 utils/mkman.rb \ + utils/reform-man.sh $(mkinstalldirs) man/man3 rm -rf doxywork man/man3/* ruby utils/mkman.rb 3m17n usr/man/man3m17n man/man3 - utils/reform-man3.sh man/man3 + utils/reform-man.sh man/man3/*.3m17n -man/man5/%: usr/man/man5/% sample/man3/SampleGroup.3 utils/mkman.rb +man/man5/%: usr/man/man5/% sample/man3/SampleGroup.3 utils/mkman.rb \ + utils/reform-man.sh $(mkinstalldirs) man/man5 rm -rf doxywork man/man5/* ruby utils/mkman.rb 5 usr/man/man5 man/man5 + utils/reform-man.sh man/man5/*.5 man/ja/man1/%: ja/man/man1/% sample/man3/SampleGroup.3 utils/mkman.rb $(mkinstalldirs) man/ja/man1 @@ -365,7 +368,7 @@ man/ja/man5/%: ja/man/man5/% sample/man3/SampleGroup.3 utils/mkman.rb rm -rf doxywork man/ja/man5/* ruby utils/mkman.rb 5 ja/man/man5 man/ja/man5 -CLEANFILES=doxyfile-* ${TARGET} *.tar.gz warning *~ +CLEANFILES=doxyfile* ${TARGET} *.tar.gz warning *~ clean-local: rm -rf usr dev ja man doxywork diff --git a/configure.ac b/configure.ac index d641bd6..1140cba 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. AC_INIT(m17n-docs, 1.5.2, bugs-m17n-lib@m17n.org) -AM_INIT_AUTOMAKE(m17n-docs, 1.5.2) +AM_INIT_AUTOMAKE([-Wno-portability]) AM_MAINTAINER_MODE diff --git a/footer.ja.html b/footer.ja.html index 8d5bffa..f2bb87a 100644 --- a/footer.ja.html +++ b/footer.ja.html @@ -23,24 +23,16 @@ diff --git a/footer.usr.html b/footer.usr.html index 0a8c091..6d5821c 100644 --- a/footer.usr.html +++ b/footer.usr.html @@ -31,7 +31,7 @@ This file is part of the m17n library documentation. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no -Invariant Section, Front-Cover Texts "The m17n library documentation", +Invariant Section, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the appendix entitled "GNU Free Documentation License". --> diff --git a/mainpage.txt b/mainpage.txt index 988aeeb..d2eb58a 100644 --- a/mainpage.txt +++ b/mainpage.txt @@ -265,8 +265,9 @@ Copyright (C) 2001-2007 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no -Invariant Section, Front-Cover Texts "The m17n library documentation", -and no Back-Cover Texts. A copy of the license is included in the -appendix entitled "GNU Free Documentation License". +Invariant Section, no Front-Cover Texts, and no Back-Cover Texts. A +copy of the license is included in the appendix entitled "GNU Free +Documentation License". + @endhtmlonly */ diff --git a/manhead b/manhead index fd63b86..079ad0a 100644 --- a/manhead +++ b/manhead @@ -5,6 +5,6 @@ .\" Permission is granted to copy, distribute and/or modify this document .\" under the terms of the GNU Free Documentation License, Version 1.2 or .\" any later version published by the Free Software Foundation; with no -.\" Invariant Section, Front-Cover Texts "The m17n library documentation", +.\" Invariant Section, no Front-Cover Texts, .\" and no Back-Cover Texts. A copy of the license is included in the .\" appendix entitled "GNU Free Documentation License". diff --git a/utils/dbdata.sh b/utils/dbdata.sh index f2095de..b0ef438 100755 --- a/utils/dbdata.sh +++ b/utils/dbdata.sh @@ -3,8 +3,8 @@ IMDOC=`pwd`/utils/imdoc set `ls $1/$2` -FILE=$1 -while shift 1; do +while [ $# -ge 1 ] ; do + FILE=$1 IM=`grep '^(input-method' $FILE` if test -n "$IM"; then if grep -q '^;;;' $FILE; then @@ -50,5 +50,5 @@ while shift 1; do echo sed -n -e '/^;;;/ p' $FILE | sed -e '/^[^;]/ s/$/
/' -e '/^;;;/ s/^;;; *//' fi - FILE=$1 + shift done diff --git a/utils/imdoc.c b/utils/imdoc.c index 644f250..974d4ca 100644 --- a/utils/imdoc.c +++ b/utils/imdoc.c @@ -122,11 +122,17 @@ main (int argc, char **argv) NULL, NULL, NULL); char *base; char cmd[1024]; + int result; base = basename (strdup (iconfile)); sprintf (cmd, "convert -resize 50%% %s images/icon-%s", iconfile, base); - system (cmd); + result = system (cmd); + if (result != 0) + { + fprintf (stderr, "Command fail: %s", cmd); + exit (1); + } printf (" icon:\n", base); } else diff --git a/utils/latex.sh b/utils/latex.sh index 5236482..e424dac 100755 --- a/utils/latex.sh +++ b/utils/latex.sh @@ -31,7 +31,7 @@ elif [ $USR_JA_DEV = "dev" ] ; then < refman.tex > ${SOURCE}.tex else SOURCE=m17n-lib - echo '\appendix' > app.tex + echo '\\appendix' > app.tex sed -n -e '/Print compile/,/GFDL/ p' < refman.tex >> app.tex sed -e '/documentclass/ s/a4paper/a4paper,twoside/' \ -e '/Print compile/,/GFDL/ d' \ diff --git a/utils/usr_filter.rb b/utils/usr_filter.rb index cade553..6b5c51a 100755 --- a/utils/usr_filter.rb +++ b/utils/usr_filter.rb @@ -45,6 +45,11 @@ while gets commentblock(buf) buf = [] + when /\/\* @[{}] \*\// # /* comment */ type comment + commentblock(buf) + buf = [] + print($_) + when /^\/\*\s.*\*\// # /* comment */ type comment # if doxy == 1 # # should be included only in the example code