*** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index 447ee44..09c5f13 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Makefile.am -- Makefile for the m17n library documentation.
 # Makefile.am -- Makefile for the m17n library documentation.

-# Copyright (C) 2003, 2004, 2005, 2006
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009

 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H15PRO112
 
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H15PRO112
 

@@ -27,22 +27,21 @@ SUBDIRS = utils
 
 pkgdata_DATA = \
        usr/html/index.html \
 
 pkgdata_DATA = \
        usr/html/index.html \

-       usr/latex/m17n-lib.dvi usr/latex/m17n-lib.ps \
+       usr/latex/m17n-lib.ps \

        man/man1/m17n-config.1 \
        man/man3/m17nIntro.3m17n \
        man/man5/mdbGeneral.5
 
 pkgdatadir = $(datadir)/m17n/docs
 
        man/man1/m17n-config.1 \
        man/man3/m17nIntro.3m17n \
        man/man5/mdbGeneral.5
 
 pkgdatadir = $(datadir)/m17n/docs
 

-EXTRA_DIST = usr/html usr/latex/m17n-lib.dvi usr/latex/m17n-lib.ps \
-       man/man1 man/man3 man/man5 \
-       ja/html ja/latex/m17n-lib-ja.dvi ja/latex/m17n-lib-ja.ps
+EXTRA_DIST = usr/html ja/html \
+       usr/latex ja/latex \
+       man/man1 man/man3 man/man5

 
 install-pkgdataDATA: $(pkgdata_DATA)
        $(mkinstalldirs) $(pkgdatadir)/html
        $(mkinstalldirs) $(mandir)/man1 $(mandir)/man3 $(mandir)/man5
 
 install-pkgdataDATA: $(pkgdata_DATA)
        $(mkinstalldirs) $(pkgdatadir)/html
        $(mkinstalldirs) $(mandir)/man1 $(mandir)/man3 $(mandir)/man5

