Commit 42175e8f authored by Davis King's avatar Davis King

Changed htmlify so that file paths in XML output always

use / regardless of which platform htmlify executes under.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403884
parent 6c1296ba
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "to_xml.h" #include "to_xml.h"
const char* VERSION = "3.3"; const char* VERSION = "3.4";
using namespace std; using namespace std;
using namespace dlib; using namespace dlib;
......
...@@ -1385,17 +1385,29 @@ string add_entity_ref (const string& str) ...@@ -1385,17 +1385,29 @@ string add_entity_ref (const string& str)
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
string flip_slashes (string str)
{
for (unsigned long i = 0; i < str.size(); ++i)
{
if (str[i] == '\\')
str[i] = '/';
}
return str;
}
// ----------------------------------------------------------------------------------------
void write_as_xml ( void write_as_xml (
const function_record& rec, const function_record& rec,
ostream& fout ostream& fout
) )
{ {
fout << " <function>\n"; fout << " <function>\n";
fout << " <name>" << add_entity_ref(rec.name) << "</name>\n"; fout << " <name>" << add_entity_ref(rec.name) << "</name>\n";
fout << " <scope>" << add_entity_ref(rec.scope) << "</scope>\n"; fout << " <scope>" << add_entity_ref(rec.scope) << "</scope>\n";
fout << " <declaration>" << add_entity_ref(rec.declaration) << "</declaration>\n"; fout << " <declaration>" << add_entity_ref(rec.declaration) << "</declaration>\n";
fout << " <file>" << add_entity_ref(rec.file) << "</file>\n"; fout << " <file>" << flip_slashes(add_entity_ref(rec.file)) << "</file>\n";
fout << " <comment>" << add_entity_ref(rec.comment) << "</comment>\n"; fout << " <comment>" << add_entity_ref(rec.comment) << "</comment>\n";
fout << " </function>\n"; fout << " </function>\n";
} }
...@@ -1410,11 +1422,11 @@ void write_as_xml ( ...@@ -1410,11 +1422,11 @@ void write_as_xml (
const string pad(indent, ' '); const string pad(indent, ' ');
fout << pad << "<class>\n"; fout << pad << "<class>\n";
fout << pad << " <name>" << add_entity_ref(rec.name) << "</name>\n"; fout << pad << " <name>" << add_entity_ref(rec.name) << "</name>\n";
fout << pad << " <scope>" << add_entity_ref(rec.scope) << "</scope>\n"; fout << pad << " <scope>" << add_entity_ref(rec.scope) << "</scope>\n";
fout << pad << " <declaration>" << add_entity_ref(rec.declaration) << "</declaration>\n"; fout << pad << " <declaration>" << add_entity_ref(rec.declaration) << "</declaration>\n";
fout << pad << " <file>" << add_entity_ref(rec.file) << "</file>\n"; fout << pad << " <file>" << flip_slashes(add_entity_ref(rec.file)) << "</file>\n";
fout << pad << " <comment>" << add_entity_ref(rec.comment) << "</comment>\n"; fout << pad << " <comment>" << add_entity_ref(rec.comment) << "</comment>\n";
if (rec.public_typedefs.size() > 0) if (rec.public_typedefs.size() > 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment