From 5492a1c705f57d65a323b9b65ea8c0cd52e21329 Mon Sep 17 00:00:00 2001
From: Lee Thomason <leethomason@gmail.com>
Date: Mon, 23 Jan 2012 15:32:10 -0800
Subject: [PATCH] basic text support

---
 tinyxml2.cpp |  36 +++++++++++++++++++++++++++++++++---
 tinyxml2.h   |  25 ++++++++++++++++++++++++-
 tinyxml2.suo | Bin 32256 -> 32256 bytes
 xmltest.cpp  |   2 ++
 4 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 367f05c..0a02c4b 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -132,9 +132,9 @@ char* XMLBase::ParseName( char* p, StrPair* pair )
 char* XMLBase::Identify( XMLDocument* document, char* p, XMLNode** node ) 
 {
 	XMLNode* returnNode = 0;
-
+	char* start = p;
 	p = XMLNode::SkipWhiteSpace( p );
-	if( !p || !*p || *p != '<' )
+	if( !p || !*p )
 	{
 		return 0;
 	}
@@ -166,6 +166,12 @@ char* XMLBase::Identify( XMLDocument* document, char* p, XMLNode** node )
 		returnNode = new XMLElement( document );
 		p += elementHeaderLen;
 	}
+	// fixme: better text detection
+	else if ( (*p != '<') && IsAlphaNum( *p ) ) {
+		// fixme: this is filtering out empty text...should it?
+		returnNode = new XMLText( document );
+		p = start;	// Back it up, all the text counts.
+	}
 	else {
 		TIXMLASSERT( 0 );
 	}
@@ -256,6 +262,22 @@ void XMLNode::PrintSpace( FILE* fp, int depth )
 }
 
 
+// --------- XMLText ---------- //
+char* XMLText::ParseDeep( char* p )
+{
+	p = ParseText( p, &value, "<" );
+	// consumes the end tag.
+	if ( p && *p ) {
+		return p-1;
+	}
+	return 0;
+}
+
+
+void XMLText::Print( FILE* cfile, int depth )
+{
+	fprintf( cfile, value.GetStr() );
+}
 
 
 // --------- XMLComment ---------- //
@@ -430,11 +452,19 @@ void XMLElement::Print( FILE* cfile, int depth )
 	}
 
 	if ( firstChild ) {
-		fprintf( cfile, ">\n" );
+		// fixme: once text is on, it should stay on, and not use newlines.
+		bool useNewline = firstChild->ToText() == 0;
+
+		fprintf( cfile, ">", Name() );
+		if ( useNewline ) fprintf( cfile, "\n" );
+
 		for( XMLNode* node=firstChild; node; node=node->next ) {
 			node->Print( cfile, depth+1 );
 		}
+
 		fprintf( cfile, "</%s>\n", Name() );
+		// fixme: see note above
+		//if ( useNewline ) fprintf( cfile, "\n" );
 	}
 	else {
 		fprintf( cfile, "/>\n" );
diff --git a/tinyxml2.h b/tinyxml2.h
index ba5d031..227c7c7 100644
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -34,6 +34,7 @@ class XMLElement;
 class XMLAttribute;
 class XMLComment;
 class XMLNode;
+class XMLText;
 
 // internal - move to separate namespace
 struct CharBuffer
@@ -116,7 +117,9 @@ public:
 	XMLNode* InsertEndChild( XMLNode* addThis );
 	virtual void Print( FILE* cfile, int depth );
 
-	virtual XMLElement* ToElement() { return 0; }
+	virtual XMLElement* ToElement()		{ return 0; }
+	virtual XMLText*	ToText()		{ return 0; }
+	virtual XMLComment* ToComment()		{ return 0; }
 
 	virtual char* ParseDeep( char* )	{ TIXMLASSERT( 0 ); }
 
@@ -139,6 +142,25 @@ private:
 };
 
 