-       $(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi
-       $(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps
+       $(INSTALL_DATA) usr/latex/m17n-lib.pdf $(pkgdatadir)/m17n-lib.pdf

        cd usr/html; \
          for f in *.html *.png; do \
            $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \
        cd usr/html; \
          for f in *.html *.png; do \
            $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \

@@ -107,9 +106,9 @@ usr-html html-usr: ${HTML_USR_TARGET}
 ja-html html-ja: ${HTML_JA_TARGET}
 dev-html html-dev: ${HTML_DEV_TARGET}
 
 ja-html html-ja: ${HTML_JA_TARGET}
 dev-html html-dev: ${HTML_DEV_TARGET}
 

-LATEX_USR_TARGET = usr/latex/m17n-lib.dvi usr/latex/m17n-lib.ps
-LATEX_JA_TARGET = ja/latex/m17n-lib.dvi ja/latex/m17n-lib.ps
-LATEX_DEV_TARGET = dev/latex/m17n-lib.dvi dev/latex/m17n-lib.ps
+LATEX_USR_TARGET = usr/latex/m17n-lib.dvi usr/latex/m17n-lib.pdf
+LATEX_JA_TARGET = ja/latex/m17n-lib.dvi ja/latex/m17n-lib.pdf
+LATEX_DEV_TARGET = dev/latex/m17n-lib.dvi dev/latex/m17n-lib.pdf

 LATEX_TARGET = ${LATEX_USR_TARGET} ${LATEX_JA_TARGET} ${LATEX_DEV_TARGET}
 
 usr-latex latex-usr: ${LATEX_USR_TARGET}
 LATEX_TARGET = ${LATEX_USR_TARGET} ${LATEX_JA_TARGET} ${LATEX_DEV_TARGET}
 
 usr-latex latex-usr: ${LATEX_USR_TARGET}

@@ -140,8 +139,9 @@ doxyfile: Makefile
              -e '/^PROJECT_NUMBER / s/=.*/= %PROJECT_NUMBER%/' \
              -e '/^OUTPUT_DIRECTORY / s/=.*/= %USR_JA_DEV%/' \
              -e '/^OUTPUT_LANGUAGE / s/=.*/= %OUTPUT_LANGUAGE%/' \
              -e '/^PROJECT_NUMBER / s/=.*/= %PROJECT_NUMBER%/' \
              -e '/^OUTPUT_DIRECTORY / s/=.*/= %USR_JA_DEV%/' \
              -e '/^OUTPUT_LANGUAGE / s/=.*/= %OUTPUT_LANGUAGE%/' \

+             -e '/^FULL_PATH_NAMES / s/=.*/= NO/' \

              -e '/^OPTIMIZE_OUTPUT_FOR_C / s/=.*/= YES/' \
              -e '/^OPTIMIZE_OUTPUT_FOR_C / s/=.*/= YES/' \

-             -e '/^EXTRACT_ALL / s/=.*/= NO/' \
+             -e '/^EXTRACT_ALL / s/=.*/= YES/' \

              -e '/^SHOW_INCLUDE_FILES / s/=.*/= NO/' \
              -e '/^SHOW_MEMBER_DOCS / s/=.*/= NO/' \
              -e '/^ENABLED_SECTIONS / s/=.*/= %ENABLED_SECTIONS%/' \
              -e '/^SHOW_INCLUDE_FILES / s/=.*/= NO/' \
              -e '/^SHOW_MEMBER_DOCS / s/=.*/= NO/' \
              -e '/^ENABLED_SECTIONS / s/=.*/= %ENABLED_SECTIONS%/' \

@@ -168,6 +168,8 @@ doxyfile: Makefile
              -e '/^PREDEFINED / s/=.*/= FOR_DOXYGEN/' \
              -e '/^GENERATE_TAGFILE / s/=.*/= m17n.tag/' \
              -e '/^TYPEDEF_HIDES_STRUCT / s/=.*/= YES/' \
              -e '/^PREDEFINED / s/=.*/= FOR_DOXYGEN/' \
              -e '/^GENERATE_TAGFILE / s/=.*/= m17n.tag/' \
              -e '/^TYPEDEF_HIDES_STRUCT / s/=.*/= YES/' \

+             -e '/^DOT_FONTNAME / s/=.*/=/' \
+             -e '/^SORT_MEMBER_DOCS / s/=.*/= NO/' \

              > $@
 
 doxyfile-html: doxyfile ${SRCALL}
              > $@
 
 doxyfile-html: doxyfile ${SRCALL}

@@ -176,7 +178,7 @@ doxyfile-html: doxyfile ${SRCALL}
            -e 's|%GENERATE_HTML%|YES|' \
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|NO|' \
            -e 's|%GENERATE_HTML%|YES|' \
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|NO|' \

-           -e 's|%ENABLED_SECTIONS%|FOR-HTML|' \
+           -e 's|%ENABLED_SECTIONS%|FOR_HTML|' \

          < $< >$@
 
 doxyfile-html.usr: doxyfile-html
          < $< >$@
 
 doxyfile-html.usr: doxyfile-html

@@ -203,7 +205,7 @@ doxyfile-latex: doxyfile ${SRCALL}
            -e 's|%GENERATE_HTML%|NO|' \
            -e 's|%GENERATE_LATEX%|YES|' \
            -e 's|%GENERATE_MAN%|NO|' \
            -e 's|%GENERATE_HTML%|NO|' \
            -e 's|%GENERATE_LATEX%|YES|' \
            -e 's|%GENERATE_MAN%|NO|' \

-           -e 's|%ENABLED_SECTIONS%|FOR-LATEX|' \
+           -e 's|%ENABLED_SECTIONS%|FOR_LATEX|' \

          < $< >$@
 
 doxyfile-latex.usr: doxyfile-latex
          < $< >$@
 
 doxyfile-latex.usr: doxyfile-latex

@@ -231,7 +233,7 @@ doxyfile-man1: doxyfile ${SRCALL}
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|YES|' \
            -e 's|%MAN_EXTENSION%|.1|' \
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|YES|' \
            -e 's|%MAN_EXTENSION%|.1|' \

-           -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
+           -e 's|%ENABLED_SECTIONS%|FOR_MAN|' \

          < $< >$@
 
 doxyfile-man3: doxyfile ${SRCALL}
          < $< >$@
 
 doxyfile-man3: doxyfile ${SRCALL}

@@ -241,7 +243,7 @@ doxyfile-man3: doxyfile ${SRCALL}
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|YES|' \
            -e 's|%MAN_EXTENSION%|.3m17n|' \
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|YES|' \
            -e 's|%MAN_EXTENSION%|.3m17n|' \

-           -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
+           -e 's|%ENABLED_SECTIONS%|FOR_MAN|' \

          < $< >$@
 
 doxyfile-man5: doxyfile ${SRCALL}
          < $< >$@
 
 doxyfile-man5: doxyfile ${SRCALL}

@@ -251,7 +253,7 @@ doxyfile-man5: doxyfile ${SRCALL}
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|YES|' \
            -e 's|%MAN_EXTENSION%|.5|' \
            -e 's|%GENERATE_LATEX%|NO|' \
            -e 's|%GENERATE_MAN%|YES|' \
            -e 's|%MAN_EXTENSION%|.5|' \

-           -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
+           -e 's|%ENABLED_SECTIONS%|FOR_MAN|' \

          < $< >$@
 
 doxyfile-man%.usr: doxyfile-man%
          < $< >$@
 
 doxyfile-man%.usr: doxyfile-man%

@@ -284,7 +286,6 @@ data/m17n-db.txt: @M17NDB@/m17n-db.in
        rm -f `dirname $@`/*.html
        ${DOXYGEN} $<
        cp images/icon-*.png `dirname $@`
        rm -f `dirname $@`/*.html
        ${DOXYGEN} $<
        cp images/icon-*.png `dirname $@`

-#      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
        echo 'code { font-weight: bold }' >> `dirname $@`/doxygen.css
 
 %/html/parrot.png: parrot.png

@@ -293,17 +294,16 @@ data/m17n-db.txt: @M17NDB@/m17n-db.in
 %/latex/refman.tex: doxyfile-latex.% ${SRCALL} utils/%_filter.rb
        rm -rf `dirname $@`
        ${DOXYGEN} $<
 %/latex/refman.tex: doxyfile-latex.% ${SRCALL} utils/%_filter.rb
        rm -rf `dirname $@`
        ${DOXYGEN} $<

-       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
 
 %/latex/m17n-lib.dvi: %/latex/refman.tex styles/m17n-lib.sty utils/latex.sh

-       -utils/latex.sh `dirname $@` latex
+       -utils/latex.sh `dirname $@`

 
 %/latex/m17n-lib.ps: %/latex/m17n-lib.dvi utils/dvips.sh
        utils/dvips.sh `dirname $@` dvips
 #      emacs -batch -q -l utils/mokuji.el -f write-mokuji $@
 
 
 %/latex/m17n-lib.ps: %/latex/m17n-lib.dvi utils/dvips.sh
        utils/dvips.sh `dirname $@` dvips
 #      emacs -batch -q -l utils/mokuji.el -f write-mokuji $@
 

-%/latex/m17n-lib.pdf: %/latex/m17n-lib.tex data-%/m17n-lib.sty utils/latex.sh
-       utils/latex.sh `dirname $@` pdflatex
+%/latex/m17n-lib.pdf: %/latex/m17n-lib.dvi
+       cd `dirname $<`; dvipdfmx `basename $<`

 
 %/man/man1/m17n-config.1: doxyfile-man1.% ${MAN1} utils/%_filter.rb
        rm -rf `dirname $@`
 
 %/man/man1/m17n-config.1: doxyfile-man1.% ${MAN1} utils/%_filter.rb
        rm -rf `dirname $@`

@@ -368,23 +368,27 @@ 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
 
        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} data/*.txt *.tar.gz warning *~

 
 clean-local:
        rm -rf usr dev ja man doxywork
 
 
 clean-local:
        rm -rf usr dev ja man doxywork
 

+dist-tgz: distdir
+       for d in usr ja; do \
+         (cd $(distdir)/"$$d"/latex/; \
+          rm -f *8[ch]* *8txt* *.aux *.ttf *.ind *.dvi *.idx *.ilg *.log); \
+       done
+       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+       $(am__remove_distdir)
+

 WEBDIR = /project/web/extra/m17n-lib
 
 WEBDIR = /project/web/extra/m17n-lib
 

-release: dist
+release: dist-tgz

        [ -d ${WEBDIR}/m17n-docs ] || mkdir ${WEBDIR}/m17n-docs
        [ -d ${WEBDIR}/download ] || mkdir ${WEBDIR}/download
        [ -d ${WEBDIR}/m17n-docs ] || mkdir ${WEBDIR}/m17n-docs
        [ -d ${WEBDIR}/download ] || mkdir ${WEBDIR}/download

-       cd usr/html; for f in *; do \
-         case $$f in *8c*);; *8h*);; *8txt*);; dirs.html);; dir_*);; files.html);; *) cp $$f ${WEBDIR}/m17n-docs;; esac; \
-       done
+       cd usr/html; cp * ${WEBDIR}/m17n-docs

        [ -d ${WEBDIR}-ja2/m17n-docs ] || mkdir ${WEBDIR}-ja2/m17n-docs
        [ -d ${WEBDIR}-ja2/m17n-docs ] || mkdir ${WEBDIR}-ja2/m17n-docs

-       cd ja/html; for f in *; do \
-         case $$f in *8c*);; *8h*);; *8txt*);; dirs.html);; dir_*);; files.html);; *) cp $$f ${WEBDIR}-ja2/m17n-docs;; esac; \
-       done
+       cd ja/html; cp * ${WEBDIR}-ja2/m17n-docs

        cp ${distdir}.tar.gz ${WEBDIR}/download
 
 
        cp ${distdir}.tar.gz ${WEBDIR}/download
 
 

diff --git a/README b/README
index 9ee1f22..96b6db2 100644 (file)
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ The default installation path ${prefix} is "/usr/local",
 the default data installation path ${datadir} is "${prefix}/share",
 and the default man installation path ${mandir} is "${prefix}/man".
 
 the default data installation path ${datadir} is "${prefix}/share",
 and the default man installation path ${mandir} is "${prefix}/man".
 

-o LaTeX documents (m17n-lib.dvi and m17n-lib.ps) are installed in
+o PDF documents (m17n-lib.pdf and m17n-lib-ja.pdf) are installed in

   "${datadir}/m17n/docs".
        
 o HTML files are installed in "${datadir}/m17n/docs/html".
   "${datadir}/m17n/docs".
        
 o HTML files are installed in "${datadir}/m17n/docs/html".

@@ -33,15 +33,22 @@ Note: Although this package contains Japanese translation of HTML and
 LaTeX files, they are not installed by the above procedure.  Please
 install the following files manually if you need them:
        ja/html/*.html
 LaTeX files, they are not installed by the above procedure.  Please
 install the following files manually if you need them:
        ja/html/*.html

-       ja/latex/m17n-lib-ja.dvi
-       ja/latex/m17n-lib-ja.ps
+       ja/latex/m17n-lib.pdf
+
+If you want to re-generate a PDF file, do this:
+       % cd usr/latex          (or cd ja/latex)
+       % latex m17n-lib        (or platex m17n-lib)
+       % makeindex m17n-lib
+       % latex m17n-lib        (or platex m17n-lib)
+       % latex m17n-lib        (or platex m17n-lib)
+       % dvipdfmx m17n-lib

 
 See the file INSTALL for more detail.
 
 ----------------------------------------------------------------------
 Copyright information
 
 
 See the file INSTALL for more detail.
 
 ----------------------------------------------------------------------
 Copyright information
 

-Copyright (C) 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009

   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H15PRO112
 
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H15PRO112
 

diff --git a/configure.ac b/configure.ac
index 1140cba..23e14fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
 # Process this file with autoconf to produce a configure script.

-AC_INIT(m17n-docs, 1.5.2, bugs-m17n-lib@m17n.org)
+AC_INIT(m17n-docs, 1.5.5, bugs-m17n-lib@m17n.org)

 AM_INIT_AUTOMAKE([-Wno-portability])
 
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE([-Wno-portability])
 
 AM_MAINTAINER_MODE

@@ -90,8 +90,7 @@ eval dir=${datadir}
 AC_MSG_NOTICE([-------------------------------------------])
 AC_MSG_NOTICE([Install documentations in these directories])
 AC_MSG_NOTICE([-------------------------------------------])
 AC_MSG_NOTICE([-------------------------------------------])
 AC_MSG_NOTICE([Install documentations in these directories])
 AC_MSG_NOTICE([-------------------------------------------])

-AC_MSG_NOTICE([  m17n-lib.dvi:  ${dir}/m17n/docs])
-AC_MSG_NOTICE([  m17n-lib.ps:   ${dir}/m17n/docs])
+AC_MSG_NOTICE([  m17n-lib.pdf:  ${dir}/m17n/docs])

 AC_MSG_NOTICE([  html files:    ${dir}/m17n/docs/html])
 eval dir=${mandir}
 AC_MSG_NOTICE([  man files:     ${dir}])
 AC_MSG_NOTICE([  html files:    ${dir}/m17n/docs/html])
 eval dir=${mandir}
 AC_MSG_NOTICE([  man files:     ${dir}])

diff --git a/images/bopo-kbd.png b/images/bopo-kbd.png
index 980e88f..30ac203 100644 (file)
Binary files a/images/bopo-kbd.png and b/images/bopo-kbd.png differ

diff --git a/images/el-kbd.png b/images/el-kbd.png
index 3567f76..86003c5 100644 (file)
Binary files a/images/el-kbd.png and b/images/el-kbd.png differ

diff --git a/images/he-kbd.png b/images/he-kbd.png
index 7da97fc..2212964 100644 (file)
Binary files a/images/he-kbd.png and b/images/he-kbd.png differ

diff --git a/images/hr-kbd.png b/images/hr-kbd.png
index 8733cc8..5fd87e9 100644 (file)
Binary files a/images/hr-kbd.png and b/images/hr-kbd.png differ

diff --git a/images/hy-kbd.png b/images/hy-kbd.png
index 28121bb..ec50de8 100644 (file)
Binary files a/images/hy-kbd.png and b/images/hy-kbd.png differ

diff --git a/images/ka-kbd.png b/images/ka-kbd.png
index ceef0a9..7c9b028 100644 (file)
Binary files a/images/ka-kbd.png and b/images/ka-kbd.png differ

diff --git a/images/ka-kbd2.png b/images/ka-kbd2.png
index de99601..f09947b 100644 (file)
Binary files a/images/ka-kbd2.png and b/images/ka-kbd2.png differ

diff --git a/images/kk-kbd.png b/images/kk-kbd.png
index 830adbc..419405c 100644 (file)
Binary files a/images/kk-kbd.png and b/images/kk-kbd.png differ

diff --git a/images/ko-han2.png b/images/ko-han2.png
index 6494b46..cce3885 100644 (file)
Binary files a/images/ko-han2.png and b/images/ko-han2.png differ

diff --git a/images/latn-post.png b/images/latn-post.png
index e3f9b56..fe38329 100644 (file)
Binary files a/images/latn-post.png and b/images/latn-post.png differ

diff --git a/images/latn-pre.png b/images/latn-pre.png
index ca76928..7abb4b3 100644 (file)
Binary files a/images/latn-pre.png and b/images/latn-pre.png differ

diff --git a/images/ru-kbd.png b/images/ru-kbd.png
index cb86fdb..02e93c2 100644 (file)
Binary files a/images/ru-kbd.png and b/images/ru-kbd.png differ

diff --git a/images/ru-phonetic.png b/images/ru-phonetic.png
index 9af88da..a14ce15 100644 (file)
Binary files a/images/ru-phonetic.png and b/images/ru-phonetic.png differ

diff --git a/images/ru-yawerty.png b/images/ru-yawerty.png
index 5c06d1e..a21ce9d 100644 (file)
Binary files a/images/ru-yawerty.png and b/images/ru-yawerty.png differ

diff --git a/images/ru-yawerty2.png b/images/ru-yawerty2.png
index 05bb814..1870763 100644 (file)
Binary files a/images/ru-yawerty2.png and b/images/ru-yawerty2.png differ

diff --git a/images/sk-kbd.png b/images/sk-kbd.png
index 332f220..6dce514 100644 (file)
Binary files a/images/sk-kbd.png and b/images/sk-kbd.png differ

diff --git a/images/sk-kbd2.png b/images/sk-kbd2.png
index f9bd5d4..3d70bee 100644 (file)
Binary files a/images/sk-kbd2.png and b/images/sk-kbd2.png differ

diff --git a/images/sr-kbd.png b/images/sr-kbd.png
index e4c5546..0653d8a 100644 (file)
Binary files a/images/sr-kbd.png and b/images/sr-kbd.png differ

diff --git a/mainpage.txt b/mainpage.txt
index d563c96..db7351b 100644 (file)
--- a/mainpage.txt
+++ b/mainpage.txt
@@ -120,7 +120,7 @@ mandatory but many functions of the m17n library depend on them.
 
      Used for handling local fonts.
 
 
      Used for handling local fonts.
 

-<li> fontconfig -- http://nexp.cs.pdx.edu/fontconfig/
+<li> fontconfig -- http://www.fontconfig.org/

 
      Used for handling local fonts supported by the freetype library.
 
 
      Used for handling local fonts supported by the freetype library.
 

@@ -259,7 +259,7 @@ Information-technology Promotion Agency (IPA)
 @htmlonly
 <hr>
 Copyright (C) 2001 Information-technology Promotion Agency (IPA)<p>
 @htmlonly
 <hr>
 Copyright (C) 2001 Information-technology Promotion Agency (IPA)<p>

-Copyright (C) 2001-2007
+Copyright (C) 2001-2009

   National Institute of Advanced Industrial Science and Technology (AIST)<p>
 
 Permission is granted to copy, distribute and/or modify this document
   National Institute of Advanced Industrial Science and Technology (AIST)<p>
 
 Permission is granted to copy, distribute and/or modify this document

diff --git a/manfoot b/manfoot
index 3334456..8e96537 100644 (file)
--- a/manfoot
+++ b/manfoot
@@ -1,7 +1,7 @@
 .SH COPYRIGHT
 Copyright (C) 2001 Information-technology Promotion Agency (IPA)
 .br
 .SH COPYRIGHT
 Copyright (C) 2001 Information-technology Promotion Agency (IPA)
 .br

-Copyright (C) 2001-2008 National Institute of Advanced Industrial Science and Technology (AIST)
+Copyright (C) 2001-2009 National Institute of Advanced Industrial Science and Technology (AIST)

 .br
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License 
 .br
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License 

diff --git a/manhead b/manhead
index 079ad0a..f161e0d 100644 (file)
--- a/manhead
+++ b/manhead
@@ -1,5 +1,5 @@
 .\" Copyright (C) 2001 Information-technology Promotion Agency (IPA)
 .\" Copyright (C) 2001 Information-technology Promotion Agency (IPA)

-.\" Copyright (C) 2001-2008
+.\" Copyright (C) 2001-2009

 .\"   National Institute of Advanced Industrial Science and Technology (AIST)
 .\" This file is part of the m17n library documentation.
 .\" Permission is granted to copy, distribute and/or modify this document
 .\"   National Institute of Advanced Industrial Science and Technology (AIST)
 .\" This file is part of the m17n library documentation.
 .\" Permission is granted to copy, distribute and/or modify this document

diff --git a/styles/m17n-lib.sty b/styles/m17n-lib.sty
index 1eba4ed..d1fe9f7 100644 (file)
--- a/styles/m17n-lib.sty
+++ b/styles/m17n-lib.sty
@@ -27,14 +27,14 @@
 \thispagestyle{empty}
 \vspace*{\fill}
 Copyright (C) 2001 Information-technology Promotion Agency (IPA)\\
 \thispagestyle{empty}
 \vspace*{\fill}
 Copyright (C) 2001 Information-technology Promotion Agency (IPA)\\

-Copyright (C) 2001-2004  National Institute of Advanced Industrial Science and Technology (AIST)
+Copyright (C) 2001-2009  National Institute of Advanced Industrial Science and Technology (AIST)

 
 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
 
 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, with no Front-Cover Texts, and no Back-Cover Texts.  A
+copy of the license is included in the appendix entitled
+``GNU Free Documentation License''.

 }
 
 %% Run the above hook in the back of the title page.
 }
 
 %% Run the above hook in the back of the title page.

diff --git a/utils/dbdata.sh b/utils/dbdata.sh
index b0ef438..51d88f8 100755 (executable)
--- a/utils/dbdata.sh
+++ b/utils/dbdata.sh
@@ -26,13 +26,13 @@ while [ $# -ge 1 ] ; do
                dir=`dirname $dir`
                icon="$dir/icons/$base.png"
                if [ -f "$icon" ] ; then
                dir=`dirname $dir`
                icon="$dir/icons/$base.png"
                if [ -f "$icon" ] ; then

-                   [ -f "images/icon-$base.png" ] || cp "$icon" "images/icon-$base.png"
+                   [ -f "images/icon-$base.png" ] || convert -resize 50% "$icon" "images/icon-$base.png"

                fi
                HEADER="<li> $base (language:$LNG name:$NAME @htmlonly"
 #              if test -n "$title"; then
 #                  HEADER="$HEADER title:$title"
 #              fi
                fi
                HEADER="<li> $base (language:$LNG name:$NAME @htmlonly"
 #              if test -n "$title"; then
 #                  HEADER="$HEADER title:$title"
 #              fi

-               HEADER2="<img src=\"icon-$base.png\" style=\"vertical-align:middle;\">"
+               HEADER2="<img src=\"icon-$base.png\" border=\"1\" style=\"vertical-align:middle;\">"

                HEADER3="@endhtmlonly"
                HEADER4=")"
            fi
                HEADER3="@endhtmlonly"
                HEADER4=")"
            fi

@@ -41,7 +41,14 @@ while [ $# -ge 1 ] ; do
                echo "$HEADER2"; echo "$HEADER3"; echo "$HEADER4"
            fi
            echo
                echo "$HEADER2"; echo "$HEADER3"; echo "$HEADER4"
            fi
            echo

-           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'
+           echo "@htmlonly"
+           echo "<pre class=\"fragment\"><div class=\"fragment\">"
+           echo "@endhtmlonly"
+           sed -n -e '/^;;; *@/ s/;;; *\(.*\)/\1/p' \
+               -e '/^;;; *[^ @]/ s,;;; *\(.*\),\1@n,p' $FILE
+           echo "@htmlonly"
+           echo "</div></pre>"
+           echo "@endhtmlonly"

            )
        else
            M17NDIR=/usr/share/m17n $IMDOC $FILE "$IM"
            )
        else
            M17NDIR=/usr/share/m17n $IMDOC $FILE "$IM"

diff --git a/utils/dbtutorial.sh b/utils/dbtutorial.sh
index 9ecab28..0f5a287 100755 (executable)
--- a/utils/dbtutorial.sh
+++ b/utils/dbtutorial.sh
@@ -21,9 +21,7 @@ EOF
 
 for f in $1/*-tut.txt; do
   sed -n -e '/\/\*\*\*/,/\*\// p' < $f| \
 
 for f in $1/*-tut.txt; do
   sed -n -e '/\/\*\*\*/,/\*\// p' < $f| \

-  sed -e 's/@section/@subsection/' -e 's/@page/@section/' \
-      -e 's,\[\[,<span class="fragment">,g' -e 's,\]\],</span>,g' \
-      -e 's,<<,<span class="fragment">\&lt;,g' -e 's,>>,\&gt;</span>,g'
+  sed -e 's/@section/@subsection/' -e 's/@page/@section/'

 done
 
 # Local Variables:
 done
 
 # Local Variables:

diff --git a/utils/imdoc.c b/utils/imdoc.c
index 974d4ca..ed5d820 100644 (file)
--- a/utils/imdoc.c
+++ b/utils/imdoc.c
@@ -175,48 +175,46 @@ main (int argc, char **argv)
     }
   else
     {
     }
   else
     {

+      MConverter *converter = mconv_stream_converter (Mutf8, stdout);

       int len = mtext_len (mt), i, c;
       int len = mtext_len (mt), i, c;

+      int has_non_ascii = 0;

       
       

+      if (mtext_ref_char (mt, len - 1) != '\n')
+       {
+         mtext_ins_char (mt, len, '\n', 1);
+         len ++;
+       }
+

       for (i = 0; i < len; i++)
        {
          c = mtext_ref_char (mt, i);
          if (c >= 0x100)
       for (i = 0; i < len; i++)
        {
          c = mtext_ref_char (mt, i);
          if (c >= 0x100)

-           break;
+           {
+             has_non_ascii = 1;
+             break;
+           }

        }
        }

-      if (i < len)
-       printf ("@htmlonly\n<div class=\"fragment\"><pre class=\"fragment\">\n");
-      else
-       printf ("@verbatim\n");
+      if (has_non_ascii)
+       printf ("@if FOR_HTML\n");
+      printf ("@verbatim\n");

       mconv_encode_stream (Mutf8, mt, stdout);
       mconv_encode_stream (Mutf8, mt, stdout);

-      if (mtext_ref_char (mt, mtext_len (mt) - 1) != '\n')
-       printf ("\n");
-      if (i < len)
+      printf ("@endverbatim\n");
+      if (has_non_ascii)

        {
        {

-         MConverter *converter = mconv_stream_converter (Mutf8, stdout);
-         int from;
-
-         printf ("</pre></div><p>\n@endhtmlonly\n");
-         printf ("@latexonly\n\\begin{verbatim}\n");
-         if (i > 0)
-           mconv_encode_range (converter, mt, 0, i);
-         for (from = i; i < len; i++)
+         printf ("@endif\n@if FOR_LATEX\n");
+         printf ("@verbatim\n");
+         for (i = 0; i < len; i++)

            {
              c = mtext_ref_char (mt, i);
              if (c >= 0x100)
            {
              c = mtext_ref_char (mt, i);
              if (c >= 0x100)

-               {
-                 if (i > from)
-                   mconv_encode_range (converter, mt, from, i);
-                 printf ("U+%04X", c);
-                 from = i + 1;
-               }
+               printf ("<U+%04X>", c);
+             else
+               putchar (c);

            }
            }

-         if (i > from)
-           mconv_encode_range (converter, mt, from, i);
-         printf ("\\end{verbatim}\n@endlatexonly\n");
-         mconv_free_converter (converter);
+         printf ("@endverbatim\n");
+         printf ("@endif\n");

        }
        }

-      else
-       printf ("@endverbatim\n");
+      mconv_free_converter (converter);

     }
 
   M17N_FINI ();
     }
 
   M17N_FINI ();

