--- /Library/WebServer/twiki/lib/TWiki-org.pm Sun Feb 2 01:55:21 2003 +++ /Library/WebServer/twiki/lib/TWiki.pm Wed Aug 13 22:26:03 2003 @@ -1424,8 +1424,10 @@ my $attrTopic = extractNameValuePair( $attributes, "topic" ); my $attrType = extractNameValuePair( $attributes, "type" ); my $attrTitle = extractNameValuePair( $attributes, "title" ); + my $attrFormat = extractNameValuePair( $attributes, "format" ); + my $alttext = extractNameValuePair( $attributes, "alttext" ); - my $searchVal = "XXX"; + my $searchVal; if( ! $attrType ) { $attrType = ""; @@ -1445,9 +1447,13 @@ "", "on", "", "", "", "on", "on", "on", "on", "", "", - "", "on", "searchmeta" + "", "on", "searchmeta", "", $attrFormat ); + if ($text eq "") { + return $alttext; + } + if( $text !~ /^\s*$/ ) { $text = "$attrTitle$text"; } @@ -1997,6 +2003,7 @@ my $noWebHome = 0; my $prefix = ""; my $suffix = ""; + my $alttext = ""; my $usesep = ""; if( $args ) { @@ -2004,9 +2011,14 @@ $noWebHome = extractNameValuePair( $args, "nowebhome" ); $prefix = extractNameValuePair( $args, "prefix" ); $suffix = extractNameValuePair( $args, "suffix" ); + $alttext = extractNameValuePair( $args, "alttext" ); $usesep = extractNameValuePair( $args, "separator" ); } + if ( ! $meta ) { + return $alttext; + } + if( ! $usesep ) { $usesep = " > "; } @@ -2052,7 +2064,11 @@ last; } } - + + if ($text eq "") { + return $alttext; + } + if( $text && $prefix ) { $text = "$prefix$text"; }