move map back to where it belongs

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

diff --git a/deal.II/doc/doxygen/headers/glossary.h b/deal.II/doc/doxygen/headers/glossary.h
index dd2bc097ee623d5a7c9cd9a400920d01d1a5cda5..20b4557775bda7529bfdee0ba346766b9d28bd36 100644 (file)
--- a/deal.II/doc/doxygen/headers/glossary.h
+++ b/deal.II/doc/doxygen/headers/glossary.h
@@ -130,11 +130,12 @@
  * case of the FE_RaviartThomas, for example, a block consists of <tt>dim</tt>
  * components). However, several such minimal blocks can be grouped together
  * into user defined blocks at will, and in accordance with the
- * application. For instance, for the $Q_2^d\times Q^1$ (Taylor-Hood) Stokes
- * element, there are $d+1$ components each of which could in principle form
+ * application. For instance, for the
+ * <b>Q</b><sub>2</sub><sup><i>d</i></sup>-<b>Q</b><sub>1</sub> (Taylor-Hood) Stokes
+ * element, there are <i>d</i>+1 components each of which could in principle form
  * its own block. But we are typically more interested in having only two
  * blocks, one of which consists of all the velocity vector components
- * (i.e. this block would have $d$ components) and the other having only the
+ * (i.e. this block would have <i>d</i> components) and the other having only the
  * single pressure component.
  *
  * <i>Implementation:</i>

diff --git a/deal.II/doc/doxygen/images/steps.png b/deal.II/doc/doxygen/images/steps.png
deleted file mode 100644 (file)
index 7b73005..0000000
Binary files a/deal.II/doc/doxygen/images/steps.png and /dev/null differ

