From: wolf Date: Tue, 27 Jun 2000 16:41:23 +0000 (+0000) Subject: Fix several cases of wrong cross-links, which were usually due to multiply escaping... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31188e3328c00330ed6f5d459720b9035ef96bc6;p=dealii-svn.git Fix several cases of wrong cross-links, which were usually due to multiply escaping special characters (from < to %253C0 to %25200253C0 or so) git-svn-id: https://svn.dealii.org/trunk@3092 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/kdoc/src/kdocAstUtil.pm b/deal.II/contrib/kdoc/src/kdocAstUtil.pm index 5da9647cbc..9636bf23d4 100644 --- a/deal.II/contrib/kdoc/src/kdocAstUtil.pm +++ b/deal.II/contrib/kdoc/src/kdocAstUtil.pm @@ -742,7 +742,7 @@ sub refHeritage my @heritage; while( 1 ) { - push @heritage, $node; + push @heritage, $node->{Ref}; last unless defined $node->{Parent}; $node = $node->{Parent}; diff --git a/deal.II/contrib/kdoc/src/kdocCxxHTML.pm b/deal.II/contrib/kdoc/src/kdocCxxHTML.pm index 73ce4f8903..178ebd8cc2 100644 --- a/deal.II/contrib/kdoc/src/kdocCxxHTML.pm +++ b/deal.II/contrib/kdoc/src/kdocCxxHTML.pm @@ -166,7 +166,7 @@ sub writeAnnotatedList $col = $col ? 0 : 1; $colour = $col ? "" : 'bgcolor="#eeeeee"'; - print CLIST "", refNameFull( $node ), + print CLIST "", refNameFull( $node, $rootnode, 1 ), "", $short, ""; } @@ -241,7 +241,7 @@ sub writeHier my $src = defined $node->{ExtSource} ? " ($node->{ExtSource})" : ""; - print HIER "
  • ", refNameFull( $node )," $src\n"; + print HIER "
  • ", refNameFull( $node, $rootnode, 1 )," $src\n"; }, sub { # up if ( $_[0] == $root ) { @@ -313,7 +313,7 @@ sub writeClassDoc return; } - my $file = "$outputdir/".join("__", kdocAstUtil::heritage($node)).".html"; + my $file = "$outputdir/".$node->{Ref}; my $docnode = $node->{DocNode}; my @list = (); my $version = undef; @@ -390,7 +390,7 @@ sub writeClassDoc $out .= $comma.esc($name); } else { - $out .= $comma.refNameFull( $ances ); + $out .= $comma.refNameFull( $ances, $rootnode, 1 ); } $out .= " <".wordRef($template, $rootnode ).">" @@ -417,7 +417,7 @@ sub writeClassDoc sub { $comma = $out = ""; }, # start sub { # print my ( $in ) = @_; - $out .= $comma.refName( $in ); + $out .= $comma.refName( $in, 1 ); if ( exists $in->{ExtSource} ) { $short .= " (". @@ -433,7 +433,7 @@ sub writeClassDoc ); $extra .= ''. - hyper( encodeURL("full-list-".$node->{Ref}), + hyper( "full-list-".$node->{Ref}, "List of all Methods" )."";