diff --git a/utils/ja_filter.sh b/utils/ja_filter.sh
index 9cddce5..ae53074 100755 (executable)
--- a/utils/ja_filter.sh
+++ b/utils/ja_filter.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-utils/ja_filter.rb $1 | iconv -f EUC-JP -t UTF-8
+case $1 in
+*dbdata.txt) utils/ja_filter.rb $1;;
+*) utils/ja_filter.rb $1 | iconv -f EUC-JP -t UTF-8;;
+esac

diff --git a/utils/latex.sh b/utils/latex.sh
index e424dac..a37e918 100755 (executable)
--- a/utils/latex.sh
+++ b/utils/latex.sh
@@ -1,47 +1,53 @@
 #!/bin/sh
 #                                                      -*- coding: utf-8; -*-
 # $1: target directory (usr/latex, ja/latex, or dev/latex)
 #!/bin/sh
 #                                                      -*- coding: utf-8; -*-
 # $1: target directory (usr/latex, ja/latex, or dev/latex)

-# $2: latex commnad (latex, platex, or pdflatex)

 
 umask 002
 USR_JA_DEV=`dirname $1`
 
 umask 002
 USR_JA_DEV=`dirname $1`

-TEXINPUTS=`pwd`/styles:.:
-export TEXINPUTS
+cp styles/m17n-lib.sty $1

 cd $1
 cd $1

