From 19d5591abadf4237944a582ef6cb54019d1a013b Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Wed, 18 Feb 2009 00:48:52 +0000
Subject: [PATCH 01/16] *** empty log message ***

---
 utils/expand-mdb.awk |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/utils/expand-mdb.awk b/utils/expand-mdb.awk
index a13c937..4067750 100644
--- a/utils/expand-mdb.awk
+++ b/utils/expand-mdb.awk
@@ -19,13 +19,11 @@ BEGIN {
 }
 
 /<filename>[^<]*<\/filename>/ {
-    from = match($0, "<filename>");
-    HEAD = substr($0, 1, from - 1)
-    if (length(HEAD) > 1 && ! match(HEAD, "^[ \t]*$"))
-	printf "%s\n", substr($0, 1, from - 1);
-    to = match($0, "<\/filename>");
-    TAIL = substr($0, to + RLENGTH);
-    FILE = sprintf("%s%s", SUBDIR[KEY], substr($0, from+10, to - (from+10)));
+    from = match($0, "<filename>[^<]*</filename>");
+    to = from + RLENGTH;
+    printf "%s\n", substr($0, 1, to - 1);
+    TAIL = substr($0, to);
+    FILE = sprintf("%s%s", SUBDIR[KEY], substr($0, from + 10, to - from - 21));
     system(sprintf("ls %s/%s | sed -f %s", M17NDB, FILE, SEDFILE));
     if (length(TAIL) > 0 && ! match(TAIL, "^[ \t]*$"))
 	print TAIL;
-- 
1.7.10.4


From c10c271b7fc3d016a5935b5df0a81fafcb2a8a4c Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Wed, 18 Feb 2009 01:43:55 +0000
Subject: [PATCH 02/16] *** empty log message ***

---
 Makefile.am          |    6 ++----
 utils/expand-mdb.awk |   23 ++++++++++++++---------
 utils/expand-mdb.sed |    1 -
 3 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 utils/expand-mdb.sed

diff --git a/Makefile.am b/Makefile.am
index 064f506..1ab60a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -264,11 +264,9 @@ 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.xml utils/expand-mdb.awk \
-			utils/expand-mdb.sed
+data/dbdata.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.xml utils/expand-mdb.awk
 	[ -d data ] || mkdir data
-	SEDFILE=utils/expand-mdb.sed; \
-	  @AWK@ -v SEDFILE=$$SEDFILE -v M17NDB=@M17NDB@ -f utils/expand-mdb.awk @M17NDB@/mdb.xml > data/expanded-mdb.xml
+	@AWK@ -v M17NDB=@M17NDB@ -f utils/expand-mdb.awk @M17NDB@/mdb.xml > data/expanded-mdb.xml
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
 	utils/dbformat.sh ${DBFORMAT} > $@
diff --git a/utils/expand-mdb.awk b/utils/expand-mdb.awk
index 4067750..b2a2f33 100644
--- a/utils/expand-mdb.awk
+++ b/utils/expand-mdb.awk
@@ -4,16 +4,14 @@ BEGIN {
     SUBDIR["language-name-*"] = "LANGDATA/";
     SUBDIR["standard-language-iso639"] = "LANGDATA/";
     KEY="";
+    XINCLUDEFMT="<xi:include xmlns:xi=\"http://www.w3.org/2001/XInclude\" parse=\"xml\" href=\"%s\"/>\n";
 }
 
 /^<item / {
     match($0, "key0=\"[^\"]*");
-    KEY=substr($0, RSTART + 6, RLENGTH - 6);
-    if (match($0, "key1=\"[^\"]*") > 0) {
-	KEY = sprintf("%s-%s", KEY, substr($0, RSTART + 6, RLENGTH - 6));
-	if (match($0, "key2=\"[^\"]*") > 0)
-	    KEY = sprintf("%s-%s", KEY, substr($0, RSTART + 6, RLENGTH - 6));
-    }
+    KEY = substr($0, RSTART + 6, RLENGTH - 6);
+    for (i = 1; i < 4 && match($0, sprintf("key%d=\"[^\"]*", i)) > 0; i++)
+	KEY=KEY"-"substr($0, RSTART + 6, RLENGTH - 6);
     print;
     next;
 }
@@ -21,10 +19,17 @@ BEGIN {
 /<filename>[^<]*<\/filename>/ {
     from = match($0, "<filename>[^<]*</filename>");
     to = from + RLENGTH;
-    printf "%s\n", substr($0, 1, to - 1);
+    printf "%s", substr($0, 1, from - 1);
     TAIL = substr($0, to);
-    FILE = sprintf("%s%s", SUBDIR[KEY], substr($0, from + 10, to - from - 21));
-    system(sprintf("ls %s/%s | sed -f %s", M17NDB, FILE, SEDFILE));
+    FILE = substr($0, from + 10, to - from - 21);
+    COMMAND = "cd "M17NDB"/"SUBDIR[KEY]"; ls "FILE;
+    COMMAND | getline LINE;
+    print "<filename>"LINE"</filename>";
+    printf XINCLUDEFMT, M17NDB"/"SUBDIR[KEY]LINE;
+    while (COMMAND | getline LINE) {
+	print "<filename>"LINE"</filename>";
+	printf XINCLUDEFMT, M17NDB"/"SUBDIR[KEY]LINE;
+    }
     if (length(TAIL) > 0 && ! match(TAIL, "^[ \t]*$"))
 	print TAIL;
     next;
diff --git a/utils/expand-mdb.sed b/utils/expand-mdb.sed
deleted file mode 100644
index 4e80791..0000000
--- a/utils/expand-mdb.sed
+++ /dev/null
@@ -1 +0,0 @@
-s,\(.*\),<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="xml" href="\1"/>,
-- 
1.7.10.4


From 764e9b0b0efcff17aa0fb32629eb5fe70841f30e Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Thu, 19 Feb 2009 03:59:21 +0000
Subject: [PATCH 03/16] *** empty log message ***

---
 utils/description-en.xsl |   62 +++++++++++++++++++++++++++++++++++++++++++
 utils/description-ja.xsl |   65 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 utils/description-en.xsl
 create mode 100644 utils/description-ja.xsl

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
new file mode 100644
index 0000000..08a52ba
--- /dev/null
+++ b/utils/description-en.xsl
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:mdb="http://www.m17n.org/mdb"
+		xmlns:mim="http://www.m17n.org/MIM">
+ <xsl:output method="text" omit-xml-declaration="yes" version="4.0"/>
+ <xsl:strip-space elements="*"/>
+
+<xsl:template match="/">
+<xsl:text>/*** 
</xsl:text>
+<xsl:if test="mdb:database/mdb:doxygen/mdb:page">
+<xsl:text>@page </xsl:text>
+<xsl:value-of select="mdb:database/mdb:doxygen/mdb:page/@id"/>
+<xsl:value-of select="mdb:database/mdb:doxygen/mdb:page/mdb:brief"/>
+<xsl:value-of select="mdb:database/mdb:doxygen/mdb:page/text()"/>
+&lt;ul&gt;
+<xsl:for-each select="mdb:database/mdb:doxygen/mdb:page/mdb:section">
+      &lt;li&gt;<xsl:text>@ref </xsl:text><xsl:value-of select="attribute::id"/><xsl:text>-list </xsl:text>&lt;/li&gt; </xsl:for-each>
+&lt;/ul&gt;
+
+<xsl:for-each select="mdb:database/mdb:doxygen/mdb:page/mdb:section">
+  <xsl:variable name="sectionname" select="attribute::id"/>
+<xsl:text>
@section </xsl:text> <xsl:value-of select="$sectionname"/>-list <xsl:value-of select="mdb:brief"/>
+<xsl:value-of select="text()"/>
+ &lt;ul&gt;  
+    <xsl:for-each select="//mdb:item">
+      <xsl:if test="attribute::sectionid=$sectionname">
+	<xsl:for-each select="mdb:source/mdb:filename">
+	  <xsl:choose>
+	    <xsl:when test="ancestor::mdb:item/attribute::sectionid='mim'">
+&lt;li&gt;<xsl:value-of select="."/><xsl:text> (langauge:</xsl:text>
+   <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:language"/>
+   <xsl:text> name:</xsl:text>
+   <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:name"/>
+   <xsl:text>@htmlonly
 title:</xsl:text>
+   <xsl:value-of select="following-sibling::mim:input-method[1]/mim:title"/>
+   <xsl:text> icon:&lt;img src="</xsl:text>
+   <xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly)
@verbatim
</xsl:text>
+   <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+   <xsl:text> 
@endverbatim
</xsl:text>
+&lt;/li&gt;
+	    </xsl:when>
+	    <xsl:otherwise>
+&lt;li&gt;
+   <xsl:value-of select="."/><xsl:text>
</xsl:text>
+   <xsl:value-of select="parent::mdb:source/parent::mdb:item/mdb:description"/>
+&lt;/li&gt;
+	      </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:for-each>
+      </xsl:if>
+    </xsl:for-each>
+    &lt;/ul&gt;
+  </xsl:for-each>
+
+</xsl:if>
+<xsl:text>*/ </xsl:text>
+
+</xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
new file mode 100644
index 0000000..2ee7d85
--- /dev/null
+++ b/utils/description-ja.xsl
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:mdb="http://www.m17n.org/mdb"
+		xmlns:mim="http://www.m17n.org/MIM">
+  <xsl:output method="html" omit-xml-declaration="yes" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+
+<xsl:template match="/">
+  <xsl:text>/*** 
</xsl:text>
+  <xsl:if test="mdb:database/mdb:doxygen/mdb:page">
+    <xsl:text>@page </xsl:text>
+    <xsl:value-of select="mdb:database/mdb:doxygen/mdb:page/@id"/><xsl:text> </xsl:text>
+    <xsl:value-of select="mdb:database/mdb:doxygen/mdb:page/mdb:brief"/>
+    <xsl:value-of select="mdb:database/mdb:doxygen/mdb:page/text()"/>
+    <xsl:text> </xsl:text>
+    <ul>
+    <xsl:for-each select="mdb:database/mdb:doxygen/mdb:page/mdb:section">
+      <li><xsl:text>@ref </xsl:text><xsl:value-of select="attribute::id"/><xsl:text>-list </xsl:text></li>
+      <xsl:text>
</xsl:text>
+    </xsl:for-each>
+    </ul>
+
+  <xsl:for-each select="mdb:database/mdb:doxygen/mdb:page/mdb:section">
+    <xsl:variable name="sectionname" select="attribute::id"/>
+@section <xsl:value-of select="$sectionname"/>-list <xsl:value-of select="mdb:brief"/>
+    <xsl:value-of select="text()"/>
+     <xsl:text>
</xsl:text>
+    <ul>
+    <xsl:for-each select="//mdb:item">
+      <xsl:if test="attribute::sectionid=$sectionname">
+	<xsl:for-each select="mdb:source/mdb:filename">
+	  <xsl:choose>
+	    <xsl:when test="ancestor::mdb:item/attribute::sectionid='mim'">
+	      <li><xsl:value-of select="."/><xsl:text> (langauge:</xsl:text>
+	          <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:language"/>
+		  <xsl:text> name:</xsl:text>
+		  <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:name"/>
+		  <xsl:text>)
@verbatim
</xsl:text>
+		  <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+		  <xsl:text> @endverbatim
</xsl:text>
+	      </li>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <li>
+		<xsl:value-of select="."/><xsl:text>

</xsl:text>
+		<xsl:value-of select="parent::mdb:source/parent::mdb:item/mdb:description"/>
+	      </li>
+	      </xsl:otherwise>
+	  </xsl:choose>
+	<xsl:text>
</xsl:text>
+	</xsl:for-each>
+      </xsl:if>
+    </xsl:for-each>
+    </ul>
+  </xsl:for-each>
+
+</xsl:if>
+<xsl:text>*/ </xsl:text>
+
+</xsl:template>
+
+</xsl:stylesheet>
+
+
-- 
1.7.10.4


From a76a304201584408ae23cc1a65430e4260f8868a Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Thu, 19 Feb 2009 04:20:33 +0000
Subject: [PATCH 04/16] *** empty log message ***

---
 Makefile.am          |    1 +
 utils/expand-mdb.awk |   30 +++++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1ab60a8..630b80f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -267,6 +267,7 @@ data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
 data/dbdata.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.xml utils/expand-mdb.awk
 	[ -d data ] || mkdir data
 	@AWK@ -v M17NDB=@M17NDB@ -f utils/expand-mdb.awk @M17NDB@/mdb.xml > data/expanded-mdb.xml
+	xsltproc -xinclude utils/description-en.xsl data/expanded-mdb.xml > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
 	utils/dbformat.sh ${DBFORMAT} > $@
diff --git a/utils/expand-mdb.awk b/utils/expand-mdb.awk
index b2a2f33..45d3d7b 100644
--- a/utils/expand-mdb.awk
+++ b/utils/expand-mdb.awk
@@ -1,8 +1,8 @@
 BEGIN {
     SUBDIR["input-method-*"] = "MIM/";
     SUBDIR["font-layouter-*"] = "FLT/";
-    SUBDIR["language-name-*"] = "LANGDATA/";
     SUBDIR["standard-language-iso639"] = "LANGDATA/";
+    IGNORED["language-name-*"] = 1;
     KEY="";
     XINCLUDEFMT="<xi:include xmlns:xi=\"http://www.w3.org/2001/XInclude\" parse=\"xml\" href=\"%s\"/>\n";
 }
@@ -17,21 +17,25 @@ BEGIN {
 }
 
 /<filename>[^<]*<\/filename>/ {
-    from = match($0, "<filename>[^<]*</filename>");
-    to = from + RLENGTH;
-    printf "%s", substr($0, 1, from - 1);
-    TAIL = substr($0, to);
-    FILE = substr($0, from + 10, to - from - 21);
-    COMMAND = "cd "M17NDB"/"SUBDIR[KEY]"; ls "FILE;
-    COMMAND | getline LINE;
-    print "<filename>"LINE"</filename>";
-    printf XINCLUDEFMT, M17NDB"/"SUBDIR[KEY]LINE;
-    while (COMMAND | getline LINE) {
+    if (IGNORED[KEY])
+	print;
+    else {
+	from = match($0, "<filename>[^<]*</filename>");
+	to = from + RLENGTH;
+	printf "%s", substr($0, 1, from - 1);
+	TAIL = substr($0, to);
+	FILE = substr($0, from + 10, to - from - 21);
+	COMMAND = "cd "M17NDB"/"SUBDIR[KEY]"; ls "FILE;
+	COMMAND | getline LINE;
 	print "<filename>"LINE"</filename>";
 	printf XINCLUDEFMT, M17NDB"/"SUBDIR[KEY]LINE;
+	while (COMMAND | getline LINE) {
+	    print "<filename>"LINE"</filename>";
+	    printf XINCLUDEFMT, M17NDB"/"SUBDIR[KEY]LINE;
+	}
+	if (length(TAIL) > 0 && ! match(TAIL, "^[ \t]*$"))
+	    print TAIL;
     }
-    if (length(TAIL) > 0 && ! match(TAIL, "^[ \t]*$"))
-	print TAIL;
     next;
 }
 
-- 
1.7.10.4


From 468f7cd47650fd801cf7b8d3559d6966cc3f2e2e Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Thu, 19 Feb 2009 04:31:26 +0000
Subject: [PATCH 05/16] *** empty log message ***

---
 utils/description-en.xsl |    3 +--
 utils/description-ja.xsl |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
index 08a52ba..93485a2 100644
--- a/utils/description-en.xsl
+++ b/utils/description-en.xsl
@@ -41,8 +41,7 @@
 &lt;/li&gt;
 	    </xsl:when>
 	    <xsl:otherwise>
-&lt;li&gt;
-   <xsl:value-of select="."/><xsl:text>
</xsl:text>
+&lt;li&gt;   <xsl:value-of select="."/><xsl:text>
</xsl:text>
    <xsl:value-of select="parent::mdb:source/parent::mdb:item/mdb:description"/>
 &lt;/li&gt;
 	      </xsl:otherwise>
diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
index 2ee7d85..5f014d7 100644
--- a/utils/description-ja.xsl
+++ b/utils/description-ja.xsl
@@ -42,8 +42,7 @@
 	      </li>
 	    </xsl:when>
 	    <xsl:otherwise>
-	      <li>
-		<xsl:value-of select="."/><xsl:text>

</xsl:text>
+	      <li><xsl:value-of select="."/><xsl:text>

</xsl:text>
 		<xsl:value-of select="parent::mdb:source/parent::mdb:item/mdb:description"/>
 	      </li>
 	      </xsl:otherwise>
-- 
1.7.10.4


From 0322538ee4935b50d0755f48ffa4af92116fef3d Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Thu, 19 Feb 2009 05:51:34 +0000
Subject: [PATCH 06/16] *** empty log message ***

---
 utils/description-en.xsl |    1 +
 utils/description-ja.xsl |    1 +
 2 files changed, 2 insertions(+)

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
index 93485a2..cac6e1c 100644
--- a/utils/description-en.xsl
+++ b/utils/description-en.xsl
@@ -37,6 +37,7 @@
    <xsl:text> icon:&lt;img src="</xsl:text>
    <xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly)
@verbatim
</xsl:text>
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+   <xsl:value-of select="following-sibling::mim:input-method[1]/comment()"/>
    <xsl:text> 
@endverbatim
</xsl:text>
 &lt;/li&gt;
 	    </xsl:when>
diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
index 5f014d7..bd51ad8 100644
--- a/utils/description-ja.xsl
+++ b/utils/description-ja.xsl
@@ -38,6 +38,7 @@
 		  <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:name"/>
 		  <xsl:text>)
@verbatim
</xsl:text>
 		  <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+		  <xsl:value-of select="following-sibling::mim:input-method[1]/comment()"/>
 		  <xsl:text> @endverbatim
</xsl:text>
 	      </li>
 	    </xsl:when>
-- 
1.7.10.4


From e304097796716f649dc668c9489d5db977d52ae1 Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Thu, 19 Feb 2009 06:08:39 +0000
Subject: [PATCH 07/16] *** empty log message ***

---
 utils/description-en.xsl |    7 ++++++-
 utils/description-ja.xsl |   10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
index cac6e1c..f8bc136 100644
--- a/utils/description-en.xsl
+++ b/utils/description-en.xsl
@@ -36,8 +36,13 @@
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:title"/>
    <xsl:text> icon:&lt;img src="</xsl:text>
    <xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly)
@verbatim
</xsl:text>
-   <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+   <xsl:choose><xsl:when  test="following-sibling::mim:input-method[1]/comment()">
    <xsl:value-of select="following-sibling::mim:input-method[1]/comment()"/>
+   </xsl:when>
+   <xsl:otherwise>
+   <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+   </xsl:otherwise>
+   </xsl:choose>
    <xsl:text> 
@endverbatim
</xsl:text>
 &lt;/li&gt;
 	    </xsl:when>
diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
index bd51ad8..b79a787 100644
--- a/utils/description-ja.xsl
+++ b/utils/description-ja.xsl
@@ -37,8 +37,14 @@
 		  <xsl:text> name:</xsl:text>
 		  <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:name"/>
 		  <xsl:text>)
