From eb30cfb31073bfc6ffeb982f8180d937cc49676d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Jan 2010 16:09:34 -0500 Subject: [PATCH] only use css alignment stuff for table This way users can use all the other alignment values when not including a caption. Also, it will work without the standard style, and I don't have to worry about regressions this way. --- IkiWiki/Plugin/img.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 083061bf6..c1048d3c9 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -156,11 +156,10 @@ sub preprocess (@) { (exists $params{alt} ? ' alt="'.$params{alt}.'"' : ''). (exists $params{title} ? ' title="'.$params{title}.'"' : ''). (exists $params{class} ? ' class="'.$params{class}.'"' : ''). + (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : ''). (exists $params{id} ? ' id="'.$params{id}.'"' : ''). ' />'; - my $alignclass=exists $params{align} ? "align-$params{align}" : ""; - my $link; if (! defined $params{link}) { $link=$fileurl; @@ -170,9 +169,7 @@ sub preprocess (@) { } if (defined $link) { - $imgtag=''.$imgtag.''; + $imgtag=''.$imgtag.''; } else { my $b = bestlink($params{page}, $params{link}); @@ -182,15 +179,13 @@ sub preprocess (@) { $imgtag=htmllink($params{page}, $params{destpage}, $params{link}, linktext => $imgtag, noimageinline => 1, - (!exists $params{caption} && $alignclass) ? - (class => $alignclass) : (), ); } } if (exists $params{caption}) { return ''. ''. ''. -- 2.39.5
'.$params{caption}.'
'.$imgtag.'