-LATEX=$2
+LATEX=latex

 if [ $USR_JA_DEV = "ja" ] ; then
   LATEX=platex
   if [ -d /usr/local/teTeX/bin ] ; then
     PATH=/usr/local/teTeX/bin:$PATH
   fi
 if [ $USR_JA_DEV = "ja" ] ; then
   LATEX=platex
   if [ -d /usr/local/teTeX/bin ] ; then
     PATH=/usr/local/teTeX/bin:$PATH
   fi

-  SOURCE=m17n-lib-ja
-  echo '\appendix' > app.tex
-  sed -n -e '/コンパイル/,/GFDL/ p' < refman.tex >> app.tex
+  echo '\\appendix' > app.tex
+  sed -n -e '/コンパイル/,/include{m17nDBFormat}/ p' \
+      -e '/Tutorial for writing/,/include{GFDL}/ p' \
+      -e '/printindex/,$ p' < refman.tex >> app.tex

   sed -e '/documentclass/ s/a4paper/a4paper,twoside/' \
   sed -e '/documentclass/ s/a4paper/a4paper,twoside/' \

-      -e '/コンパイル/,/GFDL/ d' \
-      -e '/structMInputXIMArgIM/ r app.tex' \
-    < refman.tex > ${SOURCE}.tex
+      -e '/inputenc/ d' \
+      -e '/コンパイル/,/include{GFDL}/ d' \
+      -e '/chapter{ファイル}/,$ d' < refman.tex > m17n-lib.tex
+  cat app.tex >> m17n-lib.tex
+  rm -rf tmp
+  mkdir tmp
+  for f in *; do 
+      case "$f" in
+         m17nDBData.tex) ;;
+         *.tex) mv "$f" tmp; iconv -f utf-8 -t euc-jp < "tmp/$f" > "$f";;
+         *.sty) mv "$f" tmp; iconv -f utf-8 -t euc-jp < "tmp/$f" > "$f";;
+      esac
+  done  
+  rm -rf tmp

 elif [ $USR_JA_DEV = "dev" ] ; then
 elif [ $USR_JA_DEV = "dev" ] ; then

