Testing a change via the sandbox.

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index abc7e099ace54d78ef33f919ca1ebf6eaa2ad6ba..cc0e84b01f09a7527c341a99c8262eeebb34d106 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -17,19 +17,20 @@ sub preprocess (@) { #{{{
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 

-       if (! exists $imgdefaults{$params{page}}) {
-               $imgdefaults{$params{page}} = {};
+       if (exists $imgdefaults{$params{page}}) {
+               foreach my $key (keys %{$imgdefaults{$params{page}}}) {
+                       if (! exists $params{$key}) {
+                               $params{$key}=$imgdefaults{$params{page}}->{$key};
+                       }
+               }
+       }
+
+       if (! exists $params{size}) {
+               $params{size}='full';

        }
        }

-       my $size = $params{size} || $imgdefaults{$params{page}}->{size} || 'full';
-       my $alt = $params{alt} || $imgdefaults{$params{page}}->{alt} || '';
-       my $title = $params{title} || $imgdefaults{$params{page}}->{title} || '';

 
        if ($image eq 'defaults') {
 
        if ($image eq 'defaults') {

-               $imgdefaults{$params{page}} = {
-                       size => $size,
-                       alt => $alt,
-                       title => $title,
-               };
+               $imgdefaults{$params{page}} = \%params;

                return '';
        }
 
                return '';
        }
 


@@ -50,9 +51,9 @@ sub preprocess (@) { #{{{
        my $imglink;
        my $r;
 
        my $imglink;
        my $r;
 

-       if ($size ne 'full') {
-               my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
-               return "[[img ".sprintf(gettext('bad size "%s"'), $size)."]]"
+       if ($params{size} ne 'full') {
+               my ($w, $h) = ($params{size} =~ /^(\d+)x(\d+)$/);
+               return "[[img ".sprintf(gettext('bad size "%s"'), $params{size})."]]"

                        unless (defined $w && defined $h);
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                        unless (defined $w && defined $h);
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";


@@ -104,25 +105,33 @@ sub preprocess (@) { #{{{
        }
 
        my $imgtag='<img src="'.$imgurl.
        }
 
        my $imgtag='<img src="'.$imgurl.

-               '" alt="'.$alt.'" width="'.$im->Get("width").
+               '" alt="'.(exists $params{alt} ? $params{alt} : '').
+               '" width="'.$im->Get("width").

                '" height="'.$im->Get("height").'"'.
                '" height="'.$im->Get("height").'"'.

-               (defined $title ? ' title="'.$title.'"' : '').
+               (exists $params{title} ? ' title="'.$params{title}.'"' : '').

                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
 
        if (! defined $params{link} || lc($params{link}) eq 'yes') {
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
 
        if (! defined $params{link} || lc($params{link}) eq 'yes') {

-               return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
+               $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';

        }
        elsif ($params{link} =~ /^\w+:\/\//) {
        }
        elsif ($params{link} =~ /^\w+:\/\//) {

-               return  '<a href="'.$params{link}.'">'.$imgtag.'</a>';
+               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';

        }
        elsif (length bestlink($params{page}, $params{link})) {
                add_depends($params{page}, $params{link});
        }
        elsif (length bestlink($params{page}, $params{link})) {
                add_depends($params{page}, $params{link});

-               return htmllink($params{page}, $params{destpage},
+               $imgtag=htmllink($params{page}, $params{destpage},

                        $params{link}, linktext => $imgtag,
                        noimageinline => 1);
        }
                        $params{link}, linktext => $imgtag,
                        noimageinline => 1);
        }

+
+       if (exists $params{caption}) {
+               return '<table class="img">'.
+                       '<caption>'.$params{caption}.'</caption>'.
+                       '<tr><td>'.$imgtag.'</td></tr>'.
+                       '</table>';
+       }

        else {
                return $imgtag;
        }
        else {
                return $imgtag;
        }