@verbatim
</xsl:text>
-		  <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
-		  <xsl:value-of select="following-sibling::mim:input-method[1]/comment()"/>
+		  <xsl:choose>
+		    <xsl:when  test="following-sibling::mim:input-method[1]/comment()">
+		      <xsl:value-of select="following-sibling::mim:input-method[1]/comment()"/>
+		    </xsl:when>
+		    <xsl:otherwise>
+		      <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+		    </xsl:otherwise>
+		  </xsl:choose>
 		  <xsl:text> @endverbatim
</xsl:text>
 	      </li>
 	    </xsl:when>
-- 
1.7.10.4


From 2304dee11f41d1cac335184c667990536a2f0f31 Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Wed, 25 Feb 2009 02:00:47 +0000
Subject: [PATCH 08/16] *** empty log message ***

---
 utils/description-en.xsl |    4 +++-
 utils/description-ja.xsl |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
index f8bc136..3de0598 100644
--- a/utils/description-en.xsl
+++ b/utils/description-en.xsl
@@ -37,7 +37,9 @@
    <xsl:text> icon:&lt;img src="</xsl:text>
    <xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly)
@verbatim
</xsl:text>
    <xsl:choose><xsl:when  test="following-sibling::mim:input-method[1]/comment()">
-   <xsl:value-of select="following-sibling::mim:input-method[1]/comment()"/>
+   <xsl:for-each select="following-sibling::mim:input-method[1]/comment()">
+<xsl:value-of select="."/><xsl:text>
</xsl:text>
+   </xsl:for-each>
    </xsl:when>
    <xsl:otherwise>
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
index b79a787..3d358ea 100644
--- a/utils/description-ja.xsl
+++ b/utils/description-ja.xsl
@@ -39,7 +39,9 @@
 		  <xsl:text>)
