Merge remote-tracking branch 'cnjinhao/hotfix-1.3' into geometric_scheme

include/nana/gui/widgets/skeletons/text_token_stream.hpp

@@ -194,21 +194,32 @@ namespace nana{ namespace widgets{	namespace skeletons
 				return token::tag_begin;
 			}
 
+
 			//Escape
-			if(ch == '\\')
+			if(this->format_enabled_ && (ch == '\\'))
 			{
 				if(iptr_ + 1 < endptr_)
 				{
 					ch = *(iptr_ + 1);
+
+					if ('<' == ch || '>' == ch)	//two characters need to be escaped.
+					{
 						iptr_ += 2;
 					}
 					else
+					{
+						//ignore escape
+						ch = '\\';
+						iptr_++;
+					}
+				}
+				else
 				{
 					iptr_ = endptr_;
 					return token::eof;
 				}
 			}
-
+			else
 				++iptr_;
 
 			idstr_.clear();
@@ -277,6 +288,8 @@ namespace nana{ namespace widgets{	namespace skeletons
 				return token::eof;
 			}
 
+			
+
 			if(('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') || '_' == ch)
 			{
 				--iptr_;