[gimp] gimp-mkenums: tabs-to-spaces, indentation, and trailing-space cleanup

[N/A <ell src gnome org>]

commit bbcb66dbd420c4acba8974f7925d7e1240e54521
Author: Ell <ell_se yahoo com>
Date:   Wed Nov 29 16:07:19 2017 -0500

    gimp-mkenums: tabs-to-spaces, indentation, and trailing-space cleanup

 tools/gimp-mkenums |  622 ++++++++++++++++++++++++++--------------------------
 1 files changed, 311 insertions(+), 311 deletions(-)
---
diff --git a/tools/gimp-mkenums b/tools/gimp-mkenums
index cb919ac..8c3d77b 100755
--- a/tools/gimp-mkenums
+++ b/tools/gimp-mkenums
@@ -6,35 +6,35 @@
 # allows to specify a literal description of the enum value.
 # This description is used to generate user interface elements
 # from the enumeration. To allow i18n of the description, the
-# value is by default put into the N_() macro. 
+# value is by default put into the N_() macro.
 
 use Text::ParseWords;
 use File::Basename;
 
 # gimp-mkenums
 # Information about the current enumeration
-my $flags;                     # Is enumeration a bitmask?
-my $option_lowercase_name;                     # A lower case name to use as part of the *_get_type() 
function, instead of the one that we guess.
-                        # For instance, when an enum uses abnormal capitalization and we can not guess where 
to put the underscores.
-my $seenbitshift;              # Have we seen bitshift operators?
-my $enum_prefix;               # Prefix for this enumeration
-my $enumname;                  # Name for this enumeration
-my $enumshort;                 # $enumname without prefix
-my $enumnick;                  # lower case version of $enumshort
-my $enumindex = 0;             # Global enum counter
-my $firstenum = 1;             # Is this the first enumeration per file?
-my @entries;                   # [ $name, $val ] for each entry
+my $flags;                      # Is enumeration a bitmask?
+my $option_lowercase_name;      # A lower case name to use as part of the *_get_type() function, instead of 
the one that we guess.
+                                # For instance, when an enum uses abnormal capitalization and we can not 
guess where to put the underscores.
+my $seenbitshift;               # Have we seen bitshift operators?
+my $enum_prefix;                # Prefix for this enumeration
+my $enumname;                   # Name for this enumeration
+my $enumshort;                  # $enumname without prefix
+my $enumnick;                   # lower case version of $enumshort
+my $enumindex = 0;              # Global enum counter
+my $firstenum = 1;              # Is this the first enumeration per file?
+my @entries;                    # [ $name, $val ] for each entry
 
 sub parse_trigraph {
     my $opts = shift;
     my @opts;
 
     for $opt (quotewords(",", "true", $opts)) {
-       $opt =~ s/^\s*//;
-       $opt =~ s/\s*$//;
-       my ($key,$val) = $opt =~ /(\w+)(?:=(.+))?/;
-       defined $val or $val = 1;
-       push @opts, $key, $val;
+        $opt =~ s/^\s*//;
+        $opt =~ s/\s*$//;
+        my ($key,$val) = $opt =~ /(\w+)(?:=(.+))?/;
+        defined $val or $val = 1;
+        push @opts, $key, $val;
     }
     @opts;
 }