@verbatim
</xsl:text>
 		  <xsl:choose>
 		    <xsl:when  test="following-sibling::mim:input-method[1]/comment()">
-		      <xsl:value-of select="following-sibling::mim:input-method[1]/comment()"/>
+		      <xsl:for-each select="following-sibling::mim:input-method[1]/comment()">
+			<xsl:value-of select="."/><xsl:text>
</xsl:text>
+		      </xsl:for-each>
 		    </xsl:when>
 		    <xsl:otherwise>
 		      <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
-- 
1.7.10.4


From 99b77970ad932bfaf733673595b46f15db420063 Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Fri, 6 Mar 2009 05:47:12 +0000
Subject: [PATCH 09/16] *** empty log message ***

---
 utils/description-en.xsl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
index 3de0598..0c104f2 100644
--- a/utils/description-en.xsl
+++ b/utils/description-en.xsl
@@ -35,7 +35,7 @@
    <xsl:text>@htmlonly
 title:</xsl:text>
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:title"/>
    <xsl:text> icon:&lt;img src="</xsl:text>
-   <xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly)
@verbatim
</xsl:text>
+   <xsl:text>icon-</xsl:text><xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly)
@verbatim
</xsl:text>
    <xsl:choose><xsl:when  test="following-sibling::mim:input-method[1]/comment()">
    <xsl:for-each select="following-sibling::mim:input-method[1]/comment()">
 <xsl:value-of select="."/><xsl:text>
