[Boost-commit] svn:boost r72072 - in trunk/libs/geometry/doc: . src/docutils/tools/doxygen_xml2qbk

Subject: [Boost-commit] svn:boost r72072 - in trunk/libs/geometry/doc: . src/docutils/tools/doxygen_xml2qbk
From: barend.gehrels_at_[hidden]
Date: 2011-05-22 09:28:20

Author: barendgehrels
Date: 2011-05-22 09:28:19 EDT (Sun, 22 May 2011)
New Revision: 72072
URL: http://svn.boost.org/trac/boost/changeset/72072

Log:
Enabling auto-index (without creating its own terms)
Text files modified: 
   trunk/libs/geometry/doc/Jamfile.v2                                              |    28 ++++++++++++++++++----------            
   trunk/libs/geometry/doc/geometry.qbk                                            |     2 +-                                      
   trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp |    17 +++++++++++++----                       
   3 files changed, 32 insertions(+), 15 deletions(-)

Modified: trunk/libs/geometry/doc/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/doc/Jamfile.v2	(original)
+++ trunk/libs/geometry/doc/Jamfile.v2	2011-05-22 09:28:19 EDT (Sun, 22 May 2011)
@@ -11,21 +11,29 @@
 
 project geometry/doc ;
 
+using auto-index ; 
+
 import boostbook ;
 import quickbook ;
 
 
 boostbook geometry 
-	: geometry.qbk
-	: <dependency>Jamfile.v2	  
-		<dependency>quickref.xml
-		<dependency>generated/point.qbk
+    : geometry.qbk
+    : <dependency>Jamfile.v2
+        <dependency>quickref.xml
+        <dependency>generated/point.qbk
         : <xsl:param>chunk.section.depth=4
-	<xsl:param>chunk.first.sections=1
-	<xsl:param>toc.section.depth=3
-	<xsl:param>toc.max.depth=2
-	<xsl:param>generate.section.toc.level=4
-	<xsl:param>boost.root=../../../..
-	;
+    <auto-index>on
+    <auto-index-internal>on
+    <auto-index-verbose>off
+    <xsl:param>index.on.type=1
+    <format>html
+    <xsl:param>chunk.first.sections=1
+    <xsl:param>toc.section.depth=3
+    <xsl:param>toc.max.depth=2
+    <xsl:param>generate.section.toc.level=4
+    <xsl:param>boost.root=../../../..
+    <quickbook-define>enable_index
+    ;
 
 

Modified: trunk/libs/geometry/doc/geometry.qbk
==============================================================================
--- trunk/libs/geometry/doc/geometry.qbk	(original)
+++ trunk/libs/geometry/doc/geometry.qbk	2011-05-22 09:28:19 EDT (Sun, 22 May 2011)
@@ -97,7 +97,7 @@
 [section Indexes] 
 [include matrix.qbk]
 [section Alphabetical Index]
-'''<index><title/></index>'''
+'''<index/>'''
 [endsect]
 [endsect] 
 

Modified: trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
==============================================================================
--- trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp	(original)
+++ trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp	2011-05-22 09:28:19 EDT (Sun, 22 May 2011)
@@ -289,23 +289,32 @@
         ;
 }
 
-inline void quickbook_output_indexterm(std::string const& term, std::ostream& out)
+inline void quickbook_output_indexterm(std::string const& term, std::ostream& out
+            //, std::string const& secondary = ""
+            )
 {
+    out << "'''";
     if (boost::contains(term, "::"))
     {
-        // "Unnamespace" it and add all terms (also the namespaces)
+        // "Unnamespace" it and add all terms (also namespaces)
         std::vector<std::string> splitted;
         boost::split(splitted, boost::replace_all_copy(term, "::", ":")
                 , boost::is_any_of(":"), boost::token_compress_on);
         BOOST_FOREACH(std::string const& part, splitted)
         {
-            out << "'''<indexterm><primary>" << part << "</primary></indexterm>'''" << std::endl;
+            out << "<indexterm><primary>" << part << "</primary></indexterm>";
         }
     }
     else
     {
-        out << "'''<indexterm><primary>" << term << "</primary></indexterm>'''" << std::endl;
+        out << "<indexterm><primary>" << term;
+        /*if (! secondary.empty())
+        {
+            out << "<secondary>" << secondary << "</secondary>";
+        }*/
+        out << "</primary></indexterm>";
     }
+    out << "'''" << std::endl;
 }
 
 void quickbook_output(function const& f, configuration const& config, std::ostream& out)