@@ -44,61 +44,61 @@ sub parse_entries {
     my $file = shift;
     my $file_name = shift;
     my $looking_for_name = 0;
-    
+
     while (<$file>) {
-       # read lines until we have no open comments
-       while (m@/\*([^*]|\*(?!/))*$@) {
-           my $new;
-           defined ($new = <$file>) || die "Unmatched comment in $ARGV";
-           $_ .= $new;
-       }
-       # strip comments w/o options
-       s@/\*(?!<)
-           ([^*]+|\*(?!/))*
-          \*/@@gx;
-       
-       # strip newlines
-       s@\n@ @;
-       
-       # skip empty lines
-       next if m@^\s*$@;
-       
-       if ($looking_for_name) {
-           if (/^\s*(\w+)/) {
-               $enumname = $1;
-               return 1;
-           }
-       }
-       
-       # Handle include files
-       if (/^\#include\s*<([^>]*)>/ ) {
+        # read lines until we have no open comments
+        while (m@/\*([^*]|\*(?!/))*$@) {
+            my $new;
+            defined ($new = <$file>) || die "Unmatched comment in $ARGV";
+            $_ .= $new;
+        }
+        # strip comments w/o options
+        s@/\*(?!<)
+            ([^*]+|\*(?!/))*
+           \*/@@gx;
+
+        # strip newlines
+        s@\n@ @;
+
+        # skip empty lines
+        next if m@^\s*$@;
+
+        if ($looking_for_name) {
+            if (/^\s*(\w+)/) {
+                $enumname = $1;
+                return 1;
+            }
+        }
+
+        # Handle include files
+        if (/^\#include\s*<([^>]*)>/ ) {
             my $file= "../$1";
-           open NEWFILE, $file or die "Cannot open include file $file: $!\n";
-           
-           if (parse_entries (\*NEWFILE, $NEWFILE)) {
-               return 1;
-           } else {
-               next;
-           }
-       }
-       
-       if (/^\s*\}\s*(\w+)/) {
-           $enumname = $1;
-           $enumindex++;
-           return 1;
-       }
-       
-       if (/^\s*\}/) {
-           $enumindex++;
-           $looking_for_name = 1;
-           next;
-       }
+            open NEWFILE, $file or die "Cannot open include file $file: $!\n";
+
+            if (parse_entries (\*NEWFILE, $NEWFILE)) {
+                return 1;
+            } else {
+                next;
+            }
+        }
+
+        if (/^\s*\}\s*(\w+)/) {
+            $enumname = $1;
+            $enumindex++;
+            return 1;
+        }
+
+        if (/^\s*\}/) {
+            $enumindex++;
+            $looking_for_name = 1;
+            next;
+        }
 
         if (m@^\s*
               (\w+)\s*                   # name
               (?:=(                      # value
-                  \s*\w+\s*\(.*\)\s*       # macro with multiple args
-                  |                        # OR
+                   \s*\w+\s*\(.*\)\s*       # macro with multiple args
+                   |                        # OR
                    (?:[^,/]|/(?!\*))*       # anything but a comma or comment
                   ))?,?\s*
               (?:/\*<                    # options
@@ -108,18 +108,18 @@ sub parse_entries {
              @x) {
             my ($name, $value, $options) = ($1,$2,$3);
 
-           if (!defined $flags && defined $value && $value =~ /<</) {
-               $seenbitshift = 1;
-           }
+            if (!defined $flags && defined $value && $value =~ /<</) {
+                $seenbitshift = 1;
+            }
 
-           if (defined $options) {
-               my %options = parse_trigraph($options);
-               if (!defined $options{"skip"}) {
-                   push @entries, [ $name, $options{nick}, $options{desc}, $options{help} ];
-               }
-           } else {
-               push @entries, [ $name ];
-           }
+            if (defined $options) {
+                my %options = parse_trigraph($options);
+                if (!defined $options{"skip"}) {
+                    push @entries, [ $name, $options{nick}, $options{desc}, $options{help} ];
+                }
+            } else {
+                push @entries, [ $name ];
+            }
 
             # skip remaining lines of multiline values
             do {
@@ -132,11 +132,11 @@ sub parse_entries {
 
             # failed to find end of value. bail
             die "$0: $file_name:$.: Unterminated enum, while processing `$name'\n";
-       } elsif (m@^\s*\#@) {
-           # ignore preprocessor directives
-       } else {
-           print STDERR "$0: $file_name:$.: Failed to parse `$_'\n";
-       }
+        } elsif (m@^\s*\#@) {
+            # ignore preprocessor directives
+        } else {
+            print STDERR "$0: $file_name:$.: Failed to parse `$_'\n";
+        }
     }
 
     return 0;
@@ -233,27 +233,27 @@ if (length($fhead)) {
     $prod =~ s/\@basename\@/basename($ARGV[0])/ge;
     $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
     $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-               
+
     print "$prod\n";
 }
 
 while (<>) {
     if (eof) {
-       close (ARGV);           # reset line numbering
-       $firstenum = 1;         # Flag to print filename at next enum
+        close (ARGV);           # reset line numbering
+        $firstenum = 1;         # Flag to print filename at next enum
     }
 
     # read lines until we have no open comments
     while (m@/\*([^*]|\*(?!/))*$@) {
-       my $new;
-       defined ($new = <>) || die "Unmatched comment in $ARGV";
-       $_ .= $new;
+        my $new;
+        defined ($new = <>) || die "Unmatched comment in $ARGV";
+        $_ .= $new;
     }
     # strip comments w/o options
     s@/\*(?!<)
        ([^*]+|\*(?!/))*
        \*/@@gx;
-       
+
     # ignore forward declarations
     next if /^\s*typedef\s+enum.*;/;
 
@@ -263,256 +263,256 @@ while (<>) {
              (([^*]|\*(?!/))*)
             >\s*\*/)?
          @x) {
-       if (defined $2) {
-           my %options = parse_trigraph ($2);
-           next if defined $options{"skip"};
-           $enum_prefix = $options{prefix};
-           $flags = $options{flags};
-      $option_lowercase_name = $options{lowercase_name};
-       } else {
-           $enum_prefix = undef;
-           $flags = undef;
-      $option_lowercase_name = undef;
-       }
-       # Didn't have trailing '{' look on next lines
-       if (!defined $1) {
-           while (<>) {
-               if (eof) {
-                   die "Hit end of file while parsing enum in $ARGV";
-               }
-               if (s/^\s*\{//) {
-                   last;
-               }
-           }
-       }
-
-       $seenbitshift = 0;
-
-       @entries = ();
-
-       # Now parse the entries
-       parse_entries (\*ARGV, $ARGV);
-
-       # figure out if this was a flags or enums enumeration
-       if (!defined $flags) {
-           $flags = $seenbitshift;
-       }
-
-       # Autogenerate a prefix
-       if (!defined $enum_prefix) {
-           for (@entries) {
-               my $nick = $_->[1];
-               if (!defined $nick) {
-                   my $name = $_->[0];
-                   if (defined $enum_prefix) {
-                       my $tmp = ~ ($name ^ $enum_prefix);
-                       ($tmp) = $tmp =~ /(^\xff*)/;
-                       $enum_prefix = $enum_prefix & $tmp;
-                   } else {
-                       $enum_prefix = $name;
-                   }
-               }
-           }
-           if (!defined $enum_prefix) {
-               $enum_prefix = "";
-           } else {
-               # Trim so that it ends in an underscore
-               $enum_prefix =~ s/_[^_]*$/_/;
-           }
-       } else {
-           # canonicalize user defined prefixes
-           $enum_prefix = uc($enum_prefix);
-           $enum_prefix =~ s/-/_/g;
-           $enum_prefix =~ s/(.*)([^_])$/$1$2_/;
-       }
-       
-       
-       # enumname is e.g. GMatchType
-       $enspace = $enumname;
-       $enspace =~ s/^([A-Z][a-z]*).*$/$1/;
-       
-       $enumshort = $enumname;
-       $enumshort =~ s/^[A-Z][a-z]*//;
-       $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;
-       $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
-       $enumshort = uc($enumshort);
-
-       $enumlong = uc($enspace) . "_" . $enumshort;
-       $enumsym = lc($enspace) . "_" . lc($enumshort);
-
-       $enumnick = lc($enumshort);
-       $enumnick =~ tr/_/-/;
-
-       for $entry (@entries) {
-           my ($name,$nick,$desc,$help) = @{$entry};
+        if (defined $2) {
+            my %options = parse_trigraph ($2);
+            next if defined $options{"skip"};
+            $enum_prefix = $options{prefix};
+            $flags = $options{flags};
+            $option_lowercase_name = $options{lowercase_name};
+        } else {
+            $enum_prefix = undef;
+            $flags = undef;
+            $option_lowercase_name = undef;
+        }
+        # Didn't have trailing '{' look on next lines
+        if (!defined $1) {
+            while (<>) {
+                if (eof) {
+                    die "Hit end of file while parsing enum in $ARGV";
+                }
+                if (s/^\s*\{//) {
+                    last;
+                }
+            }
+        }
+
+        $seenbitshift = 0;
+
+        @entries = ();
+
+        # Now parse the entries
+        parse_entries (\*ARGV, $ARGV);
+
+        # figure out if this was a flags or enums enumeration
+        if (!defined $flags) {
+            $flags = $seenbitshift;
+        }
+
+        # Autogenerate a prefix
+        if (!defined $enum_prefix) {
+            for (@entries) {
+                my $nick = $_->[1];
+                if (!defined $nick) {
+                    my $name = $_->[0];
+                    if (defined $enum_prefix) {
+                        my $tmp = ~ ($name ^ $enum_prefix);
+                        ($tmp) = $tmp =~ /(^\xff*)/;
+                        $enum_prefix = $enum_prefix & $tmp;
+                    } else {
+                        $enum_prefix = $name;
+                    }
+                }
+            }
+            if (!defined $enum_prefix) {
+                $enum_prefix = "";
+            } else {
+                # Trim so that it ends in an underscore
+                $enum_prefix =~ s/_[^_]*$/_/;
+            }
+        } else {
+            # canonicalize user defined prefixes
+            $enum_prefix = uc($enum_prefix);
+            $enum_prefix =~ s/-/_/g;
+            $enum_prefix =~ s/(.*)([^_])$/$1$2_/;
+        }
+
+
+        # enumname is e.g. GMatchType
+        $enspace = $enumname;
+        $enspace =~ s/^([A-Z][a-z]*).*$/$1/;
+
+        $enumshort = $enumname;
+        $enumshort =~ s/^[A-Z][a-z]*//;
+        $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;
+        $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
+        $enumshort = uc($enumshort);
+
+        $enumlong = uc($enspace) . "_" . $enumshort;
+        $enumsym = lc($enspace) . "_" . lc($enumshort);
+
+        $enumnick = lc($enumshort);
+        $enumnick =~ tr/_/-/;
+
+        for $entry (@entries) {
+            my ($name,$nick,$desc,$help) = @{$entry};
             if (!defined $nick) {
-               ($nick = $name) =~ s/^$enum_prefix//;
-               $nick =~ tr/_/-/;
-               $nick = lc($nick);
+                ($nick = $name) =~ s/^$enum_prefix//;
+                $nick =~ tr/_/-/;
+                $nick = lc($nick);
             }
-           if (!defined $desc) {
-               $desc = "\"$name\"";
-           } else {
-               $desc = "NC_(\"$enumnick\", $desc)";
-           }
-           if (!defined $help) {
-               $help = "NULL";
-           } else {
-               $help = "N_($help)";
-           }
-           @{$entry} = ($name, $nick, $desc, $help);
-       }
-       
-
-       # Spit out the output
-
-       # The options might override the lower case name if it could
-       # not be generated correctly:
-       if (defined($option_lowercase_name)) {
-           $enumsym = $option_lowercase_name;
-       }
-
-       if ($firstenum) {
-           $firstenum = 0;
-           
-           if (length($fprod)) {
-               my $prod = $fprod;
-
-               $prod =~ s/\@filename\@/$ARGV/g;
+            if (!defined $desc) {
+                $desc = "\"$name\"";
+            } else {
+                $desc = "NC_(\"$enumnick\", $desc)";
+            }
+            if (!defined $help) {
+                $help = "NULL";
+            } else {
+                $help = "N_($help)";
+            }
+            @{$entry} = ($name, $nick, $desc, $help);
+        }
+
+
+        # Spit out the output
+
+        # The options might override the lower case name if it could
+        # not be generated correctly:
+        if (defined($option_lowercase_name)) {
+            $enumsym = $option_lowercase_name;
+        }
+
+        if ($firstenum) {
+            $firstenum = 0;
+
+            if (length($fprod)) {
+                my $prod = $fprod;
+
+                $prod =~ s/\@filename\@/$ARGV/g;
                 $prod =~ s/\@basename\@/basename($ARGV)/ge;
-               $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-               $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-               
-               print "$prod\n";
-           }
-       }
-       
-       if (length($eprod)) {
-           my $prod = $eprod;
-
-           $prod =~ s/\@enum_name\@/$enumsym/g;
-           $prod =~ s/\@EnumName\@/$enumname/g;
-           $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-           $prod =~ s/\@enumnick\@/$enumnick/g;
-           $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-           if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-           if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-           if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
-           $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-           $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-
-           print "$prod\n";
-       }
-
-       if (length($vhead)) {
-           my $prod = $vhead;
-
-           $prod =~ s/\@enum_name\@/$enumsym/g;
+                $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
+                $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+
+                print "$prod\n";
+            }
+        }
+
+        if (length($eprod)) {
+            my $prod = $eprod;
+
+            $prod =~ s/\@enum_name\@/$enumsym/g;
+            $prod =~ s/\@EnumName\@/$enumname/g;
+            $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
+            $prod =~ s/\@enumnick\@/$enumnick/g;
+            $prod =~ s/\@ENUMNAME\@/$enumlong/g;
+            if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
+            if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
+            if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
+            $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
+            $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+
+            print "$prod\n";
+        }
+
+        if (length($vhead)) {
+            my $prod = $vhead;
+
+            $prod =~ s/\@enum_name\@/$enumsym/g;
             $prod =~ s/\@EnumName\@/$enumname/g;
             $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-           $prod =~ s/\@enumnick\@/$enumnick/g;
+            $prod =~ s/\@enumnick\@/$enumnick/g;
             $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-           if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-           if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-           if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
+            if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
+            if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
+            if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
             $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
             $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-           
+
             print "$prod\n";
-       }
-
-       if (length($vprod)) {
-           my $prod = $vprod;
-           
-           $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-           $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-           for (@entries) {
-               my ($name,$nick,$desc,$help) = @{$_};
-               my $tmp_prod = $prod;
-
-               $tmp_prod =~ s/\@VALUENAME\@/$name/g;
-               $tmp_prod =~ s/\@valuenick\@/$nick/g;
-               $tmp_prod =~ s/\@valuedesc\@/$desc/g;
-               $tmp_prod =~ s/\@valuehelp\@/$help/g;
-               if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }
-               if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }
-               if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }
-
-               print "$tmp_prod\n";
-           }
-       }
-
-       if (length($vtail)) {
-           my $prod = $vtail;
-
-           $prod =~ s/\@enum_name\@/$enumsym/g;
+        }
+
+        if (length($vprod)) {
+            my $prod = $vprod;
+
+            $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
+            $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+            for (@entries) {
+                my ($name,$nick,$desc,$help) = @{$_};
+                my $tmp_prod = $prod;
+
+                $tmp_prod =~ s/\@VALUENAME\@/$name/g;
+                $tmp_prod =~ s/\@valuenick\@/$nick/g;
+                $tmp_prod =~ s/\@valuedesc\@/$desc/g;
+                $tmp_prod =~ s/\@valuehelp\@/$help/g;
+                if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }
+                if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }
+                if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }
+
+                print "$tmp_prod\n";
+            }
+        }
+
+        if (length($vtail)) {
+            my $prod = $vtail;
+
+            $prod =~ s/\@enum_name\@/$enumsym/g;
             $prod =~ s/\@EnumName\@/$enumname/g;
             $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-           $prod =~ s/\@enumnick\@/$enumnick/g;
+            $prod =~ s/\@enumnick\@/$enumnick/g;
             $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-           if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-           if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-           if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
+            if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
+            if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
+            if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
             $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
             $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-           
+
             print "$prod\n";
-       }
+        }
 