</xsl:text>
-- 
1.7.10.4


From ab6572fc673e42ac3bca1d5b2563876bf614bd69 Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Fri, 6 Mar 2009 06:12:37 +0000
Subject: [PATCH 10/16] *** empty log message ***

---
 Makefile.am |   53 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 630b80f..a15915f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,11 +89,15 @@ MAN3 =	@M17NLIB@/src/m17n-core.h \
 
 MAN5 = ${DBFORMAT}
 
-SRCALL = \
+SRC_COMMON = \
 	mainpage.txt \
 	${MAN3} \
 	data/m17n-config.txt data/m17n-db.txt data/exprog.txt \
-	data/dbformat.txt data/dbdata.txt data/dbtutorial.txt fdl.txt
+	data/dbformat.txt data/dbtutorial.txt fdl.txt
+
+SRC_EN = ${SRC_COMMON} data/dbdata-en.txt
+SRC_JA = ${SRC_COMMON} data/dbdata-ja.txt
+SRCALL = ${SRC_COMMON} data/dbdata-en.txt data/dbdata-ja.txt
 
 DBDATA = $(shell echo @M17NDB@/*.{fst,tbl} @M17NDB@/MIM/*.mimx @M17NDB@/FLT/*.flt @M17NDB@/LANGDATA/LANGUAGE.tbl)
 DBIMAGE = $(shell echo images/*.png images/*.eps)
@@ -171,61 +175,65 @@ doxyfile: Makefile
 	      -e '/^GENERATE_TAGFILE / s/=.*/= m17n.tag/' \
 	      > $@
 
-doxyfile-html: doxyfile ${SRCALL}
+doxyfile-html: doxyfile
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
-	    -e 's|%INPUT%|${SRCALL}|' \
 	    -e 's|%GENERATE_HTML%|YES|' \
 	    -e 's|%GENERATE_LATEX%|NO|' \
 	    -e 's|%GENERATE_MAN%|NO|' \
 	    -e 's|%ENABLED_SECTIONS%|FOR-HTML|' \
 	  < $< >$@
 
-doxyfile-html.usr: doxyfile-html
+doxyfile-html.usr: doxyfile-html ${SRC_EN}
 	sed -e 's|%PROJECT_NAME%|${PROJECT_NAME_EN}|' \
+	    -e 's|%INPUT%|${SRC_EN}|' \
 	    -e 's/%USR_JA_DEV%/usr/g' \
 	    -e 's/%OUTPUT_LANGUAGE%/English/' \
 	  < $< >$@
 
-doxyfile-html.dev: doxyfile-html
+doxyfile-html.dev: doxyfile-html ${SRC_EN}
 	sed -e 's|%PROJECT_NAME%|${PROJECT_NAME_EN}|' \
+	    -e 's|%INPUT%|${SRC_EN}|' \
 	    -e 's/%USR_JA_DEV%/dev/g' \
 	    -e 's/%OUTPUT_LANGUAGE%/English/' \
 	  < $< >$@
 
-doxyfile-html.ja: doxyfile-html
+doxyfile-html.ja: doxyfile-html ${SRC_JA}
 	sed -e 's|%PROJECT_NAME%|${PROJECT_NAME_JA}|' \
+	    -e 's|%INPUT%|${SRC_JA}|' \
 	    -e 's/%USR_JA_DEV%/ja/g' \
 	    -e 's/%OUTPUT_LANGUAGE%/Japanese/' \
 	  < $< >$@
 
-doxyfile-latex: doxyfile ${SRCALL}
+doxyfile-latex: doxyfile
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
-	    -e 's|%INPUT%|${SRCALL}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
 	    -e 's|%GENERATE_LATEX%|YES|' \
 	    -e 's|%GENERATE_MAN%|NO|' \
 	    -e 's|%ENABLED_SECTIONS%|FOR-LATEX|' \
 	  < $< >$@
 
-doxyfile-latex.usr: doxyfile-latex
+doxyfile-latex.usr: doxyfile-latex ${SRC_EN}
 	sed -e 's|%PROJECT_NAME%|${PROJECT_NAME_EN}|' \
+	    -e 's|%INPUT%|${SRC_EN}|' \
 	    -e 's/%USR_JA_DEV%/usr/g' \
 	    -e 's/%OUTPUT_LANGUAGE%/English/' \
 	  < $< >$@
 
-doxyfile-latex.dev: doxyfile-latex
+doxyfile-latex.dev: doxyfile-latex ${SRC_EN}
 	sed -e 's|%PROJECT_NAME%|${PROJECT_NAME_EN}|' \
+	    -e 's|%INPUT%|${SRC_EN}|' \
 	    -e 's/%USR_JA_DEV%/dev/g' \
 	    -e 's/%OUTPUT_LANGUAGE%/English/' \
 	  < $< >$@
 
-doxyfile-latex.ja: doxyfile-latex
+doxyfile-latex.ja: doxyfile-latex ${SRC_JA}
 	sed -e 's|%PROJECT_NAME%|${PROJECT_NAME_JA}|' \
+	    -e 's|%INPUT%|${SRC_EN}|' \
 	    -e 's/%USR_JA_DEV%/ja/g' \
 	    -e 's/%OUTPUT_LANGUAGE%/Japanese/' \
 	  < $< >$@
 
-doxyfile-man1: doxyfile ${SRCALL}
+doxyfile-man1: doxyfile ${MAN1}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${MAN1}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
@@ -235,7 +243,7 @@ doxyfile-man1: doxyfile ${SRCALL}
 	    -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
 	  < $< >$@
 
-doxyfile-man3: doxyfile ${SRCALL}
+doxyfile-man3: doxyfile ${MAN3}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${MAN3}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
@@ -245,7 +253,7 @@ doxyfile-man3: doxyfile ${SRCALL}
 	    -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
 	  < $< >$@
 
-doxyfile-man5: doxyfile ${SRCALL}
+doxyfile-man5: doxyfile ${MAN5}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${MAN5}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
@@ -264,10 +272,23 @@ 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.xml utils/expand-mdb.awk
+data/dbdata-en.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.xml utils/expand-mdb.awk \
+			utils/description-en.xsl
 	[ -d data ] || mkdir data
 	@AWK@ -v M17NDB=@M17NDB@ -f utils/expand-mdb.awk @M17NDB@/mdb.xml > data/expanded-mdb.xml
 	xsltproc -xinclude utils/description-en.xsl data/expanded-mdb.xml > $@
+	ICONS=`sed -n 's/.*icon:<img src="icon-\([^"]*\)".*$$/\1/p' < $@`; \
+	  for f in $${ICONS}; do \
+	    SRC="@M17NDB@/icons/$$f";\
+	    DST="images/icon-$$f"; \
+	    [ ! -f $${SRC} -o -f $${DST} ] || cp $${SRC} $${DST}; \
+	  done
+
+data/dbdata-ja.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.xml utils/expand-mdb.awk \
+			utils/description-ja.xsl
+	[ -d data ] || mkdir data
+	@AWK@ -v M17NDB=@M17NDB@ -f utils/expand-mdb.awk @M17NDB@/mdb.xml > data/expanded-mdb.xml
+	xsltproc -xinclude utils/description-ja.xsl data/expanded-mdb.xml > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
 	utils/dbformat.sh ${DBFORMAT} > $@
-- 
1.7.10.4


From d276fdf5d1d1c90e9389d110351ddda785982cb2 Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Fri, 6 Mar 2009 06:43:21 +0000
Subject: [PATCH 11/16] *** empty log message ***

---
 utils/description-en.xsl |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
index 0c104f2..a30fac2 100644
--- a/utils/description-en.xsl
+++ b/utils/description-en.xsl
@@ -32,20 +32,23 @@
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:language"/>
    <xsl:text> name:</xsl:text>
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:name"/>
-   <xsl:text>@htmlonly
 title:</xsl:text>
+   <xsl:text> @htmlonly
 title:</xsl:text>
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:title"/>
    <xsl:text> icon:&lt;img src="</xsl:text>
-   <xsl:text>icon-</xsl:text><xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly)
@verbatim
</xsl:text>
-   <xsl:choose><xsl:when  test="following-sibling::mim:input-method[1]/comment()">
+   <xsl:text>icon-</xsl:text><xsl:value-of select="substring-before(., '.mimx')"/><xsl:text>.png" border="1" style="vertical-align:middle;"&gt; @endhtmlonly )
</xsl:text>
+   <xsl:choose>
+     <xsl:when  test="following-sibling::mim:input-method[1]/comment()">
    <xsl:for-each select="following-sibling::mim:input-method[1]/comment()">
