X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=MDatabase.cs;h=afefa61b97032b9f4913c47e2e943eddc912e95b;hb=4aefe2227f419cc664c8a27eeb5babb382778162;hp=5779783495962cd4daa67fb1eb2dabe9992bbae3;hpb=06a7d21737872397a9dfa8ba7619ca50677ee9de;p=m17n%2Fm17n-lib-cs.git

diff --git a/MDatabase.cs b/MDatabase.cs
index 5779783..afefa61 100644
--- a/MDatabase.cs
+++ b/MDatabase.cs
@@ -417,6 +417,7 @@ namespace M17N.Core
       };
 
     public Tag tag;
+    public NameTable name_table = new NameTable ();
     private Loader loader;
     private object ExtraInfo;
     // Directory of the database file.
@@ -995,9 +996,10 @@ namespace M17N.Core
 	return loader (tag, ExtraInfo);
       if (Info.Format == Mxml)
 	{
-	  XmlDocument doc = new XmlDocument ();
+	  XmlDocument doc = new XmlDocument (name_table);
 	  try {
-	    XmlReader reader = XmlReader.Create (FileInfo.FullName);
+	    XmlTextReader reader
+	      = new XmlTextReader (FileInfo.FullName, name_table);
 	    doc.Load (reader);
 	    LastLoaded = DateTime.Now;	    
 	  } catch (Exception e) {
@@ -1030,8 +1032,8 @@ namespace M17N.Core
 	return null;
       if (Info.Format == Mxml)
 	{
-	  XmlDocument doc = new XmlDocument ();
-	  XmlTextReader reader = new XmlTextReader (stream);
+	  XmlDocument doc = new XmlDocument (name_table);
+	  XmlTextReader reader = new XmlTextReader (stream, name_table);
 
 	  reader.WhitespaceHandling = WhitespaceHandling.None;
 	  try {
@@ -1075,8 +1077,8 @@ namespace M17N.Core
 	return null;
       if (Info.Format == Mxml)
 	{
-	  XmlDocument doc = new XmlDocument ();
-	  XmlTextReader reader = new XmlTextReader (stream);
+	  XmlDocument doc = new XmlDocument (name_table);
+	  XmlTextReader reader = new XmlTextReader (stream, name_table);
 
 	  reader.WhitespaceHandling = WhitespaceHandling.None;
 	  try {
@@ -1122,8 +1124,8 @@ namespace M17N.Core
       if (Info.Format != Mxml)
 	throw new Exception ("Not an XML format");
 
-      XmlDocument doc = new XmlDocument ();
-      XmlTextReader reader = new XmlTextReader (stream);
+      XmlDocument doc = new XmlDocument (name_table);
+      XmlTextReader reader = new XmlTextReader (stream, name_table);
       int len = nodes.Length;
 
       reader.WhitespaceHandling = WhitespaceHandling.None;