changeset 389:0bc92382a86b feature_113

Some layout and link fixes
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 07 Apr 2011 15:45:48 +0100
parents dad587ecb8d0
children 4ad6499d7998
files extra/soundsoftware/matlab-docs.conf extra/soundsoftware/matlab-docs.pl
diffstat 2 files changed, 20 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/extra/soundsoftware/matlab-docs.conf	Wed Apr 06 17:49:54 2011 +0100
+++ b/extra/soundsoftware/matlab-docs.conf	Thu Apr 07 15:45:48 2011 +0100
@@ -67,7 +67,7 @@
 #------------------------------------------------------------------------
 # texttitleframelayout:    text of title for frame layout file (whole docu)
 #------------------------------------------------------------------------
-set texttitleframelayout = Documentation of Matlab Functions of PROJEKTNAME
+set texttitleframelayout = MATLAB Function Documentation
 
 #------------------------------------------------------------------------
 # texttitle/headerindexalldirs: text of title and header for directory index
@@ -85,7 +85,7 @@
 # texttitle/headerfiles:    text of title and header for files
 #                           name of file will be added at the end
 #------------------------------------------------------------------------
-set texttitlefiles = PROJEKTNAME: Function
+set texttitlefiles = Function
 set textheaderfiles = Documentation of
 
 #------------------------------------------------------------------------
@@ -105,8 +105,8 @@
 # textjumpindexlocal:  text displayed for jump to index of files in actual
 #                      directory (local)
 #------------------------------------------------------------------------
-set textjumpindexglobal = Global Index (all files)
-set textjumpindexlocal = Local Index (files in subdir)
+set textjumpindexglobal = <b>Index of</b> all files:
+set textjumpindexlocal = this subdirectory only:
 
 #------------------------------------------------------------------------
 # includesource: include source of m-files in documentation [YES|no]
@@ -160,7 +160,7 @@
 # codeheader: HTML-code added to <H*> tags, use for centering header text
 #             or changing the colour/size/font of the header text
 #------------------------------------------------------------------------
-set codeheader = align="center"
+set codeheader = 
 
 
 # End of parameter file
--- a/extra/soundsoftware/matlab-docs.pl	Wed Apr 06 17:49:54 2011 +0100
+++ b/extra/soundsoftware/matlab-docs.pl	Thu Apr 07 15:45:48 2011 +0100
@@ -75,7 +75,7 @@
 
 $VERSION  = '1.23';
 ($PROGRAM = $0) =~ s@.*/@@; $PROGRAM = "\U$PROGRAM\E";
-$debug = 2;
+$debug = 4;
 
 #------------------------------------------------------------------------
 # Define platform specific things
@@ -701,7 +701,7 @@
       } else {
          print IFILE "<h1 $var{'codeheader'}>$var{'textheaderindexalldirs'}</h1>\n";
       }
-      print IFILE "<p align=\"center\">\n";
+      print IFILE "<p>\n";
 
       if ($var{'frames'} eq 'yes') {
 	  if ($irun == 0) { print IFILE "<strong>short</strong>\n"; }
@@ -878,7 +878,7 @@
    } elsif ($LocalShortLong eq 'long') {
       # begin create long index
       print IFILE "<table border=\"5\" width=\"100%\" cellpadding=\"5\">\n";
-      print IFILE "<tr align=\"center\"><th>Name</th><th>Description</th></tr>\n";
+      print IFILE "<tr><th>Name</th><th>Description</th></tr>\n";
 
       for('a'..'z') {
          # print "   $_: @{$_}\n";
@@ -1010,26 +1010,30 @@
    local(*WRITEFILE, $LocalPath2Index, $PathContents, $LocalGlobalLocal) = @_;
    
    # include links to short/long - local/global index and C|contents.m
-   print WRITEFILE "\n<p align=\"center\">";
-   print WRITEFILE "$var{'textjumpindexglobal'} (";
+   print WRITEFILE "\n<p>";
+   print WRITEFILE "$var{'textjumpindexglobal'} ";
 
    if ($var{'frames'} eq 'yes') {
        print WRITEFILE "<a href=\"$LocalPath2Index$var{'filenameindexshortglobal'}$var{'filenameextensionframe'}$var{'exthtml'}\">short</a> | ";
-       print WRITEFILE "<a href=\"$LocalPath2Index$var{'filenameindexlongglobal'}$var{'filenameextensionframe'}$var{'exthtml'}\">long</a>)\n";
+       print WRITEFILE "<a href=\"$LocalPath2Index$var{'filenameindexlongglobal'}$var{'filenameextensionframe'}$var{'exthtml'}\">long</a>\n";
    } else {
        print WRITEFILE "<a href=\"$LocalPath2Index$var{'filenametopframe'}$var{'exthtml'}\">short</a> | ";
-       print WRITEFILE "<a href=\"$LocalPath2Index$var{'filenameindexlongglobal'}$var{'filenameextensionindex'}$var{'exthtml'}\">long</a>)\n";
+       print WRITEFILE "<a href=\"$LocalPath2Index$var{'filenameindexlongglobal'}$var{'filenameextensionindex'}$var{'exthtml'}\">long</a>\n";
    }
 
    if ($LocalGlobalLocal eq 'local') {
       if ($var{'usecontentsm'} eq 'yes') {
          print WRITEFILE " | <a href=\"$contentsname{$PathContents}$dirnamesingle{$PathContents}$var{'exthtml'}\">Local contents</a>\n";
       }
-      # if ($var{'producetree'} eq 'yes') {
-         print WRITEFILE " | $var{'textjumpindexlocal'} (";
+      if ($var{'frames'} eq 'yes') {
+         print WRITEFILE " | $var{'textjumpindexlocal'} ";
          print WRITEFILE "<a href=\"$var{'filenameindexshortlocal'}$var{'filenameextensionframe'}$dirnamesingle{$PathContents}$var{'exthtml'}\">short</a> | ";
-         print WRITEFILE "<a href=\"$var{'filenameindexlonglocal'}$var{'filenameextensionframe'}$dirnamesingle{$PathContents}$var{'exthtml'}\">long</a>)\n";
-      # }
+         print WRITEFILE "<a href=\"$var{'filenameindexlonglocal'}$var{'filenameextensionframe'}$dirnamesingle{$PathContents}$var{'exthtml'}\">long</a>\n";
+      } else {
+         print WRITEFILE " | $var{'textjumpindexlocal'} ";
+         print WRITEFILE "<a href=\"$var{'filenameindexshortlocal'}$var{'filenameextensionindex'}$dirnamesingle{$PathContents}$var{'exthtml'}\">short</a> | ";
+         print WRITEFILE "<a href=\"$var{'filenameindexlonglocal'}$var{'filenameextensionindex'}$dirnamesingle{$PathContents}$var{'exthtml'}\">long</a>\n";
+      }
    }
    print WRITEFILE "</p>\n\n";
    print WRITEFILE "$var{'codehr'}\n";