-<xsl:value-of select="."/><xsl:text>
</xsl:text>
+     <xsl:value-of select="."/><xsl:text>
</xsl:text>
    </xsl:for-each>
    </xsl:when>
    <xsl:otherwise>
+     <xsl:text>@verbatim
</xsl:text>
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+     <xsl:text>@endverbatim
</xsl:text>
    </xsl:otherwise>
    </xsl:choose>
-   <xsl:text> 
@endverbatim
</xsl:text>
+   <xsl:text> 
</xsl:text>
 &lt;/li&gt;
 	    </xsl:when>
 	    <xsl:otherwise>
-- 
1.7.10.4


From 0dd334fa361428bab3523c5631693621150882b0 Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Fri, 6 Mar 2009 06:44:32 +0000
Subject: [PATCH 12/16] *** empty log message ***

---
 utils/description-en.xsl |    2 +-
 utils/description-ja.xsl |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/utils/description-en.xsl b/utils/description-en.xsl
index a30fac2..08db662 100644
--- a/utils/description-en.xsl
+++ b/utils/description-en.xsl
@@ -45,7 +45,7 @@
    <xsl:otherwise>
      <xsl:text>@verbatim
</xsl:text>
    <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
-     <xsl:text>@endverbatim
</xsl:text>
+     <xsl:text>
@endverbatim
</xsl:text>
    </xsl:otherwise>
    </xsl:choose>
    <xsl:text> 
