X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=back2html.pm;h=c48bbb4af5657564452631875143dc22b0f9c48e;hb=6a28c14b9cb0b02e89c9dc20dba507e1fa55ce0a;hp=0fcf9318c7bb83479fe5fdd8e9eb638027ce1b48;hpb=5bd22bec41221e9d5f8b10c570f542898ff6d106;p=webpac

diff --git a/back2html.pm b/back2html.pm
index 0fcf931..c48bbb4 100644
--- a/back2html.pm
+++ b/back2html.pm
@@ -12,35 +12,43 @@ sub back2html {
 	$html =~ s/>/>/g;
 	my $out;
 	foreach $line (split(/\s*###\s*/,$html)) {
-		$out .= "<tr><td valign=\"top\">";
+		$out .= "<tr><td valign=\"top\" class=\"htmlLeft\">";
 		my @items = split(/\s*#-#\s*/,$line);
 		# convert spaces in left field to non-breaking spaces
 		$items[0] =~ s#\s+#&nbsp;#g;
 		# try to make link on right field
 		sub mkurl($) {
 			my $url = shift || die "mkurl needs url as argument";
-			# chop URLS longer than 60 characters
-			my $txturl = substr($1,0,60);
-			$txturl .= "..." if (length($1) > 60);
-			return "<a href=\"$url\">$txturl</a>";
+			# chop URLS longer than ... characters
+			my $txturl = substr($1,0,40);
+			my $title = '';
+			if (length($1) > 40) {
+				$txturl .= "...";
+				$title = " title=\"$url\"";
+			}
+			return "<a href=\"$url\"$title>$txturl</a>";
 		}
 		$items[1] =~ s#(http://[\S]+)#mkurl($1)#gie;
 		$out .= join("</td><td>",@items);
 		$out .= "</td></tr>\n";
 	}
-	# put <br> back into html
+	# put <br> and <b> back into html
 	$out =~ s,&lt;br/*&gt;,<br/>,gi;
+	$out =~ s,&lt;b&gt;,<b>,gi;
+	$out =~ s,&lt;/b&gt;,</b>,gi;
 	# put <a href=xxx>yyyy</a> back into html
-	sub mkurl_param($$$$) {
-		my ($a_href,$url,$text,$a_end) = @_;
-		if ($url =~ m#\?#) {
-			$url .= "&".$url_params;
-		} else {
-			$url .= "?".$url_params;
+	sub mkurl_param($$$$$) {
+		my ($a_href,$url,$text,$a_end, $url_params) = @_;
+		if ($url_params) {
+			if ($url =~ m#\?#) {
+				$url .= "&".$url_params;
+			} else {
+				$url .= "?".$url_params;
+			}
 		}
 		return '<'.$a_href.'"'.$url.'">'.$text.'<'.$a_end.'>';
 	}
-	$out =~ s#&lt;(a\s+href=)['"]*(.+?)['"]*&gt;(.+?)&lt;(/a)&gt;#mkurl_param($1,$2,$3,$4)#gsie;
+	$out =~ s#&lt;(a\s+href=)['"]*(.+?)['"]*&gt;(.+?)&lt;(/a)&gt;#mkurl_param($1,$2,$3,$4,$url_params)#gsie;
 	return $out;
 }