Update from 1.12

git-svn-id: https://svn.dealii.org/branches/Branch-3-1@3774 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/Makefile.in b/deal.II/doc/Makefile.in
index f072bdbd1985812c5ef4242654d03b90dd515b5f..2f5c6facff10578e6f63dbda7bd19cb65f5e2c48 100644 (file)
--- a/deal.II/doc/Makefile.in
+++ b/deal.II/doc/Makefile.in
@@ -70,6 +70,14 @@ class_index.html: $(shell echo $D/base/include/base/*.h \
              "in which API documentation to find the corresponding reference.\n" \
              "<p>" \
              "This file is automatically generated, so please excuse the strange layout.\n" \
+             "Furthermore, please note that the script is not perfect, and even though it\n" \
+             "tries to identify the file corresponding to each class, it is not always\n" \
+             "able to do so, in particular in presence of nested classes or explicitely\n" \
+             "specialized templates, or if a class name appears more than once (e.g. as local\n" \
+             "classes in other classes). In this case, no link is presented with the name,\n" \
+             "but you can nevertheless get at the documentation of the class by clicking on\n" \
+             "the link leading to the top page for each sub-library; this link is at the top\n" \
+             "of each of the following sections.\n" \
              >> $@ 
        echo '<table>\n' >> $@ ;                                     \
        for dir in $D/base/include/base                              \
@@ -107,11 +115,24 @@ class_index.html: $(shell echo $D/base/include/base/*.h \
                                  @classes = (@classes, $$_);             \
                                }                                         \
                                print "  <tr>\n";                         \
+                                $$allfiles = `ls -1 auto/kdoc/*/*.html`;  \
                                $$n_classes = $$#classes + 1;             \
                                for ($$col=0; $$col<3; $$col++) {         \
                                  print "    <td>\n";                     \
                                  for ($$i=0; $$i<$$n_classes/3; $$i++) { \
-                                   print "      $$classes[$$i+$$col*($$n_classes+1)/3]<br>\n";\
+                                    $$classname = $$classes[$$i+$$col*($$n_classes+1)/3]; \
+                                   $$mangledname = $$classname;          \
+                                   $$mangledname =~ s/&lt;/\@3C/g;       \
+                                   $$mangledname =~ s/&gt;/\@3E/g;       \
+                                   $$mangledname =~ s/ /\@20/g;          \
+                                   $$filename = `echo \"$$allfiles\"|egrep \"/([a-zA-Z0-9_\@]+__)*$$mangledname.html\"`; \
+                                   $$filename =~ s/\n/ /g;               \
+                                   $$filename =~ s/\s+$$//g;             \
+                                    if ($$filename =~ / / || $$filename eq "") { \
+                                     print "      $$classname<br>\n";    \
+                                    } else {                              \
+                                     print "      <a href=\"$$filename\" target=\"body\">$$classname</a><br>\n";\
+                                   }                                     \
                                  }                                       \
                                  print "    </td>\n";                    \
                                }                                         \