generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-05-02 23:42:29 +02:00
Code Issues Projects Releases Wiki Activity

Update PocoDoc/src/*

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PocoDoc/src/DocWriter.cpp
View File

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

7
PocoDoc/src/PocoDoc.cpp
View File

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