diff --git a/uppsrc/Core/src.tpp/XmlParser$en-us.tpp b/uppsrc/Core/src.tpp/XmlParser$en-us.tpp
new file mode 100644
index 000000000..c283544b8
--- /dev/null
+++ b/uppsrc/Core/src.tpp/XmlParser$en-us.tpp
@@ -0,0 +1,186 @@
+topic "";
+[2 $$0,0#00000000000000000000000000000000:Default]
+[i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
+[l288;2 $$2,2#27521748481378242620020725143825:desc]
+[0 $$3,0#96390100711032703541132217272105:end]
+[H6;0 $$4,0#05600065144404261032431302351956:begin]
+[i448;a25;kKO9;2 $$5,0#37138531426314131252341829483370:item]
+[l288;a4;*@5;1 $$6,6#70004532496200323422659154056402:requirement]
+[l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param]
+[i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam]
+[b42;2 $$9,9#13035079074754324216151401829390:normal]
+[{_} 
+[ {{10000@(113.42.0) [s0;%% [*@7;4 XmlParser]]}}&]
+[s1;@(0.0.255)3 &]
+[s1;:XmlParser`:`:class: [@(0.0.255)3 class][3 _][*3 XmlParser]&]
+[s2;%% This class is a `'lexical`' parser of XML. It is intended 
+for implementation of descent parsers of XML.&]
+[s3; &]
+[s0;i448;a25;kKO9;@(0.0.255) &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
+[s4;H0; &]
+[s5;:XmlParser`:`:SkipWhites`(`): [@(0.0.255) void]_[* SkipWhites]()&]
+[s2;%% Skips any whitespaces in the input XML.&]
+[s3; &]
+[s4; &]
+[s5;:XmlParser`:`:IsEof`(`): [@(0.0.255) bool]_[* IsEof]()&]
+[s2;%% Returns true if parser reached the end of text.&]
+[s3; &]
+[s4; &]
+[s5;:XmlParser`:`:GetPtr`(`)const: [@(0.0.255) const]_[@(0.0.255) char]_`*[* GetPtr]()_[@(0.0.255) c
+onst]&]
+[s2;%% Returns a pointer to the position in the text the parser reached.&]
+[s3; &]
+[s4; &]
+[s5;:XmlParser`:`:IsTag`(`): [@(0.0.255) bool]_[* IsTag]()&]
+[s2;%% Returns true if the parser is at XML start`-tag.&]
+[s3; &]
+[s4; &]
+[s5;:XmlParser`:`:ReadTag`(`): [_^String^ String]_[* ReadTag]()&]
+[s2;%% Returns XML start`-tag id and advances. If the parser is not 
+at start`-tag, XmlError is thrown.&]
+[s3; &]
+[s4; &]
+[s5;:XmlParser`:`:Tag`(const String`&`): [@(0.0.255) bool]_[* Tag]([@(0.0.255) const]_[_^String^ S
+tring][@(0.0.255) `&]_[*@3 tag])&]
+[s5;:XmlParser`:`:Tag`(const char`*`): [@(0.0.255) bool]_[* Tag]([@(0.0.255) const]_[@(0.0.255) c
+har]_`*[*@3 tag])&]
+[s2;%% If parser is at XML start`-[%-*@3 tag], advances and returns 
+true, otherwise returns false.&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:PassTag`(const String`&`): [@(0.0.255) void]_[* PassTag]([@(0.0.255) cons
+t]_[_^String^ String][@(0.0.255) `&]_[*@3 tag])&]
+[s5;:XmlParser`:`:PassTag`(const char`*`): [@(0.0.255) void]_[* PassTag]([@(0.0.255) const]_
+[@(0.0.255) char]_`*[*@3 tag])&]
+[s2;%% If parser is at XML start`-[%-*@3 tag], advances, otherwise 
+throws XmlError exception.&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:IsEnd`(`): [@(0.0.255) bool]_[* IsEnd]()&]
+[s2;%% Returns true if the parser is at matching end`-tag. Note that 
+encountering non`-matching tags invokes XmlError, unless the 
+parser is in relaxed mode.&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:End`(`): [@(0.0.255) bool]_[* End]()&]
+[s2; Returns true if the parser is at matching end`-tag and advances. 
+Note that encountering non`-matching tags throws XmlError, unless 
+the parser is in relaxed mode.&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:PassEnd`(`): [@(0.0.255) void]_[* PassEnd]()&]
+[s2;%% If parser is at matching end`-tag, advances, otherwise XmlError 
+is thrown.&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:TagE`(const char`*`): [@(0.0.255) bool]_[* TagE]([@(0.0.255) const]_[@(0.0.255) c
+har]_`*[*@3 tag])&]
+[s2;%%  [%-*@3 tag].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:PassTagE`(const char`*`): [@(0.0.255) void]_[* PassTagE]([@(0.0.255) cons
+t]_[@(0.0.255) char]_`*[*@3 tag])&]
+[s2;%%  [%-*@3 tag].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:GetAttrCount`(`)const: [@(0.0.255) int]_[* GetAttrCount]()_[@(0.0.255) co
+nst]&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:GetAttr`(int`)const: [_^String^ String]_[* GetAttr]([@(0.0.255) int]_[*@3 i
+])_[@(0.0.255) const]&]
+[s2;%%  [%-*@3 i].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:operator`[`]`(int`)const: [_^String^ String]_[* operator`[`]]([@(0.0.255) i
+nt]_[*@3 i])_[@(0.0.255) const]&]
+[s2;%%  [%-*@3 i].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:operator`[`]`(const char`*`)const: [_^String^ String]_[* operator`[`]](
+[@(0.0.255) const]_[@(0.0.255) char]_`*[*@3 id])_[@(0.0.255) const]&]
+[s2;%%  [%-*@3 id].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:Int`(const char`*`,int`)const: [@(0.0.255) int]_[* Int]([@(0.0.255) const
+]_[@(0.0.255) char]_`*[*@3 id], [@(0.0.255) int]_[*@3 def]_`=_Null)_[@(0.0.255) const]&]
+[s2;%%  [%-*@3 id] [%-*@3 def].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:Double`(const char`*`,double`)const: [@(0.0.255) double]_[* Double]([@(0.0.255) c
+onst]_[@(0.0.255) char]_`*[*@3 id], [@(0.0.255) double]_[*@3 def]_`=_Null)_[@(0.0.255) cons
+t]&]
+[s2;%%  [%-*@3 id] [%-*@3 def].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:IsText`(`): [@(0.0.255) bool]_[* IsText]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:ReadText`(`): [_^String^ String]_[* ReadText]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:ReadTextE`(`): [_^String^ String]_[* ReadTextE]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:IsDecl`(`): [@(0.0.255) bool]_[* IsDecl]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:ReadDecl`(`): [_^String^ String]_[* ReadDecl]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:IsPI`(`): [@(0.0.255) bool]_[* IsPI]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:ReadPI`(`): [_^String^ String]_[* ReadPI]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:IsComment`(`): [@(0.0.255) bool]_[* IsComment]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:ReadComment`(`): [_^String^ String]_[* ReadComment]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:Skip`(`): [@(0.0.255) void]_[* Skip]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:SkipEnd`(`): [@(0.0.255) void]_[* SkipEnd]()&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:PickAttrs`(`)pick`_: [_^VectorMap^ VectorMap]<[_^String^ String], 
+[_^String^ String]>_[* PickAttrs]()_[@(0.128.128) pick`_]&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:GetLine`(`)const: [@(0.0.255) int]_[* GetLine]()_[@(0.0.255) const]&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:GetColumn`(`)const: [@(0.0.255) int]_[* GetColumn]()_[@(0.0.255) const]&]
+[s2;%% &]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:Relaxed`(bool`): [@(0.0.255) void]_[* Relaxed]([@(0.0.255) bool]_[*@3 b])&]
+[s2;%%  [%-*@3 b].&]
+[s3;%% &]
+[s4;%% &]
+[s5;:XmlParser`:`:XmlParser`(const char`*`): [* XmlParser]([@(0.0.255) const]_[@(0.0.255) c
+har]_`*[*@3 s])&]
+[s2;%%  [%-*@3 s].&]
+[s3;%% &]
+[s0; &]
+[s0; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s0; ]
\ No newline at end of file
diff --git a/uppsrc/Core/src.tpp/XmlParser$en-us.tppi b/uppsrc/Core/src.tpp/XmlParser$en-us.tppi
new file mode 100644
index 000000000..b741bf8fc
--- /dev/null
+++ b/uppsrc/Core/src.tpp/XmlParser$en-us.tppi
@@ -0,0 +1,9 @@
+TITLE("")
+COMPRESSED
+120,156,197,88,13,143,154,72,24,254,43,147,108,63,116,99,55,51,3,8,200,221,101,47,219,109,107,174,219,51,109,115,215,132,80,25,113,92,201,34,227,193,216,238,165,233,254,246,123,7,80,17,81,209,126,220,102,21,100,222,143,231,121,230,229,157,1,151,162,71,143,112,7,159,225,3,127,189,231,124,194,22,145,244,220,80,215,45,135,81,195,185,251,227,79,219,81,254,4,252,53,147,104,150,161,17,157,118,225,139,104,132,26,84,211,137,69,109,221,210,52,11,247,130,136,165,169,231,70,212,178,50,39,218,161,103,212,52,40,49,117,75,183,136,102,90,20,124,41,198,20,155,212,32,186,102,81,163,55,230,105,224,185,24,204,53,200,97,119,53,27,19,140,77,66,176,70,77,172,25,58,33,26,133,16,212,164,4,27,61,30,143,61,247,85,215,81,14,186,34,101,116,1,122,23,162,233,58,134,232,202,77,215,136,134,169,102,16,219,232,246,70,252,54,140,235,40,25,7,41,153,184,23,74,62,43,24,49,221,57,191,52,28,2,174,221,78,247,204,132,180,186,1,201,108,197,
+72,3,55,74,187,134,77,12,29,32,233,152,246,18,254,207,34,76,248,140,199,178,136,16,18,66,137,51,34,166,3,16,30,30,30,46,136,142,115,165,76,192,66,48,224,166,4,174,1,15,147,24,54,182,13,139,88,88,51,117,106,152,64,125,206,18,54,43,152,140,116,234,20,60,172,142,117,214,37,93,80,20,91,128,223,176,33,0,6,18,112,4,33,13,248,215,172,158,44,156,149,159,114,178,59,246,25,136,164,25,216,180,177,169,155,134,14,76,40,233,18,16,18,43,254,48,13,189,88,36,51,22,121,238,151,225,87,228,162,47,95,136,170,146,203,22,76,200,133,78,47,112,27,185,41,118,30,63,70,238,249,165,233,232,232,195,44,26,176,36,229,137,231,125,253,250,196,115,83,226,92,182,240,5,190,0,80,109,13,229,87,122,43,43,191,231,231,21,211,67,110,217,174,168,34,13,13,61,247,92,43,69,85,1,168,202,247,126,26,166,185,25,130,19,134,252,167,17,191,15,3,22,249,79,209,60,179,69,98,130,62,220,188,190,64,125,169,76,194,88,66,221,240,49,154,136,
+4,133,179,121,148,205,10,147,161,136,149,165,42,65,248,93,248,166,75,103,149,79,115,50,220,216,217,172,159,53,94,53,188,148,230,69,139,80,171,253,50,251,190,36,107,117,208,96,49,138,194,0,221,112,57,21,99,244,58,76,229,82,34,221,121,133,243,20,70,69,154,119,119,225,252,239,41,212,95,234,183,252,246,134,70,232,147,8,199,222,16,2,175,141,188,86,123,165,143,186,10,186,196,255,162,207,217,216,156,5,92,137,128,228,148,195,97,190,144,85,126,122,61,134,126,122,45,38,219,233,71,66,68,89,250,108,188,156,249,45,151,139,36,78,145,76,22,144,105,178,156,141,132,179,96,10,242,171,252,48,17,74,96,201,239,101,3,4,47,185,28,200,68,65,8,68,156,202,77,28,217,37,0,82,190,52,101,137,55,244,207,1,92,238,10,232,134,219,62,91,128,25,154,11,85,37,9,146,34,131,57,23,105,152,213,71,33,155,194,155,15,108,80,106,36,226,123,118,187,87,68,24,223,39,98,41,171,42,247,108,242,80,42,89,34,253,103,146,221,54,128,240,150,179,241,26,
+196,240,227,59,153,132,241,237,71,148,31,51,20,133,73,29,142,205,116,40,28,67,105,193,103,252,137,197,80,87,112,143,85,33,198,66,42,152,107,159,142,186,139,175,147,68,100,195,114,154,136,207,113,3,216,25,228,108,194,10,164,254,147,157,42,102,216,235,138,99,139,109,217,200,127,162,156,47,53,4,32,189,246,1,12,170,182,252,243,227,17,212,150,103,57,103,166,118,127,178,115,146,221,199,207,150,246,157,149,238,217,36,36,165,82,233,32,1,211,144,124,14,83,190,186,62,97,81,202,11,165,33,71,174,117,113,82,101,58,128,126,218,64,241,85,239,41,236,127,136,234,21,44,245,202,55,67,242,99,212,47,139,157,213,115,186,46,113,126,31,240,185,234,29,13,133,135,46,26,143,247,119,89,216,244,28,211,32,102,76,6,83,80,93,53,219,188,71,160,55,66,42,164,48,200,227,64,44,84,171,83,6,177,136,253,103,43,115,176,84,235,196,39,113,199,215,124,58,104,17,71,60,77,43,105,160,47,38,60,98,247,208,214,103,98,220,180,200,246,51,45,243,60,129,101,165,
+47,53,167,92,153,193,239,202,88,21,103,45,235,141,242,173,204,112,181,28,183,168,214,87,226,206,46,123,8,36,220,61,215,205,219,220,245,183,220,105,168,116,63,29,215,153,14,32,172,182,131,159,141,18,246,27,191,75,153,92,169,74,219,177,97,129,29,70,134,176,108,122,96,131,114,84,110,191,5,25,214,153,107,23,250,194,116,83,156,2,24,16,14,189,189,112,150,186,132,77,85,17,115,158,48,41,18,223,245,189,38,240,202,246,255,15,198,205,26,59,17,236,161,106,131,82,109,198,97,220,148,68,95,85,221,6,246,206,134,218,53,101,216,87,213,119,36,234,78,93,36,24,26,243,9,152,253,58,124,179,136,162,166,204,150,167,202,183,33,203,231,2,30,165,120,149,232,56,191,90,199,53,31,202,232,230,190,223,200,120,29,239,231,145,134,39,4,120,250,216,255,8,1,6,229,5,164,89,224,108,211,191,14,189,251,193,224,155,162,95,55,9,127,125,124,252,126,250,156,7,209,94,89,148,193,105,192,75,161,119,226,62,45,122,63,29,244,247,130,30,244,79,131,188,10,187,
+19,240,41,145,251,233,149,152,169,215,37,123,49,23,54,167,1,223,76,176,19,253,201,57,212,251,144,3,47,81,78,11,186,127,95,87,88,28,31,122,16,6,119,106,141,206,222,252,204,225,135,63,204,116,249,139,7,176,216,220,176,249,71,180,58,245,126,217,22,172,83,35,226,111,217,206,104,25,120,181,233,32,212,82,159,54,202,211,156,176,239,120,29,198,252,240,118,71,89,125,175,157,206,149,136,22,179,248,112,206,220,238,187,100,125,155,239,251,253,150,42,249,157,19,94,88,109,174,48,203,155,4,90,254,168,102,131,57,106,186,8,172,127,108,239,130,207,75,111,73,143,90,222,210,26,68,105,5,17,118,74,135,131,175,58,175,84,198,100,161,170,19,150,56,201,194,104,249,170,19,2,120,255,1,179,44,89,157,
+
diff --git a/uppsrc/Core/src.tpp/all.i b/uppsrc/Core/src.tpp/all.i
index fe709bcc6..c9be4ceb6 100644
--- a/uppsrc/Core/src.tpp/all.i
+++ b/uppsrc/Core/src.tpp/all.i
@@ -2,3 +2,7 @@ TOPIC("XmlOutput$en-us")
 #include "XmlOutput$en-us.tppi"
 END_TOPIC
 
+TOPIC("XmlParser$en-us")
+#include "XmlParser$en-us.tppi"
+END_TOPIC
+