</xsl:text>
diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
index 3d358ea..da75254 100644
--- a/utils/description-ja.xsl
+++ b/utils/description-ja.xsl
@@ -36,7 +36,7 @@
 	          <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:language"/>
 		  <xsl:text> name:</xsl:text>
 		  <xsl:value-of select="following-sibling::mim:input-method[1]/mim:tags/mim:name"/>
-		  <xsl:text>)
@verbatim
</xsl:text>
+		  <xsl:text>)</xsl:text>
 		  <xsl:choose>
 		    <xsl:when  test="following-sibling::mim:input-method[1]/comment()">
 		      <xsl:for-each select="following-sibling::mim:input-method[1]/comment()">
@@ -44,14 +44,16 @@
 		      </xsl:for-each>
 		    </xsl:when>
 		    <xsl:otherwise>
+		      <xsl:text>@verbatim
</xsl:text>
 		      <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
+		      <xsl:text>@endverbatim
</xsl:text>
 		    </xsl:otherwise>
 		  </xsl:choose>
-		  <xsl:text> @endverbatim
</xsl:text>
+		  <xsl:text>
</xsl:text>
 	      </li>
 	    </xsl:when>
 	    <xsl:otherwise>
-	      <li><xsl:value-of select="."/><xsl:text>

</xsl:text>
+	      <li><xsl:value-of select="."/><xsl:text>
</xsl:text>
 		<xsl:value-of select="parent::mdb:source/parent::mdb:item/mdb:description"/>
 	      </li>
 	      </xsl:otherwise>
