github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-22 13:17:36 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Refactoring XmlTag indentation

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6551 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-11-14 17:42:10 +00:00
commit 11892959e6
9 changed files with 2548 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

62
uppsrc/Core/XML.cpp
View file

@ -95,39 +95,43 @@ String XmlTag::operator()()
return tag + "/>\r\n";
}
String XmlTag::operator()(const char* text)
String XmlTag::operator()(const char *text)
{
StringBuffer r;
r << tag << '>';
if(strchr(text, '\n') && strchr(text, '<')) {
r << "\r\n";
bool was = true;
for(;;) {
const char *s = text;
while(*s == ' ' || *s == '\t')
s++;
if(*s == '<') {
if(was)
r.Cat('\t');
was = true;
}
else
was = false;
r.Cat(text, s);
text = s;
while(*s && *s != '\n')
s++;
r.Cat(text, s);
if(*s == '\0')
break;
r.Cat('\n');
text = s + 1;
r << tag << ">";
int fbi = r.GetCount();
r << "\r\n\t";
const char *s = text;
bool wastag = true;
for(;;) {
const char *b = s;
int last = 0;
int last2 = 0;
while(*s && *s != '\n' && *s != '\r') {
last2 = last;
last = *s++;
}
if(*s == '\r')
s++;
r.Cat(b, s);
if(*s == '\n') {
r.Cat('\n');
s++;
}
if(last2 == '/' && last == '>')
wastag = true;
if(*s == '\0') {
if(wastag)
r << end;
else {
r.SetCount(fbi);
r << text << end;
}
return r;
}
if(last2 == '/' && last == '>')
r.Cat('\t');
}
else
r << text;
r << end;
return r;
}
String XmlTag::Text(const char *text, byte charset)