diff --git a/deal.II/doc/doxygen/tutorial/Makefile b/deal.II/doc/doxygen/tutorial/Makefile
index 1a6123773c2be441419496cfa4351fca8d22013e..8510b71d49852466c8b36bb9d392d5fa584ee022 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/Makefile
+++ b/deal.II/doc/doxygen/tutorial/Makefile
@@ -40,15 +40,14 @@ get_basename = $(shell echo $(1) | $(PERL) -pi -e 's/(generated|doxygen).//g; s/
 all: $(example-doxygen)
 
 toc.html: steps.cmapx toc.html.in
-       @perl make_toc.pl > toc.html
-#      @perl -p -e '$/=undef; open FH, "steps.cmapx"; $map=<FH>; s/@@MAP@@/<img src="steps.png" usemap="#StepsMap"\/>\n$map"' toc.html.in > toc.html
+       perl make_toc.pl > toc.html
 # generate dot file
 steps.dot: steps.pl
        perl $< > $@
 
 steps.cmapx: steps.dot
        neato -Tpng -Tcmapx -O $<
-       @mv steps.dot.png ../images/steps.png
+       @mv steps.dot.png steps.png
        @mv steps.dot.cmapx steps.cmapx
 
 

diff --git a/deal.II/doc/doxygen/tutorial/steps.cmapx b/deal.II/doc/doxygen/tutorial/steps.cmapx
index c00ff9ee30dabfef6c228ce1011c174bc0cbf369..99540b29af6572453b141f1f9354c68dc17337c1 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/steps.cmapx
+++ b/deal.II/doc/doxygen/tutorial/steps.cmapx
@@ -1,47 +1,37 @@
 <map id="StepsMap" name="StepsMap">
-<area shape="rect" id="node1" href="step_1.html" title="@step1@" alt="" coords="67,108,104,136"/>
-<area shape="rect" id="node2" href="step_2.html" title="@step2@" alt="" coords="147,176,185,204"/>
-<area shape="rect" id="node3" href="step_3.html" title="@step3@" alt="" coords="253,217,291,245"/>
-<area shape="rect" id="node4" href="step_4.html" title="@step4@" alt="" coords="360,303,397,331"/>
-<area shape="rect" id="node45" href="step_45.html" title="@step45@" alt="" coords="243,107,280,135"/>
-<area shape="rect" id="node5" href="step_5.html" title="@step5@" alt="" coords="381,426,419,454"/>
-<area shape="rect" id="node10" href="step_10.html" title="@step10@" alt="" coords="515,277,553,305"/>
-<area shape="rect" id="node15" href="step_15.html" title="@step15@" alt="" coords="334,220,371,248"/>
-<area shape="rect" id="node20" href="step_20.html" title="@step20@" alt="" coords="270,362,308,390"/>
-<area shape="rect" id="node23" href="step_23.html" title="@step23@" alt="" coords="407,186,445,214"/>
-<area shape="rect" id="node29" href="step_29.html" title="@step29@" alt="" coords="425,244,462,272"/>
-<area shape="rect" id="node34" href="step_34.html" title="@step34@" alt="" coords="446,329,484,357"/>
-<area shape="rect" id="node36" href="step_36.html" title="@step36@" alt="" coords="272,280,309,308"/>
-<area shape="rect" id="node6" href="step_6.html" title="@step6@" alt="" coords="358,558,395,586"/>
-<area shape="rect" id="node37" href="step_37.html" title="@step37@" alt="" coords="496,433,534,461"/>
-<area shape="rect" id="node7" href="step_7.html" title="@step7@" alt="" coords="224,603,261,631"/>
-<area shape="rect" id="node8" href="step_8.html" title="@step8@" alt="" coords="433,663,470,691"/>
-<area shape="rect" id="node9" href="step_9.html" title="@step9@" alt="" coords="361,651,398,679"/>
-<area shape="rect" id="node13" href="step_13.html" title="@step13@" alt="" coords="484,581,521,609"/>
-<area shape="rect" id="node16" href="step_16.html" title="@step16@" alt="" coords="448,520,486,548"/>
-<area shape="rect" id="node22" href="step_22.html" title="@step22@" alt="" coords="285,628,322,656"/>
-<area shape="rect" id="node27" href="step_27.html" title="@step27@" alt="" coords="320,510,358,538"/>
-<area shape="rect" id="node28" href="step_28.html" title="@step28@" alt="" coords="423,600,461,628"/>
-<area shape="rect" id="node39" href="step_39.html" title="@step39@" alt="" coords="227,554,264,582"/>
-<area shape="rect" id="node12" href="step_12.html" title="@step12@" alt="" coords="118,604,155,632"/>
-<area shape="rect" id="node17" href="step_17.html" title="@step17@" alt="" coords="509,745,546,773"/>
-<area shape="rect" id="node11" href="step_11.html" title="@step11@" alt="" coords="598,234,636,262"/>
-<area shape="rect" id="node30" href="step_30.html" title="@step30@" alt="" coords="44,693,81,721"/>
-<area shape="rect" id="node33" href="step_33.html" title="@step33@" alt="" coords="7,586,45,614"/>
-<area shape="rect" id="node14" href="step_14.html" title="@step14@" alt="" coords="595,610,632,638"/>
-<area shape="rect" id="node18" href="step_18.html" title="@step18@" alt="" coords="578,822,616,850"/>
-<area shape="rect" id="node19" href="step_19.html" title="@step19@" alt="" coords="195,293,232,321"/>
-<area shape="rect" id="node21" href="step_21.html" title="@step21@" alt="" coords="230,472,268,500"/>
-<area shape="rect" id="node31" href="step_31.html" title="@step31@" alt="" coords="275,747,312,775"/>
-<area shape="rect" id="node35" href="step_35.html" title="@step35@" alt="" coords="191,688,228,716"/>
-<area shape="rect" id="node24" href="step_24.html" title="@step24@" alt="" coords="465,93,502,121"/>
-<area shape="rect" id="node25" href="step_25.html" title="@step25@" alt="" coords="520,7,558,35"/>
-<area shape="rect" id="node26" href="step_26.html" title="@step26@" alt="" coords="195,373,232,401"/>
-<area shape="rect" id="node32" href="step_32.html" title="@step32@" alt="" coords="251,854,289,882"/>
-<area shape="rect" id="node38" href="step_38.html" title="@step38@" alt="" coords="168,453,206,481"/>
-<area shape="rect" id="node40" href="step_40.html" title="@step40@" alt="" coords="142,533,179,561"/>
-<area shape="rect" id="node41" href="step_41.html" title="@step41@" alt="" coords="542,506,579,534"/>
-<area shape="rect" id="node42" href="step_42.html" title="@step42@" alt="" coords="542,346,579,374"/>
-<area shape="rect" id="node43" href="step_43.html" title="@step43@" alt="" coords="515,186,552,214"/>
-<area shape="rect" id="node44" href="step_44.html" title="@step44@" alt="" coords="115,239,152,267"/>
+<area shape="rect" id="node1" href="step_1.html" title="@step1@" alt="" coords="7,173,45,201"/>
+<area shape="rect" id="node2" href="step_2.html" title="@step2@" alt="" coords="98,225,136,253"/>
+<area shape="rect" id="node3" href="step_3.html" title="@step3@" alt="" coords="209,248,247,276"/>
+<area shape="rect" id="node4" href="step_4.html" title="@step4@" alt="" coords="326,322,363,350"/>
+<area shape="rect" id="node5" href="step_5.html" title="@step5@" alt="" coords="362,442,400,470"/>
+<area shape="rect" id="node10" href="step_10.html" title="@step10@" alt="" coords="448,267,486,295"/>
+<area shape="rect" id="node15" href="step_15.html" title="@step15@" alt="" coords="288,240,326,268"/>
+<area shape="rect" id="node20" href="step_20.html" title="@step20@" alt="" coords="230,378,267,406"/>
+<area shape="rect" id="node23" href="step_23.html" title="@step23@" alt="" coords="365,199,402,227"/>
+<area shape="rect" id="node28" href="step_29.html" title="@step29@" alt="" coords="414,316,451,344"/>
+<area shape="rect" id="node32" href="step_34.html" title="@step34@" alt="" coords="368,257,406,285"/>
+<area shape="rect" id="node34" href="step_36.html" title="@step36@" alt="" coords="239,310,276,338"/>
+<area shape="rect" id="node6" href="step_6.html" title="@step6@" alt="" coords="365,572,402,600"/>
+<area shape="rect" id="node7" href="step_7.html" title="@step7@" alt="" coords="378,721,416,749"/>
+<area shape="rect" id="node8" href="step_8.html" title="@step8@" alt="" coords="470,652,507,680"/>
+<area shape="rect" id="node9" href="step_9.html" title="@step9@" alt="" coords="388,644,425,672"/>
+<area shape="rect" id="node13" href="step_13.html" title="@step13@" alt="" coords="495,565,532,593"/>
+<area shape="rect" id="node16" href="step_16.html" title="@step16@" alt="" coords="438,516,475,544"/>
+<area shape="rect" id="node22" href="step_22.html" title="@step22@" alt="" coords="233,583,270,611"/>
+<area shape="rect" id="node26" href="step_27.html" title="@step27@" alt="" coords="298,561,335,589"/>
+<area shape="rect" id="node27" href="step_28.html" title="@step28@" alt="" coords="437,592,474,620"/>
+<area shape="rect" id="node35" href="step_39.html" title="@step39@" alt="" coords="281,682,318,710"/>
+<area shape="rect" id="node12" href="step_12.html" title="@step12@" alt="" coords="316,793,353,821"/>
+<area shape="rect" id="node17" href="step_17.html" title="@step17@" alt="" coords="566,710,604,738"/>
+<area shape="rect" id="node11" href="step_11.html" title="@step11@" alt="" coords="548,213,585,241"/>
+<area shape="rect" id="node29" href="step_30.html" title="@step30@" alt="" coords="243,875,280,903"/>
+<area shape="rect" id="node31" href="step_33.html" title="@step33@" alt="" coords="365,892,402,920"/>
+<area shape="rect" id="node14" href="step_14.html" title="@step14@" alt="" coords="610,569,647,597"/>
+<area shape="rect" id="node18" href="step_18.html" title="@step18@" alt="" coords="659,759,696,787"/>
+<area shape="rect" id="node19" href="step_19.html" title="@step19@" alt="" coords="635,453,672,481"/>
+<area shape="rect" id="node21" href="step_21.html" title="@step21@" alt="" coords="192,476,229,504"/>
+<area shape="rect" id="node30" href="step_31.html" title="@step31@" alt="" coords="144,664,182,692"/>
+<area shape="rect" id="node33" href="step_35.html" title="@step35@" alt="" coords="127,588,164,616"/>
+<area shape="rect" id="node24" href="step_24.html" title="@step24@" alt="" coords="410,99,447,127"/>
+<area shape="rect" id="node25" href="step_25.html" title="@step25@" alt="" coords="455,7,492,35"/>
 </map>

diff --git a/deal.II/doc/doxygen/tutorial/steps.pl b/deal.II/doc/doxygen/tutorial/steps.pl
index 10dd272852790c6b4441cba5c91b22fbe7fd0286..daabba29ec3934582656cf61dc368a9b39d7b90a 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/steps.pl
+++ b/deal.II/doc/doxygen/tutorial/steps.pl
@@ -8,7 +8,11 @@
 
 use strict;
 
-my $laststep = 45;
+my @steps = (1,2,3,4,5,6,7,8,9,
+            10,11,12,13,14,15,16,17,18,19,
+            20,21,22,23,24,25,   27,28,29,
+            30,31,   33,34,35,36,      39);
+;
 
 my $essential = ',fillcolor="red"';
 my $technique = ',fillcolor="orange"';
@@ -88,10 +92,10 @@ EOT
 
 # print all nodes
 
-for (my $i=1; $i<=$laststep;++$i)
+foreach (@steps)
 {
-    printf 'Step%02d [label="%d", URL="step_%d.html", tooltip="@step%d@"', $i, $i, $i, $i;
-    print $attribute{$i};
+    printf 'Step%02d [label="%d", URL="step_%d.html", tooltip="@step%d@"', $_, $_, $_, $_;
+    print $attribute{$_};
     print "];\n";
 }
 

diff --git a/deal.II/doc/doxygen/tutorial/steps.png b/deal.II/doc/doxygen/tutorial/steps.png
new file mode 100644 (file)
index 0000000..8d62a8f
Binary files /dev/null and b/deal.II/doc/doxygen/tutorial/steps.png differ