-- 
1.7.10.4


From d99f3ac1143116ffbf62c6d66d13363f37e84434 Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Fri, 3 Apr 2009 05:35:03 +0000
Subject: [PATCH 13/16] *** empty log message ***

---
 utils/description-ja.xsl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
index da75254..b3133cf 100644
--- a/utils/description-ja.xsl
+++ b/utils/description-ja.xsl
@@ -44,7 +44,7 @@
 		      </xsl:for-each>
 		    </xsl:when>
 		    <xsl:otherwise>
-		      <xsl:text>@verbatim
</xsl:text>
+		      <xsl:text>
@verbatim
</xsl:text>
 		      <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
 		      <xsl:text>@endverbatim
</xsl:text>
 		    </xsl:otherwise>
-- 
1.7.10.4


From e080a6495d48fd487be73a73d3d5b960b940b3cd Mon Sep 17 00:00:00 2001
From: nisikimi <nisikimi>
Date: Fri, 3 Apr 2009 06:35:45 +0000
Subject: [PATCH 14/16] *** empty log message ***

---
 utils/description-ja.xsl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/description-ja.xsl b/utils/description-ja.xsl
index b3133cf..1429fcb 100644
--- a/utils/description-ja.xsl
+++ b/utils/description-ja.xsl
@@ -46,7 +46,7 @@
 		    <xsl:otherwise>
 		      <xsl:text>
