[Boost-commit] svn:boost r59635 - in trunk: . tools/boostbook/xsl

Subject: [Boost-commit] svn:boost r59635 - in trunk: . tools/boostbook/xsl
From: grafikrobot_at_[hidden]
Date: 2010-02-11 11:06:07

Author: grafik
Date: 2010-02-11 11:06:06 EST (Thu, 11 Feb 2010)
New Revision: 59635
URL: http://svn.boost.org/trac/boost/changeset/59635

Log:
Building docs now defaults to *not* include the standard Boost navigation bar when building docs outside of the Boost tree. It's also now the default, when one asks for the Boost navbar, to *not* have the Boost logo when building outside of Boost.
Text files modified: 
   trunk/Jamroot                        |     3 +                                       
   trunk/tools/boostbook/xsl/navbar.xsl |    61 +++++++++++++++++++++++++++++---------- 
   2 files changed, 48 insertions(+), 16 deletions(-)

Modified: trunk/Jamroot
==============================================================================
--- trunk/Jamroot	(original)
+++ trunk/Jamroot	2010-02-11 11:06:06 EST (Thu, 11 Feb 2010)
@@ -189,6 +189,9 @@
       # Comeau does not support shared lib
       <toolset>como:<link>static
       <toolset>como-linux:<define>_GNU_SOURCE=1
+      # When building docs within Boost, we want the Boost standard navbar
+      <xsl:param>nav.layout=horizontal
+      <xsl:param>boost.image=Boost
     : usage-requirements <include>.
     : build-dir bin.v2
     ;

Modified: trunk/tools/boostbook/xsl/navbar.xsl
==============================================================================
--- trunk/tools/boostbook/xsl/navbar.xsl	(original)
+++ trunk/tools/boostbook/xsl/navbar.xsl	2010-02-11 11:06:06 EST (Thu, 11 Feb 2010)
@@ -13,11 +13,11 @@
 
    <!--
       how to render the Home | Libraries | ... | More contents
-         none       - do not display ("standalone" mode)
-        *horizontal - display in old-Boost style format
+        *none       - do not display ("standalone" mode)
+         horizontal - display in old-Boost style format
          vertical   - like the new Getting Started layout
    -->
-   <xsl:param name = "nav.layout" select = "'horizontal'"/>
+   <xsl:param name = "nav.layout" select = "'none'"/>
 
    <!--
       header border layout
@@ -33,17 +33,44 @@
         *Spirit  - display "mini" navigation on the right
    -->
    <xsl:param name = "nav.flow" select = "'Spirit'"/>
+   
+   <!--
+      boost.image:
+        *none    - do not display a boost logo image, nor link to Boost
+         Boost   - use standard boost logo, and link to Boost
+         custom  - use a custom image and link
+   -->
+   <xsl:param name = "boost.image" select = "'none'"/>
 
    <!-- location of the various Boost elements -->
 
    <xsl:param name = "boost.root"      select = "'../..'"/>
    <xsl:param name = "boost.website"   select = "'http://www.boost.org'"/>
-   <xsl:param name = "boost.image.src" 
-              select = "concat($boost.root, '/boost.png')"/>
-   <xsl:param name = "boost.image.alt" select = "'Boost C++ Libraries'"/>
-   <xsl:param name = "boost.image.w"   select = "277"/>
-   <xsl:param name = "boost.image.h"   select = "86"/>
-   <xsl:param name = "boost.libraries" select = "'libraries.html'"/>
+   <xsl:param name = "boost.image.src">
+      <xsl:if test = "$boost.image = 'Boost'">
+         <xsl:value-of select = "concat($boost.root, '/boost.png')"/>
+      </xsl:if>
+   </xsl:param>
+   <xsl:param name = "boost.image.alt">
+      <xsl:if test = "$boost.image = 'Boost'">
+         <xsl:value-of select = "'Boost C++ Libraries'"/>
+      </xsl:if>
+   </xsl:param>
+   <xsl:param name = "boost.image.w">
+      <xsl:if test = "$boost.image = 'Boost'">
+         <xsl:value-of select = "277"/>
+      </xsl:if>
+   </xsl:param>
+   <xsl:param name = "boost.image.h">
+      <xsl:if test = "$boost.image = 'Boost'">
+         <xsl:value-of select = "86"/>
+      </xsl:if>
+   </xsl:param>
+   <xsl:param name = "boost.libraries">
+      <xsl:if test = "$boost.image = 'Boost'">
+         <xsl:value-of select = "'libraries.html'"/>
+      </xsl:if>
+   </xsl:param>
 
    <!-- header -->
 
@@ -64,13 +91,15 @@
             <xsl:if test = "$nav.border = 'Boost'">
                <xsl:attribute name = "style">background-color: white; width: 50%;</xsl:attribute>
             </xsl:if>
-            <img alt="{$boost.image.alt}" width="{$boost.image.w}" height="{$boost.image.h}">
-                <xsl:attribute name="src">
-                    <xsl:call-template name="href.target.relative">
-                        <xsl:with-param name="target" select="$boost.image.src"/>
-                    </xsl:call-template>
-                </xsl:attribute>
-            </img>
+            <xsl:if test = "$boost.image != 'none'">
+               <img alt="{$boost.image.alt}" width="{$boost.image.w}" height="{$boost.image.h}">
+                   <xsl:attribute name="src">
+                       <xsl:call-template name="href.target.relative">
+                           <xsl:with-param name="target" select="$boost.image.src"/>
+                       </xsl:call-template>
+                   </xsl:attribute>
+               </img>
+            </xsl:if>
          </td><xsl:choose>
             <xsl:when test = "$nav.layout = 'horizontal'">
                <xsl:call-template name = "header.navdata-horiz"/>