github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

XML now produces CFLF pairs

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1291 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-06-09 13:39:04 +00:00
parent 666ca62862
commit fba472cbc6
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
uppsrc/Core/XML.cpp
View file

@ -25,21 +25,21 @@ String XmlHeader(const char *encoding, const char *version, const char *standalo
{
StringBuffer r;
r << "<?xml version=\"" << version << "\" encoding=\"" << encoding << "\" standalone=\""
<< standalone << "\" ?>\n";
<< standalone << "\" ?>\r\n";
return r;
}
String XmlPI(const char *text)
{
StringBuffer r;
r << "<?" << text << "?>\n";
r << "<?" << text << "?>\r\n";
return r;
}
String XmlDecl(const char *text)
{
StringBuffer r;
r << "<!" << text << ">\n";
r << "<!" << text << ">\r\n";
return r;
}
@ -56,7 +56,7 @@ String XmlDoc(const char *name, const char *xmlbody)
String XmlComment(const char *text)
{
StringBuffer out;
out << "<!-- " << text << " -->\n";
out << "<!-- " << text << " -->\r\n";
return out;
}
@ -65,13 +65,13 @@ XmlTag& XmlTag::Tag(const char *s)
tag.Clear();
end.Clear();
tag << '<' << s;
end << "</" << s << ">\n";
end << "</" << s << ">\r\n";
return *this;
}
String XmlTag::operator()()
{
return tag + "/>\n";
return tag + "/>\r\n";
}
String XmlTag::operator()(const char* text)
@ -79,13 +79,18 @@ String XmlTag::operator()(const char* text)
StringBuffer r;
r << tag << '>';
if(strchr(text, '\n')) {
r << '\n';
r << "\r\n"
bool tab = true;
while(*text) {
if(tab)
r << '\t';
tab = *text == '\n';
r.Cat(*text++);
int c = (byte)*text++;
tab = c == '\n';
if(tab)
r << "\r\n"
else
if(c == '\t' || c >= 32)
r.Cat(c);
}
}
else
@ -754,13 +759,13 @@ String AsXML(const XmlNode& node, dword style)
style &= ~(XML_HEADER|XML_DOCTYPE);
switch(node.GetType()) {
case XML_PI:
r << "<?" << node.GetText() << "?>\n";
r << "<?" << node.GetText() << "?>\r\n";
break;
case XML_DECL:
r << "<!" << node.GetText() << ">\n";
r << "<!" << node.GetText() << ">\r\n";
break;
case XML_COMMENT:
r << "<!--" << node.GetText() << "-->\n";
r << "<!--" << node.GetText() << "-->\r\n";
break;
case XML_DOC:
for(int i = 0; i < node.GetCount(); i++)

3
uppsrc/plugin/sqlite3/Sqlite3Schema.h
View file

@ -36,6 +36,9 @@
#define BLOB(x) COLUMN("blob", String, x, 0, 0)
#define BLOB_(x) COLUMN_("blob", String, x, 0, 0)
#define LONGRAW(x) COLUMN("blob", String, x, 0, 0)
#define LONGRAW_(x) COLUMN_("blob", String, x, 0, 0)
#define PRIMARY_KEY INLINE_ATTRIBUTE("primary key")
#define AUTO_INCREMENT
#define NOT_NULL INLINE_ATTRIBUTE("not null")