@verbatim
</xsl:text>
 		      <xsl:value-of select="following-sibling::mim:input-method[1]/mim:description"/>
-		      <xsl:text>@endverbatim
</xsl:text>
+		      <xsl:text>
@endverbatim
</xsl:text>
 		    </xsl:otherwise>
 		  </xsl:choose>
 		  <xsl:text>
</xsl:text>
-- 
1.7.10.4


From 8860128c04099250e7dc95f585c49e85ca07dfdd Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Sat, 27 Mar 2010 07:29:10 +0000
Subject: [PATCH 15/16] (data/dbdata-en.txt): Resize icon images.

---
 Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a15915f..2597b5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -279,9 +279,9 @@ data/dbdata-en.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.xml utils/expand-mdb.awk \
 	xsltproc -xinclude utils/description-en.xsl data/expanded-mdb.xml > $@
 	ICONS=`sed -n 's/.*icon:<img src="icon-\([^"]*\)".*$$/\1/p' < $@`; \
 	  for f in $${ICONS}; do \
-	    SRC="@M17NDB@/icons/$$f";\
-	    DST="images/icon-$$f"; \
-	    [ ! -f $${SRC} -o -f $${DST} ] || cp $${SRC} $${DST}; \
+	    S="@M17NDB@/icons/$$f";\
+	    D="images/icon-$$f"; \
+	    [ ! -f $${S} -o -f $${D} ] || convert -resize 50% $${S} $${D}; \
 	  done
 
 data/dbdata-ja.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.xml utils/expand-mdb.awk \
-- 
1.7.10.4


From eaa6a3cf84b99e7db559934927f4ec9fc7cd179e Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Sat, 27 Mar 2010 07:29:15 +0000
Subject: [PATCH 16/16] *** empty log message ***

---
 ChangeLog |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 41fc943..3e39428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-27  Kenichi Handa  <handa@m17n.org>
+
+	* Makefile.am (data/dbdata-en.txt): Resize icon images.
+
 2007-07-24  Kenichi Handa  <handa@m17n.org>
 
 	* utils/Makefile.am: Body surrounded by "if MAINTAINER_MODE .. endif".
-- 
1.7.10.4