+class XMLText : public XMLNode
+{
+public:
+	XMLText( XMLDocument* doc )	: XMLNode( doc )	{}
+	virtual ~XMLText()								{}
+
+	virtual void Print( FILE* cfile, int depth );
+	const char* Value() { return value.GetStr(); }
+	virtual XMLText*	ToText()		{ return this; }
+
+	char* ParseDeep( char* );
+
+protected:
+
+private:
+	StrPair value;
+};
+
+
 class XMLComment : public XMLNode
 {
 public:
@@ -146,6 +168,7 @@ public:
 	virtual ~XMLComment();
 
 	virtual void Print( FILE* cfile, int depth );
+	virtual XMLComment*	ToComment()		{ return this; }
 
 	const char* Value() { return value.GetStr(); }
 
diff --git a/tinyxml2.suo b/tinyxml2.suo
index bcaeb41d4b6e9ff08220c3f499efae611566cbb5..e3bbf90cd91fc6c593cad22ee0ff262db5e586ea 100644
GIT binary patch
delta 437
zcmYk1-z!657{|}^?i@RXHJa7JHf>6rw8Ji3NGC~=Xv+L7lEP`oZ+7FoawWAr+J!6a
z`~%u^;YK-f=W0sHKY`+g){b|gJoWAQ^nJcPPY*8vFTv#qQ-YEtHDH286tAEV9kO>&
zic^E-R@#(bK`uLvLrYaLs1xv0D<ZclRL&$Kb=wsX_U><Y=-C~TnIX|vb-#>@>p@&l
zJJImTbmF~IYbBQm281fB@Ij8^PGGDS>V?zz&$T`RZp9~zbNme7<DIP2M@x+g7J=q~
z#dlaHp^?`42>C7#cFm<J-F^&sITWU_p;e)s;@NGlxRu9DpHAt)HxJ%U1u2+(V*X~a
z_phP?JVFC!7)qLWGueR`(|-Ro`~@Vb_{#$*BJsiu1Eoz&<LI9KL~|mCv6K&Abd{Rs
zMqPyk!wnXKc0~5F&4_Cp(45Z|QYK_$+~VtiS+7C%26y4O-iyY54XJvMi|joEkVT_-
Yy0(QE5%I{uFci`T!+du;neiNa19$S3e*gdg

delta 885
zcmb7C&1+LZ5Z~Rre3T?@Oq<kD%}4XVHjN=B9z?7@V_HFqnoIo(7-^GgeWt0#lE%wB
zdACz~=*7?;MUkxFv9F#=L5L!h`bTKNUMi(=*5-*)P#pL%v%j4g_BT7)F4cDF>k($|
zB7_7W!@_1iMlL?fzEN}heetD-PfK5^lt-42TjF%6fYBu4F5(_yui0$gN3S9tAc}}7
zL<upCm_a;3h`h%wzsEPN0f}uf{@tFEDC2`JOPiCL@Y;vK%qD!0WGMTtIEfpXp5NHz
zZJ*WbK|+F^;5uCBKEby`4jZgxtGs&lDWyxCMw;|lCd#9+Pjo5DxK>seR}#7%QsH4f
ztXM2Ce<sFV7q{ByvJ0?!-Ov4_8_c_iUH9#n{sMz`M0y?qqm!_5Z2)RFyj~A&Wsp8S
zjInrG8ZhN#{U)R45FQVM_0|r2K7NGPvzJYC>OwuISlc@AM$}RWNu8kEB&ZdF@ant+
zN<(tT7|u&fEWh8LuS~2mpEx9u9Bh@M`_-cRb_7pX$sO_#$D1c<L>^o8ksukv&k=kC
z;}W7DGsQa%!?xsY!+lzP*EsYhMQZY;qaVec;0==?V;cai%h4lPX3#(VU!|Ngq-0y|
zgm+@y0TqAr6bmB;V29`ZN#0Q76mqf*YSIDmN@2pt{XfxSbqo`)`M2nh<XhH?6y#2~
z5Z`-HJjs$WE`E{Bk_s-o%JnJD1dHJq{}OSV09TFcGYW-~-UMH(oI)8-#vx}*)T?3#
H<2wBTQ((e>

diff --git a/xmltest.cpp b/xmltest.cpp
index 4972275..0301c41 100644
--- a/xmltest.cpp
+++ b/xmltest.cpp
@@ -37,6 +37,8 @@ int main( int argc, const char* argv )
 									    "<!--comment beside elements--><element><subelement></subelement></element>",
 									    "<!--comment beside elements, this time with spaces-->  \n <element>  <subelement> \n </subelement> </element>",
 									    "<element attrib1='foo' attrib2=\"bar\" ></element>",
+									    "<element attrib1='foo' attrib2=\"bar\" ><subelement attrib3='yeehaa' /></element>",
+										"<element>Text inside element.</element>",
 										0
 		};
 		for( int i=0; test[i]; ++i ) {