Update PocoDoc/src/*

Signed-off-by: Francis ANDRE <francis.andre.kampbell@orange.fr>
This commit is contained in:
Francis ANDRE 2018-03-12 07:30:50 +01:00
parent a7b2804e21
commit 745bcbc167
2 changed files with 7 additions and 8 deletions

View File

@ -2195,9 +2195,9 @@ void DocWriter::writePage(Page& page)
while (ch != -1 && ch != '\n') { category += (char) ch; ch = istr.get(); }
while (std::isspace(ch)) ch = istr.get();
while (ch != -1)
while (ch != -1)
{
text += (char) ch;
text += (char) ch;
if (ch == '\n') text += ' ';
ch = istr.get();
}
@ -2216,7 +2216,7 @@ void DocWriter::writePage(Page& page)
beginBody(ostr);
writeNavigationFrame(ostr, "category", category);
beginContent(ostr);
if (!toc.empty())
if (!toc.empty())
{
writeTOC(ostr, toc);
}
@ -2284,7 +2284,7 @@ void DocWriter::writeTOC(std::ostream& ostr, const TOC& toc)
ostr << "</ul></li>" << std::endl;
}
}
else
else
{
ostr << "</li>" << std::endl;
}

View File

@ -252,6 +252,9 @@ protected:
Environment::set("PATH", path);
}
logger().debug("exec " + exec);
logger().debug("path " + path);
if (usePipe)
{
Poco::Pipe inPipe;
@ -269,11 +272,7 @@ protected:
void parse(const std::string& file)
{
logger().information("Preprocessing " + file);
#ifndef POCO_ENABLE_CPP11
std::auto_ptr<Preprocessor> pPreProc(preprocess(file));
#else
std::unique_ptr<Preprocessor> pPreProc(preprocess(file));
#endif // POCO_ENABLE_CPP11
logger().information("Parsing " + file);
if (pPreProc->stream().good())
{