fixed: BBCODEParser incorrectly worked with the latest changes in HTMLFilter

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@729 e52654a7-88a9-db11-a3e9-0013d4bc506e

core/bbcodeparser.cpp

@@ -10,6 +10,8 @@
 #include "bbcodeparser.h"
 
 
+
+
 bool BBCODEParser::Equal(const wchar_t * str1, const wchar_t * str2)
 {
 	while( *str1 == *str2 && *str1 != 0 )
@@ -67,6 +69,10 @@ bool BBCODEParser::IsClosingXmlSimpleTagMark()
 
 
 
+
+
+
+
 // one enter will generate one <br>
 // two enters or more will generate only two br (<br><br>)
 void BBCODEParser::PutNormalText(const wchar_t * str, const wchar_t * end)
@@ -116,12 +122,6 @@ int br_len;
 }
 
 
-void BBCODEParser::PutNormalTextTrim(const wchar_t * str, const wchar_t * end)
-{
-	// we don't use trimming in bbcode parser
-	PutNormalText(str, end);
-}
-
 
 void BBCODEParser::ReadNormalTextSkipWhite(const wchar_t * & start, const wchar_t * & last_non_white)
 {
@@ -367,19 +367,21 @@ void BBCODEParser::PrintEncode(const wchar_t * start, const wchar_t * end)
 
 
 
-void BBCODEParser::PutOpeningTagFromEzc(const wchar_t * start, const wchar_t * end)
+void BBCODEParser::PutOpeningTagFromEzc()
 {
 	// this can be a tag from Ezc templates system
 	(*out_string) += '[';
 	(*out_string) += LastItem().name;
 
-	if( start != end )
-	{
-		(*out_string) += ' ';
-		PrintEscape(start, end);
-	}
+	const wchar_t * start = pchar;
 
-	(*out_string) += ']';
+	while( *pchar && *pchar!=']' )
+		++pchar;
+
+	if( *pchar == ']' )
+		++pchar;
+
+	Put(start, pchar);
 }
 
 
@@ -495,33 +497,40 @@ bool has_u;
 }
 
 
-void BBCODEParser::PutOpeningTagFromBBCode(const Tags * tag, const wchar_t * start, const wchar_t * end)
+void BBCODEParser::PutOpeningTagFromBBCode(const Tags * tag)
 {
 	CheckOpeningTag(tag);
 	PutOpeningTagMark();
-	(*out_string) += tag->html_tag;
-	PutHtmlArgument(tag, start, end);
+	Put(tag->html_tag);
+
+	const wchar_t * start = pchar;
+
+	while( *pchar && *pchar != ']' )
+		++pchar;
+
+	PutHtmlArgument(tag, start, pchar);
+
+	if( *pchar == ']' )
+		++pchar;
 
 	if( !tag->inline_tag )
 	{
-		(*out_string) += L"\n";
+		Put(10);
 		SkipWhiteLines();
 	}
 }
 
 
-void BBCODEParser::PutOpeningTag(const wchar_t * start, const wchar_t * end)
+bool BBCODEParser::PutOpeningTag()
 {
 	const Tags * tag = FindTag(LastItem().name);
 
 	if( !tag )
-	{
-		PutOpeningTagFromEzc(start, end);
-	}
+		PutOpeningTagFromEzc();
 	else
-	{
-		PutOpeningTagFromBBCode(tag, start, end);
-	}
+		PutOpeningTagFromBBCode(tag);
+
+return false;
 }
 
 
@@ -570,7 +579,7 @@ void BBCODEParser::Init()
 }
 
 
-void BBCODEParser::Deinit()
+void BBCODEParser::Uninit()
 {
 	if( has_open_li_tag )
 		(*out_string) += L"</li>\n";