[Boost-commit] svn:boost r70869 - branches/quickbook-dev/tools/quickbook/src

Subject: [Boost-commit] svn:boost r70869 - branches/quickbook-dev/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-04-02 13:44:17

Author: danieljames
Date: 2011-04-02 13:44:16 EDT (Sat, 02 Apr 2011)
New Revision: 70869
URL: http://svn.boost.org/trac/boost/changeset/70869

Log:
Quickbook: Just use doc_type for main document.
Text files modified: 
   branches/quickbook-dev/tools/quickbook/src/actions.cpp       |     5 +----                                   
   branches/quickbook-dev/tools/quickbook/src/actions_class.hpp |     3 ++-                                     
   2 files changed, 3 insertions(+), 5 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp	2011-04-02 13:44:16 EDT (Sat, 02 Apr 2011)
@@ -1786,7 +1786,7 @@
             check_path(values.consume(), actions), actions);
         values.finish();
 
-        std::string doc_type, doc_id;
+        std::string doc_id;
 
         // swap the filenames
         std::swap(actions.filename, filein.filename);
@@ -1794,11 +1794,9 @@
 
         // save the doc info strings and source mode
         if(qbk_version_n >= 106) {
-            doc_type = actions.doc_type;
             doc_id = actions.doc_id;
         }
         else {
-            actions.doc_type.swap(doc_type);
             actions.doc_id.swap(doc_id);
         }
         
@@ -1833,7 +1831,6 @@
         std::swap(actions.filename, filein.filename);
         std::swap(actions.filename_relative, filein.filename_relative);
 
-        actions.doc_type.swap(doc_type);
         actions.doc_id.swap(doc_id);
         
         if(qbk_version_n >= 106 || qbk_version_n_store >= 106)

Modified: branches/quickbook-dev/tools/quickbook/src/actions_class.hpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions_class.hpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/actions_class.hpp	2011-04-02 13:44:16 EDT (Sat, 02 Apr 2011)
@@ -39,7 +39,8 @@
         static int const max_template_depth = 100;
 
     // header info
-        std::string             doc_type;
+        std::string             doc_type;      // For the whole document, not
+                                               // the current file.
         std::string             doc_title_qbk;
         std::string             doc_id;