see plug-ins/perl/Changes

plug-ins/perl/Changes

@@ -16,6 +16,8 @@ Revision history for Gimp-Perl extension.
         - fixed a few bugs in Gimp::Fu. PF_PATTERN & friends confused the
           current with the default value and didn't restore it properly.
         - gimpdoc can now output a html file tree.
+        - moved the Perl-Server and Perl Control Center into the Perl submenu.
+        - Gimp::Parasite no longer has a search path.
         
 1.1   Fri Jul 30 07:37:30 CEST 1999
 	- one of the most successful releases, in terms of features & bugfixes.

plug-ins/perl/Gimp.pm

@@ -526,7 +526,7 @@ _pseudoclass qw(Gradients	gimp_gradients_);
 _pseudoclass qw(Edit		gimp_edit_);
 _pseudoclass qw(Progress	gimp_progress_);
 _pseudoclass qw(Region		);
-_pseudoclass qw(Parasite	parasite_ gimp_);
+_pseudoclass qw(Parasite	);
 
 # "C"-Classes
 _pseudoclass qw(GDrawable	gimp_gdrawable_ gimp_drawable_);

plug-ins/perl/Gimp/OO.pod

@@ -180,11 +180,6 @@ that are checked are shown as well (the null prefix "" is implicit).
 
  gimp_patterns_
 
-=item Parasite
-
- parasite_
- gimp_
-
 =back
 
 =head1 AUTHOR

plug-ins/perl/Perl-Server

@@ -304,7 +304,7 @@ sub query {
    Gimp->install_procedure("extension_perl_server", "Start the Gimp-Perl Server",
                            "This is the server for plug-ins written using the Gimp::Net module",
                            "Marc Lehmann <pcg\@goof.com>", "Marc Lehmann", "1998-07-22",
-                           "<Toolbox>/Xtns/Perl Server", "*",&Gimp::PROC_EXTENSION,
+                           "<Toolbox>/Xtns/Perl/Server", "*",&Gimp::PROC_EXTENSION,
                            [
                             [&Gimp::PARAM_INT32, "run_mode", "Interactive, [non-interactive]"],
                             [&Gimp::PARAM_INT32, "flags", "internal flags (must be 0)"],

plug-ins/perl/examples/perlcc

@@ -152,7 +152,7 @@ sub query {
   Gimp->install_procedure("extension_perl_control_center", "the perl control center gives information about gimp-perl",
                           "The perl control center gives information about the status of gimp-perl and allows configuration of important system parameters",
                           "Marc Lehmann", "Marc Lehmann", $VERSION,
-                          "<Toolbox>/Xtns/Perl Control Center", "*", &Gimp::PROC_EXTENSION,
+                          "<Toolbox>/Xtns/Perl/Control Center", "*", &Gimp::PROC_EXTENSION,
                           [[&Gimp::PARAM_INT32, "run_mode", "Interactive, [non-interactive]"]], []);
 }
 

plug-ins/perl/gimpdoc

@@ -100,8 +100,10 @@ EOF
       $_[0] =~ s/</&lt;/;
       $_[0] =~ s/>/&gt;/;
 
+      # FIX: the following three lines are only required for my m4 macro package.
       $_[0] =~ s/{/_lbr/;
-      $_[0] =~ s/}/_rbr/;
+      $_[0] =~ s/}/{}_rbr{}/;
+      $_[0] =~ s/_lbr/{}_lbr{}/;
 
       # do a best effort to replace function names by links
       $_[0] =~ s{\b([a-z_]+_[a-z_]+)\b}{
@@ -214,7 +216,11 @@ sub weight {
 }
     
 sub gen_alternatives(\@$\@) {
-   my @new = [@_];
+   my @vals = @{+shift};
+   my $name = shift;
+   my @args = @{+shift};
+   killcounts(@vals); killcounts(@args);
+   my @new = [\@vals,$name,\@args];
    my @res;
    do {
       my @prev = @new;
@@ -224,7 +230,6 @@ sub gen_alternatives(\@$\@) {
          my $name = $alt->[1];
          my @args = @{$alt->[2]};
          # try to get rid of array counts
-         push @new, [\@vals,$name,\@args] if killcounts(@vals) | killcounts(@args);
          unless ($name =~ /[$ ]/) {
             for my $class (qw(
                   Gimp Layer Image Drawable Selection Channel Display
@@ -232,9 +237,14 @@ sub gen_alternatives(\@$\@) {
                   PixelRgn GDrawable Patterns Parasite
                )) {
                my @pre = @{$class."::PREFIXES"};
+               prefix:
                for (@pre) {
                   my $n2 = $name;
                   if ($_ && $n2 =~ s/^$_//) {
+                     for my $p (@pre) {
+                        last if $_ eq $p;
+                        last prefix if Gimp::_gimp_procedure_available($p.$n2);
+                     }
                      if ($class eq "Drawable" && @args && $args[0][0] == &PARAM_DRAWABLE) {
                         push @new, [\@vals,"\$drawable->$n2",[@args[1..$#args]]];
                      } elsif ($class eq "Layer" && @args && $args[0][0] == &PARAM_LAYER) {
@@ -243,12 +253,18 @@ sub gen_alternatives(\@$\@) {
                         push @new, [\@vals,"\$channel->$n2",[@args[1..$#args]]];
                      } elsif ($class eq "Image" && @args && $args[0][0] == &PARAM_IMAGE) {
                         push @new, [\@vals,"\$image->$n2",[@args[1..$#args]]];
-                     } elsif ($class =~ /Gimp|Gradient|Palette|Edit|Patterns|Parasite|PixelRgn/) {
+                     } elsif (@args < 1 or ($args[0][0] != &PARAM_IMAGE
+                                         && $args[0][0] != &PARAM_DRAWABLE
+                                         && $args[0][0] != &PARAM_CHANNEL
+                                         && $args[0][0] != &PARAM_LAYER)) {
+                        if ($class =~ /Gimp|Gradient|Palette|Edit|Patterns|Parasite|PixelRgn/) {
                            push @new, [\@vals,"${class}->$n2",\@args];
                         } else {
                            push @new, [\@vals,"$n2$nbsp$class",\@args];
                         }
                      }
+                     last prefix;
+                  }
                }
             }
          }