[Boost-commit] svn:boost r61081 - in branches/quickbook-1.5-spirit2: . test

Subject: [Boost-commit] svn:boost r61081 - in branches/quickbook-1.5-spirit2: . test
From: daniel_james_at_[hidden]
Date: 2010-04-05 15:44:25

Author: danieljames
Date: 2010-04-05 15:44:24 EDT (Mon, 05 Apr 2010)
New Revision: 61081
URL: http://svn.boost.org/trac/boost/changeset/61081

Log:
Fix some errors with including files.
Added:
   branches/quickbook-1.5-spirit2/test/include_1_6-2.gold   (contents, props changed)
   branches/quickbook-1.5-spirit2/test/include_1_6-2.quickbook   (contents, props changed)
   branches/quickbook-1.5-spirit2/test/include_1_6.gold   (contents, props changed)
   branches/quickbook-1.5-spirit2/test/include_1_6.quickbook   (contents, props changed)
Text files modified: 
   branches/quickbook-1.5-spirit2/block_actions.cpp |    19 ++++++++++++++++++-                     
   branches/quickbook-1.5-spirit2/test/Jamfile.v2   |     2 ++                                      
   2 files changed, 20 insertions(+), 1 deletions(-)

Modified: branches/quickbook-1.5-spirit2/block_actions.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_actions.cpp	(original)
+++ branches/quickbook-1.5-spirit2/block_actions.cpp	2010-04-05 15:44:24 EDT (Mon, 05 Apr 2010)
@@ -320,7 +320,17 @@
         std::swap(state.filename, filein);
 
         // save the doc info strings
-        std::swap(state.doc_id, doc_id);
+        if(qbk_version_n >= 106) {
+            doc_id = state.doc_id;
+        }
+        else {
+            std::swap(state.doc_id, doc_id);
+        }
+        
+        // save the version info
+        unsigned qbk_major_version_store = qbk_major_version;
+        unsigned qbk_minor_version_store = qbk_minor_version;
+        unsigned qbk_version_n_store = qbk_version_n;
 
         // scope the macros
         macro_symbols macro = state.macro;
@@ -343,6 +353,13 @@
 
         std::swap(state.doc_id, doc_id);
 
+        if(qbk_version_n >= 106 || qbk_version_n_store >= 106)
+        {
+            qbk_major_version = qbk_major_version_store;
+            qbk_minor_version = qbk_minor_version_store;
+            qbk_version_n = qbk_version_n_store;
+        }
+
         // restore the macros
         state.macro = macro;
         // restore the templates

Modified: branches/quickbook-1.5-spirit2/test/Jamfile.v2
==============================================================================
--- branches/quickbook-1.5-spirit2/test/Jamfile.v2	(original)
+++ branches/quickbook-1.5-spirit2/test/Jamfile.v2	2010-04-05 15:44:24 EDT (Mon, 05 Apr 2010)
@@ -27,6 +27,8 @@
     #[ quickbook-test xinclude ]
     [ quickbook-test import ]
     [ quickbook-test include_1_5 ]
+    [ quickbook-test include_1_6 ]
+    [ quickbook-test include_1_6-2 ]
     [ quickbook-test section_1_4 ]
     [ quickbook-test section_1_5 ]
     [ quickbook-test heading ]

Added: branches/quickbook-1.5-spirit2/test/include_1_6-2.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-1.5-spirit2/test/include_1_6-2.gold	2010-04-05 15:44:24 EDT (Mon, 05 Apr 2010)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Include Test</title>
+  <articleinfo>
+  </articleinfo>
+  <section id="include-test.test">
+    <title><link linkend="include-test.test"> Test</link></title>
+    <para>
+      Just testing.
+    </para>
+  </section>
+  <section id="foo.test">
+    <title><link linkend="foo.test"> Test</link></title>
+    <para>
+      Just testing.
+    </para>
+  </section>
+</article>

Added: branches/quickbook-1.5-spirit2/test/include_1_6-2.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-1.5-spirit2/test/include_1_6-2.quickbook	2010-04-05 15:44:24 EDT (Mon, 05 Apr 2010)
@@ -0,0 +1,8 @@
+[article Include Test
+    [quickbook 1.6]
+    [id include-test]
+]
+
+[include include-sub.quickbook]
+[include include-sub2.quickbook]
+[include:foo include-sub2.quickbook]

Added: branches/quickbook-1.5-spirit2/test/include_1_6.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-1.5-spirit2/test/include_1_6.gold	2010-04-05 15:44:24 EDT (Mon, 05 Apr 2010)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Include Test</title>
+  <articleinfo>
+  </articleinfo>
+  <section id="include-test.test">
+    <title><link linkend="include-test.test"> Test</link></title>
+    <para>
+      Just testing.
+    </para>
+  </section>
+  <section id="foo.test">
+    <title><link linkend="foo.test"> Test</link></title>
+    <para>
+      Just testing.
+    </para>
+  </section>
+</article>

Added: branches/quickbook-1.5-spirit2/test/include_1_6.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-1.5-spirit2/test/include_1_6.quickbook	2010-04-05 15:44:24 EDT (Mon, 05 Apr 2010)
@@ -0,0 +1,7 @@
+[article Include Test
+    [quickbook 1.6]
+    [id include-test]
+]
+
+[include include-sub2.quickbook]
+[include:foo include-sub2.quickbook]