[Boost-commit] svn:boost r75848 - in branches/quickbook-dev: . tools/build/v2/doc tools/build/v2/tools tools/quickbook/extra/cxx_committee

Subject: [Boost-commit] svn:boost r75848 - in branches/quickbook-dev: . tools/build/v2/doc tools/build/v2/tools tools/quickbook/extra/cxx_committee
From: dnljms_at_[hidden]
Date: 2011-12-07 04:44:37

Author: danieljames
Date: 2011-12-07 04:44:36 EST (Wed, 07 Dec 2011)
New Revision: 75848
URL: http://svn.boost.org/trac/boost/changeset/75848

Log:
Boostbook: Add a build feature for 'boost.defaults'.
Text files modified: 
   branches/quickbook-dev/Jamroot                                        |     2 +-                                      
   branches/quickbook-dev/tools/build/v2/doc/jamfile.jam                 |     2 +-                                      
   branches/quickbook-dev/tools/build/v2/tools/boostbook.jam             |    13 ++++++++++++-                           
   branches/quickbook-dev/tools/quickbook/extra/cxx_committee/Jamfile.v2 |     2 +-                                      
   4 files changed, 15 insertions(+), 4 deletions(-)

Modified: branches/quickbook-dev/Jamroot
==============================================================================
--- branches/quickbook-dev/Jamroot	(original)
+++ branches/quickbook-dev/Jamroot	2011-12-07 04:44:36 EST (Wed, 07 Dec 2011)
@@ -152,7 +152,7 @@
       <toolset>como:<link>static
       <toolset>como-linux:<define>_GNU_SOURCE=1
       # When building docs within Boost, we want the standard Boost style
-      <xsl:param>boost.defaults=Boost
+      <boostbook-base-style>Boost
     : usage-requirements <include>.
     : build-dir bin.v2
     ;

Modified: branches/quickbook-dev/tools/build/v2/doc/jamfile.jam
==============================================================================
--- branches/quickbook-dev/tools/build/v2/doc/jamfile.jam	(original)
+++ branches/quickbook-dev/tools/build/v2/doc/jamfile.jam	2011-12-07 04:44:36 EST (Wed, 07 Dec 2011)
@@ -15,7 +15,7 @@
      <implicit-dependency>jam_docs
      <dependency>jam_docs
      <xsl:param>boost.root=../../../../..
-     <xsl:param>boost.defaults=Boost
+     <boostbook-base-style>Boost
    ;
    
 xml jam_docs : bjam.qbk ;   

Modified: branches/quickbook-dev/tools/build/v2/tools/boostbook.jam
==============================================================================
--- branches/quickbook-dev/tools/build/v2/tools/boostbook.jam	(original)
+++ branches/quickbook-dev/tools/build/v2/tools/boostbook.jam	2011-12-07 04:44:36 EST (Wed, 07 Dec 2011)
@@ -54,6 +54,11 @@
 feature.feature format : html xhtml htmlhelp onehtml man pdf ps docbook fo tests
   : incidental implicit composite propagated ;
 
+# <boostbook-base-style> sets some default style parameters in
+# the boostbook xsl stylesheets. Search for boost.defaults in
+# the stylesheets for more info.
+feature.feature boostbook-base-style : none Boost : incidental ;
+
 type.register DTDXML : dtdxml ;
 type.register XML : xml ;
 type.register BOOSTBOOK : boostbook : XML ;
@@ -618,7 +623,13 @@
             case ps      : type = PS ;
             case tests   : type = TESTS ;
         }
-        
+
+        local style = [ $(property-set).get <boostbook-base-style> ] ;
+        if $(style) {
+            property-set = [ $(property-set).add-raw
+                <xsl:param>boost.defaults=$(style) ] ;
+        }
+
         if $(manifest)
         {
             # Create DOCBOOK file from BOOSTBOOK sources.

Modified: branches/quickbook-dev/tools/quickbook/extra/cxx_committee/Jamfile.v2
==============================================================================
--- branches/quickbook-dev/tools/quickbook/extra/cxx_committee/Jamfile.v2	(original)
+++ branches/quickbook-dev/tools/quickbook/extra/cxx_committee/Jamfile.v2	2011-12-07 04:44:36 EST (Wed, 07 Dec 2011)
@@ -24,9 +24,9 @@
     
                 #<xsl:param>boost.libraries=$(BOOST_ROOT)/libs/libraries.htm
                 #<xsl:param>boost.root=../../../../
+		<boostbook-base-style>none
                 <xsl:param>html.stylesheet=proposal.css
                 <xsl:param>doc.standalone=1
-		<xsl:param>nav.layout=none
     <xsl:param>generate.toc="article toc"
     #<xsl:param>generate.toc="article toc section nop"
     #<xsl:param>generate.toc="article nop section nop"