X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=CMS%2FSimple%2FFilter%2FMarkup.pm;h=baed318b3600763659212bc0bba38f6be5a8a431;hb=master;hp=3861f949af918c7b67d5cc8f688622dc1c5db680;hpb=9e609156353bacdda67eb190212f4d67181bbe83;p=urisagit%2FCMS-Simple.git

diff --git a/CMS/Simple/Filter/Markup.pm b/CMS/Simple/Filter/Markup.pm
index 3861f94..baed318 100644
--- a/CMS/Simple/Filter/Markup.pm
+++ b/CMS/Simple/Filter/Markup.pm
@@ -13,6 +13,7 @@ my %markup_to_code = (
 	image_link	=> \&make_image_link,
 	ilink	=> \&make_image_link,
 	nbsp	=> sub { ' ' },
+	bold	=> \&make_bold,
 	em_dash	=> sub { '—' },
 	eacute	=> sub { 'é' },
 	copy	=> sub { '©' },
@@ -42,9 +43,11 @@ sub replace_markup {
 
 #print "KEY $key [$text]\n" ;
 
+	$text = 'UNDEF' unless defined $text ;
+
 	my $code = $markup_to_code{ $key } ;
 
-	$code or die "unknown markup key '$key'" ;
+	$code or die "unknown markup key '$key' text '$text'" ;
 
 	return $code->($text) ;
 }
@@ -57,7 +60,7 @@ sub make_link {
 
 	$url_text ||= $url ;
 
-	return qq{<A href="$url">$url_text</A>} ;
+	return qq{<a href="$url">$url_text</a>} ;
 }
 
 sub google_map {
@@ -67,7 +70,7 @@ sub google_map {
 	( my $url_text = $text ) =~ tr/ \t\n\r/+/s ;
 
 	return
-qq{<A href="http://maps.google.com/maps?f=q&hl=en&q=$url_text">$text</A>} ;
+qq{<a href="http://maps.google.com/maps?f=q&hl=en&q=$url_text">$text</a>} ;
 }
 
 sub make_email {
@@ -94,12 +97,21 @@ sub make_image_link {
 
 	my( $url, $image_url ) = split /\|/, $text ;
 
-	return qq{<A href="$url"><IMG src="$image_url"></A>} ;
+	return qq{<a href="$url"><img src="$image_url"></a>} ;
 }
 
 sub make_image {
 
 	my( $text ) = @_ ;
 
-	return qq{<IMG src="$text">} ;
+	return qq{<img src="$text">} ;
 }
+
+sub make_bold {
+
+	my( $text ) = @_ ;
+
+	return qq{<B>$text</B>} ;
+}
+
+1 ;