From: Wolfgang Bangerth Date: Mon, 21 Jun 2010 18:03:27 +0000 (+0000) Subject: Read tooltip files where we create the text for neato, rather than fixing things... X-Git-Tag: v8.0.0~6011 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71937136027339472935dab175264a8e7f079bd;p=dealii.git Read tooltip files where we create the text for neato, rather than fixing things up later on. 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 5f8679a498..28793c901d 100644 --- 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 8a8a68381a..eb6ab2b6b1 100644 --- 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 = ; - 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 fd3ff95625..0c38a22766 100644 --- a/deal.II/doc/doxygen/tutorial/steps.cmapx +++ b/deal.II/doc/doxygen/tutorial/steps.cmapx @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deal.II/doc/doxygen/tutorial/steps.pl b/deal.II/doc/doxygen/tutorial/steps.pl index e41627d651..f1d3c32d4c 100644 --- 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 = ; + close TF; + chop $tooltip; + + printf "Step%02d [label=\"$_\", URL=\"../deal.II/step_$_.html\", tooltip=\"$tooltip\"", $_; print $attribute{$_}; print "];\n"; }