Read tooltip files where we create the text for neato, rather than fixing things...

git-svn-id: https://svn.dealii.org/trunk@21256 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/doxygen/tutorial/Makefile b/deal.II/doc/doxygen/tutorial/Makefile
index 5f8679a49834757bda686428a71dd37f1d95bc26..28793c901d7438d1a83a4642d3129d5feaafc3ca 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/Makefile
+++ b/deal.II/doc/doxygen/tutorial/Makefile
@@ -40,7 +40,8 @@ get_basename = $(shell echo $(1) | $(PERL) -pi -e 's/(generated|doxygen).//g; s/
 all: $(example-doxygen) toc.html
 
 toc.html: steps.cmapx toc.html.in $D/examples/step-*/doc/tooltip
-       perl make_toc.pl > toc.html
+       @echo ================== Making $@
+       @perl make_toc.pl > toc.html
 
 # generate dot file
 steps.dot: steps.pl $D/examples/*/doc/tooltip

diff --git a/deal.II/doc/doxygen/tutorial/make_toc.pl b/deal.II/doc/doxygen/tutorial/make_toc.pl
index 8a8a68381a31f2ab5ff17c693a91a06b91e39bb6..eb6ab2b6b12886db16fe1f74e9e7883578bb75e4 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/make_toc.pl
+++ b/deal.II/doc/doxygen/tutorial/make_toc.pl
@@ -17,21 +17,4 @@ close MAP;
 # Insert contents of map file for @@MAP@@
 $toc =~ s/\@\@MAP\@\@/$map/;
 
-# Find tooltip files
-$list = `ls ../../../examples/step-*/doc/tooltip`;
-@list = split "\n", $list;
-
-foreach (@list)
-{
-    # Only the first line of the tooltip file is used
-    open TF, "<$_";
-    $tooltip = <TF>;
-    close TF;
-    chop $tooltip;
-    
-    m/step-(\d+)/;
-    $n = $1;
-    $toc =~ s/\@step$n\@/$tooltip/;
-}
-
 print $toc;

diff --git a/deal.II/doc/doxygen/tutorial/steps.cmapx b/deal.II/doc/doxygen/tutorial/steps.cmapx
index fd3ff9562579255fe65bfb95b84b8ca425037e24..0c38a22766f28898be64766b75fe292c419132e6 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/steps.cmapx
+++ b/deal.II/doc/doxygen/tutorial/steps.cmapx
@@ -1,37 +1,37 @@
 <map id="StepsMap" name="StepsMap">
-<area shape="poly" href="../deal.II/step_1.html" title="@step1@" alt="" coords="73,182 73,154 54,135 26,135 7,154 7,182 26,201 54,201"/>
-<area shape="poly" href="../deal.II/step_2.html" title="@step2@" alt="" coords="160,238 160,210 140,191 113,191 93,210 93,238 113,257 140,257"/>
-<area shape="poly" href="../deal.II/step_3.html" title="@step3@" alt="" coords="253,292 253,265 234,245 206,245 187,265 187,292 206,312 234,312"/>
-<area shape="poly" href="../deal.II/step_4.html" title="@step4@" alt="" coords="376,355 376,328 356,308 329,308 309,328 309,355 329,375 356,375"/>
-<area shape="poly" href="../deal.II/step_5.html" title="@step5@" alt="" coords="395,478 395,450 375,431 348,431 328,450 328,478 348,497 375,497"/>
-<area shape="rect" href="../deal.II/step_10.html" title="@step10@" alt="" coords="449,281,487,308"/>
-<area shape="rect" href="../deal.II/step_15.html" title="@step15@" alt="" coords="284,241,321,268"/>
-<area shape="rect" href="../deal.II/step_20.html" title="@step20@" alt="" coords="225,376,263,403"/>
-<area shape="rect" href="../deal.II/step_23.html" title="@step23@" alt="" coords="351,207,388,233"/>
-<area shape="rect" href="../deal.II/step_29.html" title="@step29@" alt="" coords="417,337,455,364"/>
-<area shape="rect" href="../deal.II/step_34.html" title="@step34@" alt="" coords="383,268,420,295"/>
-<area shape="rect" href="../deal.II/step_36.html" title="@step36@" alt="" coords="245,304,283,331"/>
-<area shape="poly" href="../deal.II/step_6.html" title="@step6@" alt="" coords="407,607 407,580 387,560 360,560 340,580 340,607 360,627 387,627"/>
-<area shape="rect" href="../deal.II/step_7.html" title="@step7@" alt="" coords="335,701,372,728"/>
-<area shape="rect" href="../deal.II/step_8.html" title="@step8@" alt="" coords="463,655,500,681"/>
-<area shape="rect" href="../deal.II/step_9.html" title="@step9@" alt="" coords="287,597,324,624"/>
-<area shape="rect" href="../deal.II/step_13.html" title="@step13@" alt="" coords="484,557,521,584"/>
-<area shape="rect" href="../deal.II/step_16.html" title="@step16@" alt="" coords="433,588,471,615"/>
-<area shape="rect" href="../deal.II/step_22.html" title="@step22@" alt="" coords="225,573,263,600"/>
-<area shape="rect" href="../deal.II/step_27.html" title="@step27@" alt="" coords="413,524,451,551"/>
-<area shape="rect" href="../deal.II/step_28.html" title="@step28@" alt="" coords="392,657,429,684"/>
-<area shape="rect" href="../deal.II/step_39.html" title="@step39@" alt="" coords="291,683,328,709"/>
-<area shape="rect" href="../deal.II/step_12.html" title="@step12@" alt="" coords="277,795,315,821"/>
-<area shape="rect" href="../deal.II/step_17.html" title="@step17@" alt="" coords="556,717,593,744"/>
-<area shape="rect" href="../deal.II/step_11.html" title="@step11@" alt="" coords="547,227,584,253"/>
-<area shape="rect" href="../deal.II/step_30.html" title="@step30@" alt="" coords="188,860,225,887"/>
-<area shape="rect" href="../deal.II/step_33.html" title="@step33@" alt="" coords="311,897,348,924"/>
-<area shape="rect" href="../deal.II/step_14.html" title="@step14@" alt="" coords="597,561,635,588"/>
-<area shape="rect" href="../deal.II/step_18.html" title="@step18@" alt="" coords="645,769,683,796"/>
-<area shape="rect" href="../deal.II/step_19.html" title="@step19@" alt="" coords="436,468,473,495"/>
-<area shape="rect" href="../deal.II/step_21.html" title="@step21@" alt="" coords="187,472,224,499"/>
-<area shape="rect" href="../deal.II/step_31.html" title="@step31@" alt="" coords="139,652,176,679"/>
-<area shape="rect" href="../deal.II/step_35.html" title="@step35@" alt="" coords="111,585,148,612"/>
-<area shape="rect" href="../deal.II/step_24.html" title="@step24@" alt="" coords="380,103,417,129"/>
-<area shape="rect" href="../deal.II/step_25.html" title="@step25@" alt="" coords="413,7,451,33"/>
+<area shape="poly" href="../deal.II/step_1.html" title="Creating a grid. Refining it. Writing it to a file" alt="" coords="73,182 73,154 54,135 26,135 7,154 7,182 26,201 54,201"/>
+<area shape="poly" href="../deal.II/step_2.html" title="Assigning degrees of freedom to a grid." alt="" coords="160,238 160,210 140,191 113,191 93,210 93,238 113,257 140,257"/>
+<area shape="poly" href="../deal.II/step_3.html" title="Solving Poisson&#39;s equation." alt="" coords="253,292 253,265 234,245 206,245 187,265 187,292 206,312 234,312"/>
+<area shape="poly" href="../deal.II/step_4.html" title="Dimension independent programming. Boundary conditions." alt="" coords="376,355 376,328 356,308 329,308 309,328 309,355 329,375 356,375"/>
+<area shape="poly" href="../deal.II/step_5.html" title="Reading a grid from disk. Computations on successively refined grids." alt="" coords="395,478 395,450 375,431 348,431 328,450 328,478 348,497 375,497"/>
+<area shape="rect" href="../deal.II/step_10.html" title="Higher order mappings." alt="" coords="449,281,487,308"/>
+<area shape="rect" href="../deal.II/step_15.html" title="1d problems. A nonlinear problem." alt="" coords="284,241,321,268"/>
+<area shape="rect" href="../deal.II/step_20.html" title="Mixed finite elements for the mixed Laplacian. Block solvers." alt="" coords="225,376,263,403"/>
+<area shape="rect" href="../deal.II/step_23.html" title="Time dependent problems. The wave equation." alt="" coords="351,207,388,233"/>
+<area shape="rect" href="../deal.II/step_29.html" title="A complex&#45;valued Helmholtz equation. Sparse direct solvers." alt="" coords="417,337,455,364"/>
+<area shape="rect" href="../deal.II/step_34.html" title="Boundary element methods for potential flow." alt="" coords="383,268,420,295"/>
+<area shape="rect" href="../deal.II/step_36.html" title="Finding eigenvalues of the Schr&ouml;dinger equation." alt="" coords="245,304,283,331"/>
+<area shape="poly" href="../deal.II/step_6.html" title="Adaptive local refinement. Higher order elements" alt="" coords="407,607 407,580 387,560 360,560 340,580 340,607 360,627 387,627"/>
+<area shape="rect" href="../deal.II/step_7.html" title="Helmholtz equation. Computing errors. Boundary integrals." alt="" coords="335,701,372,728"/>
+<area shape="rect" href="../deal.II/step_8.html" title="Systems of PDE. Elasticity." alt="" coords="463,655,500,681"/>
+<area shape="rect" href="../deal.II/step_9.html" title="Advection equation. Multithreading. Refinement criteria." alt="" coords="287,597,324,624"/>
+<area shape="rect" href="../deal.II/step_13.html" title="Modularity. Software design." alt="" coords="484,557,521,584"/>
+<area shape="rect" href="../deal.II/step_16.html" title="Multigrid on adaptive meshes." alt="" coords="433,588,471,615"/>
+<area shape="rect" href="../deal.II/step_22.html" title="The Stokes equation on adaptive meshes." alt="" coords="225,573,263,600"/>
+<area shape="rect" href="../deal.II/step_27.html" title="hp&#45;adaptive finite element methods." alt="" coords="413,524,451,551"/>
+<area shape="rect" href="../deal.II/step_28.html" title="Handling multiple meshes at the same time. Neutron transport." alt="" coords="392,657,429,684"/>
+<area shape="rect" href="../deal.II/step_39.html" title="Interior Penalty for the Laplace equation. Adaptive refinement. Multigrid." alt="" coords="291,683,328,709"/>
+<area shape="rect" href="../deal.II/step_12.html" title="Discontinuous Galerkin for linear advection." alt="" coords="277,795,315,821"/>
+<area shape="rect" href="../deal.II/step_17.html" title="Parallel computing using MPI. Using PETSc." alt="" coords="556,717,593,744"/>
+<area shape="rect" href="../deal.II/step_11.html" title="Higher order mappings. Dealing with constraints." alt="" coords="547,227,584,253"/>
+<area shape="rect" href="../deal.II/step_30.html" title="Anisotropic refinement for DG methods." alt="" coords="188,860,225,887"/>
+<area shape="rect" href="../deal.II/step_33.html" title="Hyperbolic conservation laws: the Euler equations of gas dynamics." alt="" coords="311,897,348,924"/>
+<area shape="rect" href="../deal.II/step_14.html" title="Duality based error estimates. Adaptivity." alt="" coords="597,561,635,588"/>
+<area shape="rect" href="../deal.II/step_18.html" title="Quasistatic elasticity. More parallel computing." alt="" coords="645,769,683,796"/>
+<area shape="rect" href="../deal.II/step_19.html" title="Handling input parameter files. Converting output formats." alt="" coords="436,468,473,495"/>
+<area shape="rect" href="../deal.II/step_21.html" title="Two&#45;phase flow in porous media." alt="" coords="187,472,224,499"/>
+<area shape="rect" href="../deal.II/step_31.html" title="Boussinesq flow for thermal convection." alt="" coords="139,652,176,679"/>
+<area shape="rect" href="../deal.II/step_35.html" title="A projection solver for the Navier&#45;Stokes equations." alt="" coords="111,585,148,612"/>
+<area shape="rect" href="../deal.II/step_24.html" title="The wave equation with absorbing boundary conditions. Extracting point values." alt="" coords="380,103,417,129"/>
+<area shape="rect" href="../deal.II/step_25.html" title="The nonlinear sine&#45;Gordon soliton equation" alt="" coords="413,7,451,33"/>
 </map>

diff --git a/deal.II/doc/doxygen/tutorial/steps.pl b/deal.II/doc/doxygen/tutorial/steps.pl
index e41627d651f0f64135fa2f4b3883a6d5e1dfb269..f1d3c32d4cf24d44f1d54c9eef93a271098a3728 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/steps.pl
+++ b/deal.II/doc/doxygen/tutorial/steps.pl
@@ -91,7 +91,13 @@ EOT
 
 foreach (@steps)
 {
-    printf 'Step%02d [label="%d", URL="../deal.II/step_%d.html", tooltip="@step%d@"', $_, $_, $_, $_;
+    # read first line of tooltip file
+    open TF, "../../../examples/step-$_/doc/tooltip";
+    my $tooltip = <TF>;
+    close TF;
+    chop $tooltip;
+
+    printf "Step%02d [label=\"$_\", URL=\"../deal.II/step_$_.html\", tooltip=\"$tooltip\"", $_;
     print $attribute{$_};
     print "];\n";
 }