From: inv <inv@opencascade.com>
Date: Tue, 19 Apr 2011 06:36:15 +0000 (+0000)
Subject: Adding patch for doxygen 1.7.3
X-Git-Tag: V6_3_0~45
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0cc47d22048742a2997feaeb9fc0ef409cb8c76c;p=tools%2Finstall.git

Adding patch for doxygen 1.7.3
---

diff --git a/config_files/patches/doxygen-1.7.3.patch b/config_files/patches/doxygen-1.7.3.patch
new file mode 100755
index 0000000..454b642
--- /dev/null
+++ b/config_files/patches/doxygen-1.7.3.patch
@@ -0,0 +1,130 @@
+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:
+