Skip to content
Browse files

Use version switch for new include/import functionality.

I didn't mean to check it in. But now I have, let's pretend it was
deliberate. Not finished yet, and I should be dealing with other things
at the moment.

git-svn-id: http://svn.boost.org/svn/boost/branches/quickbook-filenames@70032 b8fc166d-592f-0410-95f2-cb63ce0dd405
  • Loading branch information...
1 parent db0b392 commit bbc6ba7a76beaf469deaeef16905eb02be70c75a danieljames committed
Showing with 18 additions and 4 deletions.
  1. +18 −4 tools/quickbook/src/actions.cpp
View
22 tools/quickbook/src/actions.cpp
@@ -1713,14 +1713,28 @@ namespace quickbook
check_path(values.consume(), actions));
values.finish();
- std::string ext = filein.extension().generic_string();
- if (ext == ".qbk" || ext == ".quickbook")
+ if (qbk_version_n >= 106)
{
- load_quickbook(actions, filein, include.get_tag(), include_doc_id);
+ std::string ext = filein.extension().generic_string();
+ if (ext == ".qbk" || ext == ".quickbook")
+ {
+ load_quickbook(actions, filein, include.get_tag(), include_doc_id);
+ }
+ else
+ {
+ load_source_file(actions, filein, include.get_tag(), include_doc_id);
+ }
}
else
{
- load_source_file(actions, filein, include.get_tag(), include_doc_id);
+ if (include.get_tag() == block_tags::include)
+ {
+ load_quickbook(actions, filein, include.get_tag(), include_doc_id);
+ }
+ else
+ {
+ load_source_file(actions, filein, include.get_tag(), include_doc_id);
+ }
}
}

0 comments on commit bbc6ba7

Please sign in to comment.
Something went wrong with that request. Please try again.