*** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index 2d6121d..9a59ac4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ PROJECT_VERSION = @PACKAGE_VERSION@
 
 DOXYGEN = doxygen
 
 
 DOXYGEN = doxygen
 

-EXAMPLE = \
+EXAMPLE_PROGS = \

        @M17NLIB@/example/mconv.c \
        @M17NLIB@/example/mview.c \
        @M17NLIB@/example/mdate.c \
        @M17NLIB@/example/mconv.c \
        @M17NLIB@/example/mview.c \
        @M17NLIB@/example/mdate.c \

@@ -72,10 +72,14 @@ EXAMPLE = \
        @M17NLIB@/example/mimx-anthy.c \
        @M17NLIB@/example/mimx-ispell.c
 
        @M17NLIB@/example/mimx-anthy.c \
        @M17NLIB@/example/mimx-ispell.c
 

+EXAMPLE_MIMS = \
+       @M17NLIB@/example/anthy.mim \
+       @M17NLIB@/example/ispell.mim
+

 DBFORMAT = \
        @M17NDB@/FORMATS
 
 DBFORMAT = \
        @M17NDB@/FORMATS
 

-MAN1 = data/m17n-config.txt ${EXAMPLE}
+MAN1 = data/m17n-config.txt ${EXAMPLE_PROGS}

 
 MAN3 = @M17NLIB@/src/m17n-core.h \
        @M17NLIB@/src/m17n.h \
 
 MAN3 = @M17NLIB@/src/m17n-core.h \
        @M17NLIB@/src/m17n.h \

@@ -89,7 +93,7 @@ MAN5 = ${DBFORMAT}
 SRCALL = \
        mainpage.txt \
        ${MAN3} \
 SRCALL = \
        mainpage.txt \
        ${MAN3} \

-       data/m17n-config.txt data/example.txt data/dbformat.txt
+       data/m17n-config.txt data/exprog.txt data/exmim.txt data/dbformat.txt

 
 HTML_USR_TARGET = usr/html/index.html usr/html/parrot.png
 HTML_JA_TARGET = ja/html/index.html ja/html/parrot.png
 
 HTML_USR_TARGET = usr/html/index.html usr/html/parrot.png
 HTML_JA_TARGET = ja/html/index.html ja/html/parrot.png

@@ -211,8 +215,11 @@ doxyfile-man%.usr: doxyfile-man%
            -e 's/%OUTPUT_LANGUAGE%/English/' \
          < $< >$@
 
            -e 's/%OUTPUT_LANGUAGE%/English/' \
          < $< >$@
 

-data/example.txt: ${EXAMPLE} utils/example.sh
-       utils/example.sh ${EXAMPLE} > $@
+data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
+       utils/exprog.sh ${EXAMPLE_PROGS} > $@
+
+data/exmim.txt: ${EXAMPLE_MIMS} utils/exmim.sh
+       utils/exmim.sh ${EXAMPLE_MIMS} > $@

 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
        utils/dbformat.sh ${DBFORMAT}/*.txt > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
        utils/dbformat.sh ${DBFORMAT}/*.txt > $@

@@ -278,12 +285,12 @@ man/man1/%: usr/man/man1/% sample/man3/SampleGroup.3 utils/mkman.rb
 
 man/man3/%: usr/man/man3/% sample/man3/SampleGroup.3 utils/mkman.rb 
        $(mkinstalldirs) man/man3
 
 man/man3/%: usr/man/man3/% sample/man3/SampleGroup.3 utils/mkman.rb 
        $(mkinstalldirs) man/man3

-       rm -rf doxywork usr/man3/*
+       rm -rf doxywork man/man3/*

        ruby utils/mkman.rb 3m17n usr/man/man3 man/man3
 
 man/man5/%: usr/man/man5/% sample/man3/SampleGroup.3 utils/mkman.rb 
        $(mkinstalldirs) man/man5
        ruby utils/mkman.rb 3m17n usr/man/man3 man/man3
 
 man/man5/%: usr/man/man5/% sample/man3/SampleGroup.3 utils/mkman.rb 
        $(mkinstalldirs) man/man5

-       rm -rf doxywork usr/man5/*
+       rm -rf doxywork man/man5/*

        ruby utils/mkman.rb 5 usr/man/man5 man/man5
 
 ja/man3m/%.3m: ja/man/man3/%.3m sample-ja.c utils/mkman.rb 
        ruby utils/mkman.rb 5 usr/man/man5 man/man5
 
 ja/man3m/%.3m: ja/man/man3/%.3m sample-ja.c utils/mkman.rb 

diff --git a/utils/example.sh b/utils/example.sh
deleted file mode 100755 (executable)
index 91f795e..0000000
--- a/utils/example.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-cat <<EOF
-/***en @page m17nExample Example Programs
-
-This section describes these example programs.  They are to demonstrate
-the usage of the m17n library, not for practical use.
-
-<ul>
-EOF
-
-cat $* | grep '@page' | sed -e 's/@page \([^ ]*\)/<li> @ref \1 "\1" --/'
-
-cat <<EOF
-</ul>
-*/
-EOF
-
-cat $* | \
-sed -n -e '/\/\*\*\*/,/\*\// p' | \
-sed -e 's/@section/@subsection/' \
-    -e 's/@page \([^ ]*\)/@section \1 \1 --/'

diff --git a/utils/exmim.sh b/utils/exmim.sh
new file mode 100755 (executable)
index 0000000..b35f723
--- /dev/null
+++ b/utils/exmim.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+cat <<EOF
+/***en @page m17nExMim Example Input Methods
+
+This section describes these example input methods.  They are to
+demonstrate the usage of the m17n library, not for practical use.
+
+<ul>
+EOF
+
+cat $* | grep '@page' | sed -e 's/;; @page \([^.]*\).mim/<li> @ref \1 "\1.mim" --/'
+
+cat <<EOF
+</ul>
+*/
+EOF
+
+cat $* | \
+sed -n -e '/;; \/\*\*\*/,/;; \*\// p' | \
+sed -e 's/;; *//' \
+    -e 's/@section/@subsection/' \
+    -e 's/@page \([^.]*\).mim/@section \1 \1.mim --/'

diff --git a/utils/exprog.sh b/utils/exprog.sh
new file mode 100755 (executable)
index 0000000..15d0030
--- /dev/null
+++ b/utils/exprog.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+cat <<EOF
+/***en @page m17nExProg Example Programs
+
+This section describes these example programs.  They are to demonstrate
+the usage of the m17n library, not for practical use.
+
+<ul>
+EOF
+
+cat $* | grep '@page' | sed -e 's/@page \([^ ]*\)/<li> @ref \1 "\1" --/'
+
+cat <<EOF
+</ul>
+*/
+EOF
+
+cat $* | \
+sed -n -e '/\/\*\*\*/,/\*\// p' | \
+sed -e 's/@section/@subsection/' \
+    -e 's/@page \([^ ]*\)/@section \1 \1 --/'

diff --git a/utils/mkman.rb b/utils/mkman.rb
index f695ff1..55d6eff 100644 (file)
--- a/utils/mkman.rb
+++ b/utils/mkman.rb
@@ -408,9 +408,13 @@ Dir.open(".").each{|filename|
        next
      end   
 
        next
      end   
 

-     #if filename =~ /\.c\./
-     #   next
-     #end   
+     if filename =~ /\.[ch]\./
+        next
+     end   
+
+     if filename =~ /\.txt\./
+        next
+     end   

 
      file = open(filename,"r") 
      text = file.readlines
 
      file = open(filename,"r") 
      text = file.readlines