-       if (length($dhead)) {
-           my $prod = $dhead;
+        if (length($dhead)) {
+            my $prod = $dhead;
 
-           $prod =~ s/\@enum_name\@/$enumsym/g;
+            $prod =~ s/\@enum_name\@/$enumsym/g;
             $prod =~ s/\@EnumName\@/$enumname/g;
             $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-           $prod =~ s/\@enumnick\@/$enumnick/g;
+            $prod =~ s/\@enumnick\@/$enumnick/g;
             $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-           if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-           if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-           if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
+            if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
+            if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
+            if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
             $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
             $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-           
+
             print "$prod\n";
-       }
-
-       if (length($dprod)) {
-           my $prod = $dprod;
-           
-           $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-           $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-           for (@entries) {
-               my ($name,$nick,$desc,$help) = @{$_};
-               my $tmp_prod = $prod;
-
-               $tmp_prod =~ s/\@VALUENAME\@/$name/g;
-               $tmp_prod =~ s/\@valuenick\@/$nick/g;
-               $tmp_prod =~ s/\@valuedesc\@/$desc/g;
-               $tmp_prod =~ s/\@valuehelp\@/$help/g;
-               if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }
-               if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }
-               if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }
-
-               print "$tmp_prod\n";
-           }
-       }
-
-       if (length($dtail)) {
-           my $prod = $dtail;
-
-           $prod =~ s/\@enum_name\@/$enumsym/g;
+        }
+
+        if (length($dprod)) {
+            my $prod = $dprod;
+
+            $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
+            $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
+            for (@entries) {
+                my ($name,$nick,$desc,$help) = @{$_};
+                my $tmp_prod = $prod;
+
+                $tmp_prod =~ s/\@VALUENAME\@/$name/g;
+                $tmp_prod =~ s/\@valuenick\@/$nick/g;
+                $tmp_prod =~ s/\@valuedesc\@/$desc/g;
+                $tmp_prod =~ s/\@valuehelp\@/$help/g;
+                if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }
+                if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }
+                if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }
+
+                print "$tmp_prod\n";
+            }
+        }
+
+        if (length($dtail)) {
+            my $prod = $dtail;
+
+            $prod =~ s/\@enum_name\@/$enumsym/g;
             $prod =~ s/\@EnumName\@/$enumname/g;
             $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-           $prod =~ s/\@enumnick\@/$enumnick/g;
+            $prod =~ s/\@enumnick\@/$enumnick/g;
             $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-           if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-           if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-           if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
+            if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
+            if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
+            if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
             $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
             $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-           
+
             print "$prod\n";
-       }
+        }
     }
 }
 
@@ -523,7 +523,7 @@ if (length($ftail)) {
     $prod =~ s/\@basename\@/basename($ARGV)/ge;
     $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
     $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-               
+
     print "$prod\n";
 }