consolidate link and poplink sub routines

diff --git a/site/cgi-bin/modules/DevHelp/Formatter.pm b/site/cgi-bin/modules/DevHelp/Formatter.pm
index 86f0c08e96bf7d94916e207c0287f01f89f4dcd7..9ae9accd167d5117235c6593753fd25fa1124174 100644 (file)
--- a/site/cgi-bin/modules/DevHelp/Formatter.pm
+++ b/site/cgi-bin/modules/DevHelp/Formatter.pm
@@ -166,15 +166,9 @@ sub _fix_spanned {
 }
 
 sub link {
-  my ($self, $url, $text) = @_;
+  my ($self, $url, $text, $type, $extras) = @_;
 
-  qq/<a href="/ . $self->rewrite_url($url, $text, "link") . qq(">$text</a>)
-}
-
-sub poplink {
-  my ($self, $url, $text) = @_;
-
-  qq/<a href="/ . $self->rewrite_url($url, $text, "poplink") . qq(" target="_blank">$text</a>)
+  qq/<a href="/ . $self->rewrite_url($url, $text, $type) . qq("$extras>$text</a>)
 }
 
 sub replace_char {
@@ -204,16 +198,16 @@ sub replace_char {
     $self->_fix_spanned("<$1>", "</$1>", $2)#egi
     and return 1;
   $$rpart =~ s#poplink\[([^|\]\[]+)\|([^\]\[]+)\]#
-    $self->poplink($1, $2)#eig
+    $self->link($1, $2, "poplink", qq/ target="_blank"/)#eig
     and return 1;
   $$rpart =~ s#poplink\[([^|\]\[]+)\]#
-    $self->poplink($1, $2)#eig
+    $self->link($1, $2, "poplink", qq/ target="_blank"/)#eig
     and return 1;
   $$rpart =~ s#link\[([^|\]\[]+)\|([^\]\[]+)\]#
-    $self->link($1, $2)#eig
+    $self->link($1, $2, "link")#eig
     and return 1;
   $$rpart =~ s#link\[([^|\]\[]+)\]#
-    $self->link($1, $1)#ieg
+    $self->link($1, $1, "link")#ieg
     and return 1;
   $$rpart =~ s#font\[([^|\]\[]+)\|([^\]\[]+)\]#
     $self->_fix_spanned(qq/<font size="$1">/, "</font>", $2)#egi