[library-web] html2html: Include Doxygen 1.7.0 navigation header

[David King <davidk src gnome org>]

commit 5afdeb629a2cbdc7f0eff2fd56e2ccfd139f4d7c
Author: David King <davidk openismus com>
Date:   Wed Dec 7 15:11:55 2011 +0100

    html2html: Include Doxygen 1.7.0 navigation header
    
    Doxygen changed the format for HTML output in version 1.7.0, which
    required some corresponding updates to the XSL transform and CSS in
    order to include the navigation header. Fixes bug 651987.

 data/skin/doxygen.css   |   10 +++++-----
 data/xslt/html2html.xsl |   13 +++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/data/skin/doxygen.css b/data/skin/doxygen.css
index 9918a86..b027439 100644
--- a/data/skin/doxygen.css
+++ b/data/skin/doxygen.css
@@ -20,7 +20,7 @@ table {
 	font-size: inherit;
 }
 
-div.navpath, .contents h1, .navigation div.tabs:first-child li:first-child {
+div.navpath, .contents h1, .navigation div.tabs:first-child li:first-child, div[id='navrow1']:first-child li:first-child {
 	display: none;
 }
 
@@ -32,23 +32,23 @@ div.navpath, .contents h1, .navigation div.tabs:first-child li:first-child {
 	font-size: 100%;
 }
 
-.navigation div.tabs ul {
+.navigation div.tabs ul, div[id='navrow1'] ul {
 	padding: 0;
 }
 
-.navigation div.tabs li {
+.navigation div.tabs li, div[id='navrow1'] li {
 	display: inline;
 	padding: 2px 5px;
 	background: #d8dbd5 url(shade.png) top left repeat-x;
 	border: 1px solid #888a85;
 }
 
-.navigation div.tabs li.current {
+.navigation div.tabs li.current, div[id='navrow1'] li.current {
 	border: 2px solid #686a65;
 	padding: 1px 4px;
 }
 
-.navigation div.tabs li.current a {
+.navigation div.tabs li.current a, div[id='navrow1'] li.current a {
 }
 
 caption {
diff --git a/data/xslt/html2html.xsl b/data/xslt/html2html.xsl
index 28e9641..c001d23 100644
--- a/data/xslt/html2html.xsl
+++ b/data/xslt/html2html.xsl
@@ -280,15 +280,24 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
           <xsl:when test="$libgo.h2hmode = 'gtkmm'">
 	    <h1 class="lgotitle"><xsl:value-of select="//html:title" /></h1>
 	    <xsl:choose>
+	      <!-- Doxygen versions older than 1.6.0? -->
 	      <xsl:when test="//html:div[ id='content']">
 	        <xsl:apply-templates select="//html:div[ id='content']" mode="gtkmm"/>
 	      </xsl:when>
-	      <xsl:otherwise>
+	      <!-- Doxygen versions between 1.6.0 and 1.7.0 -->
+	      <xsl:when test="//html:div[ id='navigation']">
 	        <div id="content">
 	          <xsl:apply-templates select="//html:div[ class='navigation']" mode="gtkmm"/>
 	          <xsl:apply-templates select="//html:div[ class='contents']" mode="gtkmm"/>
 		</div>
-	      </xsl:otherwise>
+	      </xsl:when>
+	      <!-- Doxygen 1.7.0 or greater -->
+	      <xsl:when test="//html:div[ id='navrow1']">
+	        <div id="content">
+		  <xsl:apply-templates select="//html:div[ class='tabs']" mode="gtkmm"/>
+		  <xsl:apply-templates select="//html:div[ class='contents']" mode="gtkmm"/>
+		</div>
+	      </xsl:when>
 	    </xsl:choose>
           </xsl:when>
           <xsl:when test="$libgo.h2hmode = 'content-id'">