type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="CentOS 5.5 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Debian 4.0"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Debian 4.0 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Debian 5.0 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Debian 6.0 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Mandriva 2008.0"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Mandriva 2008.0 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Mandriva 2010.0"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Mandriva 2010.0 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Red Hat Enterprise WS 4 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
type="prerequisite"
description="Documentation system for C++, C, Java, IDL, etc.">
<installation os="Scientific SL 5.1 64bit"
- version="1.7.3"
+ version="1.8.0"
disable="false"
installdiskspace="5812,18536,52656"
- script="doxygen-1.7.3.sh"/>
+ script="doxygen.sh"/>
</product>
<product name="docutils"
type="prerequisite"
+++ /dev/null
-#!/bin/bash -noprofile
-
-####################################################################################
-# File : doxygen-1.7.3.sh
-# Created : Thu Dec 18 12:01:00 2002
-# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-# Project : SALOME
-# Module : Installation Wizard
-# Copyright : 2002-2008 CEA
-#
-# This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# Doxygen version
-#
-DOXYGEN_VERSION=1.7.3
-DOXYGEN_XVERSION=`echo ${DOXYGEN_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
-
-check_version()
-{
-check_lib_version doxygen $PATH
-if [ "$?" -ne "0" ]; then
- return 1
-fi
-ver=`doxygen --version`
-maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
-min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
-rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
-let ver=$maj_ver*10000+$min_ver*100+$rel_ver
-if [ $ver -eq ${DOXYGEN_XVERSION} ] ; then
- return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# apply general patch for doxygen 1.7.3
-
-if [ -f patches/doxygen-1.7.3.patch ] ; then
- cp patches/doxygen-1.7.3.patch ${PRODUCT_SRC_DIR}
- ( cd ${PRODUCT_SRC_DIR}; patch -p1 < doxygen-1.7.3.patch )
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-cd ${PRODUCT_SRC_DIR}
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-f_install="--install "`which install`
-
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix ${PRODUCT_DIR} $f_install
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
- test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="doxygen-${DOXYGEN_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE
--- /dev/null
+#!/bin/bash -noprofile
+
+####################################################################################
+# File : doxygen.sh
+# Created : Thu Dec 18 12:01:00 2002
+# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+# Project : SALOME
+# Module : Installation Wizard
+# Copyright : 2002-2012 CEA
+#
+# This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# Doxygen version
+#
+DOXYGEN_VERSION=1.8.0
+DOXYGEN_XVERSION=`echo ${DOXYGEN_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
+
+check_version()
+{
+check_lib_version doxygen $PATH
+if [ "$?" -ne "0" ]; then
+ return 1
+fi
+ver=`doxygen --version`
+maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
+min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
+rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
+let ver=$maj_ver*10000+$min_ver*100+$rel_ver
+if [ $ver -eq ${DOXYGEN_XVERSION} ] ; then
+ return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# apply general patch for doxygen
+
+if [ -f patches/doxygen-${DOXYGEN_VERSION}.patch ] ; then
+ cp patches/doxygen-${DOXYGEN_VERSION}.patch ${PRODUCT_SRC_DIR}
+ ( cd ${PRODUCT_SRC_DIR}; patch -p1 < doxygen-${DOXYGEN_VERSION}.patch )
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+cd ${PRODUCT_SRC_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+f_install="--install "`which install`
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix ${PRODUCT_DIR} $f_install
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+ test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="doxygen-${DOXYGEN_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE
+++ /dev/null
-diff -Naur doxygen-1.7.3_orig/src/docsets.cpp doxygen-1.7.3_new/src/docsets.cpp
---- doxygen-1.7.3_orig/src/docsets.cpp 2010-11-07 00:27:43.000000000 +0300
-+++ doxygen-1.7.3_new/src/docsets.cpp 2011-04-08 15:35:42.000000000 +0400
-@@ -135,7 +135,7 @@
- err("Could not open file %s for writing\n",notes.data());
- exit(1);
- }
-- QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index";
-+ QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
- m_nts.setDevice(m_nf);
- m_nts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
- m_nts << "<DocSetNodes version=\"1.0\">" << endl;
-diff -Naur doxygen-1.7.3_orig/src/doxygen.cpp doxygen-1.7.3_new/src/doxygen.cpp
---- doxygen-1.7.3_orig/src/doxygen.cpp 2010-12-21 23:41:44.000000000 +0300
-+++ doxygen-1.7.3_new/src/doxygen.cpp 2011-04-08 15:33:52.000000000 +0400
-@@ -7940,7 +7940,7 @@
-
- QCString title=root->args.stripWhiteSpace();
- if (title.isEmpty()) title=theTranslator->trMainPage();
-- QCString name = Config_getBool("GENERATE_TREEVIEW")?"main":"index";
-+ QCString name = /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
- addRefItem(root->sli,
- name,
- "page",
-@@ -7965,7 +7965,7 @@
- {
- //printf("Found main page! \n======\n%s\n=======\n",root->doc.data());
- QCString title=root->args.stripWhiteSpace();
-- QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index";
-+ QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
- Doxygen::mainPage = new PageDef(root->fileName,root->startLine,
- indexName, root->brief+root->doc+root->inbodyDocs,title);
- //setFileNameForSections(root->anchors,"index",Doxygen::mainPage);
-diff -Naur doxygen-1.7.3_orig/src/latexgen.cpp doxygen-1.7.3_new/src/latexgen.cpp
---- doxygen-1.7.3_orig/src/latexgen.cpp 2010-12-26 18:35:34.000000000 +0300
-+++ doxygen-1.7.3_new/src/latexgen.cpp 2011-04-08 15:36:06.000000000 +0400
-@@ -1005,7 +1005,7 @@
- break;
- case isMainPage:
- {
-- QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index";
-+ QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
- t << "}\n\\label{index}";
- if (Config_getBool("PDF_HYPERLINKS")) t << "\\hypertarget{index}{}";
- t << "\\input{" << indexName << "}\n";
-diff -Naur doxygen-1.7.3_orig/src/resize.js doxygen-1.7.3_new/src/resize.js
---- doxygen-1.7.3_orig/src/resize.js 2010-12-12 21:53:19.000000000 +0300
-+++ doxygen-1.7.3_new/src/resize.js 2011-04-08 19:04:50.000000000 +0400
-@@ -1,5 +1,6 @@
- var cookie_namespace = 'doxygen';
- var sidenav,navtree,content,header;
-+var navrows = new Array();
-
- function readCookie(cookie)
- {
-@@ -36,27 +37,45 @@
-
- function resizeWidth()
- {
-- var windowWidth = $(window).width() + "px";
-+ var windowWidth = $(window).width();
- var sidenavWidth = $(sidenav).width();
- content.css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrows[i].css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
-+ navrows[i].css({width:windowWidth-parseInt(sidenavWidth) - 6 + "px"});
-+ }
-+
- writeCookie('width',sidenavWidth, null);
- }
-
- function restoreWidth(navWidth)
- {
-- var windowWidth = $(window).width() + "px";
-+ var windowWidth = $(window).width();
- content.css({marginLeft:parseInt(navWidth)+6+"px"});
- sidenav.css({width:navWidth + "px"});
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrows[i].css({marginLeft:parseInt(navWidth)+6+"px"});
-+ navrows[i].css({width:windowWidth-parseInt(navWidth) - 6 + "px"});
-+ }
- }
-
- function resizeHeight()
- {
- var headerHeight = header.height();
- var footerHeight = footer.height();
-+ var navrowsH = 0;
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrowsH = navrowsH + navrows[i].height();
-+ }
-+
- var windowHeight = $(window).height() - headerHeight - footerHeight;
-+ var treeH = windowHeight + navrowsH;
- content.css({height:windowHeight + "px"});
-- navtree.css({height:windowHeight + "px"});
-- sidenav.css({height:windowHeight + "px",top: headerHeight+"px"});
-+ navtree.css({height:treeH +"px"});
-+ sidenav.css({height:treeH +"px", top: headerHeight+"px"});
- }
-
- function initResizable()
-@@ -66,6 +85,10 @@
- content = $("#doc-content");
- navtree = $("#nav-tree");
- footer = $("#nav-path");
-+ for(var i = 1; i <= 4;i++) {
-+ navrows[i] = $("#navrow"+i);
-+ }
-+
- $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
- $(window).resize(function() { resizeHeight(); });
- var width = readCookie('width');
-diff -Naur doxygen-1.7.3_orig/src/rtfgen.cpp doxygen-1.7.3_new/src/rtfgen.cpp
---- doxygen-1.7.3_orig/src/rtfgen.cpp 2010-06-17 15:49:09.000000000 +0400
-+++ doxygen-1.7.3_new/src/rtfgen.cpp 2011-04-08 15:34:30.000000000 +0400
-@@ -612,7 +612,8 @@
- t << "{\\tc \\v " << substitute(Doxygen::mainPage->title(),"%","") << "}"<< endl;
- }
- t << "{\\field\\fldedit{\\*\\fldinst INCLUDETEXT \"";
-- if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else t << "index";
-+ //if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else
-+ t << "index";
- t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n";
- break;
- //case isPackageIndex:
-
--- /dev/null
+diff -Naur doxygen-1.7.3_orig/src/resize.js doxygen-1.7.3_new/src/resize.js
+--- doxygen-1.7.3_orig/src/resize.js 2010-12-12 21:53:19.000000000 +0300
++++ doxygen-1.7.3_new/src/resize.js 2011-04-08 19:04:50.000000000 +0400
+@@ -1,5 +1,6 @@
+ var cookie_namespace = 'doxygen';
+ var sidenav,navtree,content,header;
++var navrows = new Array();
+
+ function readCookie(cookie)
+ {
+@@ -36,27 +37,45 @@
+
+ function resizeWidth()
+ {
+- var windowWidth = $(window).width() + "px";
++ var windowWidth = $(window).width();
+ var sidenavWidth = $(sidenav).width();
+ content.css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
++ for(var i = 1; i <= 4;i++) {
++ if(navrows[i] != null)
++ navrows[i].css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
++ navrows[i].css({width:windowWidth-parseInt(sidenavWidth) - 6 + "px"});
++ }
++
+ writeCookie('width',sidenavWidth, null);
+ }
+
+ function restoreWidth(navWidth)
+ {
+- var windowWidth = $(window).width() + "px";
++ var windowWidth = $(window).width();
+ content.css({marginLeft:parseInt(navWidth)+6+"px"});
+ sidenav.css({width:navWidth + "px"});
++ for(var i = 1; i <= 4;i++) {
++ if(navrows[i] != null)
++ navrows[i].css({marginLeft:parseInt(navWidth)+6+"px"});
++ navrows[i].css({width:windowWidth-parseInt(navWidth) - 6 + "px"});
++ }
+ }
+
+ function resizeHeight()
+ {
+ var headerHeight = header.height();
+ var footerHeight = footer.height();
++ var navrowsH = 0;
++ for(var i = 1; i <= 4;i++) {
++ if(navrows[i] != null)
++ navrowsH = navrowsH + navrows[i].height();
++ }
++
+ var windowHeight = $(window).height() - headerHeight - footerHeight;
++ var treeH = windowHeight + navrowsH;
+ content.css({height:windowHeight + "px"});
+- navtree.css({height:windowHeight + "px"});
+- sidenav.css({height:windowHeight + "px",top: headerHeight+"px"});
++ navtree.css({height:treeH +"px"});
++ sidenav.css({height:treeH +"px", top: headerHeight+"px"});
+ }
+
+ function initResizable()
+@@ -66,6 +85,10 @@
+ content = $("#doc-content");
+ navtree = $("#nav-tree");
+ footer = $("#nav-path");
++ for(var i = 1; i <= 4;i++) {
++ navrows[i] = $("#navrow"+i);
++ }
++
+ $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
+ $(window).resize(function() { resizeHeight(); });
+ var width = readCookie('width');
