From: kanschat Date: Fri, 18 Jun 2010 22:22:27 +0000 (+0000) Subject: move map back to where it belongs X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bab357bec9f19d230038e357003f203c0c32976;p=dealii-svn.git 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 dd2bc097ee..20b4557775 100644 --- 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 dim * 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 + * Q2d-Q1 (Taylor-Hood) Stokes + * element, there are d+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 d components) and the other having only the * single pressure component. * * Implementation: diff --git a/deal.II/doc/doxygen/images/steps.png b/deal.II/doc/doxygen/images/steps.png deleted file mode 100644 index 7b7300504f..0000000000 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 1a6123773c..8510b71d49 100644 --- 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=; s/@@MAP@@/\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 c00ff9ee30..99540b29af 100644 --- a/deal.II/doc/doxygen/tutorial/steps.cmapx +++ b/deal.II/doc/doxygen/tutorial/steps.cmapx @@ -1,47 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deal.II/doc/doxygen/tutorial/steps.pl b/deal.II/doc/doxygen/tutorial/steps.pl index 10dd272852..daabba29ec 100644 --- 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 index 0000000000..8d62a8ff4a Binary files /dev/null and b/deal.II/doc/doxygen/tutorial/steps.png differ