Merge the 1.5.2 changes from trunk.

[SVN r62830]
This commit is contained in:
Daniel James
2010-06-12 08:29:53 +00:00
parent f50dee9a1c
commit e529faf7ba
62 changed files with 1569 additions and 612 deletions

View File

@@ -328,7 +328,7 @@ namespace quickbook
quickbook_grammar g(actions);
// do a phrase level parse
iterator first(body.begin(), body.end(), state.filename.native_file_string().c_str());
iterator first(body.begin(), body.end(), state.filename.file_string().c_str());
first.set_position(template_pos);
iterator last(body.end(), body.end());
r = boost::spirit::qi::parse(first, last, g.simple_phrase) && first == last;
@@ -344,7 +344,7 @@ namespace quickbook
// the need to check for end of file in the grammar.
body += "\n\n";
iterator first(body.begin(), body.end(), state.filename.native_file_string().c_str());
iterator first(body.begin(), body.end(), state.filename.file_string().c_str());
first.set_position(template_pos);
iterator last(body.end(), body.end());