[Boost-commit] svn:boost r70032 - branches/quickbook-filenames/tools/quickbook/src

Subject: [Boost-commit] svn:boost r70032 - branches/quickbook-filenames/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-03-16 18:24:22

Author: danieljames
Date: 2011-03-16 18:24:20 EDT (Wed, 16 Mar 2011)
New Revision: 70032
URL: http://svn.boost.org/trac/boost/changeset/70032

Log:
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.
Text files modified: 
   branches/quickbook-filenames/tools/quickbook/src/actions.cpp |    22 ++++++++++++++++++----                  
   1 files changed, 18 insertions(+), 4 deletions(-)

Modified: branches/quickbook-filenames/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/actions.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/actions.cpp	2011-03-16 18:24:20 EDT (Wed, 16 Mar 2011)
@@ -1713,14 +1713,28 @@
             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);
+            }
         }
     }