*** Render.pm.~1~ Tue Aug 3 13:48:00 2004 --- Render.pm Thu Oct 20 18:54:41 2005 *************** *** 527,533 **** sub linkToolTipInfo { ! my( $theWeb, $theTopic ) = @_; return "" unless( $linkToolTipInfo ); return "" if( $linkToolTipInfo =~ /^off$/i ); --- 527,533 ---- sub linkToolTipInfo { ! my( $theWeb, $theTopic, $theAnchor ) = @_; return "" unless( $linkToolTipInfo ); return "" if( $linkToolTipInfo =~ /^off$/i ); *************** *** 542,548 **** $text =~ s/\$wikiname/"" . &TWiki::userToWikiName( $user, 1 )/ge; # "JohnSmith" $text =~ s/\$wikiusername/"" . &TWiki::userToWikiName( $user )/ge; # "Main.JohnSmith" if( $text =~ /\$summary/ ) { ! my $summary = &TWiki::Store::readFileHead( "$TWiki::dataDir/$theWeb/$theTopic.txt", 16 ); $summary = &TWiki::makeTopicSummary( $summary, $theTopic, $theWeb ); $summary =~ s/[\"\']//g; # remove quotes (not allowed in title attribute) $text =~ s/\$summary/$summary/g; --- 542,556 ---- $text =~ s/\$wikiname/"" . &TWiki::userToWikiName( $user, 1 )/ge; # "JohnSmith" $text =~ s/\$wikiusername/"" . &TWiki::userToWikiName( $user )/ge; # "Main.JohnSmith" if( $text =~ /\$summary/ ) { ! my $summary; ! if ( $theAnchor ) { ! $summary = &TWiki::Store::readFile( "$TWiki::dataDir/$theWeb/$theTopic.txt" ); ! if ( ! ( $summary =~ s/(.*?^$theAnchor)//ms ) ) { ! $summary = ":" . $summary; # subtle indication of non-existant anchor ! } ! } else { ! $summary = &TWiki::Store::readFileHead( "$TWiki::dataDir/$theWeb/$theTopic.txt", 16 ); ! } $summary = &TWiki::makeTopicSummary( $summary, $theTopic, $theWeb ); $summary =~ s/[\"\']//g; # remove quotes (not allowed in title attribute) $text =~ s/\$summary/$summary/g; *************** *** 612,624 **** my $anchor = makeAnchorName( $theAnchor ); $text .= "$theLinkText"; return $text; } else { $text .= "$theLinkText"; return $text; } --- 620,632 ---- my $anchor = makeAnchorName( $theAnchor ); $text .= "$theLinkText"; return $text; } else { $text .= "$theLinkText"; return $text; }