-  SOURCE=m17n-lib-dev

   sed -e '/documentclass/ s/a4paper/a4paper,twoside/' \
       -e '/The m17n Library Module Index/,/pages/ d' \
       -e '/The m17n Library File Documentation/,/textprop_8c/ d' \
       -e '/The m17n Library Directory Documentation/,/dir_000001/ d' \
       -e 's/The m17n Library Page Documentation/Appendix/' \
   sed -e '/documentclass/ s/a4paper/a4paper,twoside/' \
       -e '/The m17n Library Module Index/,/pages/ d' \
       -e '/The m17n Library File Documentation/,/textprop_8c/ d' \
       -e '/The m17n Library Directory Documentation/,/dir_000001/ d' \
       -e 's/The m17n Library Page Documentation/Appendix/' \

-    < refman.tex > ${SOURCE}.tex
+    < refman.tex > m17n-lib.tex

 else
 else

-  SOURCE=m17n-lib

   echo '\\appendix' > app.tex
   echo '\\appendix' > app.tex

-  sed -n -e '/Print compile/,/GFDL/ p' < refman.tex >> app.tex
+  sed -n -e '/Print compile/,/include{GFDL}/ p' \
+      -e '/printindex/,$ p' < refman.tex >> app.tex

   sed -e '/documentclass/ s/a4paper/a4paper,twoside/' \
   sed -e '/documentclass/ s/a4paper/a4paper,twoside/' \

-      -e '/Print compile/,/GFDL/ d' \
-      -e '/structMInputXIMArgIM/ r app.tex' \
-    < refman.tex > ${SOURCE}.tex
+      -e '/Print compile/,/include{GFDL}/ d' \
+      -e '/chapter{File Documentation}/,$ d' < refman.tex > m17n-lib.tex
+  cat app.tex >> m17n-lib.tex

 fi
 fi

-${LATEX} ${SOURCE}.tex
-#if [ "${USR_JA_DEV}" = "ja" ] ; then
-#  nkf -e < ${SOURCE}.idx > temp.idx; mv temp.idx ${SOURCE}.idx
-#fi
-/usr/bin/makeindex ${SOURCE}.idx
-${LATEX} ${SOURCE}.tex
-${LATEX} ${SOURCE}.tex
+${LATEX} m17n-lib.tex
+makeindex m17n-lib.idx
+${LATEX} m17n-lib.tex
+${LATEX} m17n-lib.tex