Migrated CMapBasicTests to use XML source.
- added TinyXML library code and helper functions
- removed old Python scripts that generated C++ files
- added Python script that generates a list of fonts to test (.h file)
- modified test/autogenerated/cmap_basic_test.cc
- update test/autogenerated/cmap_test_data.h



git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@93 672e30a5-4c29-85ac-ac6d-611c735e0a51
diff --git a/test/autogenerated/cmap_basic_test.cc b/test/autogenerated/cmap_basic_test.cc
index 0c09199..ddf3aa5 100644
--- a/test/autogenerated/cmap_basic_test.cc
+++ b/test/autogenerated/cmap_basic_test.cc
@@ -35,6 +35,7 @@
 #include "test/autogenerated/cmap_test_data.h"
 #include "test/test_font_utils.h"
 #include "test/test_utils.h"
+#include "test/test_xml_utils.h"
 
 namespace sfntly {
 
@@ -43,26 +44,26 @@
 using ::testing::TestWithParam;
 using ::testing::Values;
 
-class CMapBasicTests : public :: testing::TestWithParam<TestCMap> {
+class CMapBasicTests : public :: testing::TestWithParam<const char*> {
  public:
   CMapBasicTests() {}
   virtual void SetUp();
   virtual void TearDown() {}
 
-  void BasicTest(int32_t index);
-
   Ptr<CMapTable> cmap_table_;
+  TiXmlDocument document_;
 };
 
 void CMapBasicTests::SetUp() {
+  // Loading the font
   Ptr<FontFactory> font_factory;
   font_factory.Attach(FontFactory::GetInstance());
   FontArray font_array;
-  std::string font_name("../../");
+  std::string font_name = "../../";
 #if defined (WIN32)
   font_name += "../";
 #endif
-  font_name += std::string(GetParam().name);
+  font_name += std::string(GetParam());
   LoadFont(font_name.c_str(), font_factory, &font_array);
   ASSERT_FALSE(font_array.empty());
   Ptr<Font> font = font_array.at(0);
@@ -71,34 +72,52 @@
   if (!cmap_table_)
     fprintf(stderr, "No CMap: %s\n", font_name.c_str());
   ASSERT_NE(cmap_table_, reinterpret_cast<CMapTable*>(NULL));
-}
 
-void CMapBasicTests::BasicTest(int32_t index) {
-  const ProtoCMap* test = &GetParam().cmaps[index];
-  Ptr<CMapTable::CMap> cmap;
-  cmap.Attach(cmap_table_->GetCMap(test->platform_id, test->encoding_id));
-  if (!cmap) {
-    fprintf(stderr, "Cannot test unsupported CMapFormat%d\n", test->format);
-    return;
-  }
-  ASSERT_EQ(cmap->platform_id(), test->platform_id);
-  ASSERT_EQ(cmap->encoding_id(), test->encoding_id);
-  ASSERT_EQ(cmap->format(), test->format);
-  // There is no length() method for a CMap!
-  // ASSERT_EQ(cmap->length(), test->length);
-  for (int32_t i = 0; i < test->num_mappings; ++i)
-    ASSERT_EQ(cmap->GlyphId(test->chars[i]), test->glyph_ids[i]);
+  // Loading the XML file
+  document_ = TiXmlDocument((font_name + ".xml").c_str());
+  ASSERT_TRUE(document_.LoadFile());
 }
 
 TEST_P(CMapBasicTests, BasicTest) {
-  for (int32_t i = 0; i < GetParam().num_cmaps; ++i)
-    BasicTest(i);
+  TiXmlNodeVector* cmap_table = GetNodesWithName(&document_, "cmap_table");
+  // A font can only have one CMap table
+  ASSERT_EQ(cmap_table->size(), 1);
+  TiXmlNodeVector* cmaps = GetNodesWithName(cmap_table->at(0), "cmap");
+  const TiXmlAttribute* num_cmaps_attr = GetAttribute(cmap_table->at(0),
+                                                      "num_cmaps");
+  ASSERT_NE(num_cmaps_attr, reinterpret_cast<TiXmlAttribute*>(NULL));
+  // But there may be more than one CMap in this table
+  ASSERT_LE(cmaps->size(), num_cmaps_attr->IntValue());
+  for (TiXmlNodeVector::iterator it = cmaps->begin();
+       it != cmaps->end(); ++it) {
+    int32_t platform_id = GetAttribute(*it, "platform_id")->IntValue();
+    int32_t encoding_id = GetAttribute(*it, "encoding_id")->IntValue();
+    Ptr<CMapTable::CMap> cmap;
+    cmap.Attach(cmap_table_->GetCMap(platform_id, encoding_id));
+    if (!cmap) {
+      fprintf(stderr, "Cannot test unsupported CMapFormat%d\n",
+              GetAttribute(*it, "format")->IntValue());
+      continue;
+    }
+    ASSERT_EQ(cmap->platform_id(), platform_id);
+    ASSERT_EQ(cmap->encoding_id(), encoding_id);
+    TiXmlNodeVector* maps = GetNodesWithName(*it, "map");
+    for (TiXmlNodeVector::iterator jt = maps->begin();
+         jt != maps->end(); ++jt) {
+      int32_t character;
+      sscanf(GetAttribute(*jt, "char")->Value(), "%x", &character);
+      int32_t glyph_id = GetAttribute(*jt, "gid")->IntValue();
+      ASSERT_EQ(cmap->GlyphId(character), glyph_id);
+    }
+    delete maps;
+  }
+  delete cmaps;
+  delete cmap_table;
 }
 
-
 INSTANTIATE_TEST_CASE_P(CMapBasicTests,
                         CMapBasicTests,
-                        ::testing::ValuesIn(kAllTestCMaps));
+                        ::testing::ValuesIn(cmap_test_data::kAllTests));
 
 #else
 
diff --git a/test/autogenerated/cmap_test_data.cc b/test/autogenerated/cmap_test_data.cc
deleted file mode 100644
index 95ee15c..0000000
--- a/test/autogenerated/cmap_test_data.cc
+++ /dev/null
@@ -1,3435 +0,0 @@
-/*
- * !!! DO NOT EDIT !!!
- * THIS FILE IS GENERATED BY A SCRIPT.
- * FOR MORE DETAILS SEE 'README-test_data.txt'.
- */
-
-/*
- * Copyright 2011 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test/autogenerated/cmap_test_data.h"
-
-namespace sfntly
-{
-  TestCMap kTestCousine_BoldItalic_ttf_xml = {
-    "data/fonts/cousine/Cousine-BoldItalic.ttf",
-    2,
-    {
-     {
-      344,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCousine_Bold_ttf_xml = {
-    "data/fonts/cousine/Cousine-Bold.ttf",
-    2,
-    {
-     {
-      344,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCousine_Regular_ttf_xml = {
-    "data/fonts/cousine/Cousine-Regular.ttf",
-    2,
-    {
-     {
-      344,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCousine_Italic_ttf_xml = {
-    "data/fonts/cousine/Cousine-Italic.ttf",
-    2,
-    {
-     {
-      344,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCedarville_Cursive_ttf_xml = {
-    "data/fonts/cedarvillecursive/Cedarville-Cursive.ttf",
-    1,
-    {
-     {
-      240,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 205, 240, 278, 317, 355, 710}
-      ,				// chars
-      {3, 38, 73, 108, 143, 178, 213, 248, 283, 318}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDancingScript_Bold_ttf_xml = {
-    "data/fonts/dancingscript/DancingScript-Bold.ttf",
-    1,
-    {
-     {
-      216,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 177, 199, 221, 243, 710}
-      ,				// chars
-      {3, 25, 47, 69, 91, 113, 135, 157, 179, 201}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDancingScript_Regular_ttf_xml = {
-    "data/fonts/dancingscript/DancingScript-Regular.ttf",
-    1,
-    {
-     {
-      216,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 177, 199, 221, 243, 710}
-      ,				// chars
-      {3, 25, 47, 69, 91, 113, 135, 157, 179, 201}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDamion_Regular_ttf_xml = {
-    "data/fonts/damion/Damion-Regular.ttf",
-    1,
-    {
-     {
-      314,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 58, 84, 110, 169, 197, 223, 249, 520, 733}
-      ,				// chars
-      {3, 29, 55, 81, 106, 132, 158, 184, 210, 236}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAnnieUseYourTelescope_ttf_xml = {
-    "data/fonts/annieuseyourtelescope/AnnieUseYourTelescope.ttf",
-    1,
-    {
-     {
-      248,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 205, 240, 275, 317, 353, 710}
-      ,				// chars
-      {3, 38, 73, 108, 143, 178, 213, 248, 283, 318}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDeliusSwashCaps_Regular_ttf_xml = {
-    "data/fonts/deliusswashcaps/DeliusSwashCaps-Regular.ttf",
-    1,
-    {
-     {
-      288,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 58, 84, 110, 169, 195, 221, 247, 323, 8224}
-      ,				// chars
-      {3, 29, 55, 81, 107, 133, 159, 185, 211, 237}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDelius_Regular_ttf_xml = {
-    "data/fonts/delius/Delius-Regular.ttf",
-    1,
-    {
-     {
-      288,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 58, 84, 110, 169, 195, 221, 247, 323, 8224}
-      ,				// chars
-      {3, 29, 55, 81, 107, 133, 159, 185, 211, 237}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCoveredByYourGrace_ttf_xml = {
-    "data/fonts/coveredbyyourgrace/CoveredByYourGrace.ttf",
-    1,
-    {
-     {
-      478,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 66, 100, 167, 201, 235, 269, 311, 350, 509}
-      ,				// chars
-      {3, 37, 71, 104, 138, 172, 206, 240, 274, 308}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestEBGaramond_Regular_ttf_xml = {
-    "data/fonts/ebgaramond/EBGaramond-Regular.ttf",
-    1,
-    {
-     {
-      1048,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 217, 369, 523, 678, 1032, 7470, 7794, 8137, 8566}
-      ,				// chars
-      {3, 155, 307, 459, 611, 763, 915, 1067, 1219, 1371}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabinSketch_Bold_ttf_xml = {
-    "data/fonts/cabinsketch/CabinSketch-Bold.ttf",
-    2,
-    {
-     {
-      230,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 176, 198, 220, 242, 402}
-      ,				// chars
-      {3, 25, 47, 69, 91, 112, 134, 156, 178, 200}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 177, 152, 123, 119}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAllan_Bold_ttf_xml = {
-    "data/fonts/allan/Allan-Bold.ttf",
-    2,
-    {
-     {
-      232,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 176, 198, 220, 242, 382}
-      ,				// chars
-      {3, 25, 47, 69, 91, 113, 135, 157, 179, 201}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 178, 153, 124, 120}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCoda_Caption_Heavy_ttf_xml = {
-    "data/fonts/coda/Coda-Caption-Heavy.ttf",
-    1,
-    {
-     {
-      256,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 72, 112, 185, 225, 265, 305, 345, 452, 526}
-      ,				// chars
-      {3, 43, 83, 123, 163, 203, 243, 283, 323, 363}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCoda_Heavy_ttf_xml = {
-    "data/fonts/coda/Coda-Heavy.ttf",
-    1,
-    {
-     {
-      240,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 64, 96, 162, 195, 227, 259, 301, 336, 378}
-      ,				// chars
-      {3, 35, 67, 99, 131, 163, 195, 227, 259, 291}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestForum_Regular_ttf_xml = {
-    "data/fonts/forum/Forum-Regular.ttf",
-    2,
-    {
-     {
-      1262,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 89, 183, 245, 302, 361, 1029, 1086, 1187, 1265}
-      ,				// chars
-      {3, 60, 163, 156, 235, 565, 365, 426, 479, 531}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 193, 31, 97, 83, 112, 142, 19, 66}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAlike_Regular_ttf_xml = {
-    "data/fonts/alike/Alike-Regular.ttf",
-    2,
-    {
-     {
-      152,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 179, 154, 125, 121}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCorben_Bold_ttf_xml = {
-    "data/fonts/corben/Corben-Bold.ttf",
-    1,
-    {
-     {
-      344,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 70, 108, 179, 217, 255, 294, 339, 377, 7779}
-      ,				// chars
-      {3, 41, 79, 117, 155, 193, 231, 269, 307, 344}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCaudex_Regular_ttf_xml = {
-    "data/fonts/caudex/Caudex-Regular.ttf",
-    1,
-    {
-     {
-      3272,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 266, 537, 928, 7684, 8052, 8595, 57446, 59571, 61226}
-      ,				// chars
-      {3, 204, 405, 606, 807, 1008, 1209, 1410, 1611, 1812}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCaudex_BoldItalic_ttf_xml = {
-    "data/fonts/caudex/Caudex-BoldItalic.ttf",
-    1,
-    {
-     {
-      3272,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 266, 537, 928, 7684, 8052, 8595, 57446, 59571, 61226}
-      ,				// chars
-      {3, 204, 405, 606, 807, 1008, 1209, 1410, 1611, 1812}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCaudex_Italic_ttf_xml = {
-    "data/fonts/caudex/Caudex-Italic.ttf",
-    1,
-    {
-     {
-      3272,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 266, 537, 928, 7684, 8052, 8595, 57446, 59571, 61226}
-      ,				// chars
-      {3, 204, 405, 606, 807, 1008, 1209, 1410, 1611, 1812}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCaudex_Bold_ttf_xml = {
-    "data/fonts/caudex/Caudex-Bold.ttf",
-    1,
-    {
-     {
-      3272,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 266, 537, 928, 7684, 8052, 8595, 57446, 59571, 61226}
-      ,				// chars
-      {3, 204, 405, 606, 807, 1008, 1209, 1410, 1611, 1812}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_MediumItalic_ttf_xml = {
-    "data/fonts/cabin/Cabin-MediumItalic.ttf",
-    1,
-    {
-     {
-      232,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_SemiBold_ttf_xml = {
-    "data/fonts/cabin/Cabin-SemiBold.ttf",
-    1,
-    {
-     {
-      224,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_SemiBoldItalic_ttf_xml = {
-    "data/fonts/cabin/Cabin-SemiBoldItalic.ttf",
-    1,
-    {
-     {
-      224,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_BoldItalic_ttf_xml = {
-    "data/fonts/cabin/Cabin-BoldItalic.ttf",
-    1,
-    {
-     {
-      224,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_Medium_ttf_xml = {
-    "data/fonts/cabin/Cabin-Medium.ttf",
-    1,
-    {
-     {
-      224,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_Italic_ttf_xml = {
-    "data/fonts/cabin/Cabin-Italic.ttf",
-    1,
-    {
-     {
-      224,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_Bold_ttf_xml = {
-    "data/fonts/cabin/Cabin-Bold.ttf",
-    1,
-    {
-     {
-      224,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCabin_Regular_ttf_xml = {
-    "data/fonts/cabin/Cabin-Regular.ttf",
-    1,
-    {
-     {
-      224,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 181, 204, 227, 250, 8217}
-      ,				// chars
-      {1, 24, 47, 70, 93, 116, 139, 162, 185, 208}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDawningofaNewDay_ttf_xml = {
-    "data/fonts/dawningofanewday/DawningofaNewDay.ttf",
-    1,
-    {
-     {
-      280,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 58, 84, 110, 169, 196, 222, 248, 336, 711}
-      ,				// chars
-      {3, 29, 55, 81, 107, 133, 159, 185, 211, 237}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDangrek_ttf_xml = {
-    "data/fonts/dangrek/Dangrek.ttf",
-    2,
-    {
-     {
-      96,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBlackOpsOne_ttf_xml = {
-    "data/fonts/blackopsone/BlackOpsOne.ttf",
-    1,
-    {
-     {
-      256,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {1, 39, 65, 91, 117, 176, 202, 228, 254, 567}
-      ,				// chars
-      {3, 29, 55, 81, 107, 133, 159, 185, 211, 237}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestFrancoisOne_ttf_xml = {
-    "data/fonts/francoisone/FrancoisOne.ttf",
-    1,
-    {
-     {
-      456,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {2, 72, 115, 192, 235, 278, 322, 365, 515, 7779}
-      ,				// chars
-      {3, 46, 89, 132, 175, 218, 261, 304, 347, 390}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBowlbyOne_ttf_xml = {
-    "data/fonts/bowlbyone/BowlbyOne.ttf",
-    1,
-    {
-     {
-      368,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 60, 88, 116, 178, 206, 234, 353, 535, 8226}
-      ,				// chars
-      {3, 31, 59, 87, 115, 143, 171, 199, 227, 255}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBowlbyOneSC_ttf_xml = {
-    "data/fonts/bowlbyone/BowlbyOneSC.ttf",
-    1,
-    {
-     {
-      384,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 62, 92, 122, 185, 215, 245, 520, 806, 8240}
-      ,				// chars
-      {3, 33, 63, 93, 123, 153, 183, 213, 243, 273}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCalligraffiti_ttf_xml = {
-    "data/fonts/calligraffiti/Calligraffiti.ttf",
-    2,
-    {
-     {
-      412,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 175, 197, 219, 241, 376}
-      ,				// chars
-      {21, 43, 65, 87, 109, 217, 117, 212, 138, 188}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 39, 64, 89, 114, 138, 160, 172, 195}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBangers_ttf_xml = {
-    "data/fonts/bangers/Bangers.ttf",
-    2,
-    {
-     {
-      296,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {9, 46, 70, 94, 118, 174, 200, 224, 248, 8212}
-      ,				// chars
-      {3, 27, 51, 75, 99, 123, 147, 171, 195, 219}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 31, 56, 81, 106, 188, 163, 134, 130}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAstloch_Regular_ttf_xml = {
-    "data/fonts/astloch/Astloch-Regular.ttf",
-    2,
-    {
-     {
-      128,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 52, 72, 92, 112, 165, 185, 205, 225, 245}
-      ,				// chars
-      {3, 23, 43, 63, 83, 103, 123, 143, 163, 183}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 179, 154, 125, 121}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAstloch_Bold_ttf_xml = {
-    "data/fonts/astloch/Astloch-Bold.ttf",
-    2,
-    {
-     {
-      128,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 52, 72, 92, 112, 165, 185, 205, 225, 245}
-      ,				// chars
-      {3, 23, 43, 63, 83, 103, 123, 143, 163, 183}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 179, 154, 125, 121}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAngkor_ttf_xml = {
-    "data/fonts/angkor/Angkor.ttf",
-    2,
-    {
-     {
-      88,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAbrilFatface_Regular_ttf_xml = {
-    "data/fonts/abrilfatface/AbrilFatface-Regular.ttf",
-    1,
-    {
-     {
-      360,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 71, 110, 182, 221, 260, 299, 338, 377, 7922}
-      ,				// chars
-      {3, 42, 81, 120, 159, 198, 237, 276, 315, 354}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCantarell_BoldOblique_ttf_xml = {
-    "data/fonts/cantarell/Cantarell-BoldOblique.ttf",
-    1,
-    {
-     {
-      264,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 70, 108, 179, 217, 255, 293, 331, 369, 7767}
-      ,				// chars
-      {3, 41, 79, 117, 155, 193, 231, 269, 307, 345}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCantarell_Oblique_ttf_xml = {
-    "data/fonts/cantarell/Cantarell-Oblique.ttf",
-    1,
-    {
-     {
-      264,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 70, 108, 179, 217, 255, 293, 331, 369, 7767}
-      ,				// chars
-      {3, 41, 79, 117, 155, 193, 231, 269, 307, 345}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCantarell_Bold_ttf_xml = {
-    "data/fonts/cantarell/Cantarell-Bold.ttf",
-    1,
-    {
-     {
-      264,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 70, 108, 179, 217, 255, 293, 331, 369, 7767}
-      ,				// chars
-      {3, 41, 79, 117, 155, 193, 231, 269, 307, 345}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCantarell_Regular_ttf_xml = {
-    "data/fonts/cantarell/Cantarell-Regular.ttf",
-    1,
-    {
-     {
-      264,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 70, 108, 179, 217, 255, 293, 331, 369, 7767}
-      ,				// chars
-      {3, 41, 79, 117, 155, 193, 231, 269, 307, 345}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArvo_Bold_ttf_xml = {
-    "data/fonts/arvo/Arvo-Bold.ttf",
-    1,
-    {
-     {
-      504,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 177, 199, 221, 243, 711}
-      ,				// chars
-      {28, 65, 13, 31, 53, 99, 166, 181, 200, 123}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArvo_Italic_ttf_xml = {
-    "data/fonts/arvo/Arvo-Italic.ttf",
-    1,
-    {
-     {
-      522,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 176, 198, 220, 242, 729}
-      ,				// chars
-      {28, 65, 13, 31, 53, 124, 131, 180, 199, 129}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArvo_BoldItalic_ttf_xml = {
-    "data/fonts/arvo/Arvo-BoldItalic.ttf",
-    1,
-    {
-     {
-      522,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 176, 198, 220, 242, 710}
-      ,				// chars
-      {28, 65, 13, 31, 53, 124, 131, 180, 199, 116}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArvo_Regular_ttf_xml = {
-    "data/fonts/arvo/Arvo-Regular.ttf",
-    1,
-    {
-     {
-      542,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 176, 198, 220, 242, 710}
-      ,				// chars
-      {28, 65, 13, 31, 53, 124, 131, 167, 206, 116}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestChewy_ttf_xml = {
-    "data/fonts/chewy/Chewy.ttf",
-    2,
-    {
-     {
-      420,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 175, 197, 219, 241, 376}
-      ,				// chars
-      {21, 43, 65, 87, 109, 217, 117, 212, 138, 188}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 39, 64, 89, 114, 138, 161, 172, 195}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBigshotOne_ttf_xml = {
-    "data/fonts/bigshotone/BigshotOne.ttf",
-    2,
-    {
-     {
-      176,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 179, 154, 125, 121}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestChenla_ttf_xml = {
-    "data/fonts/chenla/Chenla.ttf",
-    2,
-    {
-     {
-      88,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBayon_ttf_xml = {
-    "data/fonts/bayon/Bayon.ttf",
-    2,
-    {
-     {
-      88,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCoustard_Black_ttf_xml = {
-    "data/fonts/coustard/Coustard-Black.ttf",
-    1,
-    {
-     {
-      272,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 64, 96, 161, 193, 225, 257, 299, 336, 381}
-      ,				// chars
-      {3, 35, 67, 99, 131, 163, 195, 227, 259, 291}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCoustard_Regular_ttf_xml = {
-    "data/fonts/coustard/Coustard-Regular.ttf",
-    1,
-    {
-     {
-      884,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 64, 96, 161, 193, 225, 257, 299, 336, 381}
-      ,				// chars
-      {3, 35, 120, 98, 166, 195, 242, 246, 285, 194}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAmaticSC_Bold_ttf_xml = {
-    "data/fonts/amaticsc/AmaticSC-Bold.ttf",
-    1,
-    {
-     {
-      248,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 70, 108, 182, 221, 259, 297, 336, 376, 531}
-      ,				// chars
-      {3, 41, 79, 117, 155, 193, 231, 269, 307, 345}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAmaticSC_Regular_ttf_xml = {
-    "data/fonts/amaticsc/AmaticSC-Regular.ttf",
-    1,
-    {
-     {
-      240,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 69, 106, 178, 216, 253, 290, 327, 365, 498}
-      ,				// chars
-      {3, 40, 77, 114, 151, 188, 225, 262, 299, 336}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestComfortaa_Light_ttf_xml = {
-    "data/fonts/comfortaa/Comfortaa-Light.ttf",
-    1,
-    {
-     {
-      620,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 92, 185, 245, 305, 365, 925, 1036, 1097, 8217}
-      ,				// chars
-      {3, 63, 121, 181, 192, 345, 394, 482, 542, 206}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestComfortaa_Bold_ttf_xml = {
-    "data/fonts/comfortaa/Comfortaa-Bold.ttf",
-    1,
-    {
-     {
-      620,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 92, 185, 245, 305, 365, 925, 1036, 1097, 8217}
-      ,				// chars
-      {3, 63, 121, 181, 192, 345, 394, 482, 542, 206}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestComfortaa_Regular_ttf_xml = {
-    "data/fonts/comfortaa/Comfortaa-Regular.ttf",
-    1,
-    {
-     {
-      620,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 92, 185, 245, 305, 365, 925, 1036, 1097, 8217}
-      ,				// chars
-      {3, 63, 121, 181, 192, 345, 394, 482, 542, 206}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_Bold_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-Bold.ttf",
-    2,
-    {
-     {
-      366,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {9, 60, 33, 86, 11, 127, 148, 169, 190, 211}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 57, 34, 3, 90, 197, 172, 143, 139}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_MediumItalic_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-MediumItalic.ttf",
-    2,
-    {
-     {
-      578,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {7, 140, 41, 29, 66, 182, 110, 112, 87, 166}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 137, 42, 62, 58, 93, 164, 181, 157}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_Medium_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-Medium.ttf",
-    2,
-    {
-     {
-      578,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {7, 146, 41, 29, 66, 188, 116, 118, 93, 172}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 143, 42, 62, 58, 99, 170, 187, 163}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_SemiBold_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-SemiBold.ttf",
-    2,
-    {
-     {
-      578,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {7, 146, 41, 29, 66, 188, 116, 118, 93, 172}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 143, 42, 62, 58, 99, 170, 187, 163}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_Regular_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-Regular.ttf",
-    2,
-    {
-     {
-      570,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {7, 146, 41, 29, 66, 188, 116, 118, 93, 172}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 143, 42, 62, 58, 99, 170, 187, 163}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_Italic_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-Italic.ttf",
-    2,
-    {
-     {
-      570,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {7, 140, 41, 29, 66, 182, 110, 112, 87, 166}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 137, 42, 62, 58, 93, 164, 181, 157}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_SemiBoldItalic_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-SemiBoldItalic.ttf",
-    2,
-    {
-     {
-      578,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {7, 139, 41, 29, 65, 181, 109, 111, 86, 165}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 136, 42, 62, 58, 92, 163, 180, 156}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestExpletusSans_BoldItalic_ttf_xml = {
-    "data/fonts/expletussans/ExpletusSans-BoldItalic.ttf",
-    2,
-    {
-     {
-      382,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 192, 213, 234, 255}
-      ,				// chars
-      {9, 60, 33, 86, 11, 127, 148, 169, 190, 211}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 57, 34, 3, 90, 197, 172, 143, 139}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAubrey_Regular_ttf_xml = {
-    "data/fonts/aubrey/Aubrey-Regular.ttf",
-    1,
-    {
-     {
-      168,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAntic_Regular_ttf_xml = {
-    "data/fonts/antic/Antic-Regular.ttf",
-    2,
-    {
-     {
-      194,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 171, 193, 214, 235, 305}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 128, 149, 170, 191}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCopse_Regular_ttf_xml = {
-    "data/fonts/copse/Copse-Regular.ttf",
-    2,
-    {
-     {
-      152,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {0, 51, 72, 93, 114, 168, 189, 210, 231, 252}
-      ,				// chars
-      {1, 22, 43, 64, 85, 106, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 179, 154, 125, 121}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDaysOne_Regular_ttf_xml = {
-    "data/fonts/daysone/DaysOne-Regular.ttf",
-    1,
-    {
-     {
-      320,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 206, 241, 321, 1033, 1069, 1105}
-      ,				// chars
-      {3, 38, 73, 108, 143, 178, 213, 248, 283, 318}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestActor_Regular_ttf_xml = {
-    "data/fonts/actor/Actor-Regular.ttf",
-    2,
-    {
-     {
-      702,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 180, 203, 226, 249, 731}
-      ,				// chars
-      {3, 195, 33, 105, 79, 65, 16, 64, 209, 234}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 204, 29, 96, 81, 154, 41, 129, 173}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBentham_Regular_ttf_xml = {
-    "data/fonts/bentham/Bentham-Regular.ttf",
-    1,
-    {
-     {
-      248,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {19, 62, 93, 124, 208, 242, 275, 306, 339, 370}
-      ,				// chars
-      {3, 34, 65, 96, 127, 158, 189, 220, 251, 282}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestFedero_Regular_ttf_xml = {
-    "data/fonts/federo/Federo-Regular.ttf",
-    1,
-    {
-     {
-      160,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArimo_Italic_ttf_xml = {
-    "data/fonts/arimo/Arimo-Italic.ttf",
-    2,
-    {
-     {
-      352,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArimo_BoldItalic_ttf_xml = {
-    "data/fonts/arimo/Arimo-BoldItalic.ttf",
-    2,
-    {
-     {
-      352,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArimo_Bold_ttf_xml = {
-    "data/fonts/arimo/Arimo-Bold.ttf",
-    2,
-    {
-     {
-      352,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArimo_Regular_ttf_xml = {
-    "data/fonts/arimo/Arimo-Regular.ttf",
-    2,
-    {
-     {
-      352,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 75, 96, 117, 171, 192, 213, 234, 255}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 127, 148, 169, 190}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 45, 70, 95, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeDPsc28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeDPsc28P.ttf",
-    1,
-    {
-     {
-      428,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 66, 100, 167, 201, 235, 273, 328, 375, 8216}
-      ,				// chars
-      {3, 37, 71, 104, 137, 171, 205, 239, 273, 303}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeGPrm28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeGPrm28P.ttf",
-    1,
-    {
-     {
-      452,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 205, 240, 281, 340, 383, 8225}
-      ,				// chars
-      {3, 38, 73, 107, 141, 176, 211, 246, 281, 311}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeENsc28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeENsc28P.ttf",
-    1,
-    {
-     {
-      428,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 66, 100, 167, 201, 235, 273, 328, 375, 8216}
-      ,				// chars
-      {3, 37, 71, 104, 137, 171, 205, 239, 273, 303}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFePIit28P_ttf_xml = {
-    "data/fonts/felltypes/IMFePIit28P.ttf",
-    1,
-    {
-     {
-      492,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 68, 104, 173, 209, 245, 291, 346, 711, 8482}
-      ,				// chars
-      {3, 39, 75, 16, 145, 181, 217, 253, 287, 320}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeDPrm28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeDPrm28P.ttf",
-    1,
-    {
-     {
-      452,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 205, 240, 281, 340, 383, 8225}
-      ,				// chars
-      {3, 38, 73, 107, 141, 176, 211, 246, 281, 311}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFePIrm28P_ttf_xml = {
-    "data/fonts/felltypes/IMFePIrm28P.ttf",
-    1,
-    {
-     {
-      444,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 205, 240, 281, 340, 383, 8226}
-      ,				// chars
-      {3, 38, 73, 107, 141, 176, 211, 246, 281, 312}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeFCrm28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeFCrm28P.ttf",
-    1,
-    {
-     {
-      460,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 205, 240, 281, 340, 383, 8225}
-      ,				// chars
-      {3, 38, 73, 107, 141, 176, 211, 246, 281, 311}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeGPit28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeGPit28P.ttf",
-    1,
-    {
-     {
-      484,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 69, 106, 176, 213, 250, 305, 356, 894, 9758}
-      ,				// chars
-      {3, 40, 77, 112, 149, 186, 223, 260, 30, 327}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeENit28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeENit28P.ttf",
-    1,
-    {
-     {
-      500,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 68, 104, 173, 209, 245, 291, 346, 711, 8482}
-      ,				// chars
-      {3, 39, 75, 16, 145, 181, 217, 253, 287, 320}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeDPit28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeDPit28P.ttf",
-    1,
-    {
-     {
-      476,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 70, 108, 179, 217, 255, 315, 368, 7813, 57355}
-      ,				// chars
-      {3, 41, 79, 115, 153, 191, 229, 267, 300, 336}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeENrm28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeENrm28P.ttf",
-    1,
-    {
-     {
-      468,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 67, 102, 170, 205, 240, 281, 340, 383, 8225}
-      ,				// chars
-      {3, 38, 73, 107, 141, 176, 211, 246, 281, 311}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeGPsc28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeGPsc28P.ttf",
-    1,
-    {
-     {
-      428,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 66, 100, 167, 201, 235, 273, 328, 375, 8216}
-      ,				// chars
-      {3, 37, 71, 104, 137, 171, 205, 239, 273, 303}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFePIsc28P_ttf_xml = {
-    "data/fonts/felltypes/IMFePIsc28P.ttf",
-    1,
-    {
-     {
-      428,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 66, 100, 167, 201, 235, 273, 328, 375, 8216}
-      ,				// chars
-      {3, 37, 71, 104, 137, 171, 205, 239, 273, 303}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeFCsc28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeFCsc28P.ttf",
-    1,
-    {
-     {
-      436,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 66, 100, 167, 201, 235, 273, 328, 375, 8212}
-      ,				// chars
-      {3, 37, 71, 104, 137, 171, 205, 239, 273, 302}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestIMFeFCit28P_ttf_xml = {
-    "data/fonts/felltypes/IMFeFCit28P.ttf",
-    1,
-    {
-     {
-      452,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 69, 106, 176, 213, 250, 305, 356, 894, 9758}
-      ,				// chars
-      {3, 40, 77, 112, 149, 186, 223, 260, 30, 327}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBokor_ttf_xml = {
-    "data/fonts/bokor/Bokor.ttf",
-    2,
-    {
-     {
-      96,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDidactGothic_ttf_xml = {
-    "data/fonts/didactgothic/DidactGothic.ttf",
-    1,
-    {
-     {
-      1048,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 179, 293, 430, 772, 1033, 1189, 7701, 7960, 8082}
-      ,				// chars
-      {3, 117, 231, 345, 459, 573, 687, 801, 915, 1029}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAllerta_Medium_ttf_xml = {
-    "data/fonts/allerta/Allerta-Medium.ttf",
-    2,
-    {
-     {
-      252,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 51, 69, 87, 107, 161, 200, 219, 238, 321}
-      ,				// chars
-      {3, 21, 39, 57, 75, 92, 110, 128, 146, 164}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 20, 45, 68, 0, 149, 0, 101, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAllerta_Stencil_ttf_xml = {
-    "data/fonts/allerta/Allerta-Stencil.ttf",
-    2,
-    {
-     {
-      252,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 51, 69, 87, 107, 161, 200, 219, 238, 321}
-      ,				// chars
-      {3, 21, 39, 57, 75, 92, 110, 128, 146, 164}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 20, 45, 68, 0, 149, 0, 101, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBuda_Light_ttf_xml = {
-    "data/fonts/buda/Buda-Light.ttf",
-    2,
-    {
-     {
-      552,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 192, 213, 234, 255}
-      ,				// chars
-      {191, 114, 30, 206, 193, 158, 8, 42, 103, 212}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 199, 31, 94, 78, 146, 41, 124, 168}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBrawler_Regular_ttf_xml = {
-    "data/fonts/brawler/Brawler-Regular.ttf",
-    2,
-    {
-     {
-      242,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 175, 197, 219, 241, 730}
-      ,				// chars
-      {2, 24, 46, 68, 90, 111, 129, 151, 173, 192}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 20, 45, 70, 95, 173, 148, 119, 116}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCarterOne_ttf_xml = {
-    "data/fonts/carterone/CarterOne.ttf",
-    1,
-    {
-     {
-      322,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 58, 84, 110, 169, 197, 223, 249, 515, 711}
-      ,				// chars
-      {3, 29, 55, 81, 106, 132, 158, 184, 210, 236}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCandal_ttf_xml = {
-    "data/fonts/candal/Candal.ttf",
-    1,
-    {
-     {
-      448,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {0, 61, 95, 162, 196, 230, 270, 340, 518, 806}
-      ,				// chars
-      {1, 36, 70, 104, 138, 172, 206, 240, 274, 308}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDorsa_Regular_ttf_xml = {
-    "data/fonts/dorsa/Dorsa-Regular.ttf",
-    2,
-    {
-     {
-      194,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 193, 214, 235, 338}
-      ,				// chars
-      {3, 24, 45, 66, 87, 107, 128, 149, 170, 191}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCrimsonText_BoldItalic_ttf_xml = {
-    "data/fonts/crimson/CrimsonText-BoldItalic.ttf",
-    1,
-    {
-     {
-      336,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 75, 118, 195, 238, 281, 324, 368, 8194, 8730}
-      ,				// chars
-      {3, 46, 89, 132, 175, 218, 261, 304, 347, 390}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCrimsonText_Bold_ttf_xml = {
-    "data/fonts/crimson/CrimsonText-Bold.ttf",
-    1,
-    {
-     {
-      464,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 105, 212, 285, 359, 550, 7719, 7794, 7873, 8222}
-      ,				// chars
-      {3, 76, 149, 222, 295, 368, 441, 514, 587, 660}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCrimsonText_Italic_ttf_xml = {
-    "data/fonts/crimson/CrimsonText-Italic.ttf",
-    1,
-    {
-     {
-      328,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 75, 118, 195, 238, 281, 324, 367, 779, 8733}
-      ,				// chars
-      {3, 46, 89, 132, 175, 218, 261, 304, 347, 390}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCrimsonText_Roman_ttf_xml = {
-    "data/fonts/crimson/CrimsonText-Roman.ttf",
-    1,
-    {
-     {
-      712,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 188, 310, 770, 995, 1117, 7792, 7920, 8060, 8195}
-      ,				// chars
-      {3, 125, 247, 369, 491, 613, 735, 857, 979, 1101}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCrimsonText_Semibold_ttf_xml = {
-    "data/fonts/crimson/CrimsonText-Semibold.ttf",
-    1,
-    {
-     {
-      336,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 76, 120, 198, 242, 286, 331, 375, 779, 8712}
-      ,				// chars
-      {3, 47, 91, 135, 179, 223, 267, 311, 355, 399}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCrimsonText_SemiboldItalic_ttf_xml = {
-    "data/fonts/crimson/CrimsonText-SemiboldItalic.ttf",
-    1,
-    {
-     {
-      296,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 75, 118, 195, 238, 281, 324, 368, 775, 8722}
-      ,				// chars
-      {3, 46, 89, 132, 175, 218, 261, 304, 347, 390}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAmaranth_Italic_ttf_xml = {
-    "data/fonts/amaranth/Amaranth-Italic.ttf",
-    2,
-    {
-     {
-      566,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 62, 41, 120, 22, 78, 105, 170, 193, 144}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 63, 40, 216, 125, 198, 108, 141, 123}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAmaranth_Bold_ttf_xml = {
-    "data/fonts/amaranth/Amaranth-Bold.ttf",
-    2,
-    {
-     {
-      566,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 62, 41, 121, 22, 78, 106, 168, 191, 145}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 63, 40, 216, 126, 196, 109, 142, 124}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAmaranth_Regular_ttf_xml = {
-    "data/fonts/amaranth/Amaranth-Regular.ttf",
-    2,
-    {
-     {
-      566,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 62, 41, 121, 22, 78, 106, 168, 191, 145}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 63, 40, 216, 126, 196, 109, 142, 124}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAmaranth_BoldItalic_ttf_xml = {
-    "data/fonts/amaranth/Amaranth-BoldItalic.ttf",
-    2,
-    {
-     {
-      566,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 62, 41, 120, 22, 78, 105, 177, 200, 144}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 63, 40, 223, 125, 205, 108, 141, 123}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCrushed_ttf_xml = {
-    "data/fonts/crushed/Crushed.ttf",
-    1,
-    {
-     {
-      696,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 68, 104, 173, 209, 245, 281, 318, 354, 711}
-      ,				// chars
-      {362, 4, 34, 345, 160, 178, 109, 155, 209, 355}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAdamina_Regular_ttf_xml = {
-    "data/fonts/adamina/Adamina-Regular.ttf",
-    2,
-    {
-     {
-      160,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 179, 154, 125, 121}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAldrich_Regular_ttf_xml = {
-    "data/fonts/aldrich/Aldrich-Regular.ttf",
-    1,
-    {
-     {
-      262,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 56, 80, 104, 161, 186, 210, 234, 297, 381}
-      ,				// chars
-      {3, 25, 49, 73, 97, 121, 145, 169, 193, 217}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestFanwoodText_Italic_ttf_xml = {
-    "data/fonts/fanwoodtext/FanwoodText-Italic.ttf",
-    1,
-    {
-     {
-      312,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 73, 114, 188, 229, 270, 311, 352, 711, 8193}
-      ,				// chars
-      {3, 44, 85, 126, 167, 208, 249, 290, 331, 372}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestFanwoodText_Regular_ttf_xml = {
-    "data/fonts/fanwoodtext/FanwoodText-Regular.ttf",
-    1,
-    {
-     {
-      312,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 73, 114, 188, 229, 270, 311, 352, 711, 8193}
-      ,				// chars
-      {3, 44, 85, 126, 167, 208, 249, 290, 331, 372}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAnonymousPro_Regular_ttf_xml = {
-    "data/fonts/anonymouspro/AnonymousPro-Regular.ttf",
-    1,
-    {
-     {
-      974,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {0, 92, 187, 249, 311, 373, 938, 1051, 1114, 8963}
-      ,				// chars
-      {1, 61, 168, 125, 297, 357, 408, 469, 531, 563}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAnonymousPro_Bold_ttf_xml = {
-    "data/fonts/anonymouspro/AnonymousPro-Bold.ttf",
-    1,
-    {
-     {
-      974,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {0, 92, 187, 249, 311, 373, 938, 1051, 1114, 8963}
-      ,				// chars
-      {1, 61, 168, 125, 297, 357, 408, 469, 531, 563}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAnonymousPro_Italic_ttf_xml = {
-    "data/fonts/anonymouspro/AnonymousPro-Italic.ttf",
-    1,
-    {
-     {
-      974,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {0, 92, 187, 249, 311, 373, 938, 1051, 1114, 8963}
-      ,				// chars
-      {1, 61, 168, 125, 297, 357, 408, 469, 531, 563}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAnonymousPro_BoldItalic_ttf_xml = {
-    "data/fonts/anonymouspro/AnonymousPro-BoldItalic.ttf",
-    1,
-    {
-     {
-      974,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {0, 92, 187, 249, 311, 373, 938, 1051, 1114, 8963}
-      ,				// chars
-      {1, 61, 168, 125, 297, 357, 408, 469, 531, 563}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBevan_ttf_xml = {
-    "data/fonts/bevan/Bevan.ttf",
-    1,
-    {
-     {
-      400,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 75, 118, 194, 237, 280, 325, 368, 531, 8200}
-      ,				// chars
-      {3, 46, 89, 132, 175, 218, 261, 304, 347, 390}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArtifika_Regular_ttf_xml = {
-    "data/fonts/artifika/Artifika-Regular.ttf",
-    1,
-    {
-     {
-      160,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {2, 52, 73, 94, 115, 169, 190, 211, 232, 253}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAnton_ttf_xml = {
-    "data/fonts/anton/Anton.ttf",
-    1,
-    {
-     {
-      384,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 73, 114, 189, 230, 271, 315, 356, 517, 7809}
-      ,				// chars
-      {3, 44, 85, 126, 167, 208, 249, 290, 331, 372}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBattambang_Regular_ttf_xml = {
-    "data/fonts/battambang/Battambang-Regular.ttf",
-    2,
-    {
-     {
-      96,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestBattambang_Bold_ttf_xml = {
-    "data/fonts/battambang/Battambang-Bold.ttf",
-    2,
-    {
-     {
-      96,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCarme_Regular_ttf_xml = {
-    "data/fonts/carme/Carme-Regular.ttf",
-    2,
-    {
-     {
-      256,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 96, 117, 179, 204, 227, 249, 8201}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 70, 95, 164, 140, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCherryCreamSoda_ttf_xml = {
-    "data/fonts/cherrycreamsoda/CherryCreamSoda.ttf",
-    2,
-    {
-     {
-      422,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 175, 198, 220, 242, 381}
-      ,				// chars
-      {21, 43, 65, 87, 109, 217, 159, 122, 140, 10}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 39, 64, 89, 114, 138, 160, 172, 195}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestDeliusUnicase_Regular_ttf_xml = {
-    "data/fonts/deliusunicase/DeliusUnicase-Regular.ttf",
-    2,
-    {
-     {
-      240,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 57, 82, 107, 165, 190, 215, 240, 309, 956}
-      ,				// chars
-      {3, 28, 53, 78, 103, 128, 153, 178, 203, 119}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 179, 154, 125, 121}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestComingSoon_ttf_xml = {
-    "data/fonts/comingsoon/ComingSoon.ttf",
-    2,
-    {
-     {
-      412,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 175, 197, 219, 241, 376}
-      ,				// chars
-      {21, 43, 65, 87, 109, 216, 117, 211, 138, 187}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 39, 64, 89, 114, 138, 160, 171, 194}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestFreehand_ttf_xml = {
-    "data/fonts/freehand/Freehand.ttf",
-    2,
-    {
-     {
-      96,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAlice_Regular_ttf_xml = {
-    "data/fonts/alice/Alice-Regular.ttf",
-    1,
-    {
-     {
-      160,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 53, 74, 95, 116, 170, 191, 212, 233, 254}
-      ,				// chars
-      {3, 24, 45, 66, 87, 108, 129, 150, 171, 192}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestContrail_Regular_ttf_xml = {
-    "data/fonts/contrail/Contrail-Regular.ttf",
-    2,
-    {
-     {
-      368,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 55, 78, 101, 124, 180, 203, 226, 249, 339}
-      ,				// chars
-      {3, 26, 49, 72, 95, 117, 140, 163, 186, 209}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 178, 153, 124, 120}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCardo_Bold_ttf_xml = {
-    "data/fonts/cardo/Cardo-Bold.ttf",
-    1,
-    {
-     {
-      3676,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 295, 653, 883, 5792, 7961, 8212, 10219, 58808, 61909}
-      ,				// chars
-      {3, 232, 461, 691, 921, 1151, 1381, 1610, 1840, 2070}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCardo_Italic_ttf_xml = {
-    "data/fonts/cardo/Cardo-Italic.ttf",
-    1,
-    {
-     {
-      3788,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 306, 662, 921, 5833, 8008, 8313, 42804, 58625, 61889}
-      ,				// chars
-      {3, 243, 483, 724, 965, 1206, 1447, 1687, 1926, 2139}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCardo_Regular_ttf_xml = {
-    "data/fonts/cardo/Cardo-Regular.ttf",
-    1,
-    {
-     {
-      4686,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 376, 802, 4347, 8000, 8710, 57497, 59336, 61431, 62510}
-      ,				// chars
-      {3, 313, 623, 934, 1245, 729, 1866, 2175, 2481, 2792}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAsset_ttf_xml = {
-    "data/fonts/asset/Asset.ttf",
-    2,
-    {
-     {
-      210,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 176, 198, 220, 242, 312}
-      ,				// chars
-      {3, 25, 47, 69, 91, 112, 134, 156, 178, 200}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 177, 152, 123, 119}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestChangaOne_Regular_ttf_xml = {
-    "data/fonts/changaone/ChangaOne-Regular.ttf",
-    2,
-    {
-     {
-      320,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 56, 80, 104, 162, 188, 212, 236, 339, 8224}
-      ,				// chars
-      {3, 27, 51, 75, 99, 123, 147, 171, 195, 219}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 176, 151, 122, 118}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAclonica_ttf_xml = {
-    "data/fonts/aclonica/Aclonica.ttf",
-    2,
-    {
-     {
-      718,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 68, 104, 173, 209, 245, 281, 317, 353, 711}
-      ,				// chars
-      {3, 50, 86, 233, 201, 224, 267, 333, 172, 170}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 32, 57, 82, 107, 219, 124, 140, 156}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCraftyGirls_ttf_xml = {
-    "data/fonts/craftygirls/CraftyGirls.ttf",
-    2,
-    {
-     {
-      428,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 54, 76, 98, 120, 175, 197, 219, 241, 376}
-      ,				// chars
-      {21, 43, 65, 87, 109, 219, 117, 214, 138, 189}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {0, 0, 39, 64, 89, 114, 138, 160, 173, 196}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestArchitectsDaughter_ttf_xml = {
-    "data/fonts/architectsdaughter/ArchitectsDaughter.ttf",
-    1,
-    {
-     {
-      282,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 66, 100, 167, 202, 236, 270, 311, 349, 508}
-      ,				// chars
-      {3, 37, 71, 104, 138, 172, 206, 240, 274, 308}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestContent_Bold_ttf_xml = {
-    "data/fonts/content/Content-Bold.ttf",
-    2,
-    {
-     {
-      96,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestContent_Regular_ttf_xml = {
-    "data/fonts/content/Content-Regular.ttf",
-    2,
-    {
-     {
-      96,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 45, 58, 6019, 6032, 6045, 6058, 6073, 6086, 6099}
-      ,				// chars
-      {3, 16, 29, 39, 52, 65, 78, 91, 104, 117}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 0, 0, 0, 0, 0, 0, 0}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAbel_Regular_ttf_xml = {
-    "data/fonts/abel/Abel-Regular.ttf",
-    2,
-    {
-     {
-      248,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 56, 80, 104, 161, 186, 210, 234, 297, 381}
-      ,				// chars
-      {3, 27, 51, 75, 99, 123, 147, 171, 195, 219}
-      ,				// glyph ids
-      }
-     ,
-     {
-      262,			// length
-      0,			// format
-      1,			// platform id
-      0,			// encoding id
-      10,			// num_mappings
-      {0, 25, 50, 75, 100, 125, 150, 175, 200, 225}
-      ,				// chars
-      {1, 0, 21, 46, 71, 96, 178, 153, 124, 120}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestCuprum_ttf_xml = {
-    "data/fonts/cuprum/Cuprum.ttf",
-    1,
-    {
-     {
-      352,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {32, 69, 106, 176, 213, 250, 324, 1028, 1066, 1103}
-      ,				// chars
-      {3, 40, 77, 114, 151, 188, 225, 262, 299, 336}
-      ,				// glyph ids
-      }
-     }
-  };
-
-  TestCMap kTestAndika_R_ttf_xml = {
-    "data/fonts/andika/Andika-R.ttf",
-    1,
-    {
-     {
-      4792,			// length
-      4,			// format
-      3,			// platform id
-      1,			// encoding id
-      10,			// num_mappings
-      {13, 281, 498, 715, 1067, 7424, 7691, 7908, 8580, 61860}
-      ,				// chars
-      {2, 817, 745, 2639, 597, 474, 699, 2213, 644, 876}
-      ,				// glyph ids
-      }
-     }
-  };
-
-}				// namespace sfntly
diff --git a/test/autogenerated/cmap_test_data.h b/test/autogenerated/cmap_test_data.h
index 63fd9c9..4a9f267 100644
--- a/test/autogenerated/cmap_test_data.h
+++ b/test/autogenerated/cmap_test_data.h
@@ -20,334 +20,166 @@
  * limitations under the License.
  */
 
-#ifndef SFNTLY_CPP_SRC_TEST_CMAP_TEST_DATA_H_
-#define SFNTLY_CPP_SRC_TEST_CMAP_TEST_DATA_H_
+#ifndef TYPOGRAPHY_FONT_SFNTLY_SRC_TEST_AUTOGENERATED_CMAP_TEST_DATA_H_
+#define TYPOGRAPHY_FONT_SFNTLY_SRC_TEST_AUTOGENERATED_CMAP_TEST_DATA_H_
 
 #include "sfntly/port/type.h"
 
-namespace sfntly
-{
-  struct ProtoCMap
-  {
-    int32_t length;
-    int32_t format;
-    int32_t platform_id;
-    int32_t encoding_id;
-    int32_t num_mappings;
-    int32_t chars[10];
-    int32_t glyph_ids[10];
-  };
+namespace sfntly {
+namespace cmap_test_data {
+const char* kAllTests[] = {
+  "data/fonts/cousine/Cousine-BoldItalic.ttf",
+  "data/fonts/cousine/Cousine-Bold.ttf",
+  "data/fonts/cousine/Cousine-Regular.ttf",
+  "data/fonts/cousine/Cousine-Italic.ttf",
+  "data/fonts/cedarvillecursive/Cedarville-Cursive.ttf",
+  "data/fonts/dancingscript/DancingScript-Bold.ttf",
+  "data/fonts/dancingscript/DancingScript-Regular.ttf",
+  "data/fonts/damion/Damion-Regular.ttf",
+  "data/fonts/annieuseyourtelescope/AnnieUseYourTelescope.ttf",
+  "data/fonts/deliusswashcaps/DeliusSwashCaps-Regular.ttf",
+  "data/fonts/delius/Delius-Regular.ttf",
+  "data/fonts/coveredbyyourgrace/CoveredByYourGrace.ttf",
+  "data/fonts/ebgaramond/EBGaramond-Regular.ttf",
+  "data/fonts/cabinsketch/CabinSketch-Bold.ttf",
+  "data/fonts/allan/Allan-Bold.ttf",
+  "data/fonts/coda/Coda-Caption-Heavy.ttf",
+  "data/fonts/coda/Coda-Heavy.ttf",
+  "data/fonts/forum/Forum-Regular.ttf",
+  "data/fonts/alike/Alike-Regular.ttf",
+  "data/fonts/corben/Corben-Bold.ttf",
+  "data/fonts/caudex/Caudex-Regular.ttf",
+  "data/fonts/caudex/Caudex-BoldItalic.ttf",
+  "data/fonts/caudex/Caudex-Italic.ttf",
+  "data/fonts/caudex/Caudex-Bold.ttf",
+  "data/fonts/cabin/Cabin-MediumItalic.ttf",
+  "data/fonts/cabin/Cabin-SemiBold.ttf",
+  "data/fonts/cabin/Cabin-SemiBoldItalic.ttf",
+  "data/fonts/cabin/Cabin-BoldItalic.ttf",
+  "data/fonts/cabin/Cabin-Medium.ttf",
+  "data/fonts/cabin/Cabin-Italic.ttf",
+  "data/fonts/cabin/Cabin-Bold.ttf",
+  "data/fonts/cabin/Cabin-Regular.ttf",
+  "data/fonts/dawningofanewday/DawningofaNewDay.ttf",
+  "data/fonts/dangrek/Dangrek.ttf",
+  "data/fonts/blackopsone/BlackOpsOne.ttf",
+  "data/fonts/francoisone/FrancoisOne.ttf",
+  "data/fonts/bowlbyone/BowlbyOne.ttf",
+  "data/fonts/bowlbyone/BowlbyOneSC.ttf",
+  "data/fonts/calligraffiti/Calligraffiti.ttf",
+  "data/fonts/bangers/Bangers.ttf",
+  "data/fonts/astloch/Astloch-Regular.ttf",
+  "data/fonts/astloch/Astloch-Bold.ttf",
+  "data/fonts/angkor/Angkor.ttf",
+  "data/fonts/abrilfatface/AbrilFatface-Regular.ttf",
+  "data/fonts/cantarell/Cantarell-BoldOblique.ttf",
+  "data/fonts/cantarell/Cantarell-Oblique.ttf",
+  "data/fonts/cantarell/Cantarell-Bold.ttf",
+  "data/fonts/cantarell/Cantarell-Regular.ttf",
+  "data/fonts/arvo/Arvo-Bold.ttf",
+  "data/fonts/arvo/Arvo-Italic.ttf",
+  "data/fonts/arvo/Arvo-BoldItalic.ttf",
+  "data/fonts/arvo/Arvo-Regular.ttf",
+  "data/fonts/chewy/Chewy.ttf",
+  "data/fonts/bigshotone/BigshotOne.ttf",
+  "data/fonts/chenla/Chenla.ttf",
+  "data/fonts/bayon/Bayon.ttf",
+  "data/fonts/coustard/Coustard-Black.ttf",
+  "data/fonts/coustard/Coustard-Regular.ttf",
+  "data/fonts/amaticsc/AmaticSC-Bold.ttf",
+  "data/fonts/amaticsc/AmaticSC-Regular.ttf",
+  "data/fonts/comfortaa/Comfortaa-Light.ttf",
+  "data/fonts/comfortaa/Comfortaa-Bold.ttf",
+  "data/fonts/comfortaa/Comfortaa-Regular.ttf",
+  "data/fonts/expletussans/ExpletusSans-Bold.ttf",
+  "data/fonts/expletussans/ExpletusSans-MediumItalic.ttf",
+  "data/fonts/expletussans/ExpletusSans-Medium.ttf",
+  "data/fonts/expletussans/ExpletusSans-SemiBold.ttf",
+  "data/fonts/expletussans/ExpletusSans-Regular.ttf",
+  "data/fonts/expletussans/ExpletusSans-Italic.ttf",
+  "data/fonts/expletussans/ExpletusSans-SemiBoldItalic.ttf",
+  "data/fonts/expletussans/ExpletusSans-BoldItalic.ttf",
+  "data/fonts/aubrey/Aubrey-Regular.ttf",
+  "data/fonts/antic/Antic-Regular.ttf",
+  "data/fonts/copse/Copse-Regular.ttf",
+  "data/fonts/daysone/DaysOne-Regular.ttf",
+  "data/fonts/actor/Actor-Regular.ttf",
+  "data/fonts/bentham/Bentham-Regular.ttf",
+  "data/fonts/federo/Federo-Regular.ttf",
+  "data/fonts/arimo/Arimo-Italic.ttf",
+  "data/fonts/arimo/Arimo-BoldItalic.ttf",
+  "data/fonts/arimo/Arimo-Bold.ttf",
+  "data/fonts/arimo/Arimo-Regular.ttf",
+  "data/fonts/felltypes/IMFeDPsc28P.ttf",
+  "data/fonts/felltypes/IMFeGPrm28P.ttf",
+  "data/fonts/felltypes/IMFeENsc28P.ttf",
+  "data/fonts/felltypes/IMFePIit28P.ttf",
+  "data/fonts/felltypes/IMFeDPrm28P.ttf",
+  "data/fonts/felltypes/IMFePIrm28P.ttf",
+  "data/fonts/felltypes/IMFeFCrm28P.ttf",
+  "data/fonts/felltypes/IMFeGPit28P.ttf",
+  "data/fonts/felltypes/IMFeENit28P.ttf",
+  "data/fonts/felltypes/IMFeDPit28P.ttf",
+  "data/fonts/felltypes/IMFeENrm28P.ttf",
+  "data/fonts/felltypes/IMFeGPsc28P.ttf",
+  "data/fonts/felltypes/IMFePIsc28P.ttf",
+  "data/fonts/felltypes/IMFeFCsc28P.ttf",
+  "data/fonts/felltypes/IMFeFCit28P.ttf",
+  "data/fonts/bokor/Bokor.ttf",
+  "data/fonts/didactgothic/DidactGothic.ttf",
+  "data/fonts/allerta/Allerta-Medium.ttf",
+  "data/fonts/allerta/Allerta-Stencil.ttf",
+  "data/fonts/buda/Buda-Light.ttf",
+  "data/fonts/brawler/Brawler-Regular.ttf",
+  "data/fonts/carterone/CarterOne.ttf",
+  "data/fonts/candal/Candal.ttf",
+  "data/fonts/dorsa/Dorsa-Regular.ttf",
+  "data/fonts/crimson/CrimsonText-BoldItalic.ttf",
+  "data/fonts/crimson/CrimsonText-Bold.ttf",
+  "data/fonts/crimson/CrimsonText-Italic.ttf",
+  "data/fonts/crimson/CrimsonText-Roman.ttf",
+  "data/fonts/crimson/CrimsonText-Semibold.ttf",
+  "data/fonts/crimson/CrimsonText-SemiboldItalic.ttf",
+  "data/fonts/amaranth/Amaranth-Italic.ttf",
+  "data/fonts/amaranth/Amaranth-Bold.ttf",
+  "data/fonts/amaranth/Amaranth-Regular.ttf",
+  "data/fonts/amaranth/Amaranth-BoldItalic.ttf",
+  "data/fonts/crushed/Crushed.ttf",
+  "data/fonts/adamina/Adamina-Regular.ttf",
+  "data/fonts/aldrich/Aldrich-Regular.ttf",
+  "data/fonts/fanwoodtext/FanwoodText-Italic.ttf",
+  "data/fonts/fanwoodtext/FanwoodText-Regular.ttf",
+  "data/fonts/anonymouspro/AnonymousPro-Regular.ttf",
+  "data/fonts/anonymouspro/AnonymousPro-Bold.ttf",
+  "data/fonts/anonymouspro/AnonymousPro-Italic.ttf",
+  "data/fonts/anonymouspro/AnonymousPro-BoldItalic.ttf",
+  "data/fonts/bevan/Bevan.ttf",
+  "data/fonts/artifika/Artifika-Regular.ttf",
+  "data/fonts/anton/Anton.ttf",
+  "data/fonts/battambang/Battambang-Regular.ttf",
+  "data/fonts/battambang/Battambang-Bold.ttf",
+  "data/fonts/carme/Carme-Regular.ttf",
+  "data/fonts/cherrycreamsoda/CherryCreamSoda.ttf",
+  "data/fonts/deliusunicase/DeliusUnicase-Regular.ttf",
+  "data/fonts/comingsoon/ComingSoon.ttf",
+  "data/fonts/freehand/Freehand.ttf",
+  "data/fonts/alice/Alice-Regular.ttf",
+  "data/fonts/contrail/Contrail-Regular.ttf",
+  "data/fonts/cardo/Cardo-Bold.ttf",
+  "data/fonts/cardo/Cardo-Italic.ttf",
+  "data/fonts/cardo/Cardo-Regular.ttf",
+  "data/fonts/asset/Asset.ttf",
+  "data/fonts/changaone/ChangaOne-Regular.ttf",
+  "data/fonts/aclonica/Aclonica.ttf",
+  "data/fonts/craftygirls/CraftyGirls.ttf",
+  "data/fonts/architectsdaughter/ArchitectsDaughter.ttf",
+  "data/fonts/content/Content-Bold.ttf",
+  "data/fonts/content/Content-Regular.ttf",
+  "data/fonts/abel/Abel-Regular.ttf",
+  "data/fonts/cuprum/Cuprum.ttf",
+  "data/fonts/andika/Andika-R.ttf"
+};
+}  // namespace cmap_test_data
+}  // namespace sfntly
 
-  struct TestCMap
-  {
-    const char *name;
-    int32_t num_cmaps;
-    ProtoCMap cmaps[2];
-  };
-
-  extern TestCMap kTestCousine_BoldItalic_ttf_xml;
-  extern TestCMap kTestCousine_Bold_ttf_xml;
-  extern TestCMap kTestCousine_Regular_ttf_xml;
-  extern TestCMap kTestCousine_Italic_ttf_xml;
-  extern TestCMap kTestCedarville_Cursive_ttf_xml;
-  extern TestCMap kTestDancingScript_Bold_ttf_xml;
-  extern TestCMap kTestDancingScript_Regular_ttf_xml;
-  extern TestCMap kTestDamion_Regular_ttf_xml;
-  extern TestCMap kTestAnnieUseYourTelescope_ttf_xml;
-  extern TestCMap kTestDeliusSwashCaps_Regular_ttf_xml;
-  extern TestCMap kTestDelius_Regular_ttf_xml;
-  extern TestCMap kTestCoveredByYourGrace_ttf_xml;
-  extern TestCMap kTestEBGaramond_Regular_ttf_xml;
-  extern TestCMap kTestCabinSketch_Bold_ttf_xml;
-  extern TestCMap kTestAllan_Bold_ttf_xml;
-  extern TestCMap kTestCoda_Caption_Heavy_ttf_xml;
-  extern TestCMap kTestCoda_Heavy_ttf_xml;
-  extern TestCMap kTestForum_Regular_ttf_xml;
-  extern TestCMap kTestAlike_Regular_ttf_xml;
-  extern TestCMap kTestCorben_Bold_ttf_xml;
-  extern TestCMap kTestCaudex_Regular_ttf_xml;
-  extern TestCMap kTestCaudex_BoldItalic_ttf_xml;
-  extern TestCMap kTestCaudex_Italic_ttf_xml;
-  extern TestCMap kTestCaudex_Bold_ttf_xml;
-  extern TestCMap kTestCabin_MediumItalic_ttf_xml;
-  extern TestCMap kTestCabin_SemiBold_ttf_xml;
-  extern TestCMap kTestCabin_SemiBoldItalic_ttf_xml;
-  extern TestCMap kTestCabin_BoldItalic_ttf_xml;
-  extern TestCMap kTestCabin_Medium_ttf_xml;
-  extern TestCMap kTestCabin_Italic_ttf_xml;
-  extern TestCMap kTestCabin_Bold_ttf_xml;
-  extern TestCMap kTestCabin_Regular_ttf_xml;
-  extern TestCMap kTestDawningofaNewDay_ttf_xml;
-  extern TestCMap kTestDangrek_ttf_xml;
-  extern TestCMap kTestBlackOpsOne_ttf_xml;
-  extern TestCMap kTestFrancoisOne_ttf_xml;
-  extern TestCMap kTestBowlbyOne_ttf_xml;
-  extern TestCMap kTestBowlbyOneSC_ttf_xml;
-  extern TestCMap kTestCalligraffiti_ttf_xml;
-  extern TestCMap kTestBangers_ttf_xml;
-  extern TestCMap kTestAstloch_Regular_ttf_xml;
-  extern TestCMap kTestAstloch_Bold_ttf_xml;
-  extern TestCMap kTestAngkor_ttf_xml;
-  extern TestCMap kTestAbrilFatface_Regular_ttf_xml;
-  extern TestCMap kTestCantarell_BoldOblique_ttf_xml;
-  extern TestCMap kTestCantarell_Oblique_ttf_xml;
-  extern TestCMap kTestCantarell_Bold_ttf_xml;
-  extern TestCMap kTestCantarell_Regular_ttf_xml;
-  extern TestCMap kTestArvo_Bold_ttf_xml;
-  extern TestCMap kTestArvo_Italic_ttf_xml;
-  extern TestCMap kTestArvo_BoldItalic_ttf_xml;
-  extern TestCMap kTestArvo_Regular_ttf_xml;
-  extern TestCMap kTestChewy_ttf_xml;
-  extern TestCMap kTestBigshotOne_ttf_xml;
-  extern TestCMap kTestChenla_ttf_xml;
-  extern TestCMap kTestBayon_ttf_xml;
-  extern TestCMap kTestCoustard_Black_ttf_xml;
-  extern TestCMap kTestCoustard_Regular_ttf_xml;
-  extern TestCMap kTestAmaticSC_Bold_ttf_xml;
-  extern TestCMap kTestAmaticSC_Regular_ttf_xml;
-  extern TestCMap kTestComfortaa_Light_ttf_xml;
-  extern TestCMap kTestComfortaa_Bold_ttf_xml;
-  extern TestCMap kTestComfortaa_Regular_ttf_xml;
-  extern TestCMap kTestExpletusSans_Bold_ttf_xml;
-  extern TestCMap kTestExpletusSans_MediumItalic_ttf_xml;
-  extern TestCMap kTestExpletusSans_Medium_ttf_xml;
-  extern TestCMap kTestExpletusSans_SemiBold_ttf_xml;
-  extern TestCMap kTestExpletusSans_Regular_ttf_xml;
-  extern TestCMap kTestExpletusSans_Italic_ttf_xml;
-  extern TestCMap kTestExpletusSans_SemiBoldItalic_ttf_xml;
-  extern TestCMap kTestExpletusSans_BoldItalic_ttf_xml;
-  extern TestCMap kTestAubrey_Regular_ttf_xml;
-  extern TestCMap kTestAntic_Regular_ttf_xml;
-  extern TestCMap kTestCopse_Regular_ttf_xml;
-  extern TestCMap kTestDaysOne_Regular_ttf_xml;
-  extern TestCMap kTestActor_Regular_ttf_xml;
-  extern TestCMap kTestBentham_Regular_ttf_xml;
-  extern TestCMap kTestFedero_Regular_ttf_xml;
-  extern TestCMap kTestArimo_Italic_ttf_xml;
-  extern TestCMap kTestArimo_BoldItalic_ttf_xml;
-  extern TestCMap kTestArimo_Bold_ttf_xml;
-  extern TestCMap kTestArimo_Regular_ttf_xml;
-  extern TestCMap kTestIMFeDPsc28P_ttf_xml;
-  extern TestCMap kTestIMFeGPrm28P_ttf_xml;
-  extern TestCMap kTestIMFeENsc28P_ttf_xml;
-  extern TestCMap kTestIMFePIit28P_ttf_xml;
-  extern TestCMap kTestIMFeDPrm28P_ttf_xml;
-  extern TestCMap kTestIMFePIrm28P_ttf_xml;
-  extern TestCMap kTestIMFeFCrm28P_ttf_xml;
-  extern TestCMap kTestIMFeGPit28P_ttf_xml;
-  extern TestCMap kTestIMFeENit28P_ttf_xml;
-  extern TestCMap kTestIMFeDPit28P_ttf_xml;
-  extern TestCMap kTestIMFeENrm28P_ttf_xml;
-  extern TestCMap kTestIMFeGPsc28P_ttf_xml;
-  extern TestCMap kTestIMFePIsc28P_ttf_xml;
-  extern TestCMap kTestIMFeFCsc28P_ttf_xml;
-  extern TestCMap kTestIMFeFCit28P_ttf_xml;
-  extern TestCMap kTestBokor_ttf_xml;
-  extern TestCMap kTestDidactGothic_ttf_xml;
-  extern TestCMap kTestAllerta_Medium_ttf_xml;
-  extern TestCMap kTestAllerta_Stencil_ttf_xml;
-  extern TestCMap kTestBuda_Light_ttf_xml;
-  extern TestCMap kTestBrawler_Regular_ttf_xml;
-  extern TestCMap kTestCarterOne_ttf_xml;
-  extern TestCMap kTestCandal_ttf_xml;
-  extern TestCMap kTestDorsa_Regular_ttf_xml;
-  extern TestCMap kTestCrimsonText_BoldItalic_ttf_xml;
-  extern TestCMap kTestCrimsonText_Bold_ttf_xml;
-  extern TestCMap kTestCrimsonText_Italic_ttf_xml;
-  extern TestCMap kTestCrimsonText_Roman_ttf_xml;
-  extern TestCMap kTestCrimsonText_Semibold_ttf_xml;
-  extern TestCMap kTestCrimsonText_SemiboldItalic_ttf_xml;
-  extern TestCMap kTestAmaranth_Italic_ttf_xml;
-  extern TestCMap kTestAmaranth_Bold_ttf_xml;
-  extern TestCMap kTestAmaranth_Regular_ttf_xml;
-  extern TestCMap kTestAmaranth_BoldItalic_ttf_xml;
-  extern TestCMap kTestCrushed_ttf_xml;
-  extern TestCMap kTestAdamina_Regular_ttf_xml;
-  extern TestCMap kTestAldrich_Regular_ttf_xml;
-  extern TestCMap kTestFanwoodText_Italic_ttf_xml;
-  extern TestCMap kTestFanwoodText_Regular_ttf_xml;
-  extern TestCMap kTestAnonymousPro_Regular_ttf_xml;
-  extern TestCMap kTestAnonymousPro_Bold_ttf_xml;
-  extern TestCMap kTestAnonymousPro_Italic_ttf_xml;
-  extern TestCMap kTestAnonymousPro_BoldItalic_ttf_xml;
-  extern TestCMap kTestBevan_ttf_xml;
-  extern TestCMap kTestArtifika_Regular_ttf_xml;
-  extern TestCMap kTestAnton_ttf_xml;
-  extern TestCMap kTestBattambang_Regular_ttf_xml;
-  extern TestCMap kTestBattambang_Bold_ttf_xml;
-  extern TestCMap kTestCarme_Regular_ttf_xml;
-  extern TestCMap kTestCherryCreamSoda_ttf_xml;
-  extern TestCMap kTestDeliusUnicase_Regular_ttf_xml;
-  extern TestCMap kTestComingSoon_ttf_xml;
-  extern TestCMap kTestFreehand_ttf_xml;
-  extern TestCMap kTestAlice_Regular_ttf_xml;
-  extern TestCMap kTestContrail_Regular_ttf_xml;
-  extern TestCMap kTestCardo_Bold_ttf_xml;
-  extern TestCMap kTestCardo_Italic_ttf_xml;
-  extern TestCMap kTestCardo_Regular_ttf_xml;
-  extern TestCMap kTestAsset_ttf_xml;
-  extern TestCMap kTestChangaOne_Regular_ttf_xml;
-  extern TestCMap kTestAclonica_ttf_xml;
-  extern TestCMap kTestCraftyGirls_ttf_xml;
-  extern TestCMap kTestArchitectsDaughter_ttf_xml;
-  extern TestCMap kTestContent_Bold_ttf_xml;
-  extern TestCMap kTestContent_Regular_ttf_xml;
-  extern TestCMap kTestAbel_Regular_ttf_xml;
-  extern TestCMap kTestCuprum_ttf_xml;
-  extern TestCMap kTestAndika_R_ttf_xml;
-
-  const TestCMap kAllTestCMaps[] = {
-    kTestCousine_BoldItalic_ttf_xml,
-    kTestCousine_Bold_ttf_xml,
-    kTestCousine_Regular_ttf_xml,
-    kTestCousine_Italic_ttf_xml,
-    kTestCedarville_Cursive_ttf_xml,
-    kTestDancingScript_Bold_ttf_xml,
-    kTestDancingScript_Regular_ttf_xml,
-    kTestDamion_Regular_ttf_xml,
-    kTestAnnieUseYourTelescope_ttf_xml,
-    kTestDeliusSwashCaps_Regular_ttf_xml,
-    kTestDelius_Regular_ttf_xml,
-    kTestCoveredByYourGrace_ttf_xml,
-    kTestEBGaramond_Regular_ttf_xml,
-    kTestCabinSketch_Bold_ttf_xml,
-    kTestAllan_Bold_ttf_xml,
-    kTestCoda_Caption_Heavy_ttf_xml,
-    kTestCoda_Heavy_ttf_xml,
-    kTestForum_Regular_ttf_xml,
-    kTestAlike_Regular_ttf_xml,
-    kTestCorben_Bold_ttf_xml,
-    kTestCaudex_Regular_ttf_xml,
-    kTestCaudex_BoldItalic_ttf_xml,
-    kTestCaudex_Italic_ttf_xml,
-    kTestCaudex_Bold_ttf_xml,
-    kTestCabin_MediumItalic_ttf_xml,
-    kTestCabin_SemiBold_ttf_xml,
-    kTestCabin_SemiBoldItalic_ttf_xml,
-    kTestCabin_BoldItalic_ttf_xml,
-    kTestCabin_Medium_ttf_xml,
-    kTestCabin_Italic_ttf_xml,
-    kTestCabin_Bold_ttf_xml,
-    kTestCabin_Regular_ttf_xml,
-    kTestDawningofaNewDay_ttf_xml,
-    kTestDangrek_ttf_xml,
-    kTestBlackOpsOne_ttf_xml,
-    kTestFrancoisOne_ttf_xml,
-    kTestBowlbyOne_ttf_xml,
-    kTestBowlbyOneSC_ttf_xml,
-    kTestCalligraffiti_ttf_xml,
-    kTestBangers_ttf_xml,
-    kTestAstloch_Regular_ttf_xml,
-    kTestAstloch_Bold_ttf_xml,
-    kTestAngkor_ttf_xml,
-    kTestAbrilFatface_Regular_ttf_xml,
-    kTestCantarell_BoldOblique_ttf_xml,
-    kTestCantarell_Oblique_ttf_xml,
-    kTestCantarell_Bold_ttf_xml,
-    kTestCantarell_Regular_ttf_xml,
-    kTestArvo_Bold_ttf_xml,
-    kTestArvo_Italic_ttf_xml,
-    kTestArvo_BoldItalic_ttf_xml,
-    kTestArvo_Regular_ttf_xml,
-    kTestChewy_ttf_xml,
-    kTestBigshotOne_ttf_xml,
-    kTestChenla_ttf_xml,
-    kTestBayon_ttf_xml,
-    kTestCoustard_Black_ttf_xml,
-    kTestCoustard_Regular_ttf_xml,
-    kTestAmaticSC_Bold_ttf_xml,
-    kTestAmaticSC_Regular_ttf_xml,
-    kTestComfortaa_Light_ttf_xml,
-    kTestComfortaa_Bold_ttf_xml,
-    kTestComfortaa_Regular_ttf_xml,
-    kTestExpletusSans_Bold_ttf_xml,
-    kTestExpletusSans_MediumItalic_ttf_xml,
-    kTestExpletusSans_Medium_ttf_xml,
-    kTestExpletusSans_SemiBold_ttf_xml,
-    kTestExpletusSans_Regular_ttf_xml,
-    kTestExpletusSans_Italic_ttf_xml,
-    kTestExpletusSans_SemiBoldItalic_ttf_xml,
-    kTestExpletusSans_BoldItalic_ttf_xml,
-    kTestAubrey_Regular_ttf_xml,
-    kTestAntic_Regular_ttf_xml,
-    kTestCopse_Regular_ttf_xml,
-    kTestDaysOne_Regular_ttf_xml,
-    kTestActor_Regular_ttf_xml,
-    kTestBentham_Regular_ttf_xml,
-    kTestFedero_Regular_ttf_xml,
-    kTestArimo_Italic_ttf_xml,
-    kTestArimo_BoldItalic_ttf_xml,
-    kTestArimo_Bold_ttf_xml,
-    kTestArimo_Regular_ttf_xml,
-    kTestIMFeDPsc28P_ttf_xml,
-    kTestIMFeGPrm28P_ttf_xml,
-    kTestIMFeENsc28P_ttf_xml,
-    kTestIMFePIit28P_ttf_xml,
-    kTestIMFeDPrm28P_ttf_xml,
-    kTestIMFePIrm28P_ttf_xml,
-    kTestIMFeFCrm28P_ttf_xml,
-    kTestIMFeGPit28P_ttf_xml,
-    kTestIMFeENit28P_ttf_xml,
-    kTestIMFeDPit28P_ttf_xml,
-    kTestIMFeENrm28P_ttf_xml,
-    kTestIMFeGPsc28P_ttf_xml,
-    kTestIMFePIsc28P_ttf_xml,
-    kTestIMFeFCsc28P_ttf_xml,
-    kTestIMFeFCit28P_ttf_xml,
-    kTestBokor_ttf_xml,
-    kTestDidactGothic_ttf_xml,
-    kTestAllerta_Medium_ttf_xml,
-    kTestAllerta_Stencil_ttf_xml,
-    kTestBuda_Light_ttf_xml,
-    kTestBrawler_Regular_ttf_xml,
-    kTestCarterOne_ttf_xml,
-    kTestCandal_ttf_xml,
-    kTestDorsa_Regular_ttf_xml,
-    kTestCrimsonText_BoldItalic_ttf_xml,
-    kTestCrimsonText_Bold_ttf_xml,
-    kTestCrimsonText_Italic_ttf_xml,
-    kTestCrimsonText_Roman_ttf_xml,
-    kTestCrimsonText_Semibold_ttf_xml,
-    kTestCrimsonText_SemiboldItalic_ttf_xml,
-    kTestAmaranth_Italic_ttf_xml,
-    kTestAmaranth_Bold_ttf_xml,
-    kTestAmaranth_Regular_ttf_xml,
-    kTestAmaranth_BoldItalic_ttf_xml,
-    kTestCrushed_ttf_xml,
-    kTestAdamina_Regular_ttf_xml,
-    kTestAldrich_Regular_ttf_xml,
-    kTestFanwoodText_Italic_ttf_xml,
-    kTestFanwoodText_Regular_ttf_xml,
-    kTestAnonymousPro_Regular_ttf_xml,
-    kTestAnonymousPro_Bold_ttf_xml,
-    kTestAnonymousPro_Italic_ttf_xml,
-    kTestAnonymousPro_BoldItalic_ttf_xml,
-    kTestBevan_ttf_xml,
-    kTestArtifika_Regular_ttf_xml,
-    kTestAnton_ttf_xml,
-    kTestBattambang_Regular_ttf_xml,
-    kTestBattambang_Bold_ttf_xml,
-    kTestCarme_Regular_ttf_xml,
-    kTestCherryCreamSoda_ttf_xml,
-    kTestDeliusUnicase_Regular_ttf_xml,
-    kTestComingSoon_ttf_xml,
-    kTestFreehand_ttf_xml,
-    kTestAlice_Regular_ttf_xml,
-    kTestContrail_Regular_ttf_xml,
-    kTestCardo_Bold_ttf_xml,
-    kTestCardo_Italic_ttf_xml,
-    kTestCardo_Regular_ttf_xml,
-    kTestAsset_ttf_xml,
-    kTestChangaOne_Regular_ttf_xml,
-    kTestAclonica_ttf_xml,
-    kTestCraftyGirls_ttf_xml,
-    kTestArchitectsDaughter_ttf_xml,
-    kTestContent_Bold_ttf_xml,
-    kTestContent_Regular_ttf_xml,
-    kTestAbel_Regular_ttf_xml,
-    kTestCuprum_ttf_xml,
-    kTestAndika_R_ttf_xml
-  };
-}				// namespace sfntly
-
-#endif //SFNTLY_CPP_SRC_TEST_CMAP_TEST_DATA_H_
+#endif  // TYPOGRAPHY_FONT_SFNTLY_SRC_TEST_AUTOGENERATED_CMAP_TEST_DATA_H_
diff --git a/test/test_xml_utils.cc b/test/test_xml_utils.cc
new file mode 100644
index 0000000..dc65add
--- /dev/null
+++ b/test/test_xml_utils.cc
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2011 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <map>
+#include <string>
+#include "test/test_xml_utils.h"
+#include "test/tinyxml/tinyxml.h"
+
+namespace sfntly {
+void InternalGetNodesWithName(const TiXmlNode* node, const std::string& name,
+                              TiXmlNodeVector* wanted_nodes) {
+  if (node->ValueStr() == name)
+    wanted_nodes->push_back(node);
+  for (const TiXmlNode* child = node->FirstChild();
+       child != NULL; child = child->NextSibling()) {
+    InternalGetNodesWithName(child, name, wanted_nodes);
+  }
+}
+
+TiXmlNodeVector* GetNodesWithName(const TiXmlNode* node,
+                                  const std::string& name) {
+  TiXmlNodeVector* wanted_nodes = new TiXmlNodeVector;
+  InternalGetNodesWithName(node, name, wanted_nodes);
+  return wanted_nodes;
+}
+
+const TiXmlAttribute* GetAttribute(const TiXmlNode* node,
+                                   const std::string& name) {
+  for (const TiXmlAttribute* attribute = node->ToElement()->FirstAttribute();
+       attribute != NULL; attribute = attribute->Next()) {
+    if (attribute->Name() == name) {
+      return attribute;
+    }
+  }
+  return NULL;
+}
+}
diff --git a/test/test_xml_utils.h b/test/test_xml_utils.h
new file mode 100644
index 0000000..7a5fe49
--- /dev/null
+++ b/test/test_xml_utils.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "sfntly/port/refcount.h"
+#include "test/tinyxml/tinyxml.h"
+
+#ifndef SFNTLY_CPP_SRC_TEST_TEST_XML_UTILS_H_
+#define SFNTLY_CPP_SRC_TEST_TEST_XML_UTILS_H_
+
+namespace sfntly {
+typedef std::map<std::string, std::string> AttributeMap;
+typedef std::vector<const TiXmlNode*> TiXmlNodeVector;
+
+TiXmlNodeVector* GetNodesWithName(const TiXmlNode* node,
+                                  const std::string& name);
+const TiXmlAttribute* GetAttribute(const TiXmlNode* node,
+                                   const std::string& name);
+}  // namespace sfntly
+
+#endif  // SFNTLY_CPP_SRC_TEST_TEST_XML_UTILS_H_
diff --git a/test/tinyxml/tinystr.cpp b/test/tinyxml/tinystr.cpp
new file mode 100644
index 0000000..0665768
--- /dev/null
+++ b/test/tinyxml/tinystr.cpp
@@ -0,0 +1,111 @@
+/*
+www.sourceforge.net/projects/tinyxml
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+
+#ifndef TIXML_USE_STL
+
+#include "tinystr.h"
+
+// Error value for find primitive
+const TiXmlString::size_type TiXmlString::npos = static_cast< TiXmlString::size_type >(-1);
+
+
+// Null rep.
+TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, { '\0' } };
+
+
+void TiXmlString::reserve (size_type cap)
+{
+	if (cap > capacity())
+	{
+		TiXmlString tmp;
+		tmp.init(length(), cap);
+		memcpy(tmp.start(), data(), length());
+		swap(tmp);
+	}
+}
+
+
+TiXmlString& TiXmlString::assign(const char* str, size_type len)
+{
+	size_type cap = capacity();
+	if (len > cap || cap > 3*(len + 8))
+	{
+		TiXmlString tmp;
+		tmp.init(len);
+		memcpy(tmp.start(), str, len);
+		swap(tmp);
+	}
+	else
+	{
+		memmove(start(), str, len);
+		set_size(len);
+	}
+	return *this;
+}
+
+
+TiXmlString& TiXmlString::append(const char* str, size_type len)
+{
+	size_type newsize = length() + len;
+	if (newsize > capacity())
+	{
+		reserve (newsize + capacity());
+	}
+	memmove(finish(), str, len);
+	set_size(newsize);
+	return *this;
+}
+
+
+TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
+{
+	TiXmlString tmp;
+	tmp.reserve(a.length() + b.length());
+	tmp += a;
+	tmp += b;
+	return tmp;
+}
+
+TiXmlString operator + (const TiXmlString & a, const char* b)
+{
+	TiXmlString tmp;
+	TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen(b) );
+	tmp.reserve(a.length() + b_len);
+	tmp += a;
+	tmp.append(b, b_len);
+	return tmp;
+}
+
+TiXmlString operator + (const char* a, const TiXmlString & b)
+{
+	TiXmlString tmp;
+	TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen(a) );
+	tmp.reserve(a_len + b.length());
+	tmp.append(a, a_len);
+	tmp += b;
+	return tmp;
+}
+
+
+#endif	// TIXML_USE_STL
diff --git a/test/tinyxml/tinystr.h b/test/tinyxml/tinystr.h
new file mode 100644
index 0000000..89cca33
--- /dev/null
+++ b/test/tinyxml/tinystr.h
@@ -0,0 +1,305 @@
+/*
+www.sourceforge.net/projects/tinyxml
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+
+#ifndef TIXML_USE_STL
+
+#ifndef TIXML_STRING_INCLUDED
+#define TIXML_STRING_INCLUDED
+
+#include <assert.h>
+#include <string.h>
+
+/*	The support for explicit isn't that universal, and it isn't really
+	required - it is used to check that the TiXmlString class isn't incorrectly
+	used. Be nice to old compilers and macro it here:
+*/
+#if defined(_MSC_VER) && (_MSC_VER >= 1200 )
+	// Microsoft visual studio, version 6 and higher.
+	#define TIXML_EXPLICIT explicit
+#elif defined(__GNUC__) && (__GNUC__ >= 3 )
+	// GCC version 3 and higher.s
+	#define TIXML_EXPLICIT explicit
+#else
+	#define TIXML_EXPLICIT
+#endif
+
+
+/*
+   TiXmlString is an emulation of a subset of the std::string template.
+   Its purpose is to allow compiling TinyXML on compilers with no or poor STL support.
+   Only the member functions relevant to the TinyXML project have been implemented.
+   The buffer allocation is made by a simplistic power of 2 like mechanism : if we increase
+   a string and there's no more room, we allocate a buffer twice as big as we need.
+*/
+class TiXmlString
+{
+  public :
+	// The size type used
+  	typedef size_t size_type;
+
+	// Error value for find primitive
+	static const size_type npos; // = -1;
+
+
+	// TiXmlString empty constructor
+	TiXmlString () : rep_(&nullrep_)
+	{
+	}
+
+	// TiXmlString copy constructor
+	TiXmlString ( const TiXmlString & copy) : rep_(0)
+	{
+		init(copy.length());
+		memcpy(start(), copy.data(), length());
+	}
+
+	// TiXmlString constructor, based on a string
+	TIXML_EXPLICIT TiXmlString ( const char * copy) : rep_(0)
+	{
+		init( static_cast<size_type>( strlen(copy) ));
+		memcpy(start(), copy, length());
+	}
+
+	// TiXmlString constructor, based on a string
+	TIXML_EXPLICIT TiXmlString ( const char * str, size_type len) : rep_(0)
+	{
+		init(len);
+		memcpy(start(), str, len);
+	}
+
+	// TiXmlString destructor
+	~TiXmlString ()
+	{
+		quit();
+	}
+
+	TiXmlString& operator = (const char * copy)
+	{
+		return assign( copy, (size_type)strlen(copy));
+	}
+
+	TiXmlString& operator = (const TiXmlString & copy)
+	{
+		return assign(copy.start(), copy.length());
+	}
+
+
+	// += operator. Maps to append
+	TiXmlString& operator += (const char * suffix)
+	{
+		return append(suffix, static_cast<size_type>( strlen(suffix) ));
+	}
+
+	// += operator. Maps to append
+	TiXmlString& operator += (char single)
+	{
+		return append(&single, 1);
+	}
+
+	// += operator. Maps to append
+	TiXmlString& operator += (const TiXmlString & suffix)
+	{
+		return append(suffix.data(), suffix.length());
+	}
+
+
+	// Convert a TiXmlString into a null-terminated char *
+	const char * c_str () const { return rep_->str; }
+
+	// Convert a TiXmlString into a char * (need not be null terminated).
+	const char * data () const { return rep_->str; }
+
+	// Return the length of a TiXmlString
+	size_type length () const { return rep_->size; }
+
+	// Alias for length()
+	size_type size () const { return rep_->size; }
+
+	// Checks if a TiXmlString is empty
+	bool empty () const { return rep_->size == 0; }
+
+	// Return capacity of string
+	size_type capacity () const { return rep_->capacity; }
+
+
+	// single char extraction
+	const char& at (size_type index) const
+	{
+		assert( index < length() );
+		return rep_->str[ index ];
+	}
+
+	// [] operator
+	char& operator [] (size_type index) const
+	{
+		assert( index < length() );
+		return rep_->str[ index ];
+	}
+
+	// find a char in a string. Return TiXmlString::npos if not found
+	size_type find (char lookup) const
+	{
+		return find(lookup, 0);
+	}
+
+	// find a char in a string from an offset. Return TiXmlString::npos if not found
+	size_type find (char tofind, size_type offset) const
+	{
+		if (offset >= length()) return npos;
+
+		for (const char* p = c_str() + offset; *p != '\0'; ++p)
+		{
+		   if (*p == tofind) return static_cast< size_type >( p - c_str() );
+		}
+		return npos;
+	}
+
+	void clear ()
+	{
+		//Lee:
+		//The original was just too strange, though correct:
+		//	TiXmlString().swap(*this);
+		//Instead use the quit & re-init:
+		quit();
+		init(0,0);
+	}
+
+	/*	Function to reserve a big amount of data when we know we'll need it. Be aware that this
+		function DOES NOT clear the content of the TiXmlString if any exists.
+	*/
+	void reserve (size_type cap);
+
+	TiXmlString& assign (const char* str, size_type len);
+
+	TiXmlString& append (const char* str, size_type len);
+
+	void swap (TiXmlString& other)
+	{
+		Rep* r = rep_;
+		rep_ = other.rep_;
+		other.rep_ = r;
+	}
+
+  private:
+
+	void init(size_type sz) { init(sz, sz); }
+	void set_size(size_type sz) { rep_->str[ rep_->size = sz ] = '\0'; }
+	char* start() const { return rep_->str; }
+	char* finish() const { return rep_->str + rep_->size; }
+
+	struct Rep
+	{
+		size_type size, capacity;
+		char str[1];
+	};
+
+	void init(size_type sz, size_type cap)
+	{
+		if (cap)
+		{
+			// Lee: the original form:
+			//	rep_ = static_cast<Rep*>(operator new(sizeof(Rep) + cap));
+			// doesn't work in some cases of new being overloaded. Switching
+			// to the normal allocation, although use an 'int' for systems
+			// that are overly picky about structure alignment.
+			const size_type bytesNeeded = sizeof(Rep) + cap;
+			const size_type intsNeeded = ( bytesNeeded + sizeof(int) - 1 ) / sizeof( int ); 
+			rep_ = reinterpret_cast<Rep*>( new int[ intsNeeded ] );
+
+			rep_->str[ rep_->size = sz ] = '\0';
+			rep_->capacity = cap;
+		}
+		else
+		{
+			rep_ = &nullrep_;
+		}
+	}
+
+	void quit()
+	{
+		if (rep_ != &nullrep_)
+		{
+			// The rep_ is really an array of ints. (see the allocator, above).
+			// Cast it back before delete, so the compiler won't incorrectly call destructors.
+			delete [] ( reinterpret_cast<int*>( rep_ ) );
+		}
+	}
+
+	Rep * rep_;
+	static Rep nullrep_;
+
+} ;
+
+
+inline bool operator == (const TiXmlString & a, const TiXmlString & b)
+{
+	return    ( a.length() == b.length() )				// optimization on some platforms
+	       && ( strcmp(a.c_str(), b.c_str()) == 0 );	// actual compare
+}
+inline bool operator < (const TiXmlString & a, const TiXmlString & b)
+{
+	return strcmp(a.c_str(), b.c_str()) < 0;
+}
+
+inline bool operator != (const TiXmlString & a, const TiXmlString & b) { return !(a == b); }
+inline bool operator >  (const TiXmlString & a, const TiXmlString & b) { return b < a; }
+inline bool operator <= (const TiXmlString & a, const TiXmlString & b) { return !(b < a); }
+inline bool operator >= (const TiXmlString & a, const TiXmlString & b) { return !(a < b); }
+
+inline bool operator == (const TiXmlString & a, const char* b) { return strcmp(a.c_str(), b) == 0; }
+inline bool operator == (const char* a, const TiXmlString & b) { return b == a; }
+inline bool operator != (const TiXmlString & a, const char* b) { return !(a == b); }
+inline bool operator != (const char* a, const TiXmlString & b) { return !(b == a); }
+
+TiXmlString operator + (const TiXmlString & a, const TiXmlString & b);
+TiXmlString operator + (const TiXmlString & a, const char* b);
+TiXmlString operator + (const char* a, const TiXmlString & b);
+
+
+/*
+   TiXmlOutStream is an emulation of std::ostream. It is based on TiXmlString.
+   Only the operators that we need for TinyXML have been developped.
+*/
+class TiXmlOutStream : public TiXmlString
+{
+public :
+
+	// TiXmlOutStream << operator.
+	TiXmlOutStream & operator << (const TiXmlString & in)
+	{
+		*this += in;
+		return *this;
+	}
+
+	// TiXmlOutStream << operator.
+	TiXmlOutStream & operator << (const char * in)
+	{
+		*this += in;
+		return *this;
+	}
+
+} ;
+
+#endif	// TIXML_STRING_INCLUDED
+#endif	// TIXML_USE_STL
diff --git a/test/tinyxml/tinyxml.cpp b/test/tinyxml/tinyxml.cpp
new file mode 100644
index 0000000..9c161df
--- /dev/null
+++ b/test/tinyxml/tinyxml.cpp
@@ -0,0 +1,1886 @@
+/*
+www.sourceforge.net/projects/tinyxml
+Original code by Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+#include <ctype.h>
+
+#ifdef TIXML_USE_STL
+#include <sstream>
+#include <iostream>
+#endif
+
+#include "tinyxml.h"
+
+FILE* TiXmlFOpen( const char* filename, const char* mode );
+
+bool TiXmlBase::condenseWhiteSpace = true;
+
+// Microsoft compiler security
+FILE* TiXmlFOpen( const char* filename, const char* mode )
+{
+	#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+		FILE* fp = 0;
+		errno_t err = fopen_s( &fp, filename, mode );
+		if ( !err && fp )
+			return fp;
+		return 0;
+	#else
+		return fopen( filename, mode );
+	#endif
+}
+
+void TiXmlBase::EncodeString( const TIXML_STRING& str, TIXML_STRING* outString )
+{
+	int i=0;
+
+	while( i<(int)str.length() )
+	{
+		unsigned char c = (unsigned char) str[i];
+
+		if (    c == '&' 
+		     && i < ( (int)str.length() - 2 )
+			 && str[i+1] == '#'
+			 && str[i+2] == 'x' )
+		{
+			// Hexadecimal character reference.
+			// Pass through unchanged.
+			// &#xA9;	-- copyright symbol, for example.
+			//
+			// The -1 is a bug fix from Rob Laveaux. It keeps
+			// an overflow from happening if there is no ';'.
+			// There are actually 2 ways to exit this loop -
+			// while fails (error case) and break (semicolon found).
+			// However, there is no mechanism (currently) for
+			// this function to return an error.
+			while ( i<(int)str.length()-1 )
+			{
+				outString->append( str.c_str() + i, 1 );
+				++i;
+				if ( str[i] == ';' )
+					break;
+			}
+		}
+		else if ( c == '&' )
+		{
+			outString->append( entity[0].str, entity[0].strLength );
+			++i;
+		}
+		else if ( c == '<' )
+		{
+			outString->append( entity[1].str, entity[1].strLength );
+			++i;
+		}
+		else if ( c == '>' )
+		{
+			outString->append( entity[2].str, entity[2].strLength );
+			++i;
+		}
+		else if ( c == '\"' )
+		{
+			outString->append( entity[3].str, entity[3].strLength );
+			++i;
+		}
+		else if ( c == '\'' )
+		{
+			outString->append( entity[4].str, entity[4].strLength );
+			++i;
+		}
+		else if ( c < 32 )
+		{
+			// Easy pass at non-alpha/numeric/symbol
+			// Below 32 is symbolic.
+			char buf[ 32 ];
+			
+			#if defined(TIXML_SNPRINTF)		
+				TIXML_SNPRINTF( buf, sizeof(buf), "&#x%02X;", (unsigned) ( c & 0xff ) );
+			#else
+				sprintf( buf, "&#x%02X;", (unsigned) ( c & 0xff ) );
+			#endif		
+
+			//*ME:	warning C4267: convert 'size_t' to 'int'
+			//*ME:	Int-Cast to make compiler happy ...
+			outString->append( buf, (int)strlen( buf ) );
+			++i;
+		}
+		else
+		{
+			//char realc = (char) c;
+			//outString->append( &realc, 1 );
+			*outString += (char) c;	// somewhat more efficient function call.
+			++i;
+		}
+	}
+}
+
+
+TiXmlNode::TiXmlNode( NodeType _type ) : TiXmlBase()
+{
+	parent = 0;
+	type = _type;
+	firstChild = 0;
+	lastChild = 0;
+	prev = 0;
+	next = 0;
+}
+
+
+TiXmlNode::~TiXmlNode()
+{
+	TiXmlNode* node = firstChild;
+	TiXmlNode* temp = 0;
+
+	while ( node )
+	{
+		temp = node;
+		node = node->next;
+		delete temp;
+	}	
+}
+
+
+void TiXmlNode::CopyTo( TiXmlNode* target ) const
+{
+	target->SetValue (value.c_str() );
+	target->userData = userData; 
+	target->location = location;
+}
+
+
+void TiXmlNode::Clear()
+{
+	TiXmlNode* node = firstChild;
+	TiXmlNode* temp = 0;
+
+	while ( node )
+	{
+		temp = node;
+		node = node->next;
+		delete temp;
+	}	
+
+	firstChild = 0;
+	lastChild = 0;
+}
+
+
+TiXmlNode* TiXmlNode::LinkEndChild( TiXmlNode* node )
+{
+	assert( node->parent == 0 || node->parent == this );
+	assert( node->GetDocument() == 0 || node->GetDocument() == this->GetDocument() );
+
+	if ( node->Type() == TiXmlNode::TINYXML_DOCUMENT )
+	{
+		delete node;
+		if ( GetDocument() ) 
+			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return 0;
+	}
+
+	node->parent = this;
+
+	node->prev = lastChild;
+	node->next = 0;
+
+	if ( lastChild )
+		lastChild->next = node;
+	else
+		firstChild = node;			// it was an empty list.
+
+	lastChild = node;
+	return node;
+}
+
+
+TiXmlNode* TiXmlNode::InsertEndChild( const TiXmlNode& addThis )
+{
+	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
+	{
+		if ( GetDocument() ) 
+			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return 0;
+	}
+	TiXmlNode* node = addThis.Clone();
+	if ( !node )
+		return 0;
+
+	return LinkEndChild( node );
+}
+
+
+TiXmlNode* TiXmlNode::InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis )
+{	
+	if ( !beforeThis || beforeThis->parent != this ) {
+		return 0;
+	}
+	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
+	{
+		if ( GetDocument() ) 
+			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return 0;
+	}
+
+	TiXmlNode* node = addThis.Clone();
+	if ( !node )
+		return 0;
+	node->parent = this;
+
+	node->next = beforeThis;
+	node->prev = beforeThis->prev;
+	if ( beforeThis->prev )
+	{
+		beforeThis->prev->next = node;
+	}
+	else
+	{
+		assert( firstChild == beforeThis );
+		firstChild = node;
+	}
+	beforeThis->prev = node;
+	return node;
+}
+
+
+TiXmlNode* TiXmlNode::InsertAfterChild( TiXmlNode* afterThis, const TiXmlNode& addThis )
+{
+	if ( !afterThis || afterThis->parent != this ) {
+		return 0;
+	}
+	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
+	{
+		if ( GetDocument() ) 
+			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return 0;
+	}
+
+	TiXmlNode* node = addThis.Clone();
+	if ( !node )
+		return 0;
+	node->parent = this;
+
+	node->prev = afterThis;
+	node->next = afterThis->next;
+	if ( afterThis->next )
+	{
+		afterThis->next->prev = node;
+	}
+	else
+	{
+		assert( lastChild == afterThis );
+		lastChild = node;
+	}
+	afterThis->next = node;
+	return node;
+}
+
+
+TiXmlNode* TiXmlNode::ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis )
+{
+	if ( !replaceThis )
+		return 0;
+
+	if ( replaceThis->parent != this )
+		return 0;
+
+	if ( withThis.ToDocument() ) {
+		// A document can never be a child.	Thanks to Noam.
+		TiXmlDocument* document = GetDocument();
+		if ( document ) 
+			document->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return 0;
+	}
+
+	TiXmlNode* node = withThis.Clone();
+	if ( !node )
+		return 0;
+
+	node->next = replaceThis->next;
+	node->prev = replaceThis->prev;
+
+	if ( replaceThis->next )
+		replaceThis->next->prev = node;
+	else
+		lastChild = node;
+
+	if ( replaceThis->prev )
+		replaceThis->prev->next = node;
+	else
+		firstChild = node;
+
+	delete replaceThis;
+	node->parent = this;
+	return node;
+}
+
+
+bool TiXmlNode::RemoveChild( TiXmlNode* removeThis )
+{
+	if ( !removeThis ) {
+		return false;
+	}
+
+	if ( removeThis->parent != this )
+	{	
+		assert( 0 );
+		return false;
+	}
+
+	if ( removeThis->next )
+		removeThis->next->prev = removeThis->prev;
+	else
+		lastChild = removeThis->prev;
+
+	if ( removeThis->prev )
+		removeThis->prev->next = removeThis->next;
+	else
+		firstChild = removeThis->next;
+
+	delete removeThis;
+	return true;
+}
+
+const TiXmlNode* TiXmlNode::FirstChild( const char * _value ) const
+{
+	const TiXmlNode* node;
+	for ( node = firstChild; node; node = node->next )
+	{
+		if ( strcmp( node->Value(), _value ) == 0 )
+			return node;
+	}
+	return 0;
+}
+
+
+const TiXmlNode* TiXmlNode::LastChild( const char * _value ) const
+{
+	const TiXmlNode* node;
+	for ( node = lastChild; node; node = node->prev )
+	{
+		if ( strcmp( node->Value(), _value ) == 0 )
+			return node;
+	}
+	return 0;
+}
+
+
+const TiXmlNode* TiXmlNode::IterateChildren( const TiXmlNode* previous ) const
+{
+	if ( !previous )
+	{
+		return FirstChild();
+	}
+	else
+	{
+		assert( previous->parent == this );
+		return previous->NextSibling();
+	}
+}
+
+
+const TiXmlNode* TiXmlNode::IterateChildren( const char * val, const TiXmlNode* previous ) const
+{
+	if ( !previous )
+	{
+		return FirstChild( val );
+	}
+	else
+	{
+		assert( previous->parent == this );
+		return previous->NextSibling( val );
+	}
+}
+
+
+const TiXmlNode* TiXmlNode::NextSibling( const char * _value ) const 
+{
+	const TiXmlNode* node;
+	for ( node = next; node; node = node->next )
+	{
+		if ( strcmp( node->Value(), _value ) == 0 )
+			return node;
+	}
+	return 0;
+}
+
+
+const TiXmlNode* TiXmlNode::PreviousSibling( const char * _value ) const
+{
+	const TiXmlNode* node;
+	for ( node = prev; node; node = node->prev )
+	{
+		if ( strcmp( node->Value(), _value ) == 0 )
+			return node;
+	}
+	return 0;
+}
+
+
+void TiXmlElement::RemoveAttribute( const char * name )
+{
+    #ifdef TIXML_USE_STL
+	TIXML_STRING str( name );
+	TiXmlAttribute* node = attributeSet.Find( str );
+	#else
+	TiXmlAttribute* node = attributeSet.Find( name );
+	#endif
+	if ( node )
+	{
+		attributeSet.Remove( node );
+		delete node;
+	}
+}
+
+const TiXmlElement* TiXmlNode::FirstChildElement() const
+{
+	const TiXmlNode* node;
+
+	for (	node = FirstChild();
+			node;
+			node = node->NextSibling() )
+	{
+		if ( node->ToElement() )
+			return node->ToElement();
+	}
+	return 0;
+}
+
+
+const TiXmlElement* TiXmlNode::FirstChildElement( const char * _value ) const
+{
+	const TiXmlNode* node;
+
+	for (	node = FirstChild( _value );
+			node;
+			node = node->NextSibling( _value ) )
+	{
+		if ( node->ToElement() )
+			return node->ToElement();
+	}
+	return 0;
+}
+
+
+const TiXmlElement* TiXmlNode::NextSiblingElement() const
+{
+	const TiXmlNode* node;
+
+	for (	node = NextSibling();
+			node;
+			node = node->NextSibling() )
+	{
+		if ( node->ToElement() )
+			return node->ToElement();
+	}
+	return 0;
+}
+
+
+const TiXmlElement* TiXmlNode::NextSiblingElement( const char * _value ) const
+{
+	const TiXmlNode* node;
+
+	for (	node = NextSibling( _value );
+			node;
+			node = node->NextSibling( _value ) )
+	{
+		if ( node->ToElement() )
+			return node->ToElement();
+	}
+	return 0;
+}
+
+
+const TiXmlDocument* TiXmlNode::GetDocument() const
+{
+	const TiXmlNode* node;
+
+	for( node = this; node; node = node->parent )
+	{
+		if ( node->ToDocument() )
+			return node->ToDocument();
+	}
+	return 0;
+}
+
+
+TiXmlElement::TiXmlElement (const char * _value)
+	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
+{
+	firstChild = lastChild = 0;
+	value = _value;
+}
+
+
+#ifdef TIXML_USE_STL
+TiXmlElement::TiXmlElement( const std::string& _value ) 
+	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
+{
+	firstChild = lastChild = 0;
+	value = _value;
+}
+#endif
+
+
+TiXmlElement::TiXmlElement( const TiXmlElement& copy)
+	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
+{
+	firstChild = lastChild = 0;
+	copy.CopyTo( this );	
+}
+
+
+TiXmlElement& TiXmlElement::operator=( const TiXmlElement& base )
+{
+	ClearThis();
+	base.CopyTo( this );
+	return *this;
+}
+
+
+TiXmlElement::~TiXmlElement()
+{
+	ClearThis();
+}
+
+
+void TiXmlElement::ClearThis()
+{
+	Clear();
+	while( attributeSet.First() )
+	{
+		TiXmlAttribute* node = attributeSet.First();
+		attributeSet.Remove( node );
+		delete node;
+	}
+}
+
+
+const char* TiXmlElement::Attribute( const char* name ) const
+{
+	const TiXmlAttribute* node = attributeSet.Find( name );
+	if ( node )
+		return node->Value();
+	return 0;
+}
+
+
+#ifdef TIXML_USE_STL
+const std::string* TiXmlElement::Attribute( const std::string& name ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	if ( attrib )
+		return &attrib->ValueStr();
+	return 0;
+}
+#endif
+
+
+const char* TiXmlElement::Attribute( const char* name, int* i ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	const char* result = 0;
+
+	if ( attrib ) {
+		result = attrib->Value();
+		if ( i ) {
+			attrib->QueryIntValue( i );
+		}
+	}
+	return result;
+}
+
+
+#ifdef TIXML_USE_STL
+const std::string* TiXmlElement::Attribute( const std::string& name, int* i ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	const std::string* result = 0;
+
+	if ( attrib ) {
+		result = &attrib->ValueStr();
+		if ( i ) {
+			attrib->QueryIntValue( i );
+		}
+	}
+	return result;
+}
+#endif
+
+
+const char* TiXmlElement::Attribute( const char* name, double* d ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	const char* result = 0;
+
+	if ( attrib ) {
+		result = attrib->Value();
+		if ( d ) {
+			attrib->QueryDoubleValue( d );
+		}
+	}
+	return result;
+}
+
+
+#ifdef TIXML_USE_STL
+const std::string* TiXmlElement::Attribute( const std::string& name, double* d ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	const std::string* result = 0;
+
+	if ( attrib ) {
+		result = &attrib->ValueStr();
+		if ( d ) {
+			attrib->QueryDoubleValue( d );
+		}
+	}
+	return result;
+}
+#endif
+
+
+int TiXmlElement::QueryIntAttribute( const char* name, int* ival ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	if ( !attrib )
+		return TIXML_NO_ATTRIBUTE;
+	return attrib->QueryIntValue( ival );
+}
+
+
+int TiXmlElement::QueryUnsignedAttribute( const char* name, unsigned* value ) const
+{
+	const TiXmlAttribute* node = attributeSet.Find( name );
+	if ( !node )
+		return TIXML_NO_ATTRIBUTE;
+
+	int ival = 0;
+	int result = node->QueryIntValue( &ival );
+	*value = (unsigned)ival;
+	return result;
+}
+
+
+int TiXmlElement::QueryBoolAttribute( const char* name, bool* bval ) const
+{
+	const TiXmlAttribute* node = attributeSet.Find( name );
+	if ( !node )
+		return TIXML_NO_ATTRIBUTE;
+	
+	int result = TIXML_WRONG_TYPE;
+	if (    StringEqual( node->Value(), "true", true, TIXML_ENCODING_UNKNOWN ) 
+		 || StringEqual( node->Value(), "yes", true, TIXML_ENCODING_UNKNOWN ) 
+		 || StringEqual( node->Value(), "1", true, TIXML_ENCODING_UNKNOWN ) ) 
+	{
+		*bval = true;
+		result = TIXML_SUCCESS;
+	}
+	else if (    StringEqual( node->Value(), "false", true, TIXML_ENCODING_UNKNOWN ) 
+			  || StringEqual( node->Value(), "no", true, TIXML_ENCODING_UNKNOWN ) 
+			  || StringEqual( node->Value(), "0", true, TIXML_ENCODING_UNKNOWN ) ) 
+	{
+		*bval = false;
+		result = TIXML_SUCCESS;
+	}
+	return result;
+}
+
+
+
+#ifdef TIXML_USE_STL
+int TiXmlElement::QueryIntAttribute( const std::string& name, int* ival ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	if ( !attrib )
+		return TIXML_NO_ATTRIBUTE;
+	return attrib->QueryIntValue( ival );
+}
+#endif
+
+
+int TiXmlElement::QueryDoubleAttribute( const char* name, double* dval ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	if ( !attrib )
+		return TIXML_NO_ATTRIBUTE;
+	return attrib->QueryDoubleValue( dval );
+}
+
+
+#ifdef TIXML_USE_STL
+int TiXmlElement::QueryDoubleAttribute( const std::string& name, double* dval ) const
+{
+	const TiXmlAttribute* attrib = attributeSet.Find( name );
+	if ( !attrib )
+		return TIXML_NO_ATTRIBUTE;
+	return attrib->QueryDoubleValue( dval );
+}
+#endif
+
+
+void TiXmlElement::SetAttribute( const char * name, int val )
+{	
+	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+	if ( attrib ) {
+		attrib->SetIntValue( val );
+	}
+}
+
+
+#ifdef TIXML_USE_STL
+void TiXmlElement::SetAttribute( const std::string& name, int val )
+{	
+	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+	if ( attrib ) {
+		attrib->SetIntValue( val );
+	}
+}
+#endif
+
+
+void TiXmlElement::SetDoubleAttribute( const char * name, double val )
+{	
+	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+	if ( attrib ) {
+		attrib->SetDoubleValue( val );
+	}
+}
+
+
+#ifdef TIXML_USE_STL
+void TiXmlElement::SetDoubleAttribute( const std::string& name, double val )
+{	
+	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+	if ( attrib ) {
+		attrib->SetDoubleValue( val );
+	}
+}
+#endif 
+
+
+void TiXmlElement::SetAttribute( const char * cname, const char * cvalue )
+{
+	TiXmlAttribute* attrib = attributeSet.FindOrCreate( cname );
+	if ( attrib ) {
+		attrib->SetValue( cvalue );
+	}
+}
+
+
+#ifdef TIXML_USE_STL
+void TiXmlElement::SetAttribute( const std::string& _name, const std::string& _value )
+{
+	TiXmlAttribute* attrib = attributeSet.FindOrCreate( _name );
+	if ( attrib ) {
+		attrib->SetValue( _value );
+	}
+}
+#endif
+
+
+void TiXmlElement::Print( FILE* cfile, int depth ) const
+{
+	int i;
+	assert( cfile );
+	for ( i=0; i<depth; i++ ) {
+		fprintf( cfile, "    " );
+	}
+
+	fprintf( cfile, "<%s", value.c_str() );
+
+	const TiXmlAttribute* attrib;
+	for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() )
+	{
+		fprintf( cfile, " " );
+		attrib->Print( cfile, depth );
+	}
+
+	// There are 3 different formatting approaches:
+	// 1) An element without children is printed as a <foo /> node
+	// 2) An element with only a text child is printed as <foo> text </foo>
+	// 3) An element with children is printed on multiple lines.
+	TiXmlNode* node;
+	if ( !firstChild )
+	{
+		fprintf( cfile, " />" );
+	}
+	else if ( firstChild == lastChild && firstChild->ToText() )
+	{
+		fprintf( cfile, ">" );
+		firstChild->Print( cfile, depth + 1 );
+		fprintf( cfile, "</%s>", value.c_str() );
+	}
+	else
+	{
+		fprintf( cfile, ">" );
+
+		for ( node = firstChild; node; node=node->NextSibling() )
+		{
+			if ( !node->ToText() )
+			{
+				fprintf( cfile, "\n" );
+			}
+			node->Print( cfile, depth+1 );
+		}
+		fprintf( cfile, "\n" );
+		for( i=0; i<depth; ++i ) {
+			fprintf( cfile, "    " );
+		}
+		fprintf( cfile, "</%s>", value.c_str() );
+	}
+}
+
+
+void TiXmlElement::CopyTo( TiXmlElement* target ) const
+{
+	// superclass:
+	TiXmlNode::CopyTo( target );
+
+	// Element class: 
+	// Clone the attributes, then clone the children.
+	const TiXmlAttribute* attribute = 0;
+	for(	attribute = attributeSet.First();
+	attribute;
+	attribute = attribute->Next() )
+	{
+		target->SetAttribute( attribute->Name(), attribute->Value() );
+	}
+
+	TiXmlNode* node = 0;
+	for ( node = firstChild; node; node = node->NextSibling() )
+	{
+		target->LinkEndChild( node->Clone() );
+	}
+}
+
+bool TiXmlElement::Accept( TiXmlVisitor* visitor ) const
+{
+	if ( visitor->VisitEnter( *this, attributeSet.First() ) ) 
+	{
+		for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
+		{
+			if ( !node->Accept( visitor ) )
+				break;
+		}
+	}
+	return visitor->VisitExit( *this );
+}
+
+
+TiXmlNode* TiXmlElement::Clone() const
+{
+	TiXmlElement* clone = new TiXmlElement( Value() );
+	if ( !clone )
+		return 0;
+
+	CopyTo( clone );
+	return clone;
+}
+
+
+const char* TiXmlElement::GetText() const
+{
+	const TiXmlNode* child = this->FirstChild();
+	if ( child ) {
+		const TiXmlText* childText = child->ToText();
+		if ( childText ) {
+			return childText->Value();
+		}
+	}
+	return 0;
+}
+
+
+TiXmlDocument::TiXmlDocument() : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
+{
+	tabsize = 4;
+	useMicrosoftBOM = false;
+	ClearError();
+}
+
+TiXmlDocument::TiXmlDocument( const char * documentName ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
+{
+	tabsize = 4;
+	useMicrosoftBOM = false;
+	value = documentName;
+	ClearError();
+}
+
+
+#ifdef TIXML_USE_STL
+TiXmlDocument::TiXmlDocument( const std::string& documentName ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
+{
+	tabsize = 4;
+	useMicrosoftBOM = false;
+    value = documentName;
+	ClearError();
+}
+#endif
+
+
+TiXmlDocument::TiXmlDocument( const TiXmlDocument& copy ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
+{
+	copy.CopyTo( this );
+}
+
+
+TiXmlDocument& TiXmlDocument::operator=( const TiXmlDocument& copy )
+{
+	Clear();
+	copy.CopyTo( this );
+	return *this;
+}
+
+
+bool TiXmlDocument::LoadFile( TiXmlEncoding encoding )
+{
+	return LoadFile( Value(), encoding );
+}
+
+
+bool TiXmlDocument::SaveFile() const
+{
+	return SaveFile( Value() );
+}
+
+bool TiXmlDocument::LoadFile( const char* _filename, TiXmlEncoding encoding )
+{
+	TIXML_STRING filename( _filename );
+	value = filename;
+
+	// reading in binary mode so that tinyxml can normalize the EOL
+	FILE* file = TiXmlFOpen( value.c_str (), "rb" );	
+
+	if ( file )
+	{
+		bool result = LoadFile( file, encoding );
+		fclose( file );
+		return result;
+	}
+	else
+	{
+		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return false;
+	}
+}
+
+bool TiXmlDocument::LoadFile( FILE* file, TiXmlEncoding encoding )
+{
+	if ( !file ) 
+	{
+		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return false;
+	}
+
+	// Delete the existing data:
+	Clear();
+	location.Clear();
+
+	// Get the file size, so we can pre-allocate the string. HUGE speed impact.
+	long length = 0;
+	fseek( file, 0, SEEK_END );
+	length = ftell( file );
+	fseek( file, 0, SEEK_SET );
+
+	// Strange case, but good to handle up front.
+	if ( length <= 0 )
+	{
+		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return false;
+	}
+
+	// Subtle bug here. TinyXml did use fgets. But from the XML spec:
+	// 2.11 End-of-Line Handling
+	// <snip>
+	// <quote>
+	// ...the XML processor MUST behave as if it normalized all line breaks in external 
+	// parsed entities (including the document entity) on input, before parsing, by translating 
+	// both the two-character sequence #xD #xA and any #xD that is not followed by #xA to 
+	// a single #xA character.
+	// </quote>
+	//
+	// It is not clear fgets does that, and certainly isn't clear it works cross platform. 
+	// Generally, you expect fgets to translate from the convention of the OS to the c/unix
+	// convention, and not work generally.
+
+	/*
+	while( fgets( buf, sizeof(buf), file ) )
+	{
+		data += buf;
+	}
+	*/
+
+	char* buf = new char[ length+1 ];
+	buf[0] = 0;
+
+	if ( fread( buf, length, 1, file ) != 1 ) {
+		delete [] buf;
+		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return false;
+	}
+
+	// Process the buffer in place to normalize new lines. (See comment above.)
+	// Copies from the 'p' to 'q' pointer, where p can advance faster if
+	// a newline-carriage return is hit.
+	//
+	// Wikipedia:
+	// Systems based on ASCII or a compatible character set use either LF  (Line feed, '\n', 0x0A, 10 in decimal) or 
+	// CR (Carriage return, '\r', 0x0D, 13 in decimal) individually, or CR followed by LF (CR+LF, 0x0D 0x0A)...
+	//		* LF:    Multics, Unix and Unix-like systems (GNU/Linux, AIX, Xenix, Mac OS X, FreeBSD, etc.), BeOS, Amiga, RISC OS, and others
+    //		* CR+LF: DEC RT-11 and most other early non-Unix, non-IBM OSes, CP/M, MP/M, DOS, OS/2, Microsoft Windows, Symbian OS
+    //		* CR:    Commodore 8-bit machines, Apple II family, Mac OS up to version 9 and OS-9
+
+	const char* p = buf;	// the read head
+	char* q = buf;			// the write head
+	const char CR = 0x0d;
+	const char LF = 0x0a;
+
+	buf[length] = 0;
+	while( *p ) {
+		assert( p < (buf+length) );
+		assert( q <= (buf+length) );
+		assert( q <= p );
+
+		if ( *p == CR ) {
+			*q++ = LF;
+			p++;
+			if ( *p == LF ) {		// check for CR+LF (and skip LF)
+				p++;
+			}
+		}
+		else {
+			*q++ = *p++;
+		}
+	}
+	assert( q <= (buf+length) );
+	*q = 0;
+
+	Parse( buf, 0, encoding );
+
+	delete [] buf;
+	return !Error();
+}
+
+
+bool TiXmlDocument::SaveFile( const char * filename ) const
+{
+	// The old c stuff lives on...
+	FILE* fp = TiXmlFOpen( filename, "w" );
+	if ( fp )
+	{
+		bool result = SaveFile( fp );
+		fclose( fp );
+		return result;
+	}
+	return false;
+}
+
+
+bool TiXmlDocument::SaveFile( FILE* fp ) const
+{
+	if ( useMicrosoftBOM ) 
+	{
+		const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
+		const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
+		const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
+
+		fputc( TIXML_UTF_LEAD_0, fp );
+		fputc( TIXML_UTF_LEAD_1, fp );
+		fputc( TIXML_UTF_LEAD_2, fp );
+	}
+	Print( fp, 0 );
+	return (ferror(fp) == 0);
+}
+
+
+void TiXmlDocument::CopyTo( TiXmlDocument* target ) const
+{
+	TiXmlNode::CopyTo( target );
+
+	target->error = error;
+	target->errorId = errorId;
+	target->errorDesc = errorDesc;
+	target->tabsize = tabsize;
+	target->errorLocation = errorLocation;
+	target->useMicrosoftBOM = useMicrosoftBOM;
+
+	TiXmlNode* node = 0;
+	for ( node = firstChild; node; node = node->NextSibling() )
+	{
+		target->LinkEndChild( node->Clone() );
+	}	
+}
+
+
+TiXmlNode* TiXmlDocument::Clone() const
+{
+	TiXmlDocument* clone = new TiXmlDocument();
+	if ( !clone )
+		return 0;
+
+	CopyTo( clone );
+	return clone;
+}
+
+
+void TiXmlDocument::Print( FILE* cfile, int depth ) const
+{
+	assert( cfile );
+	for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
+	{
+		node->Print( cfile, depth );
+		fprintf( cfile, "\n" );
+	}
+}
+
+
+bool TiXmlDocument::Accept( TiXmlVisitor* visitor ) const
+{
+	if ( visitor->VisitEnter( *this ) )
+	{
+		for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
+		{
+			if ( !node->Accept( visitor ) )
+				break;
+		}
+	}
+	return visitor->VisitExit( *this );
+}
+
+
+const TiXmlAttribute* TiXmlAttribute::Next() const
+{
+	// We are using knowledge of the sentinel. The sentinel
+	// have a value or name.
+	if ( next->value.empty() && next->name.empty() )
+		return 0;
+	return next;
+}
+
+/*
+TiXmlAttribute* TiXmlAttribute::Next()
+{
+	// We are using knowledge of the sentinel. The sentinel
+	// have a value or name.
+	if ( next->value.empty() && next->name.empty() )
+		return 0;
+	return next;
+}
+*/
+
+const TiXmlAttribute* TiXmlAttribute::Previous() const
+{
+	// We are using knowledge of the sentinel. The sentinel
+	// have a value or name.
+	if ( prev->value.empty() && prev->name.empty() )
+		return 0;
+	return prev;
+}
+
+/*
+TiXmlAttribute* TiXmlAttribute::Previous()
+{
+	// We are using knowledge of the sentinel. The sentinel
+	// have a value or name.
+	if ( prev->value.empty() && prev->name.empty() )
+		return 0;
+	return prev;
+}
+*/
+
+void TiXmlAttribute::Print( FILE* cfile, int /*depth*/, TIXML_STRING* str ) const
+{
+	TIXML_STRING n, v;
+
+	EncodeString( name, &n );
+	EncodeString( value, &v );
+
+	if (value.find ('\"') == TIXML_STRING::npos) {
+		if ( cfile ) {
+			fprintf (cfile, "%s=\"%s\"", n.c_str(), v.c_str() );
+		}
+		if ( str ) {
+			(*str) += n; (*str) += "=\""; (*str) += v; (*str) += "\"";
+		}
+	}
+	else {
+		if ( cfile ) {
+			fprintf (cfile, "%s='%s'", n.c_str(), v.c_str() );
+		}
+		if ( str ) {
+			(*str) += n; (*str) += "='"; (*str) += v; (*str) += "'";
+		}
+	}
+}
+
+
+int TiXmlAttribute::QueryIntValue( int* ival ) const
+{
+	if ( TIXML_SSCANF( value.c_str(), "%d", ival ) == 1 )
+		return TIXML_SUCCESS;
+	return TIXML_WRONG_TYPE;
+}
+
+int TiXmlAttribute::QueryDoubleValue( double* dval ) const
+{
+	if ( TIXML_SSCANF( value.c_str(), "%lf", dval ) == 1 )
+		return TIXML_SUCCESS;
+	return TIXML_WRONG_TYPE;
+}
+
+void TiXmlAttribute::SetIntValue( int _value )
+{
+	char buf [64];
+	#if defined(TIXML_SNPRINTF)		
+		TIXML_SNPRINTF(buf, sizeof(buf), "%d", _value);
+	#else
+		sprintf (buf, "%d", _value);
+	#endif
+	SetValue (buf);
+}
+
+void TiXmlAttribute::SetDoubleValue( double _value )
+{
+	char buf [256];
+	#if defined(TIXML_SNPRINTF)		
+		TIXML_SNPRINTF( buf, sizeof(buf), "%g", _value);
+	#else
+		sprintf (buf, "%g", _value);
+	#endif
+	SetValue (buf);
+}
+
+int TiXmlAttribute::IntValue() const
+{
+	return atoi (value.c_str ());
+}
+
+double  TiXmlAttribute::DoubleValue() const
+{
+	return atof (value.c_str ());
+}
+
+
+TiXmlComment::TiXmlComment( const TiXmlComment& copy ) : TiXmlNode( TiXmlNode::TINYXML_COMMENT )
+{
+	copy.CopyTo( this );
+}
+
+
+TiXmlComment& TiXmlComment::operator=( const TiXmlComment& base )
+{
+	Clear();
+	base.CopyTo( this );
+	return *this;
+}
+
+
+void TiXmlComment::Print( FILE* cfile, int depth ) const
+{
+	assert( cfile );
+	for ( int i=0; i<depth; i++ )
+	{
+		fprintf( cfile,  "    " );
+	}
+	fprintf( cfile, "<!--%s-->", value.c_str() );
+}
+
+
+void TiXmlComment::CopyTo( TiXmlComment* target ) const
+{
+	TiXmlNode::CopyTo( target );
+}
+
+
+bool TiXmlComment::Accept( TiXmlVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+
+TiXmlNode* TiXmlComment::Clone() const
+{
+	TiXmlComment* clone = new TiXmlComment();
+
+	if ( !clone )
+		return 0;
+
+	CopyTo( clone );
+	return clone;
+}
+
+
+void TiXmlText::Print( FILE* cfile, int depth ) const
+{
+	assert( cfile );
+	if ( cdata )
+	{
+		int i;
+		fprintf( cfile, "\n" );
+		for ( i=0; i<depth; i++ ) {
+			fprintf( cfile, "    " );
+		}
+		fprintf( cfile, "<![CDATA[%s]]>\n", value.c_str() );	// unformatted output
+	}
+	else
+	{
+		TIXML_STRING buffer;
+		EncodeString( value, &buffer );
+		fprintf( cfile, "%s", buffer.c_str() );
+	}
+}
+
+
+void TiXmlText::CopyTo( TiXmlText* target ) const
+{
+	TiXmlNode::CopyTo( target );
+	target->cdata = cdata;
+}
+
+
+bool TiXmlText::Accept( TiXmlVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+
+TiXmlNode* TiXmlText::Clone() const
+{	
+	TiXmlText* clone = 0;
+	clone = new TiXmlText( "" );
+
+	if ( !clone )
+		return 0;
+
+	CopyTo( clone );
+	return clone;
+}
+
+
+TiXmlDeclaration::TiXmlDeclaration( const char * _version,
+									const char * _encoding,
+									const char * _standalone )
+	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
+{
+	version = _version;
+	encoding = _encoding;
+	standalone = _standalone;
+}
+
+
+#ifdef TIXML_USE_STL
+TiXmlDeclaration::TiXmlDeclaration(	const std::string& _version,
+									const std::string& _encoding,
+									const std::string& _standalone )
+	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
+{
+	version = _version;
+	encoding = _encoding;
+	standalone = _standalone;
+}
+#endif
+
+
+TiXmlDeclaration::TiXmlDeclaration( const TiXmlDeclaration& copy )
+	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
+{
+	copy.CopyTo( this );	
+}
+
+
+TiXmlDeclaration& TiXmlDeclaration::operator=( const TiXmlDeclaration& copy )
+{
+	Clear();
+	copy.CopyTo( this );
+	return *this;
+}
+
+
+void TiXmlDeclaration::Print( FILE* cfile, int /*depth*/, TIXML_STRING* str ) const
+{
+	if ( cfile ) fprintf( cfile, "<?xml " );
+	if ( str )	 (*str) += "<?xml ";
+
+	if ( !version.empty() ) {
+		if ( cfile ) fprintf (cfile, "version=\"%s\" ", version.c_str ());
+		if ( str ) { (*str) += "version=\""; (*str) += version; (*str) += "\" "; }
+	}
+	if ( !encoding.empty() ) {
+		if ( cfile ) fprintf (cfile, "encoding=\"%s\" ", encoding.c_str ());
+		if ( str ) { (*str) += "encoding=\""; (*str) += encoding; (*str) += "\" "; }
+	}
+	if ( !standalone.empty() ) {
+		if ( cfile ) fprintf (cfile, "standalone=\"%s\" ", standalone.c_str ());
+		if ( str ) { (*str) += "standalone=\""; (*str) += standalone; (*str) += "\" "; }
+	}
+	if ( cfile ) fprintf( cfile, "?>" );
+	if ( str )	 (*str) += "?>";
+}
+
+
+void TiXmlDeclaration::CopyTo( TiXmlDeclaration* target ) const
+{
+	TiXmlNode::CopyTo( target );
+
+	target->version = version;
+	target->encoding = encoding;
+	target->standalone = standalone;
+}
+
+
+bool TiXmlDeclaration::Accept( TiXmlVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+
+TiXmlNode* TiXmlDeclaration::Clone() const
+{	
+	TiXmlDeclaration* clone = new TiXmlDeclaration();
+
+	if ( !clone )
+		return 0;
+
+	CopyTo( clone );
+	return clone;
+}
+
+
+void TiXmlUnknown::Print( FILE* cfile, int depth ) const
+{
+	for ( int i=0; i<depth; i++ )
+		fprintf( cfile, "    " );
+	fprintf( cfile, "<%s>", value.c_str() );
+}
+
+
+void TiXmlUnknown::CopyTo( TiXmlUnknown* target ) const
+{
+	TiXmlNode::CopyTo( target );
+}
+
+
+bool TiXmlUnknown::Accept( TiXmlVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+
+TiXmlNode* TiXmlUnknown::Clone() const
+{
+	TiXmlUnknown* clone = new TiXmlUnknown();
+
+	if ( !clone )
+		return 0;
+
+	CopyTo( clone );
+	return clone;
+}
+
+
+TiXmlAttributeSet::TiXmlAttributeSet()
+{
+	sentinel.next = &sentinel;
+	sentinel.prev = &sentinel;
+}
+
+
+TiXmlAttributeSet::~TiXmlAttributeSet()
+{
+	assert( sentinel.next == &sentinel );
+	assert( sentinel.prev == &sentinel );
+}
+
+
+void TiXmlAttributeSet::Add( TiXmlAttribute* addMe )
+{
+    #ifdef TIXML_USE_STL
+	assert( !Find( TIXML_STRING( addMe->Name() ) ) );	// Shouldn't be multiply adding to the set.
+	#else
+	assert( !Find( addMe->Name() ) );	// Shouldn't be multiply adding to the set.
+	#endif
+
+	addMe->next = &sentinel;
+	addMe->prev = sentinel.prev;
+
+	sentinel.prev->next = addMe;
+	sentinel.prev      = addMe;
+}
+
+void TiXmlAttributeSet::Remove( TiXmlAttribute* removeMe )
+{
+	TiXmlAttribute* node;
+
+	for( node = sentinel.next; node != &sentinel; node = node->next )
+	{
+		if ( node == removeMe )
+		{
+			node->prev->next = node->next;
+			node->next->prev = node->prev;
+			node->next = 0;
+			node->prev = 0;
+			return;
+		}
+	}
+	assert( 0 );		// we tried to remove a non-linked attribute.
+}
+
+
+#ifdef TIXML_USE_STL
+TiXmlAttribute* TiXmlAttributeSet::Find( const std::string& name ) const
+{
+	for( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
+	{
+		if ( node->name == name )
+			return node;
+	}
+	return 0;
+}
+
+TiXmlAttribute* TiXmlAttributeSet::FindOrCreate( const std::string& _name )
+{
+	TiXmlAttribute* attrib = Find( _name );
+	if ( !attrib ) {
+		attrib = new TiXmlAttribute();
+		Add( attrib );
+		attrib->SetName( _name );
+	}
+	return attrib;
+}
+#endif
+
+
+TiXmlAttribute* TiXmlAttributeSet::Find( const char* name ) const
+{
+	for( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
+	{
+		if ( strcmp( node->name.c_str(), name ) == 0 )
+			return node;
+	}
+	return 0;
+}
+
+
+TiXmlAttribute* TiXmlAttributeSet::FindOrCreate( const char* _name )
+{
+	TiXmlAttribute* attrib = Find( _name );
+	if ( !attrib ) {
+		attrib = new TiXmlAttribute();
+		Add( attrib );
+		attrib->SetName( _name );
+	}
+	return attrib;
+}
+
+
+#ifdef TIXML_USE_STL	
+std::istream& operator>> (std::istream & in, TiXmlNode & base)
+{
+	TIXML_STRING tag;
+	tag.reserve( 8 * 1000 );
+	base.StreamIn( &in, &tag );
+
+	base.Parse( tag.c_str(), 0, TIXML_DEFAULT_ENCODING );
+	return in;
+}
+#endif
+
+
+#ifdef TIXML_USE_STL	
+std::ostream& operator<< (std::ostream & out, const TiXmlNode & base)
+{
+	TiXmlPrinter printer;
+	printer.SetStreamPrinting();
+	base.Accept( &printer );
+	out << printer.Str();
+
+	return out;
+}
+
+
+std::string& operator<< (std::string& out, const TiXmlNode& base )
+{
+	TiXmlPrinter printer;
+	printer.SetStreamPrinting();
+	base.Accept( &printer );
+	out.append( printer.Str() );
+
+	return out;
+}
+#endif
+
+
+TiXmlHandle TiXmlHandle::FirstChild() const
+{
+	if ( node )
+	{
+		TiXmlNode* child = node->FirstChild();
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+TiXmlHandle TiXmlHandle::FirstChild( const char * value ) const
+{
+	if ( node )
+	{
+		TiXmlNode* child = node->FirstChild( value );
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+TiXmlHandle TiXmlHandle::FirstChildElement() const
+{
+	if ( node )
+	{
+		TiXmlElement* child = node->FirstChildElement();
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+TiXmlHandle TiXmlHandle::FirstChildElement( const char * value ) const
+{
+	if ( node )
+	{
+		TiXmlElement* child = node->FirstChildElement( value );
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+TiXmlHandle TiXmlHandle::Child( int count ) const
+{
+	if ( node )
+	{
+		int i;
+		TiXmlNode* child = node->FirstChild();
+		for (	i=0;
+				child && i<count;
+				child = child->NextSibling(), ++i )
+		{
+			// nothing
+		}
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+TiXmlHandle TiXmlHandle::Child( const char* value, int count ) const
+{
+	if ( node )
+	{
+		int i;
+		TiXmlNode* child = node->FirstChild( value );
+		for (	i=0;
+				child && i<count;
+				child = child->NextSibling( value ), ++i )
+		{
+			// nothing
+		}
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+TiXmlHandle TiXmlHandle::ChildElement( int count ) const
+{
+	if ( node )
+	{
+		int i;
+		TiXmlElement* child = node->FirstChildElement();
+		for (	i=0;
+				child && i<count;
+				child = child->NextSiblingElement(), ++i )
+		{
+			// nothing
+		}
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+TiXmlHandle TiXmlHandle::ChildElement( const char* value, int count ) const
+{
+	if ( node )
+	{
+		int i;
+		TiXmlElement* child = node->FirstChildElement( value );
+		for (	i=0;
+				child && i<count;
+				child = child->NextSiblingElement( value ), ++i )
+		{
+			// nothing
+		}
+		if ( child )
+			return TiXmlHandle( child );
+	}
+	return TiXmlHandle( 0 );
+}
+
+
+bool TiXmlPrinter::VisitEnter( const TiXmlDocument& )
+{
+	return true;
+}
+
+bool TiXmlPrinter::VisitExit( const TiXmlDocument& )
+{
+	return true;
+}
+
+bool TiXmlPrinter::VisitEnter( const TiXmlElement& element, const TiXmlAttribute* firstAttribute )
+{
+	DoIndent();
+	buffer += "<";
+	buffer += element.Value();
+
+	for( const TiXmlAttribute* attrib = firstAttribute; attrib; attrib = attrib->Next() )
+	{
+		buffer += " ";
+		attrib->Print( 0, 0, &buffer );
+	}
+
+	if ( !element.FirstChild() ) 
+	{
+		buffer += " />";
+		DoLineBreak();
+	}
+	else 
+	{
+		buffer += ">";
+		if (    element.FirstChild()->ToText()
+			  && element.LastChild() == element.FirstChild()
+			  && element.FirstChild()->ToText()->CDATA() == false )
+		{
+			simpleTextPrint = true;
+			// no DoLineBreak()!
+		}
+		else
+		{
+			DoLineBreak();
+		}
+	}
+	++depth;	
+	return true;
+}
+
+
+bool TiXmlPrinter::VisitExit( const TiXmlElement& element )
+{
+	--depth;
+	if ( !element.FirstChild() ) 
+	{
+		// nothing.
+	}
+	else 
+	{
+		if ( simpleTextPrint )
+		{
+			simpleTextPrint = false;
+		}
+		else
+		{
+			DoIndent();
+		}
+		buffer += "</";
+		buffer += element.Value();
+		buffer += ">";
+		DoLineBreak();
+	}
+	return true;
+}
+
+
+bool TiXmlPrinter::Visit( const TiXmlText& text )
+{
+	if ( text.CDATA() )
+	{
+		DoIndent();
+		buffer += "<![CDATA[";
+		buffer += text.Value();
+		buffer += "]]>";
+		DoLineBreak();
+	}
+	else if ( simpleTextPrint )
+	{
+		TIXML_STRING str;
+		TiXmlBase::EncodeString( text.ValueTStr(), &str );
+		buffer += str;
+	}
+	else
+	{
+		DoIndent();
+		TIXML_STRING str;
+		TiXmlBase::EncodeString( text.ValueTStr(), &str );
+		buffer += str;
+		DoLineBreak();
+	}
+	return true;
+}
+
+
+bool TiXmlPrinter::Visit( const TiXmlDeclaration& declaration )
+{
+	DoIndent();
+	declaration.Print( 0, 0, &buffer );
+	DoLineBreak();
+	return true;
+}
+
+
+bool TiXmlPrinter::Visit( const TiXmlComment& comment )
+{
+	DoIndent();
+	buffer += "<!--";
+	buffer += comment.Value();
+	buffer += "-->";
+	DoLineBreak();
+	return true;
+}
+
+
+bool TiXmlPrinter::Visit( const TiXmlUnknown& unknown )
+{
+	DoIndent();
+	buffer += "<";
+	buffer += unknown.Value();
+	buffer += ">";
+	DoLineBreak();
+	return true;
+}
+
diff --git a/test/tinyxml/tinyxml.h b/test/tinyxml/tinyxml.h
new file mode 100644
index 0000000..a3589e5
--- /dev/null
+++ b/test/tinyxml/tinyxml.h
@@ -0,0 +1,1805 @@
+/*
+www.sourceforge.net/projects/tinyxml
+Original code by Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+
+#ifndef TINYXML_INCLUDED
+#define TINYXML_INCLUDED
+
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable : 4530 )
+#pragma warning( disable : 4786 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+// Help out windows:
+#if defined( _DEBUG ) && !defined( DEBUG )
+#define DEBUG
+#endif
+
+#ifdef TIXML_USE_STL
+	#include <string>
+ 	#include <iostream>
+	#include <sstream>
+	#define TIXML_STRING		std::string
+#else
+	#include "tinystr.h"
+	#define TIXML_STRING		TiXmlString
+#endif
+
+// Deprecated library function hell. Compilers want to use the
+// new safe versions. This probably doesn't fully address the problem,
+// but it gets closer. There are too many compilers for me to fully
+// test. If you get compilation troubles, undefine TIXML_SAFE
+#define TIXML_SAFE
+
+#ifdef TIXML_SAFE
+	#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+		// Microsoft visual studio, version 2005 and higher.
+		#define TIXML_SNPRINTF _snprintf_s
+		#define TIXML_SSCANF   sscanf_s
+	#elif defined(_MSC_VER) && (_MSC_VER >= 1200 )
+		// Microsoft visual studio, version 6 and higher.
+		//#pragma message( "Using _sn* functions." )
+		#define TIXML_SNPRINTF _snprintf
+		#define TIXML_SSCANF   sscanf
+	#elif defined(__GNUC__) && (__GNUC__ >= 3 )
+		// GCC version 3 and higher.s
+		//#warning( "Using sn* functions." )
+		#define TIXML_SNPRINTF snprintf
+		#define TIXML_SSCANF   sscanf
+	#else
+		#define TIXML_SNPRINTF snprintf
+		#define TIXML_SSCANF   sscanf
+	#endif
+#endif	
+
+class TiXmlDocument;
+class TiXmlElement;
+class TiXmlComment;
+class TiXmlUnknown;
+class TiXmlAttribute;
+class TiXmlText;
+class TiXmlDeclaration;
+class TiXmlParsingData;
+
+const int TIXML_MAJOR_VERSION = 2;
+const int TIXML_MINOR_VERSION = 6;
+const int TIXML_PATCH_VERSION = 2;
+
+/*	Internal structure for tracking location of items 
+	in the XML file.
+*/
+struct TiXmlCursor
+{
+	TiXmlCursor()		{ Clear(); }
+	void Clear()		{ row = col = -1; }
+
+	int row;	// 0 based.
+	int col;	// 0 based.
+};
+
+
+/**
+	Implements the interface to the "Visitor pattern" (see the Accept() method.)
+	If you call the Accept() method, it requires being passed a TiXmlVisitor
+	class to handle callbacks. For nodes that contain other nodes (Document, Element)
+	you will get called with a VisitEnter/VisitExit pair. Nodes that are always leaves
+	are simply called with Visit().
+
+	If you return 'true' from a Visit method, recursive parsing will continue. If you return
+	false, <b>no children of this node or its sibilings</b> will be Visited.
+
+	All flavors of Visit methods have a default implementation that returns 'true' (continue 
+	visiting). You need to only override methods that are interesting to you.
+
+	Generally Accept() is called on the TiXmlDocument, although all nodes suppert Visiting.
+
+	You should never change the document from a callback.
+
+	@sa TiXmlNode::Accept()
+*/
+class TiXmlVisitor
+{
+public:
+	virtual ~TiXmlVisitor() {}
+
+	/// Visit a document.
+	virtual bool VisitEnter( const TiXmlDocument& /*doc*/ )			{ return true; }
+	/// Visit a document.
+	virtual bool VisitExit( const TiXmlDocument& /*doc*/ )			{ return true; }
+
+	/// Visit an element.
+	virtual bool VisitEnter( const TiXmlElement& /*element*/, const TiXmlAttribute* /*firstAttribute*/ )	{ return true; }
+	/// Visit an element.
+	virtual bool VisitExit( const TiXmlElement& /*element*/ )		{ return true; }
+
+	/// Visit a declaration
+	virtual bool Visit( const TiXmlDeclaration& /*declaration*/ )	{ return true; }
+	/// Visit a text node
+	virtual bool Visit( const TiXmlText& /*text*/ )					{ return true; }
+	/// Visit a comment node
+	virtual bool Visit( const TiXmlComment& /*comment*/ )			{ return true; }
+	/// Visit an unknown node
+	virtual bool Visit( const TiXmlUnknown& /*unknown*/ )			{ return true; }
+};
+
+// Only used by Attribute::Query functions
+enum 
+{ 
+	TIXML_SUCCESS,
+	TIXML_NO_ATTRIBUTE,
+	TIXML_WRONG_TYPE
+};
+
+
+// Used by the parsing routines.
+enum TiXmlEncoding
+{
+	TIXML_ENCODING_UNKNOWN,
+	TIXML_ENCODING_UTF8,
+	TIXML_ENCODING_LEGACY
+};
+
+const TiXmlEncoding TIXML_DEFAULT_ENCODING = TIXML_ENCODING_UNKNOWN;
+
+/** TiXmlBase is a base class for every class in TinyXml.
+	It does little except to establish that TinyXml classes
+	can be printed and provide some utility functions.
+
+	In XML, the document and elements can contain
+	other elements and other types of nodes.
+
+	@verbatim
+	A Document can contain:	Element	(container or leaf)
+							Comment (leaf)
+							Unknown (leaf)
+							Declaration( leaf )
+
+	An Element can contain:	Element (container or leaf)
+							Text	(leaf)
+							Attributes (not on tree)
+							Comment (leaf)
+							Unknown (leaf)
+
+	A Decleration contains: Attributes (not on tree)
+	@endverbatim
+*/
+class TiXmlBase
+{
+	friend class TiXmlNode;
+	friend class TiXmlElement;
+	friend class TiXmlDocument;
+
+public:
+	TiXmlBase()	:	userData(0)		{}
+	virtual ~TiXmlBase()			{}
+
+	/**	All TinyXml classes can print themselves to a filestream
+		or the string class (TiXmlString in non-STL mode, std::string
+		in STL mode.) Either or both cfile and str can be null.
+		
+		This is a formatted print, and will insert 
+		tabs and newlines.
+		
+		(For an unformatted stream, use the << operator.)
+	*/
+	virtual void Print( FILE* cfile, int depth ) const = 0;
+
+	/**	The world does not agree on whether white space should be kept or
+		not. In order to make everyone happy, these global, static functions
+		are provided to set whether or not TinyXml will condense all white space
+		into a single space or not. The default is to condense. Note changing this
+		value is not thread safe.
+	*/
+	static void SetCondenseWhiteSpace( bool condense )		{ condenseWhiteSpace = condense; }
+
+	/// Return the current white space setting.
+	static bool IsWhiteSpaceCondensed()						{ return condenseWhiteSpace; }
+
+	/** Return the position, in the original source file, of this node or attribute.
+		The row and column are 1-based. (That is the first row and first column is
+		1,1). If the returns values are 0 or less, then the parser does not have
+		a row and column value.
+
+		Generally, the row and column value will be set when the TiXmlDocument::Load(),
+		TiXmlDocument::LoadFile(), or any TiXmlNode::Parse() is called. It will NOT be set
+		when the DOM was created from operator>>.
+
+		The values reflect the initial load. Once the DOM is modified programmatically
+		(by adding or changing nodes and attributes) the new values will NOT update to
+		reflect changes in the document.
+
+		There is a minor performance cost to computing the row and column. Computation
+		can be disabled if TiXmlDocument::SetTabSize() is called with 0 as the value.
+
+		@sa TiXmlDocument::SetTabSize()
+	*/
+	int Row() const			{ return location.row + 1; }
+	int Column() const		{ return location.col + 1; }	///< See Row()
+
+	void  SetUserData( void* user )			{ userData = user; }	///< Set a pointer to arbitrary user data.
+	void* GetUserData()						{ return userData; }	///< Get a pointer to arbitrary user data.
+	const void* GetUserData() const 		{ return userData; }	///< Get a pointer to arbitrary user data.
+
+	// Table that returs, for a given lead byte, the total number of bytes
+	// in the UTF-8 sequence.
+	static const int utf8ByteTable[256];
+
+	virtual const char* Parse(	const char* p, 
+								TiXmlParsingData* data, 
+								TiXmlEncoding encoding /*= TIXML_ENCODING_UNKNOWN */ ) = 0;
+
+	/** Expands entities in a string. Note this should not contian the tag's '<', '>', etc, 
+		or they will be transformed into entities!
+	*/
+	static void EncodeString( const TIXML_STRING& str, TIXML_STRING* out );
+
+	enum
+	{
+		TIXML_NO_ERROR = 0,
+		TIXML_ERROR,
+		TIXML_ERROR_OPENING_FILE,
+		TIXML_ERROR_PARSING_ELEMENT,
+		TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME,
+		TIXML_ERROR_READING_ELEMENT_VALUE,
+		TIXML_ERROR_READING_ATTRIBUTES,
+		TIXML_ERROR_PARSING_EMPTY,
+		TIXML_ERROR_READING_END_TAG,
+		TIXML_ERROR_PARSING_UNKNOWN,
+		TIXML_ERROR_PARSING_COMMENT,
+		TIXML_ERROR_PARSING_DECLARATION,
+		TIXML_ERROR_DOCUMENT_EMPTY,
+		TIXML_ERROR_EMBEDDED_NULL,
+		TIXML_ERROR_PARSING_CDATA,
+		TIXML_ERROR_DOCUMENT_TOP_ONLY,
+
+		TIXML_ERROR_STRING_COUNT
+	};
+
+protected:
+
+	static const char* SkipWhiteSpace( const char*, TiXmlEncoding encoding );
+
+	inline static bool IsWhiteSpace( char c )		
+	{ 
+		return ( isspace( (unsigned char) c ) || c == '\n' || c == '\r' ); 
+	}
+	inline static bool IsWhiteSpace( int c )
+	{
+		if ( c < 256 )
+			return IsWhiteSpace( (char) c );
+		return false;	// Again, only truly correct for English/Latin...but usually works.
+	}
+
+	#ifdef TIXML_USE_STL
+	static bool	StreamWhiteSpace( std::istream * in, TIXML_STRING * tag );
+	static bool StreamTo( std::istream * in, int character, TIXML_STRING * tag );
+	#endif
+
+	/*	Reads an XML name into the string provided. Returns
+		a pointer just past the last character of the name,
+		or 0 if the function has an error.
+	*/
+	static const char* ReadName( const char* p, TIXML_STRING* name, TiXmlEncoding encoding );
+
+	/*	Reads text. Returns a pointer past the given end tag.
+		Wickedly complex options, but it keeps the (sensitive) code in one place.
+	*/
+	static const char* ReadText(	const char* in,				// where to start
+									TIXML_STRING* text,			// the string read
+									bool ignoreWhiteSpace,		// whether to keep the white space
+									const char* endTag,			// what ends this text
+									bool ignoreCase,			// whether to ignore case in the end tag
+									TiXmlEncoding encoding );	// the current encoding
+
+	// If an entity has been found, transform it into a character.
+	static const char* GetEntity( const char* in, char* value, int* length, TiXmlEncoding encoding );
+
+	// Get a character, while interpreting entities.
+	// The length can be from 0 to 4 bytes.
+	inline static const char* GetChar( const char* p, char* _value, int* length, TiXmlEncoding encoding )
+	{
+		assert( p );
+		if ( encoding == TIXML_ENCODING_UTF8 )
+		{
+			*length = utf8ByteTable[ *((const unsigned char*)p) ];
+			assert( *length >= 0 && *length < 5 );
+		}
+		else
+		{
+			*length = 1;
+		}
+
+		if ( *length == 1 )
+		{
+			if ( *p == '&' )
+				return GetEntity( p, _value, length, encoding );
+			*_value = *p;
+			return p+1;
+		}
+		else if ( *length )
+		{
+			//strncpy( _value, p, *length );	// lots of compilers don't like this function (unsafe),
+												// and the null terminator isn't needed
+			for( int i=0; p[i] && i<*length; ++i ) {
+				_value[i] = p[i];
+			}
+			return p + (*length);
+		}
+		else
+		{
+			// Not valid text.
+			return 0;
+		}
+	}
+
+	// Return true if the next characters in the stream are any of the endTag sequences.
+	// Ignore case only works for english, and should only be relied on when comparing
+	// to English words: StringEqual( p, "version", true ) is fine.
+	static bool StringEqual(	const char* p,
+								const char* endTag,
+								bool ignoreCase,
+								TiXmlEncoding encoding );
+
+	static const char* errorString[ TIXML_ERROR_STRING_COUNT ];
+
+	TiXmlCursor location;
+
+    /// Field containing a generic user pointer
+	void*			userData;
+	
+	// None of these methods are reliable for any language except English.
+	// Good for approximation, not great for accuracy.
+	static int IsAlpha( unsigned char anyByte, TiXmlEncoding encoding );
+	static int IsAlphaNum( unsigned char anyByte, TiXmlEncoding encoding );
+	inline static int ToLower( int v, TiXmlEncoding encoding )
+	{
+		if ( encoding == TIXML_ENCODING_UTF8 )
+		{
+			if ( v < 128 ) return tolower( v );
+			return v;
+		}
+		else
+		{
+			return tolower( v );
+		}
+	}
+	static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length );
+
+private:
+	TiXmlBase( const TiXmlBase& );				// not implemented.
+	void operator=( const TiXmlBase& base );	// not allowed.
+
+	struct Entity
+	{
+		const char*     str;
+		unsigned int	strLength;
+		char		    chr;
+	};
+	enum
+	{
+		NUM_ENTITY = 5,
+		MAX_ENTITY_LENGTH = 6
+
+	};
+	static Entity entity[ NUM_ENTITY ];
+	static bool condenseWhiteSpace;
+};
+
+
+/** The parent class for everything in the Document Object Model.
+	(Except for attributes).
+	Nodes have siblings, a parent, and children. A node can be
+	in a document, or stand on its own. The type of a TiXmlNode
+	can be queried, and it can be cast to its more defined type.
+*/
+class TiXmlNode : public TiXmlBase
+{
+	friend class TiXmlDocument;
+	friend class TiXmlElement;
+
+public:
+	#ifdef TIXML_USE_STL	
+
+	    /** An input stream operator, for every class. Tolerant of newlines and
+		    formatting, but doesn't expect them.
+	    */
+	    friend std::istream& operator >> (std::istream& in, TiXmlNode& base);
+
+	    /** An output stream operator, for every class. Note that this outputs
+		    without any newlines or formatting, as opposed to Print(), which
+		    includes tabs and new lines.
+
+		    The operator<< and operator>> are not completely symmetric. Writing
+		    a node to a stream is very well defined. You'll get a nice stream
+		    of output, without any extra whitespace or newlines.
+		    
+		    But reading is not as well defined. (As it always is.) If you create
+		    a TiXmlElement (for example) and read that from an input stream,
+		    the text needs to define an element or junk will result. This is
+		    true of all input streams, but it's worth keeping in mind.
+
+		    A TiXmlDocument will read nodes until it reads a root element, and
+			all the children of that root element.
+	    */	
+	    friend std::ostream& operator<< (std::ostream& out, const TiXmlNode& base);
+
+		/// Appends the XML node or attribute to a std::string.
+		friend std::string& operator<< (std::string& out, const TiXmlNode& base );
+
+	#endif
+
+	/** The types of XML nodes supported by TinyXml. (All the
+			unsupported types are picked up by UNKNOWN.)
+	*/
+	enum NodeType
+	{
+		TINYXML_DOCUMENT,
+		TINYXML_ELEMENT,
+		TINYXML_COMMENT,
+		TINYXML_UNKNOWN,
+		TINYXML_TEXT,
+		TINYXML_DECLARATION,
+		TINYXML_TYPECOUNT
+	};
+
+	virtual ~TiXmlNode();
+
+	/** The meaning of 'value' changes for the specific type of
+		TiXmlNode.
+		@verbatim
+		Document:	filename of the xml file
+		Element:	name of the element
+		Comment:	the comment text
+		Unknown:	the tag contents
+		Text:		the text string
+		@endverbatim
+
+		The subclasses will wrap this function.
+	*/
+	const char *Value() const { return value.c_str (); }
+
+    #ifdef TIXML_USE_STL
+	/** Return Value() as a std::string. If you only use STL,
+	    this is more efficient than calling Value().
+		Only available in STL mode.
+	*/
+	const std::string& ValueStr() const { return value; }
+	#endif
+
+	const TIXML_STRING& ValueTStr() const { return value; }
+
+	/** Changes the value of the node. Defined as:
+		@verbatim
+		Document:	filename of the xml file
+		Element:	name of the element
+		Comment:	the comment text
+		Unknown:	the tag contents
+		Text:		the text string
+		@endverbatim
+	*/
+	void SetValue(const char * _value) { value = _value;}
+
+    #ifdef TIXML_USE_STL
+	/// STL std::string form.
+	void SetValue( const std::string& _value )	{ value = _value; }
+	#endif
+
+	/// Delete all the children of this node. Does not affect 'this'.
+	void Clear();
+
+	/// One step up the DOM.
+	TiXmlNode* Parent()							{ return parent; }
+	const TiXmlNode* Parent() const				{ return parent; }
+
+	const TiXmlNode* FirstChild()	const		{ return firstChild; }	///< The first child of this node. Will be null if there are no children.
+	TiXmlNode* FirstChild()						{ return firstChild; }
+	const TiXmlNode* FirstChild( const char * value ) const;			///< The first child of this node with the matching 'value'. Will be null if none found.
+	/// The first child of this node with the matching 'value'. Will be null if none found.
+	TiXmlNode* FirstChild( const char * _value ) {
+		// Call through to the const version - safe since nothing is changed. Exiting syntax: cast this to a const (always safe)
+		// call the method, cast the return back to non-const.
+		return const_cast< TiXmlNode* > ((const_cast< const TiXmlNode* >(this))->FirstChild( _value ));
+	}
+	const TiXmlNode* LastChild() const	{ return lastChild; }		/// The last child of this node. Will be null if there are no children.
+	TiXmlNode* LastChild()	{ return lastChild; }
+	
+	const TiXmlNode* LastChild( const char * value ) const;			/// The last child of this node matching 'value'. Will be null if there are no children.
+	TiXmlNode* LastChild( const char * _value ) {
+		return const_cast< TiXmlNode* > ((const_cast< const TiXmlNode* >(this))->LastChild( _value ));
+	}
+
+    #ifdef TIXML_USE_STL
+	const TiXmlNode* FirstChild( const std::string& _value ) const	{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
+	TiXmlNode* FirstChild( const std::string& _value )				{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
+	const TiXmlNode* LastChild( const std::string& _value ) const	{	return LastChild (_value.c_str ());	}	///< STL std::string form.
+	TiXmlNode* LastChild( const std::string& _value )				{	return LastChild (_value.c_str ());	}	///< STL std::string form.
+	#endif
+
+	/** An alternate way to walk the children of a node.
+		One way to iterate over nodes is:
+		@verbatim
+			for( child = parent->FirstChild(); child; child = child->NextSibling() )
+		@endverbatim
+
+		IterateChildren does the same thing with the syntax:
+		@verbatim
+			child = 0;
+			while( child = parent->IterateChildren( child ) )
+		@endverbatim
+
+		IterateChildren takes the previous child as input and finds
+		the next one. If the previous child is null, it returns the
+		first. IterateChildren will return null when done.
+	*/
+	const TiXmlNode* IterateChildren( const TiXmlNode* previous ) const;
+	TiXmlNode* IterateChildren( const TiXmlNode* previous ) {
+		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->IterateChildren( previous ) );
+	}
+
+	/// This flavor of IterateChildren searches for children with a particular 'value'
+	const TiXmlNode* IterateChildren( const char * value, const TiXmlNode* previous ) const;
+	TiXmlNode* IterateChildren( const char * _value, const TiXmlNode* previous ) {
+		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->IterateChildren( _value, previous ) );
+	}
+
+    #ifdef TIXML_USE_STL
+	const TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) const	{	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
+	TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) {	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
+	#endif
+
+	/** Add a new node related to this. Adds a child past the LastChild.
+		Returns a pointer to the new object or NULL if an error occured.
+	*/
+	TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
+
+
+	/** Add a new node related to this. Adds a child past the LastChild.
+
+		NOTE: the node to be added is passed by pointer, and will be
+		henceforth owned (and deleted) by tinyXml. This method is efficient
+		and avoids an extra copy, but should be used with care as it
+		uses a different memory model than the other insert functions.
+
+		@sa InsertEndChild
+	*/
+	TiXmlNode* LinkEndChild( TiXmlNode* addThis );
+
+	/** Add a new node related to this. Adds a child before the specified child.
+		Returns a pointer to the new object or NULL if an error occured.
+	*/
+	TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
+
+	/** Add a new node related to this. Adds a child after the specified child.
+		Returns a pointer to the new object or NULL if an error occured.
+	*/
+	TiXmlNode* InsertAfterChild(  TiXmlNode* afterThis, const TiXmlNode& addThis );
+
+	/** Replace a child of this node.
+		Returns a pointer to the new object or NULL if an error occured.
+	*/
+	TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
+
+	/// Delete a child of this node.
+	bool RemoveChild( TiXmlNode* removeThis );
+
+	/// Navigate to a sibling node.
+	const TiXmlNode* PreviousSibling() const			{ return prev; }
+	TiXmlNode* PreviousSibling()						{ return prev; }
+
+	/// Navigate to a sibling node.
+	const TiXmlNode* PreviousSibling( const char * ) const;
+	TiXmlNode* PreviousSibling( const char *_prev ) {
+		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->PreviousSibling( _prev ) );
+	}
+
+    #ifdef TIXML_USE_STL
+	const TiXmlNode* PreviousSibling( const std::string& _value ) const	{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
+	TiXmlNode* PreviousSibling( const std::string& _value ) 			{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
+	const TiXmlNode* NextSibling( const std::string& _value) const		{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
+	TiXmlNode* NextSibling( const std::string& _value) 					{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
+	#endif
+
+	/// Navigate to a sibling node.
+	const TiXmlNode* NextSibling() const				{ return next; }
+	TiXmlNode* NextSibling()							{ return next; }
+
+	/// Navigate to a sibling node with the given 'value'.
+	const TiXmlNode* NextSibling( const char * ) const;
+	TiXmlNode* NextSibling( const char* _next ) {
+		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->NextSibling( _next ) );
+	}
+
+	/** Convenience function to get through elements.
+		Calls NextSibling and ToElement. Will skip all non-Element
+		nodes. Returns 0 if there is not another element.
+	*/
+	const TiXmlElement* NextSiblingElement() const;
+	TiXmlElement* NextSiblingElement() {
+		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->NextSiblingElement() );
+	}
+
+	/** Convenience function to get through elements.
+		Calls NextSibling and ToElement. Will skip all non-Element
+		nodes. Returns 0 if there is not another element.
+	*/
+	const TiXmlElement* NextSiblingElement( const char * ) const;
+	TiXmlElement* NextSiblingElement( const char *_next ) {
+		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->NextSiblingElement( _next ) );
+	}
+
+    #ifdef TIXML_USE_STL
+	const TiXmlElement* NextSiblingElement( const std::string& _value) const	{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
+	TiXmlElement* NextSiblingElement( const std::string& _value)				{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
+	#endif
+
+	/// Convenience function to get through elements.
+	const TiXmlElement* FirstChildElement()	const;
+	TiXmlElement* FirstChildElement() {
+		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->FirstChildElement() );
+	}
+
+	/// Convenience function to get through elements.
+	const TiXmlElement* FirstChildElement( const char * _value ) const;
+	TiXmlElement* FirstChildElement( const char * _value ) {
+		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->FirstChildElement( _value ) );
+	}
+
+    #ifdef TIXML_USE_STL
+	const TiXmlElement* FirstChildElement( const std::string& _value ) const	{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
+	TiXmlElement* FirstChildElement( const std::string& _value )				{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
+	#endif
+
+	/** Query the type (as an enumerated value, above) of this node.
+		The possible types are: TINYXML_DOCUMENT, TINYXML_ELEMENT, TINYXML_COMMENT,
+								TINYXML_UNKNOWN, TINYXML_TEXT, and TINYXML_DECLARATION.
+	*/
+	int Type() const	{ return type; }
+
+	/** Return a pointer to the Document this node lives in.
+		Returns null if not in a document.
+	*/
+	const TiXmlDocument* GetDocument() const;
+	TiXmlDocument* GetDocument() {
+		return const_cast< TiXmlDocument* >( (const_cast< const TiXmlNode* >(this))->GetDocument() );
+	}
+
+	/// Returns true if this node has no children.
+	bool NoChildren() const						{ return !firstChild; }
+
+	virtual const TiXmlDocument*    ToDocument()    const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual const TiXmlElement*     ToElement()     const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual const TiXmlComment*     ToComment()     const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual const TiXmlUnknown*     ToUnknown()     const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual const TiXmlText*        ToText()        const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual const TiXmlDeclaration* ToDeclaration() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+
+	virtual TiXmlDocument*          ToDocument()    { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual TiXmlElement*           ToElement()	    { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual TiXmlComment*           ToComment()     { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual TiXmlUnknown*           ToUnknown()	    { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual TiXmlText*	            ToText()        { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+	virtual TiXmlDeclaration*       ToDeclaration() { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
+
+	/** Create an exact duplicate of this node and return it. The memory must be deleted
+		by the caller. 
+	*/
+	virtual TiXmlNode* Clone() const = 0;
+
+	/** Accept a hierchical visit the nodes in the TinyXML DOM. Every node in the 
+		XML tree will be conditionally visited and the host will be called back
+		via the TiXmlVisitor interface.
+
+		This is essentially a SAX interface for TinyXML. (Note however it doesn't re-parse
+		the XML for the callbacks, so the performance of TinyXML is unchanged by using this
+		interface versus any other.)
+
+		The interface has been based on ideas from:
+
+		- http://www.saxproject.org/
+		- http://c2.com/cgi/wiki?HierarchicalVisitorPattern 
+
+		Which are both good references for "visiting".
+
+		An example of using Accept():
+		@verbatim
+		TiXmlPrinter printer;
+		tinyxmlDoc.Accept( &printer );
+		const char* xmlcstr = printer.CStr();
+		@endverbatim
+	*/
+	virtual bool Accept( TiXmlVisitor* visitor ) const = 0;
+
+protected:
+	TiXmlNode( NodeType _type );
+
+	// Copy to the allocated object. Shared functionality between Clone, Copy constructor,
+	// and the assignment operator.
+	void CopyTo( TiXmlNode* target ) const;
+
+	#ifdef TIXML_USE_STL
+	    // The real work of the input operator.
+	virtual void StreamIn( std::istream* in, TIXML_STRING* tag ) = 0;
+	#endif
+
+	// Figure out what is at *p, and parse it. Returns null if it is not an xml node.
+	TiXmlNode* Identify( const char* start, TiXmlEncoding encoding );
+
+	TiXmlNode*		parent;
+	NodeType		type;
+
+	TiXmlNode*		firstChild;
+	TiXmlNode*		lastChild;
+
+	TIXML_STRING	value;
+
+	TiXmlNode*		prev;
+	TiXmlNode*		next;
+
+private:
+	TiXmlNode( const TiXmlNode& );				// not implemented.
+	void operator=( const TiXmlNode& base );	// not allowed.
+};
+
+
+/** An attribute is a name-value pair. Elements have an arbitrary
+	number of attributes, each with a unique name.
+
+	@note The attributes are not TiXmlNodes, since they are not
+		  part of the tinyXML document object model. There are other
+		  suggested ways to look at this problem.
+*/
+class TiXmlAttribute : public TiXmlBase
+{
+	friend class TiXmlAttributeSet;
+
+public:
+	/// Construct an empty attribute.
+	TiXmlAttribute() : TiXmlBase()
+	{
+		document = 0;
+		prev = next = 0;
+	}
+
+	#ifdef TIXML_USE_STL
+	/// std::string constructor.
+	TiXmlAttribute( const std::string& _name, const std::string& _value )
+	{
+		name = _name;
+		value = _value;
+		document = 0;
+		prev = next = 0;
+	}
+	#endif
+
+	/// Construct an attribute with a name and value.
+	TiXmlAttribute( const char * _name, const char * _value )
+	{
+		name = _name;
+		value = _value;
+		document = 0;
+		prev = next = 0;
+	}
+
+	const char*		Name()  const		{ return name.c_str(); }		///< Return the name of this attribute.
+	const char*		Value() const		{ return value.c_str(); }		///< Return the value of this attribute.
+	#ifdef TIXML_USE_STL
+	const std::string& ValueStr() const	{ return value; }				///< Return the value of this attribute.
+	#endif
+	int				IntValue() const;									///< Return the value of this attribute, converted to an integer.
+	double			DoubleValue() const;								///< Return the value of this attribute, converted to a double.
+
+	// Get the tinyxml string representation
+	const TIXML_STRING& NameTStr() const { return name; }
+
+	/** QueryIntValue examines the value string. It is an alternative to the
+		IntValue() method with richer error checking.
+		If the value is an integer, it is stored in 'value' and 
+		the call returns TIXML_SUCCESS. If it is not
+		an integer, it returns TIXML_WRONG_TYPE.
+
+		A specialized but useful call. Note that for success it returns 0,
+		which is the opposite of almost all other TinyXml calls.
+	*/
+	int QueryIntValue( int* _value ) const;
+	/// QueryDoubleValue examines the value string. See QueryIntValue().
+	int QueryDoubleValue( double* _value ) const;
+
+	void SetName( const char* _name )	{ name = _name; }				///< Set the name of this attribute.
+	void SetValue( const char* _value )	{ value = _value; }				///< Set the value.
+
+	void SetIntValue( int _value );										///< Set the value from an integer.
+	void SetDoubleValue( double _value );								///< Set the value from a double.
+
+    #ifdef TIXML_USE_STL
+	/// STL std::string form.
+	void SetName( const std::string& _name )	{ name = _name; }	
+	/// STL std::string form.	
+	void SetValue( const std::string& _value )	{ value = _value; }
+	#endif
+
+	/// Get the next sibling attribute in the DOM. Returns null at end.
+	const TiXmlAttribute* Next() const;
+	TiXmlAttribute* Next() {
+		return const_cast< TiXmlAttribute* >( (const_cast< const TiXmlAttribute* >(this))->Next() ); 
+	}
+
+	/// Get the previous sibling attribute in the DOM. Returns null at beginning.
+	const TiXmlAttribute* Previous() const;
+	TiXmlAttribute* Previous() {
+		return const_cast< TiXmlAttribute* >( (const_cast< const TiXmlAttribute* >(this))->Previous() ); 
+	}
+
+	bool operator==( const TiXmlAttribute& rhs ) const { return rhs.name == name; }
+	bool operator<( const TiXmlAttribute& rhs )	 const { return name < rhs.name; }
+	bool operator>( const TiXmlAttribute& rhs )  const { return name > rhs.name; }
+
+	/*	Attribute parsing starts: first letter of the name
+						 returns: the next char after the value end quote
+	*/
+	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+	// Prints this Attribute to a FILE stream.
+	virtual void Print( FILE* cfile, int depth ) const {
+		Print( cfile, depth, 0 );
+	}
+	void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
+
+	// [internal use]
+	// Set the document pointer so the attribute can report errors.
+	void SetDocument( TiXmlDocument* doc )	{ document = doc; }
+
+private:
+	TiXmlAttribute( const TiXmlAttribute& );				// not implemented.
+	void operator=( const TiXmlAttribute& base );	// not allowed.
+
+	TiXmlDocument*	document;	// A pointer back to a document, for error reporting.
+	TIXML_STRING name;
+	TIXML_STRING value;
+	TiXmlAttribute*	prev;
+	TiXmlAttribute*	next;
+};
+
+
+/*	A class used to manage a group of attributes.
+	It is only used internally, both by the ELEMENT and the DECLARATION.
+	
+	The set can be changed transparent to the Element and Declaration
+	classes that use it, but NOT transparent to the Attribute
+	which has to implement a next() and previous() method. Which makes
+	it a bit problematic and prevents the use of STL.
+
+	This version is implemented with circular lists because:
+		- I like circular lists
+		- it demonstrates some independence from the (typical) doubly linked list.
+*/
+class TiXmlAttributeSet
+{
+public:
+	TiXmlAttributeSet();
+	~TiXmlAttributeSet();
+
+	void Add( TiXmlAttribute* attribute );
+	void Remove( TiXmlAttribute* attribute );
+
+	const TiXmlAttribute* First()	const	{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
+	TiXmlAttribute* First()					{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
+	const TiXmlAttribute* Last() const		{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
+	TiXmlAttribute* Last()					{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
+
+	TiXmlAttribute*	Find( const char* _name ) const;
+	TiXmlAttribute* FindOrCreate( const char* _name );
+
+#	ifdef TIXML_USE_STL
+	TiXmlAttribute*	Find( const std::string& _name ) const;
+	TiXmlAttribute* FindOrCreate( const std::string& _name );
+#	endif
+
+
+private:
+	//*ME:	Because of hidden/disabled copy-construktor in TiXmlAttribute (sentinel-element),
+	//*ME:	this class must be also use a hidden/disabled copy-constructor !!!
+	TiXmlAttributeSet( const TiXmlAttributeSet& );	// not allowed
+	void operator=( const TiXmlAttributeSet& );	// not allowed (as TiXmlAttribute)
+
+	TiXmlAttribute sentinel;
+};
+
+
+/** The element is a container class. It has a value, the element name,
+	and can contain other elements, text, comments, and unknowns.
+	Elements also contain an arbitrary number of attributes.
+*/
+class TiXmlElement : public TiXmlNode
+{
+public:
+	/// Construct an element.
+	TiXmlElement (const char * in_value);
+
+	#ifdef TIXML_USE_STL
+	/// std::string constructor.
+	TiXmlElement( const std::string& _value );
+	#endif
+
+	TiXmlElement( const TiXmlElement& );
+
+	TiXmlElement& operator=( const TiXmlElement& base );
+
+	virtual ~TiXmlElement();
+
+	/** Given an attribute name, Attribute() returns the value
+		for the attribute of that name, or null if none exists.
+	*/
+	const char* Attribute( const char* name ) const;
+
+	/** Given an attribute name, Attribute() returns the value
+		for the attribute of that name, or null if none exists.
+		If the attribute exists and can be converted to an integer,
+		the integer value will be put in the return 'i', if 'i'
+		is non-null.
+	*/
+	const char* Attribute( const char* name, int* i ) const;
+
+	/** Given an attribute name, Attribute() returns the value
+		for the attribute of that name, or null if none exists.
+		If the attribute exists and can be converted to an double,
+		the double value will be put in the return 'd', if 'd'
+		is non-null.
+	*/
+	const char* Attribute( const char* name, double* d ) const;
+
+	/** QueryIntAttribute examines the attribute - it is an alternative to the
+		Attribute() method with richer error checking.
+		If the attribute is an integer, it is stored in 'value' and 
+		the call returns TIXML_SUCCESS. If it is not
+		an integer, it returns TIXML_WRONG_TYPE. If the attribute
+		does not exist, then TIXML_NO_ATTRIBUTE is returned.
+	*/	
+	int QueryIntAttribute( const char* name, int* _value ) const;
+	/// QueryUnsignedAttribute examines the attribute - see QueryIntAttribute().
+	int QueryUnsignedAttribute( const char* name, unsigned* _value ) const;
+	/** QueryBoolAttribute examines the attribute - see QueryIntAttribute(). 
+		Note that '1', 'true', or 'yes' are considered true, while '0', 'false'
+		and 'no' are considered false.
+	*/
+	int QueryBoolAttribute( const char* name, bool* _value ) const;
+	/// QueryDoubleAttribute examines the attribute - see QueryIntAttribute().
+	int QueryDoubleAttribute( const char* name, double* _value ) const;
+	/// QueryFloatAttribute examines the attribute - see QueryIntAttribute().
+	int QueryFloatAttribute( const char* name, float* _value ) const {
+		double d;
+		int result = QueryDoubleAttribute( name, &d );
+		if ( result == TIXML_SUCCESS ) {
+			*_value = (float)d;
+		}
+		return result;
+	}
+
+    #ifdef TIXML_USE_STL
+	/// QueryStringAttribute examines the attribute - see QueryIntAttribute().
+	int QueryStringAttribute( const char* name, std::string* _value ) const {
+		const char* cstr = Attribute( name );
+		if ( cstr ) {
+			*_value = std::string( cstr );
+			return TIXML_SUCCESS;
+		}
+		return TIXML_NO_ATTRIBUTE;
+	}
+
+	/** Template form of the attribute query which will try to read the
+		attribute into the specified type. Very easy, very powerful, but
+		be careful to make sure to call this with the correct type.
+		
+		NOTE: This method doesn't work correctly for 'string' types that contain spaces.
+
+		@return TIXML_SUCCESS, TIXML_WRONG_TYPE, or TIXML_NO_ATTRIBUTE
+	*/
+	template< typename T > int QueryValueAttribute( const std::string& name, T* outValue ) const
+	{
+		const TiXmlAttribute* node = attributeSet.Find( name );
+		if ( !node )
+			return TIXML_NO_ATTRIBUTE;
+
+		std::stringstream sstream( node->ValueStr() );
+		sstream >> *outValue;
+		if ( !sstream.fail() )
+			return TIXML_SUCCESS;
+		return TIXML_WRONG_TYPE;
+	}
+
+	int QueryValueAttribute( const std::string& name, std::string* outValue ) const
+	{
+		const TiXmlAttribute* node = attributeSet.Find( name );
+		if ( !node )
+			return TIXML_NO_ATTRIBUTE;
+		*outValue = node->ValueStr();
+		return TIXML_SUCCESS;
+	}
+	#endif
+
+	/** Sets an attribute of name to a given value. The attribute
+		will be created if it does not exist, or changed if it does.
+	*/
+	void SetAttribute( const char* name, const char * _value );
+
+    #ifdef TIXML_USE_STL
+	const std::string* Attribute( const std::string& name ) const;
+	const std::string* Attribute( const std::string& name, int* i ) const;
+	const std::string* Attribute( const std::string& name, double* d ) const;
+	int QueryIntAttribute( const std::string& name, int* _value ) const;
+	int QueryDoubleAttribute( const std::string& name, double* _value ) const;
+
+	/// STL std::string form.
+	void SetAttribute( const std::string& name, const std::string& _value );
+	///< STL std::string form.
+	void SetAttribute( const std::string& name, int _value );
+	///< STL std::string form.
+	void SetDoubleAttribute( const std::string& name, double value );
+	#endif
+
+	/** Sets an attribute of name to a given value. The attribute
+		will be created if it does not exist, or changed if it does.
+	*/
+	void SetAttribute( const char * name, int value );
+
+	/** Sets an attribute of name to a given value. The attribute
+		will be created if it does not exist, or changed if it does.
+	*/
+	void SetDoubleAttribute( const char * name, double value );
+
+	/** Deletes an attribute with the given name.
+	*/
+	void RemoveAttribute( const char * name );
+    #ifdef TIXML_USE_STL
+	void RemoveAttribute( const std::string& name )	{	RemoveAttribute (name.c_str ());	}	///< STL std::string form.
+	#endif
+
+	const TiXmlAttribute* FirstAttribute() const	{ return attributeSet.First(); }		///< Access the first attribute in this element.
+	TiXmlAttribute* FirstAttribute() 				{ return attributeSet.First(); }
+	const TiXmlAttribute* LastAttribute()	const 	{ return attributeSet.Last(); }		///< Access the last attribute in this element.
+	TiXmlAttribute* LastAttribute()					{ return attributeSet.Last(); }
+
+	/** Convenience function for easy access to the text inside an element. Although easy
+		and concise, GetText() is limited compared to getting the TiXmlText child
+		and accessing it directly.
+	
+		If the first child of 'this' is a TiXmlText, the GetText()
+		returns the character string of the Text node, else null is returned.
+
+		This is a convenient method for getting the text of simple contained text:
+		@verbatim
+		<foo>This is text</foo>
+		const char* str = fooElement->GetText();
+		@endverbatim
+
+		'str' will be a pointer to "This is text". 
+		
+		Note that this function can be misleading. If the element foo was created from
+		this XML:
+		@verbatim
+		<foo><b>This is text</b></foo> 
+		@endverbatim
+
+		then the value of str would be null. The first child node isn't a text node, it is
+		another element. From this XML:
+		@verbatim
+		<foo>This is <b>text</b></foo> 
+		@endverbatim
+		GetText() will return "This is ".
+
+		WARNING: GetText() accesses a child node - don't become confused with the 
+				 similarly named TiXmlHandle::Text() and TiXmlNode::ToText() which are 
+				 safe type casts on the referenced node.
+	*/
+	const char* GetText() const;
+
+	/// Creates a new Element and returns it - the returned element is a copy.
+	virtual TiXmlNode* Clone() const;
+	// Print the Element to a FILE stream.
+	virtual void Print( FILE* cfile, int depth ) const;
+
+	/*	Attribtue parsing starts: next char past '<'
+						 returns: next char past '>'
+	*/
+	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+	virtual const TiXmlElement*     ToElement()     const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+	virtual TiXmlElement*           ToElement()	          { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+
+	/** Walk the XML tree visiting this node and all of its children. 
+	*/
+	virtual bool Accept( TiXmlVisitor* visitor ) const;
+
+protected:
+
+	void CopyTo( TiXmlElement* target ) const;
+	void ClearThis();	// like clear, but initializes 'this' object as well
+
+	// Used to be public [internal use]
+	#ifdef TIXML_USE_STL
+	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+	#endif
+	/*	[internal use]
+		Reads the "value" of the element -- another element, or text.
+		This should terminate with the current end tag.
+	*/
+	const char* ReadValue( const char* in, TiXmlParsingData* prevData, TiXmlEncoding encoding );
+
+private:
+	TiXmlAttributeSet attributeSet;
+};
+
+
+/**	An XML comment.
+*/
+class TiXmlComment : public TiXmlNode
+{
+public:
+	/// Constructs an empty comment.
+	TiXmlComment() : TiXmlNode( TiXmlNode::TINYXML_COMMENT ) {}
+	/// Construct a comment from text.
+	TiXmlComment( const char* _value ) : TiXmlNode( TiXmlNode::TINYXML_COMMENT ) {
+		SetValue( _value );
+	}
+	TiXmlComment( const TiXmlComment& );
+	TiXmlComment& operator=( const TiXmlComment& base );
+
+	virtual ~TiXmlComment()	{}
+
+	/// Returns a copy of this Comment.
+	virtual TiXmlNode* Clone() const;
+	// Write this Comment to a FILE stream.
+	virtual void Print( FILE* cfile, int depth ) const;
+
+	/*	Attribtue parsing starts: at the ! of the !--
+						 returns: next char past '>'
+	*/
+	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+	virtual const TiXmlComment*  ToComment() const	{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+	virtual		  TiXmlComment*  ToComment()		{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+
+	/** Walk the XML tree visiting this node and all of its children. 
+	*/
+	virtual bool Accept( TiXmlVisitor* visitor ) const;
+
+protected:
+	void CopyTo( TiXmlComment* target ) const;
+
+	// used to be public
+	#ifdef TIXML_USE_STL
+	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+	#endif
+//	virtual void StreamOut( TIXML_OSTREAM * out ) const;
+
+private:
+
+};
+
+
+/** XML text. A text node can have 2 ways to output the next. "normal" output 
+	and CDATA. It will default to the mode it was parsed from the XML file and
+	you generally want to leave it alone, but you can change the output mode with 
+	SetCDATA() and query it with CDATA().
+*/
+class TiXmlText : public TiXmlNode
+{
+	friend class TiXmlElement;
+public:
+	/** Constructor for text element. By default, it is treated as 
+		normal, encoded text. If you want it be output as a CDATA text
+		element, set the parameter _cdata to 'true'
+	*/
+	TiXmlText (const char * initValue ) : TiXmlNode (TiXmlNode::TINYXML_TEXT)
+	{
+		SetValue( initValue );
+		cdata = false;
+	}
+	virtual ~TiXmlText() {}
+
+	#ifdef TIXML_USE_STL
+	/// Constructor.
+	TiXmlText( const std::string& initValue ) : TiXmlNode (TiXmlNode::TINYXML_TEXT)
+	{
+		SetValue( initValue );
+		cdata = false;
+	}
+	#endif
+
+	TiXmlText( const TiXmlText& copy ) : TiXmlNode( TiXmlNode::TINYXML_TEXT )	{ copy.CopyTo( this ); }
+	TiXmlText& operator=( const TiXmlText& base )							 	{ base.CopyTo( this ); return *this; }
+
+	// Write this text object to a FILE stream.
+	virtual void Print( FILE* cfile, int depth ) const;
+
+	/// Queries whether this represents text using a CDATA section.
+	bool CDATA() const				{ return cdata; }
+	/// Turns on or off a CDATA representation of text.
+	void SetCDATA( bool _cdata )	{ cdata = _cdata; }
+
+	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+	virtual const TiXmlText* ToText() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+	virtual TiXmlText*       ToText()       { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+
+	/** Walk the XML tree visiting this node and all of its children. 
+	*/
+	virtual bool Accept( TiXmlVisitor* content ) const;
+
+protected :
+	///  [internal use] Creates a new Element and returns it.
+	virtual TiXmlNode* Clone() const;
+	void CopyTo( TiXmlText* target ) const;
+
+	bool Blank() const;	// returns true if all white space and new lines
+	// [internal use]
+	#ifdef TIXML_USE_STL
+	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+	#endif
+
+private:
+	bool cdata;			// true if this should be input and output as a CDATA style text element
+};
+
+
+/** In correct XML the declaration is the first entry in the file.
+	@verbatim
+		<?xml version="1.0" standalone="yes"?>
+	@endverbatim
+
+	TinyXml will happily read or write files without a declaration,
+	however. There are 3 possible attributes to the declaration:
+	version, encoding, and standalone.
+
+	Note: In this version of the code, the attributes are
+	handled as special cases, not generic attributes, simply
+	because there can only be at most 3 and they are always the same.
+*/
+class TiXmlDeclaration : public TiXmlNode
+{
+public:
+	/// Construct an empty declaration.
+	TiXmlDeclaration()   : TiXmlNode( TiXmlNode::TINYXML_DECLARATION ) {}
+
+#ifdef TIXML_USE_STL
+	/// Constructor.
+	TiXmlDeclaration(	const std::string& _version,
+						const std::string& _encoding,
+						const std::string& _standalone );
+#endif
+
+	/// Construct.
+	TiXmlDeclaration(	const char* _version,
+						const char* _encoding,
+						const char* _standalone );
+
+	TiXmlDeclaration( const TiXmlDeclaration& copy );
+	TiXmlDeclaration& operator=( const TiXmlDeclaration& copy );
+
+	virtual ~TiXmlDeclaration()	{}
+
+	/// Version. Will return an empty string if none was found.
+	const char *Version() const			{ return version.c_str (); }
+	/// Encoding. Will return an empty string if none was found.
+	const char *Encoding() const		{ return encoding.c_str (); }
+	/// Is this a standalone document?
+	const char *Standalone() const		{ return standalone.c_str (); }
+
+	/// Creates a copy of this Declaration and returns it.
+	virtual TiXmlNode* Clone() const;
+	// Print this declaration to a FILE stream.
+	virtual void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
+	virtual void Print( FILE* cfile, int depth ) const {
+		Print( cfile, depth, 0 );
+	}
+
+	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+	virtual const TiXmlDeclaration* ToDeclaration() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+	virtual TiXmlDeclaration*       ToDeclaration()       { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+
+	/** Walk the XML tree visiting this node and all of its children. 
+	*/
+	virtual bool Accept( TiXmlVisitor* visitor ) const;
+
+protected:
+	void CopyTo( TiXmlDeclaration* target ) const;
+	// used to be public
+	#ifdef TIXML_USE_STL
+	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+	#endif
+
+private:
+
+	TIXML_STRING version;
+	TIXML_STRING encoding;
+	TIXML_STRING standalone;
+};
+
+
+/** Any tag that tinyXml doesn't recognize is saved as an
+	unknown. It is a tag of text, but should not be modified.
+	It will be written back to the XML, unchanged, when the file
+	is saved.
+
+	DTD tags get thrown into TiXmlUnknowns.
+*/
+class TiXmlUnknown : public TiXmlNode
+{
+public:
+	TiXmlUnknown() : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )	{}
+	virtual ~TiXmlUnknown() {}
+
+	TiXmlUnknown( const TiXmlUnknown& copy ) : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )		{ copy.CopyTo( this ); }
+	TiXmlUnknown& operator=( const TiXmlUnknown& copy )										{ copy.CopyTo( this ); return *this; }
+
+	/// Creates a copy of this Unknown and returns it.
+	virtual TiXmlNode* Clone() const;
+	// Print this Unknown to a FILE stream.
+	virtual void Print( FILE* cfile, int depth ) const;
+
+	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+	virtual const TiXmlUnknown*     ToUnknown()     const	{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+	virtual TiXmlUnknown*           ToUnknown()				{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+
+	/** Walk the XML tree visiting this node and all of its children. 
+	*/
+	virtual bool Accept( TiXmlVisitor* content ) const;
+
+protected:
+	void CopyTo( TiXmlUnknown* target ) const;
+
+	#ifdef TIXML_USE_STL
+	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+	#endif
+
+private:
+
+};
+
+
+/** Always the top level node. A document binds together all the
+	XML pieces. It can be saved, loaded, and printed to the screen.
+	The 'value' of a document node is the xml file name.
+*/
+class TiXmlDocument : public TiXmlNode
+{
+public:
+	/// Create an empty document, that has no name.
+	TiXmlDocument();
+	/// Create a document with a name. The name of the document is also the filename of the xml.
+	TiXmlDocument( const char * documentName );
+
+	#ifdef TIXML_USE_STL
+	/// Constructor.
+	TiXmlDocument( const std::string& documentName );
+	#endif
+
+	TiXmlDocument( const TiXmlDocument& copy );
+	TiXmlDocument& operator=( const TiXmlDocument& copy );
+
+	virtual ~TiXmlDocument() {}
+
+	/** Load a file using the current document value.
+		Returns true if successful. Will delete any existing
+		document data before loading.
+	*/
+	bool LoadFile( TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+	/// Save a file using the current document value. Returns true if successful.
+	bool SaveFile() const;
+	/// Load a file using the given filename. Returns true if successful.
+	bool LoadFile( const char * filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+	/// Save a file using the given filename. Returns true if successful.
+	bool SaveFile( const char * filename ) const;
+	/** Load a file using the given FILE*. Returns true if successful. Note that this method
+		doesn't stream - the entire object pointed at by the FILE*
+		will be interpreted as an XML file. TinyXML doesn't stream in XML from the current
+		file location. Streaming may be added in the future.
+	*/
+	bool LoadFile( FILE*, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+	/// Save a file using the given FILE*. Returns true if successful.
+	bool SaveFile( FILE* ) const;
+
+	#ifdef TIXML_USE_STL
+	bool LoadFile( const std::string& filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING )			///< STL std::string version.
+	{
+		return LoadFile( filename.c_str(), encoding );
+	}
+	bool SaveFile( const std::string& filename ) const		///< STL std::string version.
+	{
+		return SaveFile( filename.c_str() );
+	}
+	#endif
+
+	/** Parse the given null terminated block of xml data. Passing in an encoding to this
+		method (either TIXML_ENCODING_LEGACY or TIXML_ENCODING_UTF8 will force TinyXml
+		to use that encoding, regardless of what TinyXml might otherwise try to detect.
+	*/
+	virtual const char* Parse( const char* p, TiXmlParsingData* data = 0, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+
+	/** Get the root element -- the only top level element -- of the document.
+		In well formed XML, there should only be one. TinyXml is tolerant of
+		multiple elements at the document level.
+	*/
+	const TiXmlElement* RootElement() const		{ return FirstChildElement(); }
+	TiXmlElement* RootElement()					{ return FirstChildElement(); }
+
+	/** If an error occurs, Error will be set to true. Also,
+		- The ErrorId() will contain the integer identifier of the error (not generally useful)
+		- The ErrorDesc() method will return the name of the error. (very useful)
+		- The ErrorRow() and ErrorCol() will return the location of the error (if known)
+	*/	
+	bool Error() const						{ return error; }
+
+	/// Contains a textual (english) description of the error if one occurs.
+	const char * ErrorDesc() const	{ return errorDesc.c_str (); }
+
+	/** Generally, you probably want the error string ( ErrorDesc() ). But if you
+		prefer the ErrorId, this function will fetch it.
+	*/
+	int ErrorId()	const				{ return errorId; }
+
+	/** Returns the location (if known) of the error. The first column is column 1, 
+		and the first row is row 1. A value of 0 means the row and column wasn't applicable
+		(memory errors, for example, have no row/column) or the parser lost the error. (An
+		error in the error reporting, in that case.)
+
+		@sa SetTabSize, Row, Column
+	*/
+	int ErrorRow() const	{ return errorLocation.row+1; }
+	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occured. See ErrorRow()
+
+	/** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
+		to report the correct values for row and column. It does not change the output
+		or input in any way.
+		
+		By calling this method, with a tab size
+		greater than 0, the row and column of each node and attribute is stored
+		when the file is loaded. Very useful for tracking the DOM back in to
+		the source file.
+
+		The tab size is required for calculating the location of nodes. If not
+		set, the default of 4 is used. The tabsize is set per document. Setting
+		the tabsize to 0 disables row/column tracking.
+
+		Note that row and column tracking is not supported when using operator>>.
+
+		The tab size needs to be enabled before the parse or load. Correct usage:
+		@verbatim
+		TiXmlDocument doc;
+		doc.SetTabSize( 8 );
+		doc.Load( "myfile.xml" );
+		@endverbatim
+
+		@sa Row, Column
+	*/
+	void SetTabSize( int _tabsize )		{ tabsize = _tabsize; }
+
+	int TabSize() const	{ return tabsize; }
+
+	/** If you have handled the error, it can be reset with this call. The error
+		state is automatically cleared if you Parse a new XML block.
+	*/
+	void ClearError()						{	error = false; 
+												errorId = 0; 
+												errorDesc = ""; 
+												errorLocation.row = errorLocation.col = 0; 
+												//errorLocation.last = 0; 
+											}
+
+	/** Write the document to standard out using formatted printing ("pretty print"). */
+	void Print() const						{ Print( stdout, 0 ); }
+
+	/* Write the document to a string using formatted printing ("pretty print"). This
+		will allocate a character array (new char[]) and return it as a pointer. The
+		calling code pust call delete[] on the return char* to avoid a memory leak.
+	*/
+	//char* PrintToMemory() const; 
+
+	/// Print this Document to a FILE stream.
+	virtual void Print( FILE* cfile, int depth = 0 ) const;
+	// [internal use]
+	void SetError( int err, const char* errorLocation, TiXmlParsingData* prevData, TiXmlEncoding encoding );
+
+	virtual const TiXmlDocument*    ToDocument()    const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+	virtual TiXmlDocument*          ToDocument()          { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+
+	/** Walk the XML tree visiting this node and all of its children. 
+	*/
+	virtual bool Accept( TiXmlVisitor* content ) const;
+
+protected :
+	// [internal use]
+	virtual TiXmlNode* Clone() const;
+	#ifdef TIXML_USE_STL
+	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+	#endif
+
+private:
+	void CopyTo( TiXmlDocument* target ) const;
+
+	bool error;
+	int  errorId;
+	TIXML_STRING errorDesc;
+	int tabsize;
+	TiXmlCursor errorLocation;
+	bool useMicrosoftBOM;		// the UTF-8 BOM were found when read. Note this, and try to write.
+};
+
+
+/**
+	A TiXmlHandle is a class that wraps a node pointer with null checks; this is
+	an incredibly useful thing. Note that TiXmlHandle is not part of the TinyXml
+	DOM structure. It is a separate utility class.
+
+	Take an example:
+	@verbatim
+	<Document>
+		<Element attributeA = "valueA">
+			<Child attributeB = "value1" />
+			<Child attributeB = "value2" />
+		</Element>
+	<Document>
+	@endverbatim
+
+	Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very 
+	easy to write a *lot* of code that looks like:
+
+	@verbatim
+	TiXmlElement* root = document.FirstChildElement( "Document" );
+	if ( root )
+	{
+		TiXmlElement* element = root->FirstChildElement( "Element" );
+		if ( element )
+		{
+			TiXmlElement* child = element->FirstChildElement( "Child" );
+			if ( child )
+			{
+				TiXmlElement* child2 = child->NextSiblingElement( "Child" );
+				if ( child2 )
+				{
+					// Finally do something useful.
+	@endverbatim
+
+	And that doesn't even cover "else" cases. TiXmlHandle addresses the verbosity
+	of such code. A TiXmlHandle checks for null	pointers so it is perfectly safe 
+	and correct to use:
+
+	@verbatim
+	TiXmlHandle docHandle( &document );
+	TiXmlElement* child2 = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", 1 ).ToElement();
+	if ( child2 )
+	{
+		// do something useful
+	@endverbatim
+
+	Which is MUCH more concise and useful.
+
+	It is also safe to copy handles - internally they are nothing more than node pointers.
+	@verbatim
+	TiXmlHandle handleCopy = handle;
+	@endverbatim
+
+	What they should not be used for is iteration:
+
+	@verbatim
+	int i=0; 
+	while ( true )
+	{
+		TiXmlElement* child = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", i ).ToElement();
+		if ( !child )
+			break;
+		// do something
+		++i;
+	}
+	@endverbatim
+
+	It seems reasonable, but it is in fact two embedded while loops. The Child method is 
+	a linear walk to find the element, so this code would iterate much more than it needs 
+	to. Instead, prefer:
+
+	@verbatim
+	TiXmlElement* child = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).FirstChild( "Child" ).ToElement();
+
+	for( child; child; child=child->NextSiblingElement() )
+	{
+		// do something
+	}
+	@endverbatim
+*/
+class TiXmlHandle
+{
+public:
+	/// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
+	TiXmlHandle( TiXmlNode* _node )					{ this->node = _node; }
+	/// Copy constructor
+	TiXmlHandle( const TiXmlHandle& ref )			{ this->node = ref.node; }
+	TiXmlHandle operator=( const TiXmlHandle& ref ) { if ( &ref != this ) this->node = ref.node; return *this; }
+
+	/// Return a handle to the first child node.
+	TiXmlHandle FirstChild() const;
+	/// Return a handle to the first child node with the given name.
+	TiXmlHandle FirstChild( const char * value ) const;
+	/// Return a handle to the first child element.
+	TiXmlHandle FirstChildElement() const;
+	/// Return a handle to the first child element with the given name.
+	TiXmlHandle FirstChildElement( const char * value ) const;
+
+	/** Return a handle to the "index" child with the given name. 
+		The first child is 0, the second 1, etc.
+	*/
+	TiXmlHandle Child( const char* value, int index ) const;
+	/** Return a handle to the "index" child. 
+		The first child is 0, the second 1, etc.
+	*/
+	TiXmlHandle Child( int index ) const;
+	/** Return a handle to the "index" child element with the given name. 
+		The first child element is 0, the second 1, etc. Note that only TiXmlElements
+		are indexed: other types are not counted.
+	*/
+	TiXmlHandle ChildElement( const char* value, int index ) const;
+	/** Return a handle to the "index" child element. 
+		The first child element is 0, the second 1, etc. Note that only TiXmlElements
+		are indexed: other types are not counted.
+	*/
+	TiXmlHandle ChildElement( int index ) const;
+
+	#ifdef TIXML_USE_STL
+	TiXmlHandle FirstChild( const std::string& _value ) const				{ return FirstChild( _value.c_str() ); }
+	TiXmlHandle FirstChildElement( const std::string& _value ) const		{ return FirstChildElement( _value.c_str() ); }
+
+	TiXmlHandle Child( const std::string& _value, int index ) const			{ return Child( _value.c_str(), index ); }
+	TiXmlHandle ChildElement( const std::string& _value, int index ) const	{ return ChildElement( _value.c_str(), index ); }
+	#endif
+
+	/** Return the handle as a TiXmlNode. This may return null.
+	*/
+	TiXmlNode* ToNode() const			{ return node; } 
+	/** Return the handle as a TiXmlElement. This may return null.
+	*/
+	TiXmlElement* ToElement() const		{ return ( ( node && node->ToElement() ) ? node->ToElement() : 0 ); }
+	/**	Return the handle as a TiXmlText. This may return null.
+	*/
+	TiXmlText* ToText() const			{ return ( ( node && node->ToText() ) ? node->ToText() : 0 ); }
+	/** Return the handle as a TiXmlUnknown. This may return null.
+	*/
+	TiXmlUnknown* ToUnknown() const		{ return ( ( node && node->ToUnknown() ) ? node->ToUnknown() : 0 ); }
+
+	/** @deprecated use ToNode. 
+		Return the handle as a TiXmlNode. This may return null.
+	*/
+	TiXmlNode* Node() const			{ return ToNode(); } 
+	/** @deprecated use ToElement. 
+		Return the handle as a TiXmlElement. This may return null.
+	*/
+	TiXmlElement* Element() const	{ return ToElement(); }
+	/**	@deprecated use ToText()
+		Return the handle as a TiXmlText. This may return null.
+	*/
+	TiXmlText* Text() const			{ return ToText(); }
+	/** @deprecated use ToUnknown()
+		Return the handle as a TiXmlUnknown. This may return null.
+	*/
+	TiXmlUnknown* Unknown() const	{ return ToUnknown(); }
+
+private:
+	TiXmlNode* node;
+};
+
+
+/** Print to memory functionality. The TiXmlPrinter is useful when you need to:
+
+	-# Print to memory (especially in non-STL mode)
+	-# Control formatting (line endings, etc.)
+
+	When constructed, the TiXmlPrinter is in its default "pretty printing" mode.
+	Before calling Accept() you can call methods to control the printing
+	of the XML document. After TiXmlNode::Accept() is called, the printed document can
+	be accessed via the CStr(), Str(), and Size() methods.
+
+	TiXmlPrinter uses the Visitor API.
+	@verbatim
+	TiXmlPrinter printer;
+	printer.SetIndent( "\t" );
+
+	doc.Accept( &printer );
+	fprintf( stdout, "%s", printer.CStr() );
+	@endverbatim
+*/
+class TiXmlPrinter : public TiXmlVisitor
+{
+public:
+	TiXmlPrinter() : depth( 0 ), simpleTextPrint( false ),
+					 buffer(), indent( "    " ), lineBreak( "\n" ) {}
+
+	virtual bool VisitEnter( const TiXmlDocument& doc );
+	virtual bool VisitExit( const TiXmlDocument& doc );
+
+	virtual bool VisitEnter( const TiXmlElement& element, const TiXmlAttribute* firstAttribute );
+	virtual bool VisitExit( const TiXmlElement& element );
+
+	virtual bool Visit( const TiXmlDeclaration& declaration );
+	virtual bool Visit( const TiXmlText& text );
+	virtual bool Visit( const TiXmlComment& comment );
+	virtual bool Visit( const TiXmlUnknown& unknown );
+
+	/** Set the indent characters for printing. By default 4 spaces
+		but tab (\t) is also useful, or null/empty string for no indentation.
+	*/
+	void SetIndent( const char* _indent )			{ indent = _indent ? _indent : "" ; }
+	/// Query the indention string.
+	const char* Indent()							{ return indent.c_str(); }
+	/** Set the line breaking string. By default set to newline (\n). 
+		Some operating systems prefer other characters, or can be
+		set to the null/empty string for no indenation.
+	*/
+	void SetLineBreak( const char* _lineBreak )		{ lineBreak = _lineBreak ? _lineBreak : ""; }
+	/// Query the current line breaking string.
+	const char* LineBreak()							{ return lineBreak.c_str(); }
+
+	/** Switch over to "stream printing" which is the most dense formatting without 
+		linebreaks. Common when the XML is needed for network transmission.
+	*/
+	void SetStreamPrinting()						{ indent = "";
+													  lineBreak = "";
+													}	
+	/// Return the result.
+	const char* CStr()								{ return buffer.c_str(); }
+	/// Return the length of the result string.
+	size_t Size()									{ return buffer.size(); }
+
+	#ifdef TIXML_USE_STL
+	/// Return the result.
+	const std::string& Str()						{ return buffer; }
+	#endif
+
+private:
+	void DoIndent()	{
+		for( int i=0; i<depth; ++i )
+			buffer += indent;
+	}
+	void DoLineBreak() {
+		buffer += lineBreak;
+	}
+
+	int depth;
+	bool simpleTextPrint;
+	TIXML_STRING buffer;
+	TIXML_STRING indent;
+	TIXML_STRING lineBreak;
+};
+
+
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
+#endif
diff --git a/test/tinyxml/tinyxmlerror.cpp b/test/tinyxml/tinyxmlerror.cpp
new file mode 100644
index 0000000..538c21d
--- /dev/null
+++ b/test/tinyxml/tinyxmlerror.cpp
@@ -0,0 +1,52 @@
+/*
+www.sourceforge.net/projects/tinyxml
+Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied 
+warranty. In no event will the authors be held liable for any 
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any 
+purpose, including commercial applications, and to alter it and 
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+#include "tinyxml.h"
+
+// The goal of the seperate error file is to make the first
+// step towards localization. tinyxml (currently) only supports
+// english error messages, but the could now be translated.
+//
+// It also cleans up the code a bit.
+//
+
+const char* TiXmlBase::errorString[ TiXmlBase::TIXML_ERROR_STRING_COUNT ] =
+{
+	"No error",
+	"Error",
+	"Failed to open file",
+	"Error parsing Element.",
+	"Failed to read Element name",
+	"Error reading Element value.",
+	"Error reading Attributes.",
+	"Error: empty tag.",
+	"Error reading end tag.",
+	"Error parsing Unknown.",
+	"Error parsing Comment.",
+	"Error parsing Declaration.",
+	"Error document empty.",
+	"Error null (0) or unexpected EOF found in input stream.",
+	"Error parsing CDATA.",
+	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
+};
diff --git a/test/tinyxml/tinyxmlparser.cpp b/test/tinyxml/tinyxmlparser.cpp
new file mode 100644
index 0000000..81b7eae
--- /dev/null
+++ b/test/tinyxml/tinyxmlparser.cpp
@@ -0,0 +1,1638 @@
+/*
+www.sourceforge.net/projects/tinyxml
+Original code by Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied 
+warranty. In no event will the authors be held liable for any 
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any 
+purpose, including commercial applications, and to alter it and 
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must 
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and 
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source 
+distribution.
+*/
+
+#include <ctype.h>
+#include <stddef.h>
+
+#include "tinyxml.h"
+
+//#define DEBUG_PARSER
+#if defined( DEBUG_PARSER )
+#	if defined( DEBUG ) && defined( _MSC_VER )
+#		include <windows.h>
+#		define TIXML_LOG OutputDebugString
+#	else
+#		define TIXML_LOG printf
+#	endif
+#endif
+
+// Note tha "PutString" hardcodes the same list. This
+// is less flexible than it appears. Changing the entries
+// or order will break putstring.	
+TiXmlBase::Entity TiXmlBase::entity[ TiXmlBase::NUM_ENTITY ] = 
+{
+	{ "&amp;",  5, '&' },
+	{ "&lt;",   4, '<' },
+	{ "&gt;",   4, '>' },
+	{ "&quot;", 6, '\"' },
+	{ "&apos;", 6, '\'' }
+};
+
+// Bunch of unicode info at:
+//		http://www.unicode.org/faq/utf_bom.html
+// Including the basic of this table, which determines the #bytes in the
+// sequence from the lead byte. 1 placed for invalid sequences --
+// although the result will be junk, pass it through as much as possible.
+// Beware of the non-characters in UTF-8:	
+//				ef bb bf (Microsoft "lead bytes")
+//				ef bf be
+//				ef bf bf 
+
+const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
+const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
+const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
+
+const int TiXmlBase::utf8ByteTable[256] = 
+{
+	//	0	1	2	3	4	5	6	7	8	9	a	b	c	d	e	f
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x00
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x10
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x20
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x30
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x40
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x50
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x60
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x70	End of ASCII range
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x80 0x80 to 0xc1 invalid
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x90 
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xa0 
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xb0 
+		1,	1,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xc0 0xc2 to 0xdf 2 byte
+		2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xd0
+		3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	// 0xe0 0xe0 to 0xef 3 byte
+		4,	4,	4,	4,	4,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1	// 0xf0 0xf0 to 0xf4 4 byte, 0xf5 and higher invalid
+};
+
+
+void TiXmlBase::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length )
+{
+	const unsigned long BYTE_MASK = 0xBF;
+	const unsigned long BYTE_MARK = 0x80;
+	const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+	if (input < 0x80) 
+		*length = 1;
+	else if ( input < 0x800 )
+		*length = 2;
+	else if ( input < 0x10000 )
+		*length = 3;
+	else if ( input < 0x200000 )
+		*length = 4;
+	else
+		{ *length = 0; return; }	// This code won't covert this correctly anyway.
+
+	output += *length;
+
+	// Scary scary fall throughs.
+	switch (*length) 
+	{
+		case 4:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 3:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 2:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 1:
+			--output; 
+			*output = (char)(input | FIRST_BYTE_MARK[*length]);
+	}
+}
+
+
+/*static*/ int TiXmlBase::IsAlpha( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
+{
+	// This will only work for low-ascii, everything else is assumed to be a valid
+	// letter. I'm not sure this is the best approach, but it is quite tricky trying
+	// to figure out alhabetical vs. not across encoding. So take a very 
+	// conservative approach.
+
+//	if ( encoding == TIXML_ENCODING_UTF8 )
+//	{
+		if ( anyByte < 127 )
+			return isalpha( anyByte );
+		else
+			return 1;	// What else to do? The unicode set is huge...get the english ones right.
+//	}
+//	else
+//	{
+//		return isalpha( anyByte );
+//	}
+}
+
+
+/*static*/ int TiXmlBase::IsAlphaNum( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
+{
+	// This will only work for low-ascii, everything else is assumed to be a valid
+	// letter. I'm not sure this is the best approach, but it is quite tricky trying
+	// to figure out alhabetical vs. not across encoding. So take a very 
+	// conservative approach.
+
+//	if ( encoding == TIXML_ENCODING_UTF8 )
+//	{
+		if ( anyByte < 127 )
+			return isalnum( anyByte );
+		else
+			return 1;	// What else to do? The unicode set is huge...get the english ones right.
+//	}
+//	else
+//	{
+//		return isalnum( anyByte );
+//	}
+}
+
+
+class TiXmlParsingData
+{
+	friend class TiXmlDocument;
+  public:
+	void Stamp( const char* now, TiXmlEncoding encoding );
+
+	const TiXmlCursor& Cursor() const	{ return cursor; }
+
+  private:
+	// Only used by the document!
+	TiXmlParsingData( const char* start, int _tabsize, int row, int col )
+	{
+		assert( start );
+		stamp = start;
+		tabsize = _tabsize;
+		cursor.row = row;
+		cursor.col = col;
+	}
+
+	TiXmlCursor		cursor;
+	const char*		stamp;
+	int				tabsize;
+};
+
+
+void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
+{
+	assert( now );
+
+	// Do nothing if the tabsize is 0.
+	if ( tabsize < 1 )
+	{
+		return;
+	}
+
+	// Get the current row, column.
+	int row = cursor.row;
+	int col = cursor.col;
+	const char* p = stamp;
+	assert( p );
+
+	while ( p < now )
+	{
+		// Treat p as unsigned, so we have a happy compiler.
+		const unsigned char* pU = (const unsigned char*)p;
+
+		// Code contributed by Fletcher Dunn: (modified by lee)
+		switch (*pU) {
+			case 0:
+				// We *should* never get here, but in case we do, don't
+				// advance past the terminating null character, ever
+				return;
+
+			case '\r':
+				// bump down to the next line
+				++row;
+				col = 0;				
+				// Eat the character
+				++p;
+
+				// Check for \r\n sequence, and treat this as a single character
+				if (*p == '\n') {
+					++p;
+				}
+				break;
+
+			case '\n':
+				// bump down to the next line
+				++row;
+				col = 0;
+
+				// Eat the character
+				++p;
+
+				// Check for \n\r sequence, and treat this as a single
+				// character.  (Yes, this bizarre thing does occur still
+				// on some arcane platforms...)
+				if (*p == '\r') {
+					++p;
+				}
+				break;
+
+			case '\t':
+				// Eat the character
+				++p;
+
+				// Skip to next tab stop
+				col = (col / tabsize + 1) * tabsize;
+				break;
+
+			case TIXML_UTF_LEAD_0:
+				if ( encoding == TIXML_ENCODING_UTF8 )
+				{
+					if ( *(p+1) && *(p+2) )
+					{
+						// In these cases, don't advance the column. These are
+						// 0-width spaces.
+						if ( *(pU+1)==TIXML_UTF_LEAD_1 && *(pU+2)==TIXML_UTF_LEAD_2 )
+							p += 3;	
+						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbeU )
+							p += 3;	
+						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbfU )
+							p += 3;	
+						else
+							{ p +=3; ++col; }	// A normal character.
+					}
+				}
+				else
+				{
+					++p;
+					++col;
+				}
+				break;
+
+			default:
+				if ( encoding == TIXML_ENCODING_UTF8 )
+				{
+					// Eat the 1 to 4 byte utf8 character.
+					int step = TiXmlBase::utf8ByteTable[*((const unsigned char*)p)];
+					if ( step == 0 )
+						step = 1;		// Error case from bad encoding, but handle gracefully.
+					p += step;
+
+					// Just advance one column, of course.
+					++col;
+				}
+				else
+				{
+					++p;
+					++col;
+				}
+				break;
+		}
+	}
+	cursor.row = row;
+	cursor.col = col;
+	assert( cursor.row >= -1 );
+	assert( cursor.col >= -1 );
+	stamp = p;
+	assert( stamp );
+}
+
+
+const char* TiXmlBase::SkipWhiteSpace( const char* p, TiXmlEncoding encoding )
+{
+	if ( !p || !*p )
+	{
+		return 0;
+	}
+	if ( encoding == TIXML_ENCODING_UTF8 )
+	{
+		while ( *p )
+		{
+			const unsigned char* pU = (const unsigned char*)p;
+			
+			// Skip the stupid Microsoft UTF-8 Byte order marks
+			if (	*(pU+0)==TIXML_UTF_LEAD_0
+				 && *(pU+1)==TIXML_UTF_LEAD_1 
+				 && *(pU+2)==TIXML_UTF_LEAD_2 )
+			{
+				p += 3;
+				continue;
+			}
+			else if(*(pU+0)==TIXML_UTF_LEAD_0
+				 && *(pU+1)==0xbfU
+				 && *(pU+2)==0xbeU )
+			{
+				p += 3;
+				continue;
+			}
+			else if(*(pU+0)==TIXML_UTF_LEAD_0
+				 && *(pU+1)==0xbfU
+				 && *(pU+2)==0xbfU )
+			{
+				p += 3;
+				continue;
+			}
+
+			if ( IsWhiteSpace( *p ) )		// Still using old rules for white space.
+				++p;
+			else
+				break;
+		}
+	}
+	else
+	{
+		while ( *p && IsWhiteSpace( *p ) )
+			++p;
+	}
+
+	return p;
+}
+
+#ifdef TIXML_USE_STL
+/*static*/ bool TiXmlBase::StreamWhiteSpace( std::istream * in, TIXML_STRING * tag )
+{
+	for( ;; )
+	{
+		if ( !in->good() ) return false;
+
+		int c = in->peek();
+		// At this scope, we can't get to a document. So fail silently.
+		if ( !IsWhiteSpace( c ) || c <= 0 )
+			return true;
+
+		*tag += (char) in->get();
+	}
+}
+
+/*static*/ bool TiXmlBase::StreamTo( std::istream * in, int character, TIXML_STRING * tag )
+{
+	//assert( character > 0 && character < 128 );	// else it won't work in utf-8
+	while ( in->good() )
+	{
+		int c = in->peek();
+		if ( c == character )
+			return true;
+		if ( c <= 0 )		// Silent failure: can't get document at this scope
+			return false;
+
+		in->get();
+		*tag += (char) c;
+	}
+	return false;
+}
+#endif
+
+// One of TinyXML's more performance demanding functions. Try to keep the memory overhead down. The
+// "assign" optimization removes over 10% of the execution time.
+//
+const char* TiXmlBase::ReadName( const char* p, TIXML_STRING * name, TiXmlEncoding encoding )
+{
+	// Oddly, not supported on some comilers,
+	//name->clear();
+	// So use this:
+	*name = "";
+	assert( p );
+
+	// Names start with letters or underscores.
+	// Of course, in unicode, tinyxml has no idea what a letter *is*. The
+	// algorithm is generous.
+	//
+	// After that, they can be letters, underscores, numbers,
+	// hyphens, or colons. (Colons are valid ony for namespaces,
+	// but tinyxml can't tell namespaces from names.)
+	if (    p && *p 
+		 && ( IsAlpha( (unsigned char) *p, encoding ) || *p == '_' ) )
+	{
+		const char* start = p;
+		while(		p && *p
+				&&	(		IsAlphaNum( (unsigned char ) *p, encoding ) 
+						 || *p == '_'
+						 || *p == '-'
+						 || *p == '.'
+						 || *p == ':' ) )
+		{
+			//(*name) += *p; // expensive
+			++p;
+		}
+		if ( p-start > 0 ) {
+			name->assign( start, p-start );
+		}
+		return p;
+	}
+	return 0;
+}
+
+const char* TiXmlBase::GetEntity( const char* p, char* value, int* length, TiXmlEncoding encoding )
+{
+	// Presume an entity, and pull it out.
+    TIXML_STRING ent;
+	int i;
+	*length = 0;
+
+	if ( *(p+1) && *(p+1) == '#' && *(p+2) )
+	{
+		unsigned long ucs = 0;
+		ptrdiff_t delta = 0;
+		unsigned mult = 1;
+
+		if ( *(p+2) == 'x' )
+		{
+			// Hexadecimal.
+			if ( !*(p+3) ) return 0;
+
+			const char* q = p+3;
+			q = strchr( q, ';' );
+
+			if ( !q || !*q ) return 0;
+
+			delta = q-p;
+			--q;
+
+			while ( *q != 'x' )
+			{
+				if ( *q >= '0' && *q <= '9' )
+					ucs += mult * (*q - '0');
+				else if ( *q >= 'a' && *q <= 'f' )
+					ucs += mult * (*q - 'a' + 10);
+				else if ( *q >= 'A' && *q <= 'F' )
+					ucs += mult * (*q - 'A' + 10 );
+				else 
+					return 0;
+				mult *= 16;
+				--q;
+			}
+		}
+		else
+		{
+			// Decimal.
+			if ( !*(p+2) ) return 0;
+
+			const char* q = p+2;
+			q = strchr( q, ';' );
+
+			if ( !q || !*q ) return 0;
+
+			delta = q-p;
+			--q;
+
+			while ( *q != '#' )
+			{
+				if ( *q >= '0' && *q <= '9' )
+					ucs += mult * (*q - '0');
+				else 
+					return 0;
+				mult *= 10;
+				--q;
+			}
+		}
+		if ( encoding == TIXML_ENCODING_UTF8 )
+		{
+			// convert the UCS to UTF-8
+			ConvertUTF32ToUTF8( ucs, value, length );
+		}
+		else
+		{
+			*value = (char)ucs;
+			*length = 1;
+		}
+		return p + delta + 1;
+	}
+
+	// Now try to match it.
+	for( i=0; i<NUM_ENTITY; ++i )
+	{
+		if ( strncmp( entity[i].str, p, entity[i].strLength ) == 0 )
+		{
+			assert( strlen( entity[i].str ) == entity[i].strLength );
+			*value = entity[i].chr;
+			*length = 1;
+			return ( p + entity[i].strLength );
+		}
+	}
+
+	// So it wasn't an entity, its unrecognized, or something like that.
+	*value = *p;	// Don't put back the last one, since we return it!
+	//*length = 1;	// Leave unrecognized entities - this doesn't really work.
+					// Just writes strange XML.
+	return p+1;
+}
+
+
+bool TiXmlBase::StringEqual( const char* p,
+							 const char* tag,
+							 bool ignoreCase,
+							 TiXmlEncoding encoding )
+{
+	assert( p );
+	assert( tag );
+	if ( !p || !*p )
+	{
+		assert( 0 );
+		return false;
+	}
+
+	const char* q = p;
+
+	if ( ignoreCase )
+	{
+		while ( *q && *tag && ToLower( *q, encoding ) == ToLower( *tag, encoding ) )
+		{
+			++q;
+			++tag;
+		}
+
+		if ( *tag == 0 )
+			return true;
+	}
+	else
+	{
+		while ( *q && *tag && *q == *tag )
+		{
+			++q;
+			++tag;
+		}
+
+		if ( *tag == 0 )		// Have we found the end of the tag, and everything equal?
+			return true;
+	}
+	return false;
+}
+
+const char* TiXmlBase::ReadText(	const char* p, 
+									TIXML_STRING * text, 
+									bool trimWhiteSpace, 
+									const char* endTag, 
+									bool caseInsensitive,
+									TiXmlEncoding encoding )
+{
+    *text = "";
+	if (    !trimWhiteSpace			// certain tags always keep whitespace
+		 || !condenseWhiteSpace )	// if true, whitespace is always kept
+	{
+		// Keep all the white space.
+		while (	   p && *p
+				&& !StringEqual( p, endTag, caseInsensitive, encoding )
+			  )
+		{
+			int len;
+			char cArr[4] = { 0, 0, 0, 0 };
+			p = GetChar( p, cArr, &len, encoding );
+			text->append( cArr, len );
+		}
+	}
+	else
+	{
+		bool whitespace = false;
+
+		// Remove leading white space:
+		p = SkipWhiteSpace( p, encoding );
+		while (	   p && *p
+				&& !StringEqual( p, endTag, caseInsensitive, encoding ) )
+		{
+			if ( *p == '\r' || *p == '\n' )
+			{
+				whitespace = true;
+				++p;
+			}
+			else if ( IsWhiteSpace( *p ) )
+			{
+				whitespace = true;
+				++p;
+			}
+			else
+			{
+				// If we've found whitespace, add it before the
+				// new character. Any whitespace just becomes a space.
+				if ( whitespace )
+				{
+					(*text) += ' ';
+					whitespace = false;
+				}
+				int len;
+				char cArr[4] = { 0, 0, 0, 0 };
+				p = GetChar( p, cArr, &len, encoding );
+				if ( len == 1 )
+					(*text) += cArr[0];	// more efficient
+				else
+					text->append( cArr, len );
+			}
+		}
+	}
+	if ( p && *p )
+		p += strlen( endTag );
+	return ( p && *p ) ? p : 0;
+}
+
+#ifdef TIXML_USE_STL
+
+void TiXmlDocument::StreamIn( std::istream * in, TIXML_STRING * tag )
+{
+	// The basic issue with a document is that we don't know what we're
+	// streaming. Read something presumed to be a tag (and hope), then
+	// identify it, and call the appropriate stream method on the tag.
+	//
+	// This "pre-streaming" will never read the closing ">" so the
+	// sub-tag can orient itself.
+
+	if ( !StreamTo( in, '<', tag ) ) 
+	{
+		SetError( TIXML_ERROR_PARSING_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return;
+	}
+
+	while ( in->good() )
+	{
+		int tagIndex = (int) tag->length();
+		while ( in->good() && in->peek() != '>' )
+		{
+			int c = in->get();
+			if ( c <= 0 )
+			{
+				SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+				break;
+			}
+			(*tag) += (char) c;
+		}
+
+		if ( in->good() )
+		{
+			// We now have something we presume to be a node of 
+			// some sort. Identify it, and call the node to
+			// continue streaming.
+			TiXmlNode* node = Identify( tag->c_str() + tagIndex, TIXML_DEFAULT_ENCODING );
+
+			if ( node )
+			{
+				node->StreamIn( in, tag );
+				bool isElement = node->ToElement() != 0;
+				delete node;
+				node = 0;
+
+				// If this is the root element, we're done. Parsing will be
+				// done by the >> operator.
+				if ( isElement )
+				{
+					return;
+				}
+			}
+			else
+			{
+				SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
+				return;
+			}
+		}
+	}
+	// We should have returned sooner.
+	SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
+}
+
+#endif
+
+const char* TiXmlDocument::Parse( const char* p, TiXmlParsingData* prevData, TiXmlEncoding encoding )
+{
+	ClearError();
+
+	// Parse away, at the document level. Since a document
+	// contains nothing but other tags, most of what happens
+	// here is skipping white space.
+	if ( !p || !*p )
+	{
+		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return 0;
+	}
+
+	// Note that, for a document, this needs to come
+	// before the while space skip, so that parsing
+	// starts from the pointer we are given.
+	location.Clear();
+	if ( prevData )
+	{
+		location.row = prevData->cursor.row;
+		location.col = prevData->cursor.col;
+	}
+	else
+	{
+		location.row = 0;
+		location.col = 0;
+	}
+	TiXmlParsingData data( p, TabSize(), location.row, location.col );
+	location = data.Cursor();
+
+	if ( encoding == TIXML_ENCODING_UNKNOWN )
+	{
+		// Check for the Microsoft UTF-8 lead bytes.
+		const unsigned char* pU = (const unsigned char*)p;
+		if (	*(pU+0) && *(pU+0) == TIXML_UTF_LEAD_0
+			 && *(pU+1) && *(pU+1) == TIXML_UTF_LEAD_1
+			 && *(pU+2) && *(pU+2) == TIXML_UTF_LEAD_2 )
+		{
+			encoding = TIXML_ENCODING_UTF8;
+			useMicrosoftBOM = true;
+		}
+	}
+
+    p = SkipWhiteSpace( p, encoding );
+	if ( !p )
+	{
+		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+		return 0;
+	}
+
+	while ( p && *p )
+	{
+		TiXmlNode* node = Identify( p, encoding );
+		if ( node )
+		{
+			p = node->Parse( p, &data, encoding );
+			LinkEndChild( node );
+		}
+		else
+		{
+			break;
+		}
+
+		// Did we get encoding info?
+		if (    encoding == TIXML_ENCODING_UNKNOWN
+			 && node->ToDeclaration() )
+		{
+			TiXmlDeclaration* dec = node->ToDeclaration();
+			const char* enc = dec->Encoding();
+			assert( enc );
+
+			if ( *enc == 0 )
+				encoding = TIXML_ENCODING_UTF8;
+			else if ( StringEqual( enc, "UTF-8", true, TIXML_ENCODING_UNKNOWN ) )
+				encoding = TIXML_ENCODING_UTF8;
+			else if ( StringEqual( enc, "UTF8", true, TIXML_ENCODING_UNKNOWN ) )
+				encoding = TIXML_ENCODING_UTF8;	// incorrect, but be nice
+			else 
+				encoding = TIXML_ENCODING_LEGACY;
+		}
+
+		p = SkipWhiteSpace( p, encoding );
+	}
+
+	// Was this empty?
+	if ( !firstChild ) {
+		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, encoding );
+		return 0;
+	}
+
+	// All is well.
+	return p;
+}
+
+void TiXmlDocument::SetError( int err, const char* pError, TiXmlParsingData* data, TiXmlEncoding encoding )
+{	
+	// The first error in a chain is more accurate - don't set again!
+	if ( error )
+		return;
+
+	assert( err > 0 && err < TIXML_ERROR_STRING_COUNT );
+	error   = true;
+	errorId = err;
+	errorDesc = errorString[ errorId ];
+
+	errorLocation.Clear();
+	if ( pError && data )
+	{
+		data->Stamp( pError, encoding );
+		errorLocation = data->Cursor();
+	}
+}
+
+
+TiXmlNode* TiXmlNode::Identify( const char* p, TiXmlEncoding encoding )
+{
+	TiXmlNode* returnNode = 0;
+
+	p = SkipWhiteSpace( p, encoding );
+	if( !p || !*p || *p != '<' )
+	{
+		return 0;
+	}
+
+	p = SkipWhiteSpace( p, encoding );
+
+	if ( !p || !*p )
+	{
+		return 0;
+	}
+
+	// What is this thing? 
+	// - Elements start with a letter or underscore, but xml is reserved.
+	// - Comments: <!--
+	// - Decleration: <?xml
+	// - Everthing else is unknown to tinyxml.
+	//
+
+	const char* xmlHeader = { "<?xml" };
+	const char* commentHeader = { "<!--" };
+	const char* dtdHeader = { "<!" };
+	const char* cdataHeader = { "<![CDATA[" };
+
+	if ( StringEqual( p, xmlHeader, true, encoding ) )
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG( "XML parsing Declaration\n" );
+		#endif
+		returnNode = new TiXmlDeclaration();
+	}
+	else if ( StringEqual( p, commentHeader, false, encoding ) )
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG( "XML parsing Comment\n" );
+		#endif
+		returnNode = new TiXmlComment();
+	}
+	else if ( StringEqual( p, cdataHeader, false, encoding ) )
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG( "XML parsing CDATA\n" );
+		#endif
+		TiXmlText* text = new TiXmlText( "" );
+		text->SetCDATA( true );
+		returnNode = text;
+	}
+	else if ( StringEqual( p, dtdHeader, false, encoding ) )
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG( "XML parsing Unknown(1)\n" );
+		#endif
+		returnNode = new TiXmlUnknown();
+	}
+	else if (    IsAlpha( *(p+1), encoding )
+			  || *(p+1) == '_' )
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG( "XML parsing Element\n" );
+		#endif
+		returnNode = new TiXmlElement( "" );
+	}
+	else
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG( "XML parsing Unknown(2)\n" );
+		#endif
+		returnNode = new TiXmlUnknown();
+	}
+
+	if ( returnNode )
+	{
+		// Set the parent, so it can report errors
+		returnNode->parent = this;
+	}
+	return returnNode;
+}
+
+#ifdef TIXML_USE_STL
+
+void TiXmlElement::StreamIn (std::istream * in, TIXML_STRING * tag)
+{
+	// We're called with some amount of pre-parsing. That is, some of "this"
+	// element is in "tag". Go ahead and stream to the closing ">"
+	while( in->good() )
+	{
+		int c = in->get();
+		if ( c <= 0 )
+		{
+			TiXmlDocument* document = GetDocument();
+			if ( document )
+				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+			return;
+		}
+		(*tag) += (char) c ;
+		
+		if ( c == '>' )
+			break;
+	}
+
+	if ( tag->length() < 3 ) return;
+
+	// Okay...if we are a "/>" tag, then we're done. We've read a complete tag.
+	// If not, identify and stream.
+
+	if (    tag->at( tag->length() - 1 ) == '>' 
+		 && tag->at( tag->length() - 2 ) == '/' )
+	{
+		// All good!
+		return;
+	}
+	else if ( tag->at( tag->length() - 1 ) == '>' )
+	{
+		// There is more. Could be:
+		//		text
+		//		cdata text (which looks like another node)
+		//		closing tag
+		//		another node.
+		for ( ;; )
+		{
+			StreamWhiteSpace( in, tag );
+
+			// Do we have text?
+			if ( in->good() && in->peek() != '<' ) 
+			{
+				// Yep, text.
+				TiXmlText text( "" );
+				text.StreamIn( in, tag );
+
+				// What follows text is a closing tag or another node.
+				// Go around again and figure it out.
+				continue;
+			}
+
+			// We now have either a closing tag...or another node.
+			// We should be at a "<", regardless.
+			if ( !in->good() ) return;
+			assert( in->peek() == '<' );
+			int tagIndex = (int) tag->length();
+
+			bool closingTag = false;
+			bool firstCharFound = false;
+
+			for( ;; )
+			{
+				if ( !in->good() )
+					return;
+
+				int c = in->peek();
+				if ( c <= 0 )
+				{
+					TiXmlDocument* document = GetDocument();
+					if ( document )
+						document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+					return;
+				}
+				
+				if ( c == '>' )
+					break;
+
+				*tag += (char) c;
+				in->get();
+
+				// Early out if we find the CDATA id.
+				if ( c == '[' && tag->size() >= 9 )
+				{
+					size_t len = tag->size();
+					const char* start = tag->c_str() + len - 9;
+					if ( strcmp( start, "<![CDATA[" ) == 0 ) {
+						assert( !closingTag );
+						break;
+					}
+				}
+
+				if ( !firstCharFound && c != '<' && !IsWhiteSpace( c ) )
+				{
+					firstCharFound = true;
+					if ( c == '/' )
+						closingTag = true;
+				}
+			}
+			// If it was a closing tag, then read in the closing '>' to clean up the input stream.
+			// If it was not, the streaming will be done by the tag.
+			if ( closingTag )
+			{
+				if ( !in->good() )
+					return;
+
+				int c = in->get();
+				if ( c <= 0 )
+				{
+					TiXmlDocument* document = GetDocument();
+					if ( document )
+						document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+					return;
+				}
+				assert( c == '>' );
+				*tag += (char) c;
+
+				// We are done, once we've found our closing tag.
+				return;
+			}
+			else
+			{
+				// If not a closing tag, id it, and stream.
+				const char* tagloc = tag->c_str() + tagIndex;
+				TiXmlNode* node = Identify( tagloc, TIXML_DEFAULT_ENCODING );
+				if ( !node )
+					return;
+				node->StreamIn( in, tag );
+				delete node;
+				node = 0;
+
+				// No return: go around from the beginning: text, closing tag, or node.
+			}
+		}
+	}
+}
+#endif
+
+const char* TiXmlElement::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
+{
+	p = SkipWhiteSpace( p, encoding );
+	TiXmlDocument* document = GetDocument();
+
+	if ( !p || !*p )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, 0, 0, encoding );
+		return 0;
+	}
+
+	if ( data )
+	{
+		data->Stamp( p, encoding );
+		location = data->Cursor();
+	}
+
+	if ( *p != '<' )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, p, data, encoding );
+		return 0;
+	}
+
+	p = SkipWhiteSpace( p+1, encoding );
+
+	// Read the name.
+	const char* pErr = p;
+
+    p = ReadName( p, &value, encoding );
+	if ( !p || !*p )
+	{
+		if ( document )	document->SetError( TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME, pErr, data, encoding );
+		return 0;
+	}
+
+    TIXML_STRING endTag ("</");
+	endTag += value;
+
+	// Check for and read attributes. Also look for an empty
+	// tag or an end tag.
+	while ( p && *p )
+	{
+		pErr = p;
+		p = SkipWhiteSpace( p, encoding );
+		if ( !p || !*p )
+		{
+			if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
+			return 0;
+		}
+		if ( *p == '/' )
+		{
+			++p;
+			// Empty tag.
+			if ( *p  != '>' )
+			{
+				if ( document ) document->SetError( TIXML_ERROR_PARSING_EMPTY, p, data, encoding );		
+				return 0;
+			}
+			return (p+1);
+		}
+		else if ( *p == '>' )
+		{
+			// Done with attributes (if there were any.)
+			// Read the value -- which can include other
+			// elements -- read the end tag, and return.
+			++p;
+			p = ReadValue( p, data, encoding );		// Note this is an Element method, and will set the error if one happens.
+			if ( !p || !*p ) {
+				// We were looking for the end tag, but found nothing.
+				// Fix for [ 1663758 ] Failure to report error on bad XML
+				if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
+				return 0;
+			}
+
+			// We should find the end tag now
+			// note that:
+			// </foo > and
+			// </foo> 
+			// are both valid end tags.
+			if ( StringEqual( p, endTag.c_str(), false, encoding ) )
+			{
+				p += endTag.length();
+				p = SkipWhiteSpace( p, encoding );
+				if ( p && *p && *p == '>' ) {
+					++p;
+					return p;
+				}
+				if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
+				return 0;
+			}
+			else
+			{
+				if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
+				return 0;
+			}
+		}
+		else
+		{
+			// Try to read an attribute:
+			TiXmlAttribute* attrib = new TiXmlAttribute();
+			if ( !attrib )
+			{
+				return 0;
+			}
+
+			attrib->SetDocument( document );
+			pErr = p;
+			p = attrib->Parse( p, data, encoding );
+
+			if ( !p || !*p )
+			{
+				if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding );
+				delete attrib;
+				return 0;
+			}
+
+			// Handle the strange case of double attributes:
+			#ifdef TIXML_USE_STL
+			TiXmlAttribute* node = attributeSet.Find( attrib->NameTStr() );
+			#else
+			TiXmlAttribute* node = attributeSet.Find( attrib->Name() );
+			#endif
+			if ( node )
+			{
+				if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding );
+				delete attrib;
+				return 0;
+			}
+
+			attributeSet.Add( attrib );
+		}
+	}
+	return p;
+}
+
+
+const char* TiXmlElement::ReadValue( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
+{
+	TiXmlDocument* document = GetDocument();
+
+	// Read in text and elements in any order.
+	const char* pWithWhiteSpace = p;
+	p = SkipWhiteSpace( p, encoding );
+
+	while ( p && *p )
+	{
+		if ( *p != '<' )
+		{
+			// Take what we have, make a text element.
+			TiXmlText* textNode = new TiXmlText( "" );
+
+			if ( !textNode )
+			{
+			    return 0;
+			}
+
+			if ( TiXmlBase::IsWhiteSpaceCondensed() )
+			{
+				p = textNode->Parse( p, data, encoding );
+			}
+			else
+			{
+				// Special case: we want to keep the white space
+				// so that leading spaces aren't removed.
+				p = textNode->Parse( pWithWhiteSpace, data, encoding );
+			}
+
+			if ( !textNode->Blank() )
+				LinkEndChild( textNode );
+			else
+				delete textNode;
+		} 
+		else 
+		{
+			// We hit a '<'
+			// Have we hit a new element or an end tag? This could also be
+			// a TiXmlText in the "CDATA" style.
+			if ( StringEqual( p, "</", false, encoding ) )
+			{
+				return p;
+			}
+			else
+			{
+				TiXmlNode* node = Identify( p, encoding );
+				if ( node )
+				{
+					p = node->Parse( p, data, encoding );
+					LinkEndChild( node );
+				}				
+				else
+				{
+					return 0;
+				}
+			}
+		}
+		pWithWhiteSpace = p;
+		p = SkipWhiteSpace( p, encoding );
+	}
+
+	if ( !p )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_READING_ELEMENT_VALUE, 0, 0, encoding );
+	}	
+	return p;
+}
+
+
+#ifdef TIXML_USE_STL
+void TiXmlUnknown::StreamIn( std::istream * in, TIXML_STRING * tag )
+{
+	while ( in->good() )
+	{
+		int c = in->get();	
+		if ( c <= 0 )
+		{
+			TiXmlDocument* document = GetDocument();
+			if ( document )
+				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+			return;
+		}
+		(*tag) += (char) c;
+
+		if ( c == '>' )
+		{
+			// All is well.
+			return;		
+		}
+	}
+}
+#endif
+
+
+const char* TiXmlUnknown::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
+{
+	TiXmlDocument* document = GetDocument();
+	p = SkipWhiteSpace( p, encoding );
+
+	if ( data )
+	{
+		data->Stamp( p, encoding );
+		location = data->Cursor();
+	}
+	if ( !p || !*p || *p != '<' )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_PARSING_UNKNOWN, p, data, encoding );
+		return 0;
+	}
+	++p;
+    value = "";
+
+	while ( p && *p && *p != '>' )
+	{
+		value += *p;
+		++p;
+	}
+
+	if ( !p )
+	{
+		if ( document )	
+			document->SetError( TIXML_ERROR_PARSING_UNKNOWN, 0, 0, encoding );
+	}
+	if ( p && *p == '>' )
+		return p+1;
+	return p;
+}
+
+#ifdef TIXML_USE_STL
+void TiXmlComment::StreamIn( std::istream * in, TIXML_STRING * tag )
+{
+	while ( in->good() )
+	{
+		int c = in->get();	
+		if ( c <= 0 )
+		{
+			TiXmlDocument* document = GetDocument();
+			if ( document )
+				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+			return;
+		}
+
+		(*tag) += (char) c;
+
+		if ( c == '>' 
+			 && tag->at( tag->length() - 2 ) == '-'
+			 && tag->at( tag->length() - 3 ) == '-' )
+		{
+			// All is well.
+			return;		
+		}
+	}
+}
+#endif
+
+
+const char* TiXmlComment::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
+{
+	TiXmlDocument* document = GetDocument();
+	value = "";
+
+	p = SkipWhiteSpace( p, encoding );
+
+	if ( data )
+	{
+		data->Stamp( p, encoding );
+		location = data->Cursor();
+	}
+	const char* startTag = "<!--";
+	const char* endTag   = "-->";
+
+	if ( !StringEqual( p, startTag, false, encoding ) )
+	{
+		if ( document )
+			document->SetError( TIXML_ERROR_PARSING_COMMENT, p, data, encoding );
+		return 0;
+	}
+	p += strlen( startTag );
+
+	// [ 1475201 ] TinyXML parses entities in comments
+	// Oops - ReadText doesn't work, because we don't want to parse the entities.
+	// p = ReadText( p, &value, false, endTag, false, encoding );
+	//
+	// from the XML spec:
+	/*
+	 [Definition: Comments may appear anywhere in a document outside other markup; in addition, 
+	              they may appear within the document type declaration at places allowed by the grammar. 
+				  They are not part of the document's character data; an XML processor MAY, but need not, 
+				  make it possible for an application to retrieve the text of comments. For compatibility, 
+				  the string "--" (double-hyphen) MUST NOT occur within comments.] Parameter entity 
+				  references MUST NOT be recognized within comments.
+
+				  An example of a comment:
+
+				  <!-- declarations for <head> & <body> -->
+	*/
+
+    value = "";
+	// Keep all the white space.
+	while (	p && *p && !StringEqual( p, endTag, false, encoding ) )
+	{
+		value.append( p, 1 );
+		++p;
+	}
+	if ( p && *p ) 
+		p += strlen( endTag );
+
+	return p;
+}
+
+
+const char* TiXmlAttribute::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
+{
+	p = SkipWhiteSpace( p, encoding );
+	if ( !p || !*p ) return 0;
+
+	if ( data )
+	{
+		data->Stamp( p, encoding );
+		location = data->Cursor();
+	}
+	// Read the name, the '=' and the value.
+	const char* pErr = p;
+	p = ReadName( p, &name, encoding );
+	if ( !p || !*p )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
+		return 0;
+	}
+	p = SkipWhiteSpace( p, encoding );
+	if ( !p || !*p || *p != '=' )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
+		return 0;
+	}
+
+	++p;	// skip '='
+	p = SkipWhiteSpace( p, encoding );
+	if ( !p || !*p )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
+		return 0;
+	}
+	
+	const char* end;
+	const char SINGLE_QUOTE = '\'';
+	const char DOUBLE_QUOTE = '\"';
+
+	if ( *p == SINGLE_QUOTE )
+	{
+		++p;
+		end = "\'";		// single quote in string
+		p = ReadText( p, &value, false, end, false, encoding );
+	}
+	else if ( *p == DOUBLE_QUOTE )
+	{
+		++p;
+		end = "\"";		// double quote in string
+		p = ReadText( p, &value, false, end, false, encoding );
+	}
+	else
+	{
+		// All attribute values should be in single or double quotes.
+		// But this is such a common error that the parser will try
+		// its best, even without them.
+		value = "";
+		while (    p && *p											// existence
+				&& !IsWhiteSpace( *p )								// whitespace
+				&& *p != '/' && *p != '>' )							// tag end
+		{
+			if ( *p == SINGLE_QUOTE || *p == DOUBLE_QUOTE ) {
+				// [ 1451649 ] Attribute values with trailing quotes not handled correctly
+				// We did not have an opening quote but seem to have a 
+				// closing one. Give up and throw an error.
+				if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
+				return 0;
+			}
+			value += *p;
+			++p;
+		}
+	}
+	return p;
+}
+
+#ifdef TIXML_USE_STL
+void TiXmlText::StreamIn( std::istream * in, TIXML_STRING * tag )
+{
+	while ( in->good() )
+	{
+		int c = in->peek();	
+		if ( !cdata && (c == '<' ) ) 
+		{
+			return;
+		}
+		if ( c <= 0 )
+		{
+			TiXmlDocument* document = GetDocument();
+			if ( document )
+				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+			return;
+		}
+
+		(*tag) += (char) c;
+		in->get();	// "commits" the peek made above
+
+		if ( cdata && c == '>' && tag->size() >= 3 ) {
+			size_t len = tag->size();
+			if ( (*tag)[len-2] == ']' && (*tag)[len-3] == ']' ) {
+				// terminator of cdata.
+				return;
+			}
+		}    
+	}
+}
+#endif
+
+const char* TiXmlText::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
+{
+	value = "";
+	TiXmlDocument* document = GetDocument();
+
+	if ( data )
+	{
+		data->Stamp( p, encoding );
+		location = data->Cursor();
+	}
+
+	const char* const startTag = "<![CDATA[";
+	const char* const endTag   = "]]>";
+
+	if ( cdata || StringEqual( p, startTag, false, encoding ) )
+	{
+		cdata = true;
+
+		if ( !StringEqual( p, startTag, false, encoding ) )
+		{
+			if ( document )
+				document->SetError( TIXML_ERROR_PARSING_CDATA, p, data, encoding );
+			return 0;
+		}
+		p += strlen( startTag );
+
+		// Keep all the white space, ignore the encoding, etc.
+		while (	   p && *p
+				&& !StringEqual( p, endTag, false, encoding )
+			  )
+		{
+			value += *p;
+			++p;
+		}
+
+		TIXML_STRING dummy; 
+		p = ReadText( p, &dummy, false, endTag, false, encoding );
+		return p;
+	}
+	else
+	{
+		bool ignoreWhite = true;
+
+		const char* end = "<";
+		p = ReadText( p, &value, ignoreWhite, end, false, encoding );
+		if ( p && *p )
+			return p-1;	// don't truncate the '<'
+		return 0;
+	}
+}
+
+#ifdef TIXML_USE_STL
+void TiXmlDeclaration::StreamIn( std::istream * in, TIXML_STRING * tag )
+{
+	while ( in->good() )
+	{
+		int c = in->get();
+		if ( c <= 0 )
+		{
+			TiXmlDocument* document = GetDocument();
+			if ( document )
+				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+			return;
+		}
+		(*tag) += (char) c;
+
+		if ( c == '>' )
+		{
+			// All is well.
+			return;
+		}
+	}
+}
+#endif
+
+const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding _encoding )
+{
+	p = SkipWhiteSpace( p, _encoding );
+	// Find the beginning, find the end, and look for
+	// the stuff in-between.
+	TiXmlDocument* document = GetDocument();
+	if ( !p || !*p || !StringEqual( p, "<?xml", true, _encoding ) )
+	{
+		if ( document ) document->SetError( TIXML_ERROR_PARSING_DECLARATION, 0, 0, _encoding );
+		return 0;
+	}
+	if ( data )
+	{
+		data->Stamp( p, _encoding );
+		location = data->Cursor();
+	}
+	p += 5;
+
+	version = "";
+	encoding = "";
+	standalone = "";
+
+	while ( p && *p )
+	{
+		if ( *p == '>' )
+		{
+			++p;
+			return p;
+		}
+
+		p = SkipWhiteSpace( p, _encoding );
+		if ( StringEqual( p, "version", true, _encoding ) )
+		{
+			TiXmlAttribute attrib;
+			p = attrib.Parse( p, data, _encoding );		
+			version = attrib.Value();
+		}
+		else if ( StringEqual( p, "encoding", true, _encoding ) )
+		{
+			TiXmlAttribute attrib;
+			p = attrib.Parse( p, data, _encoding );		
+			encoding = attrib.Value();
+		}
+		else if ( StringEqual( p, "standalone", true, _encoding ) )
+		{
+			TiXmlAttribute attrib;
+			p = attrib.Parse( p, data, _encoding );		
+			standalone = attrib.Value();
+		}
+		else
+		{
+			// Read over whatever it is.
+			while( p && *p && *p != '>' && !IsWhiteSpace( *p ) )
+				++p;
+		}
+	}
+	return 0;
+}
+
+bool TiXmlText::Blank() const
+{
+	for ( unsigned i=0; i<value.length(); i++ )
+		if ( !IsWhiteSpace( value[i] ) )
+			return false;
+	return true;
+}
+