X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6db5e4707c2f11ef0b0ecfd49ef84d07a37db3c..ada64beec413781e8e11cc6106c5411962cac0fb:/tools/doxygen/doxygen_postprocesser.pl

diff --git a/tools/doxygen/doxygen_postprocesser.pl b/tools/doxygen/doxygen_postprocesser.pl
index fb7a566f80..f50d016372 100755
--- a/tools/doxygen/doxygen_postprocesser.pl
+++ b/tools/doxygen/doxygen_postprocesser.pl
@@ -5,7 +5,7 @@ use strict;
 # Add here the pages of the documentation generated by a @page doxygen macro
 my @extra_files = qw(html/index.html html/faq.html html/history.html html/contrib.html html/people.html
                      html/publis.html html/publis_core.html html/publis_extern.html html/publis_intra.html
-                     html/pages.html html/modules.html  index.php 
+                     html/pages.html html/modules.html html/annotated.html html/functions.html html/functions_vars.html index.php 
                      html/GRAS_tut.html);
 
 # GRAS tutorial
@@ -211,7 +211,8 @@ sub handle_page {
   # we generate the tabs bottom up begining from where we are in the tree
   # and display them top down, as it should in a file
   my @tabs = ();
-
+  my $found_div_tabs=0;
+  
   if (defined ($current->{'label'}) and $current->{'label'} ne 'ROOT') {
 #    print "handle $current->{'file'}, at level $level\n";
     # generate the tabs
@@ -246,8 +247,9 @@ sub handle_page {
       # add "current" to the module API granfather page
       s|<li><a href="modules.html"><span>[^<]*</span></a></li>|<li class="current"><a href="modules.html"><span>Modules&nbsp;API</span></a></li>|;
 #      print "++Write $_";
+	  $found_div_tabs=1 if m/div.*class="tabs"/;	
       print TO "$_";
-      last if (m|</div>|);
+      last if ((m|</div>|)&&($found_div_tabs));
     }
       
     print TO "\n<!-- POST-PROCESSED TABS -->\n";
@@ -258,26 +260,26 @@ sub handle_page {
     print TO "\n<!-- END OF POST-PROCESSED TABS -->\n";
       
     if ($current->{'file'} =~ m/^class/) {
-	while (<FROM>) {
-	    last if (m|</div>|);
-	}
+	  while (<FROM>) {
+	 	last if (m|</div>|);
+	  }
       print TO "$_";	
     }
     while (<FROM>) {
       if (m/POST-PROCESSED TABS/) {
-	  while (<FROM>) {
+	    while (<FROM>) {
 	      last if (m/END OF POST-PROCESSED TABS/);
-	  }
-	  next;
+	    }
+	    next;
       }
 
       if (m/The documentation for/) {
-	  while (<FROM>) {
+	    while (<FROM>) {
 	      last if (m/<p>/);
-	  }
+	    }
       }
       print TO "$_";
-    }    
+    }
     close FROM;
     close TO;
     rename("$newname","html/$current->{'file'}") unless $debug{'rename'};
@@ -292,8 +294,45 @@ sub handle_page {
 ###
 ### Launch the modules navbar reworking
 ###
-handle_page($top,-2);# skip roots (we have 2 roots) in level counting
+handle_page($top,-1);# skip roots (we have 2 roots) in level counting
 
+###
+### Add the modules navbar reworking to the modules.html file
+###
+sub add_tabs_to_module_html {
+  my $found_div_tabs=0;
+  my $module_tabs = "<div class=\"tabs2\">\n<ul class=\"tablist\">\n";
+  foreach my $entry (@{$top->{'down'}}) {
+      $module_tabs .= "  <li> <a href=\"$entry->{'file'}\"><span>$entry->{'label'}</span></a></li>\n";
+  }
+  $module_tabs .= "  </ul></div>\n";      
+  
+  my $oldname = "html/modules.html";
+  open FROM,$oldname || die;
+  my $newname=$oldname;
+  $newname =~ s/.html/.handlepage.html/;
+  open TO,">$newname" || die;
+  while (<FROM>) {
+    $found_div_tabs=1 if m/div.*class="tabs"/;	
+	print TO "$_";
+	last if ((m|</div>|)&&($found_div_tabs));
+  }
+  
+  print TO "\n<!-- POST-PROCESSED TABS -->\n";
+  print TO $module_tabs;
+  print TO "\n<!-- END OF POST-PROCESSED TABS -->\n";
+
+  while (<FROM>) {
+	print TO "$_";
+  }  
+  close FROM;
+  close TO;
+  rename($newname, $oldname) unless $debug{'rename'};
+  
+  # die;
+}   
+
+add_tabs_to_module_html;
 
 ###
 ### Post-processsing common to all pages
@@ -301,6 +340,8 @@ handle_page($top,-2);# skip roots (we have 2 roots) in level counting
 map {push @allfiles,$_} @extra_files;
 print "All files: ".(join(", ",@allfiles))."\n" if $debug{'parse'};
 
+my $tabs;
+
 foreach my $file (@allfiles) {
     $file =~ s/.html/.handlepage.html/ if $debug{'rename'}; # Take right name if debugging
 	
@@ -314,19 +355,55 @@ foreach my $file (@allfiles) {
       print TO '<link href="simgrid.css" rel="stylesheet" type="text/css">'."\n"
         if (m|</head>|);
 
-      # Rework the navbar
-      if (m,<li><a href="(doc/)?index.html"><span>Main\&nbsp;Page</span></a></li>,) {
-        print TO '    <li'.($file =~ m,(doc/)?index.html, ? " class='current'" :"").'><a href="'.$1.'index.html"><span>Overview</span></a></li>'."\n";
-        print TO '    <li'.($file =~ m,(doc/)?faq.html, ? " class='current'" :"").'><a href="'.$1.'faq.html"><span>FAQ</span></a></li>'."\n";
-        next;
+	  if($tabs){
+		  if($file =~ /^html\/index\..*/){
+		  	$_ =~ s/<li class="current">/<li>/g;
+		  	$_ =~ s/<li><a href="index.html">/<li class="current"><a href="index.html">/g;
+		  }
+		  
+		  $_ =~ s/<li class="current"><a href="pages.html">/<li><a href="pages.html">/g;
+		  
+		  if($file =~ /^html\/pages\..*/){
+		  	$_ =~ s/<li><a href="pages.html">/<li class="current"><a href="pages.html">/g;
+		  }
+	  }
+	
+	  # Add the FAQ PUBLIS PEOPLE HISTORY and CONTRIB to the top navbar.
+      if( $_ =~ /<div.*class="tabs">/){
+      	$tabs = 1;
       }
-      if (m,<li><a href="(doc/)?annotated.html"><span>Data\&nbsp;Structures</span></a></li>,) {
-        print TO '    <li'.($file =~ m,(doc/)?publis(_[^.]*)?.html, ? " class='current'" :"").'><a href="'.$1.'publis.html"><span>Publications</span></a></li>'."\n";
-        print TO '    <li'.($file =~ m,(doc/)?people.html, ? " class='current'" :"").'><a href="'.$1.'people.html"><span>People</span></a></li>'."\n";
-        print TO '    <li'.($file =~ m,(doc/)?history.html, ? " class='current'" :"").'><a href="'.$1.'history.html"><span>History</span></a></li>'."\n";
-        print TO '    <li'.($file =~ m,(doc/)?contrib.html, ? " class='current'" :"").'><a href="'.$1.'contrib.html"><span>Contrib</span></a></li>'."\n";
-        next;
+      if( $_ =~ /<\/div>/){
+      	$tabs = 0;
       }
+      if( $_ =~ /<\/ul>/ && $tabs){
+      		my $tmp_buff="";
+      		$tmp_buff .= '     <li><a href="publis.html"><span>Publications</span></a></li>'."\n";
+      		$tmp_buff .= '      <li><a href="people.html"><span>People</span></a></li>'."\n";
+      		$tmp_buff .= '      <li><a href="history.html"><span>History</span></a></li>'."\n";
+      		$tmp_buff .= '      <li><a href="contrib.html"><span>Contrib</span></a></li>'."\n";
+      		$tmp_buff .= '      <li><a href="faq.html"><span>FAQ&#160;Page</span></a></li>'."\n";
+      	  	$tmp_buff .= $_;
+      	  	$tabs = 0;
+	
+	      # Rework the navbar
+	      # Fix the current "button" of buggy Doxygen tabs   
+	      if($file =~ /^html\/faq.*/ 
+	      || $file =~ /^html\/publis.*/ 
+	      || $file =~ /^html\/people.*/ 
+	      || $file =~ /^html\/history.*/ 
+	      || $file =~ /^html\/contrib.*/)
+	      {
+		      my $filename = $file;
+		      $filename =~ s/html\///g;
+		      $filename =~ s/\.html//g;
+		      $filename =~ s/publis_.*/publis/g;
+		      $tmp_buff =~ s/<li class="current">/<li>/g;
+		      $tmp_buff =~ s/<li><a href="$filename.html">/<li class="current"><a href="$filename.html">/g;	      
+	      }
+	      print TO $tmp_buff;
+	      next;
+    }
+      
       s|<span>Modules</span>|<span>Modules API</span>|g;
       s|<span>Related&nbsp;Pages</span>|<span>Site&nbsp;Plan</span>|g;