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

@@ -33,7 +33,7 @@ namespace quickbook
, encoder(encoder)
// state
, filename(fs::complete(fs::path(filein_, fs::native)))
, filename(fs::complete(fs::path(filein_)))
, outdir(outdir_)
, macro()
, section_level(0)
@@ -50,7 +50,7 @@ namespace quickbook
// turn off __FILENAME__ macro on debug mode = true
std::string filename_str = debug_mode ?
std::string("NO_FILENAME_MACRO_GENERATED_IN_DEBUG_MODE") :
filename.native_file_string();
filename.file_string();
// add the predefined macros
macro.add